diff --git a/its/src/test/kotlin/org/sonarlint/intellij/its/tests/domain/OpenInIdeTests.kt b/its/src/test/kotlin/org/sonarlint/intellij/its/tests/domain/OpenInIdeTests.kt index 83fafcf71b..35be2ff2ee 100644 --- a/its/src/test/kotlin/org/sonarlint/intellij/its/tests/domain/OpenInIdeTests.kt +++ b/its/src/test/kotlin/org/sonarlint/intellij/its/tests/domain/OpenInIdeTests.kt @@ -39,8 +39,8 @@ class OpenInIdeTests { fun createConnection(token: String) { with(remoteRobot) { idea { - dialog("Trust This SonarQube Server?") { - button("Connect to This SonarQube Server").click() + dialog("Trust This SonarQube Server Instance?") { + button("Connect to This SonarQube Server Instance").click() } dialog("New Connection: Server Details") { keyboard { enterText("Orchestrator") } @@ -63,9 +63,9 @@ class OpenInIdeTests { fun acceptNewAutomatedConnection() { with(remoteRobot) { idea { - dialog("Trust This SonarQube Server?") { + dialog("Trust This SonarQube Server Instance?") { jbTextFields()[1].text = "Orchestrator" - buttonContainsText("Connect to This SonarQube Server").click() + buttonContainsText("Connect to This SonarQube Server Instance").click() } } } diff --git a/its/src/test/kotlin/org/sonarlint/intellij/its/tests/domain/SharedConfigurationTests.kt b/its/src/test/kotlin/org/sonarlint/intellij/its/tests/domain/SharedConfigurationTests.kt index a57e6afcb7..e3e9f923d4 100644 --- a/its/src/test/kotlin/org/sonarlint/intellij/its/tests/domain/SharedConfigurationTests.kt +++ b/its/src/test/kotlin/org/sonarlint/intellij/its/tests/domain/SharedConfigurationTests.kt @@ -45,9 +45,9 @@ class SharedConfigurationTests { with(remoteRobot) { idea { notificationByActionName("Use configuration").click() - dialog("Connect to This SonarQube Server?") { + dialog("Connect to This SonarQube Server Instance?") { jBPasswordField().text = token - buttonContainsText("Connect to This SonarQube Server").click() + buttonContainsText("Connect to This SonarQube Server Instance").click() } } } diff --git a/src/main/java/org/sonarlint/intellij/SonarLintIcons.kt b/src/main/java/org/sonarlint/intellij/SonarLintIcons.kt index 9494651c1a..22d2b703e2 100644 --- a/src/main/java/org/sonarlint/intellij/SonarLintIcons.kt +++ b/src/main/java/org/sonarlint/intellij/SonarLintIcons.kt @@ -31,30 +31,31 @@ import org.sonarsource.sonarlint.core.rpc.protocol.common.RuleType object SonarLintIcons { @JvmField - val ICON_SONARQUBE = getIcon("/images/SonarQube.png") + val ICON_SONARQUBE_SERVER = getIcon("/images/sonarqube_server.png") @JvmField - val ICON_SONARCLOUD = getIcon("/images/SonarCloud.png") + val ICON_SONARQUBE_CLOUD = getIcon("/images/sonarqube_cloud.png") @JvmField - val ICON_SONARQUBE_16 = getIcon("/images/onde-sonar-16.png") + val ICON_SONARQUBE_SERVER_16 = getIcon("/images/sonarqube_server_16px.svg") @JvmField - val ICON_SONARCLOUD_16 = getIcon("/images/sonarcloud-16.png") + val ICON_SONARQUBE_CLOUD_16 = getIcon("/images/sonarqube_cloud_16px.svg") @JvmField - val SONARLINT_TOOLWINDOW = getIcon("/images/sonarlintToolWindow.svg") + val SONARQUBE_FOR_INTELLIJ_13PX = getIcon("/images/sonarqube_for_intellij_13px.svg") @JvmField - val SONARLINT_ACTION = getIcon("/images/sonarlintAction.svg") + val SONARQUBE_FOR_INTELLIJ_RED_13PX = getIcon("/images/sonarqube_for_intellij_red_13px.svg") @JvmField - val SONARLINT_ACTION_12PX = getIcon("/images/sonarlintAction_12px.svg") + val SONARQUBE_FOR_INTELLIJ_GREEN_13PX = getIcon("/images/sonarqube_for_intellij_green_13px.svg") @JvmField - val SONARLINT_ACTION_GREEN_12PX = getIcon("/images/sonarlintAction_green_12px.svg") + val SONARQUBE_FOR_INTELLIJ_ORANGE_13PX = getIcon("/images/sonarqube_for_intellij_orange_13px.svg") @JvmField - val SONARLINT_ACTION_ORANGE_12PX = getIcon("/images/sonarlintAction_orange_12px.svg") + val SONARQUBE_FOR_INTELLIJ_TOOLWINDOW = getIcon("/images/sonarqube_for_intellij_toolwindow.svg") + @JvmField - val SONARLINT_TOOLWINDOW_EMPTY = getIcon("/images/sonarlintToolWindowEmpty.svg") + val SONARQUBE_FOR_INTELLIJ_EMPTY_TOOLWINDOW = getIcon("/images/sonarqube_for_intellij_empty_toolwindow.svg") @JvmField - val SONARLINT = getIcon("/images/sonarlint.png") + val SONARQUBE_FOR_INTELLIJ = getIcon("/images/sonarqube_for_intellij.svg") @JvmField - val SONARLINT_32 = getIcon("/images/sonarlint@2x.png") + val SONARQUBE_FOR_INTELLIJ_32PX = getIcon("/images/sonarqube_for_intellij_32px.svg") @JvmField val PLAY = getIcon("/images/execute.png") @JvmField diff --git a/src/main/java/org/sonarlint/intellij/SonarLintIntelliJClient.kt b/src/main/java/org/sonarlint/intellij/SonarLintIntelliJClient.kt index f88a06d9b0..1fb562d435 100644 --- a/src/main/java/org/sonarlint/intellij/SonarLintIntelliJClient.kt +++ b/src/main/java/org/sonarlint/intellij/SonarLintIntelliJClient.kt @@ -198,7 +198,7 @@ object SonarLintIntelliJClient : SonarLintRpcClientDelegate { uniqueSuggestion.connectionSuggestion.right.organization) } else { Triple( - "SonarQube Server", uniqueSuggestion.connectionSuggestion.left.projectKey, + "SonarQube Server instance", uniqueSuggestion.connectionSuggestion.left.projectKey, uniqueSuggestion.connectionSuggestion.left.serverUrl) } } @@ -423,7 +423,7 @@ object SonarLintIntelliJClient : SonarLintRpcClientDelegate { projectLessNotification( "", - "You have successfully established a connection to the ${if (isSQ) "SonarQube Server" else "SonarQube Cloud organization"}", + "You have successfully established a connection to the ${if (isSQ) "SonarQube Server instance" else "SonarQube Cloud organization"}", NotificationType.INFORMATION ) @@ -440,13 +440,13 @@ object SonarLintIntelliJClient : SonarLintRpcClientDelegate { } private fun setUpManualConnection(serverUrl: String): AssistCreatingConnectionResponse { - val warningTitle = "Trust This SonarQube Server?" + val warningTitle = "Trust This SonarQube Server Instance?" val message = """ - The server ${StringEscapeUtils.escapeHtml4(serverUrl)} is attempting to set up a connection with SonarQube for IntelliJ. Letting SonarQube for IntelliJ connect to an untrusted SonarQube Server is potentially dangerous. + The server ${StringEscapeUtils.escapeHtml4(serverUrl)} is attempting to set up a connection with SonarQube for IntelliJ. Letting SonarQube for IntelliJ connect to an untrusted SonarQube Server instance is potentially dangerous. If you don’t trust this server, we recommend canceling this action and manually setting up Connected Mode. """.trimIndent() - val connectButtonText = "Connect to This SonarQube Server" + val connectButtonText = "Connect to This SonarQube Server Instance" val dontTrustButtonText = "I Don't Trust This Server" val choice = ApplicationManager.getApplication().computeInEDT { @@ -482,7 +482,7 @@ object SonarLintIntelliJClient : SonarLintRpcClientDelegate { getService(project, ProjectBindingManager::class.java).bindTo(connection, projectKey, emptyMap(), mode) get(project).simpleNotification( "Project successfully bound", - "Local project bound to project '$projectKey' of SonarQube Server '${connection.name}'. " + "Local project bound to project '$projectKey' of SonarQube Server instance '${connection.name}'. " + "You can now enjoy all capabilities of SonarQube for IntelliJ Connected Mode. The binding of this project can be updated in the SonarQube for IntelliJ Settings.", NotificationType.INFORMATION, OpenInBrowserAction("Learn More in Documentation", null, CONNECTED_MODE_BENEFITS_LINK) diff --git a/src/main/java/org/sonarlint/intellij/actions/MarkAsResolvedAction.kt b/src/main/java/org/sonarlint/intellij/actions/MarkAsResolvedAction.kt index 6f664e8be7..3a05cce552 100644 --- a/src/main/java/org/sonarlint/intellij/actions/MarkAsResolvedAction.kt +++ b/src/main/java/org/sonarlint/intellij/actions/MarkAsResolvedAction.kt @@ -250,10 +250,10 @@ class MarkAsResolvedAction( override fun startInWriteAction() = false - override fun getText() = "SonarQube for IntelliJ: Mark issue as\u2026" + override fun getText() = "SonarQube: Mark issue as\u2026" override fun getFamilyName(): String { - return "SonarQube for IntelliJ mark issue as\u2026" + return "SonarQube mark issue as\u2026" } override fun isVisible(e: AnActionEvent): Boolean { diff --git a/src/main/java/org/sonarlint/intellij/actions/ReopenIssueAction.kt b/src/main/java/org/sonarlint/intellij/actions/ReopenIssueAction.kt index fc928dea2d..6c8e06dcb4 100644 --- a/src/main/java/org/sonarlint/intellij/actions/ReopenIssueAction.kt +++ b/src/main/java/org/sonarlint/intellij/actions/ReopenIssueAction.kt @@ -164,10 +164,10 @@ class ReopenIssueAction(private var issue: LiveIssue? = null) : AbstractSonarAct override fun startInWriteAction() = false - override fun getText() = "SonarQube for IntelliJ: Reopen issue" + override fun getText() = "SonarQube: Reopen issue" override fun getFamilyName(): String { - return "SonarQube for IntelliJ reopen issue" + return "SonarQube reopen issue" } override fun isVisible(e: AnActionEvent): Boolean { diff --git a/src/main/java/org/sonarlint/intellij/actions/ReviewSecurityHotspotAction.kt b/src/main/java/org/sonarlint/intellij/actions/ReviewSecurityHotspotAction.kt index ee54e2f751..dcd06008ca 100644 --- a/src/main/java/org/sonarlint/intellij/actions/ReviewSecurityHotspotAction.kt +++ b/src/main/java/org/sonarlint/intellij/actions/ReviewSecurityHotspotAction.kt @@ -134,9 +134,9 @@ class ReviewSecurityHotspotAction(private var serverFindingKey: String? = null, override fun startInWriteAction() = false - override fun getText() = "SonarQube for IntelliJ: Change Security Hotspot status" + override fun getText() = "SonarQube: Change Security Hotspot status" - override fun getFamilyName() = "SonarQube for IntelliJ review" + override fun getFamilyName() = "SonarQube review" override fun isAvailable(project: Project, editor: Editor?, file: PsiFile?) = serverFindingKey != null diff --git a/src/main/java/org/sonarlint/intellij/config/SonarLintColorSettingsPage.java b/src/main/java/org/sonarlint/intellij/config/SonarLintColorSettingsPage.java index e0e556bdf9..88952ad8ab 100644 --- a/src/main/java/org/sonarlint/intellij/config/SonarLintColorSettingsPage.java +++ b/src/main/java/org/sonarlint/intellij/config/SonarLintColorSettingsPage.java @@ -54,7 +54,7 @@ private static class DescriptorComparator implements Comparator ADDITIONAL_HIGHLIGHT_DESCRIPTORS = new TreeMap<>(); @Nullable @Override public Icon getIcon() { - return SonarLintIcons.SONARLINT; + return SonarLintIcons.SONARQUBE_FOR_INTELLIJ; } @NotNull @Override public SyntaxHighlighter getHighlighter() { diff --git a/src/main/java/org/sonarlint/intellij/config/global/AutomaticServerConnectionCreator.kt b/src/main/java/org/sonarlint/intellij/config/global/AutomaticServerConnectionCreator.kt index d16e9d4f27..7c059c83b6 100644 --- a/src/main/java/org/sonarlint/intellij/config/global/AutomaticServerConnectionCreator.kt +++ b/src/main/java/org/sonarlint/intellij/config/global/AutomaticServerConnectionCreator.kt @@ -64,11 +64,11 @@ class AutomaticServerConnectionCreator(private val serverOrOrg: String, private private val proxyButton = JButton("Proxy") init { - title = if (isSQ) "Trust This SonarQube Server?" else "Trust This SonarQube Cloud Organization?" + title = if (isSQ) "Trust This SonarQube Server Instance?" else "Trust This SonarQube Cloud Organization?" val connectionNames = Settings.getGlobalSettings().serverNames connectionNameField.text = findFirstUniqueConnectionName(connectionNames, serverOrOrg) - val buttonTextAction = if (isSQ) "Connect to This SonarQube Server" else "Connect to This SonarQube Cloud Organization" + val buttonTextAction = if (isSQ) "Connect to This SonarQube Server Instance" else "Connect to This SonarQube Cloud Organization" createConnectionAction = object : DialogWrapperAction(buttonTextAction) { init { @@ -149,7 +149,7 @@ class AutomaticServerConnectionCreator(private val serverOrOrg: String, private redWarningIcon.icon = AllIcons.Ide.FatalError warningLabel.text = if (isSQ) { "Always ensure that your Server URL matches your SonarQube Server instance. " + - "Letting SonarQube for IntelliJ connect to an untrusted SonarQube Server is potentially dangerous." + "Letting SonarQube for IntelliJ connect to an untrusted SonarQube Server instance is potentially dangerous." } else { "Ensure that the organization matches your SonarQube Cloud organization." } diff --git a/src/main/java/org/sonarlint/intellij/config/global/ServerConnection.java b/src/main/java/org/sonarlint/intellij/config/global/ServerConnection.java index 7bcfce00f4..25dcc64476 100644 --- a/src/main/java/org/sonarlint/intellij/config/global/ServerConnection.java +++ b/src/main/java/org/sonarlint/intellij/config/global/ServerConnection.java @@ -143,7 +143,7 @@ public String getProductName() { } public Icon getProductIcon() { - return isSonarCloud() ? SonarLintIcons.ICON_SONARCLOUD_16 : SonarLintIcons.ICON_SONARQUBE_16; + return isSonarCloud() ? SonarLintIcons.ICON_SONARQUBE_CLOUD_16 : SonarLintIcons.ICON_SONARQUBE_SERVER_16; } public boolean enableProxy() { diff --git a/src/main/java/org/sonarlint/intellij/config/global/ServerConnectionMgmtPanel.java b/src/main/java/org/sonarlint/intellij/config/global/ServerConnectionMgmtPanel.java index fca276c00a..60def07c83 100644 --- a/src/main/java/org/sonarlint/intellij/config/global/ServerConnectionMgmtPanel.java +++ b/src/main/java/org/sonarlint/intellij/config/global/ServerConnectionMgmtPanel.java @@ -127,9 +127,9 @@ public void mouseClicked(MouseEvent evt) { @Override protected void customizeCellRenderer(JList list, ServerConnection server, int index, boolean selected, boolean hasFocus) { if (server.isSonarCloud()) { - setIcon(SonarLintIcons.ICON_SONARCLOUD_16); + setIcon(SonarLintIcons.ICON_SONARQUBE_CLOUD_16); } else { - setIcon(SonarLintIcons.ICON_SONARQUBE_16); + setIcon(SonarLintIcons.ICON_SONARQUBE_SERVER_16); } append(server.getName(), SimpleTextAttributes.REGULAR_ATTRIBUTES); if (!server.isSonarCloud()) { @@ -143,10 +143,10 @@ private static JPanel initConnectionTitle() { var titlePanel = new JPanel(new HorizontalLayout(5)); var connectionLabel = new JBLabel("Connections to SonarQube ("); connectionLabel.setFont(connectionLabel.getFont().deriveFont(Font.BOLD, 16f)); - var sonarQubeIcon = new JBLabel(SonarLintIcons.ICON_SONARCLOUD_16); + var sonarQubeIcon = new JBLabel(SonarLintIcons.ICON_SONARQUBE_CLOUD_16); var sonarQubeLabel = new JBLabel("Server, "); sonarQubeLabel.setFont(sonarQubeLabel.getFont().deriveFont(Font.BOLD, 16f)); - var sonarCloudIcon = new JBLabel(SonarLintIcons.ICON_SONARQUBE_16); + var sonarCloudIcon = new JBLabel(SonarLintIcons.ICON_SONARQUBE_SERVER_16); var sonarCloudLabel = new JBLabel("Cloud)"); sonarCloudLabel.setFont(sonarQubeLabel.getFont().deriveFont(Font.BOLD, 16f)); titlePanel.add(connectionLabel); diff --git a/src/main/java/org/sonarlint/intellij/config/global/SonarLintAboutPanel.java b/src/main/java/org/sonarlint/intellij/config/global/SonarLintAboutPanel.java index be949a6301..bdff8bbabd 100644 --- a/src/main/java/org/sonarlint/intellij/config/global/SonarLintAboutPanel.java +++ b/src/main/java/org/sonarlint/intellij/config/global/SonarLintAboutPanel.java @@ -63,7 +63,7 @@ public SonarLintAboutPanel() { } private JComponent createSonarLintPanel() { - var sonarlintIcon = new JBLabel(SonarLintIcons.SONARLINT_32); + var sonarlintIcon = new JBLabel(SonarLintIcons.SONARQUBE_FOR_INTELLIJ_32PX); var plugin = SonarLintUtils.getService(SonarLintPlugin.class); var title = new JBLabel("SonarQube for IntelliJ " + plugin.getVersion() + ""); var linkLabel = new HyperlinkLabel("Documentation"); diff --git a/src/main/java/org/sonarlint/intellij/config/global/wizard/ServerStep.java b/src/main/java/org/sonarlint/intellij/config/global/wizard/ServerStep.java index fdebe410af..c842163793 100644 --- a/src/main/java/org/sonarlint/intellij/config/global/wizard/ServerStep.java +++ b/src/main/java/org/sonarlint/intellij/config/global/wizard/ServerStep.java @@ -30,7 +30,6 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.Collection; -import javax.swing.Icon; import javax.swing.JButton; import javax.swing.JComponent; import javax.swing.JEditorPane; @@ -150,19 +149,19 @@ private void paintErrors() { } private void load(boolean editing) { - Icon sqIcon = SonarLintIcons.ICON_SONARQUBE; - Icon clIcon = SonarLintIcons.ICON_SONARCLOUD; + var sqsIcon = SonarLintIcons.ICON_SONARQUBE_SERVER; + var sqcIcon = SonarLintIcons.ICON_SONARQUBE_CLOUD; if (model.getServerType() == WizardModel.ServerType.SONARCLOUD || model.getServerType() == null) { radioSonarCloud.setSelected(true); if (editing) { - sqIcon = SonarLintIcons.toDisabled(sqIcon); + sqsIcon = SonarLintIcons.toDisabled(sqsIcon); } } else { radioSonarQube.setSelected(true); urlText.setText(model.getServerUrl()); if (editing) { - clIcon = SonarLintIcons.toDisabled(clIcon); + sqcIcon = SonarLintIcons.toDisabled(sqcIcon); } } @@ -174,8 +173,8 @@ private void load(boolean editing) { radioSonarCloud.setEnabled(false); } - sonarqubeIcon.setIcon(sqIcon); - sonarcloudIcon.setIcon(clIcon); + sonarqubeIcon.setIcon(sqsIcon); + sonarcloudIcon.setIcon(sqcIcon); } private void selectionChanged() { @@ -269,8 +268,8 @@ public JComponent getPreferredFocusedComponent() { } private void createUIComponents() { - sonarcloudIcon = new JLabel(SonarLintIcons.ICON_SONARCLOUD); - sonarqubeIcon = new JLabel(SonarLintIcons.ICON_SONARQUBE); + sonarcloudIcon = new JLabel(SonarLintIcons.ICON_SONARQUBE_CLOUD); + sonarqubeIcon = new JLabel(SonarLintIcons.ICON_SONARQUBE_SERVER); sonarcloudText = SwingHelper.createHtmlViewer(false, null, null, null); sonarqubeText = SwingHelper.createHtmlViewer(false, null, null, null); sonarQubeDescription = SwingHelper.createHtmlViewer(false, null, null, null); diff --git a/src/main/java/org/sonarlint/intellij/config/project/SonarLintProjectBindPanel.java b/src/main/java/org/sonarlint/intellij/config/project/SonarLintProjectBindPanel.java index 0ec4313f59..e56038da8c 100644 --- a/src/main/java/org/sonarlint/intellij/config/project/SonarLintProjectBindPanel.java +++ b/src/main/java/org/sonarlint/intellij/config/project/SonarLintProjectBindPanel.java @@ -375,9 +375,9 @@ protected void customizeCellRenderer(JList list, @Nullable ServerConnection valu append(value.getName(), attrs, true); setToolTipText("Bind project using this connection"); if (value.isSonarCloud()) { - setIcon(SonarLintIcons.ICON_SONARCLOUD_16); + setIcon(SonarLintIcons.ICON_SONARQUBE_CLOUD_16); } else { - setIcon(SonarLintIcons.ICON_SONARQUBE_16); + setIcon(SonarLintIcons.ICON_SONARQUBE_SERVER_16); } } } diff --git a/src/main/java/org/sonarlint/intellij/editor/ApplyQuickFixIntentionAction.kt b/src/main/java/org/sonarlint/intellij/editor/ApplyQuickFixIntentionAction.kt index 1e861f12d2..952ade7ed3 100644 --- a/src/main/java/org/sonarlint/intellij/editor/ApplyQuickFixIntentionAction.kt +++ b/src/main/java/org/sonarlint/intellij/editor/ApplyQuickFixIntentionAction.kt @@ -36,8 +36,8 @@ import org.sonarlint.intellij.finding.RangeMarkerEdit import org.sonarlint.intellij.telemetry.SonarLintTelemetry class ApplyQuickFixIntentionAction(private val fix: QuickFix, private val ruleKey: String, private val invokedInPreview: Boolean) : IntentionAction, PriorityAction, Iconable { - override fun getText() = "SonarQube for IntelliJ: " + fix.message - override fun getFamilyName() = "SonarQube for IntelliJ quick fix" + override fun getText() = "SonarQube: " + fix.message + override fun getFamilyName() = "SonarQube quick fix" override fun startInWriteAction() = true override fun getIcon(flags: Int) = AllIcons.Actions.IntentionBulb override fun getPriority() = PriorityAction.Priority.TOP diff --git a/src/main/java/org/sonarlint/intellij/editor/DisableRuleIntentionAction.java b/src/main/java/org/sonarlint/intellij/editor/DisableRuleIntentionAction.java index 2359062223..e5df86cdfa 100644 --- a/src/main/java/org/sonarlint/intellij/editor/DisableRuleIntentionAction.java +++ b/src/main/java/org/sonarlint/intellij/editor/DisableRuleIntentionAction.java @@ -46,11 +46,11 @@ public class DisableRuleIntentionAction implements IntentionAction, LowPriorityA } @Nls @NotNull @Override public String getText() { - return "SonarQube for IntelliJ: Disable rule '" + ruleKey + "'"; + return "SonarQube: Disable rule '" + ruleKey + "'"; } @Nls @NotNull @Override public String getFamilyName() { - return "SonarQube for IntelliJ disable rule"; + return "SonarQube disable rule"; } @Override public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) { diff --git a/src/main/java/org/sonarlint/intellij/editor/EditorDecorator.kt b/src/main/java/org/sonarlint/intellij/editor/EditorDecorator.kt index 6470ced047..310ce61047 100644 --- a/src/main/java/org/sonarlint/intellij/editor/EditorDecorator.kt +++ b/src/main/java/org/sonarlint/intellij/editor/EditorDecorator.kt @@ -196,7 +196,7 @@ class EditorDecorator(private val project: Project) { .severity(HighlightSeverity.ERROR) .textAttributes(SonarLintTextAttributes.SELECTED) if (!message.isNullOrEmpty() && "..." != message) { - builder.descriptionAndTooltip("SonarQube for IntelliJ: $message") + builder.descriptionAndTooltip("SonarQube: $message") } return builder.create()?.let { hl -> computeReadActionSafely { Highlight(location.document, hl) } } } diff --git a/src/main/java/org/sonarlint/intellij/editor/ShowLocationsIntentionAction.java b/src/main/java/org/sonarlint/intellij/editor/ShowLocationsIntentionAction.java index 8231956dd5..3cefb68fa4 100644 --- a/src/main/java/org/sonarlint/intellij/editor/ShowLocationsIntentionAction.java +++ b/src/main/java/org/sonarlint/intellij/editor/ShowLocationsIntentionAction.java @@ -44,11 +44,11 @@ public ShowLocationsIntentionAction(LiveFinding finding, FindingContext context) } @Nls @NotNull @Override public String getText() { - return "SonarQube for IntelliJ: Show " + (context.hasUniqueFlow() ? "issue locations" : "data flows"); + return "SonarQube: Show " + (context.hasUniqueFlow() ? "issue locations" : "data flows"); } @Nls @NotNull @Override public String getFamilyName() { - return "SonarQube for IntelliJ locations"; + return "SonarQube locations"; } @Override public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) { diff --git a/src/main/java/org/sonarlint/intellij/editor/ShowRuleDescriptionIntentionAction.java b/src/main/java/org/sonarlint/intellij/editor/ShowRuleDescriptionIntentionAction.java index e6f40fed61..17a77a4d24 100644 --- a/src/main/java/org/sonarlint/intellij/editor/ShowRuleDescriptionIntentionAction.java +++ b/src/main/java/org/sonarlint/intellij/editor/ShowRuleDescriptionIntentionAction.java @@ -44,12 +44,12 @@ public ShowRuleDescriptionIntentionAction(LiveFinding liveFinding) { @Override public @Nls(capitalization = Nls.Capitalization.Sentence) @NotNull String getText() { - return "SonarQube for IntelliJ: Show rule description '" + liveFinding.getRuleKey() + "'"; + return "SonarQube: Show rule description '" + liveFinding.getRuleKey() + "'"; } @Override public @NotNull @Nls(capitalization = Nls.Capitalization.Sentence) String getFamilyName() { - return "SonarQube for IntelliJ show issue description"; + return "SonarQube show issue description"; } @Override diff --git a/src/main/java/org/sonarlint/intellij/editor/ShowTaintVulnerabilityRuleDescriptionIntentionAction.java b/src/main/java/org/sonarlint/intellij/editor/ShowTaintVulnerabilityRuleDescriptionIntentionAction.java index cdea368f4a..bba259611b 100644 --- a/src/main/java/org/sonarlint/intellij/editor/ShowTaintVulnerabilityRuleDescriptionIntentionAction.java +++ b/src/main/java/org/sonarlint/intellij/editor/ShowTaintVulnerabilityRuleDescriptionIntentionAction.java @@ -45,12 +45,12 @@ public ShowTaintVulnerabilityRuleDescriptionIntentionAction(LocalTaintVulnerabil @Override public @Nls(capitalization = Nls.Capitalization.Sentence) @NotNull String getText() { - return "SonarQube for IntelliJ: Show rule description '" + taintVulnerability.getRuleKey() + "'"; + return "SonarQube: Show rule description '" + taintVulnerability.getRuleKey() + "'"; } @Override public @NotNull @Nls(capitalization = Nls.Capitalization.Sentence) String getFamilyName() { - return "SonarQube for IntelliJ show taint vulnerability description"; + return "SonarQube show taint vulnerability description"; } @Override diff --git a/src/main/java/org/sonarlint/intellij/fs/DefaultVirtualFileSystemEventsHandler.kt b/src/main/java/org/sonarlint/intellij/fs/DefaultVirtualFileSystemEventsHandler.kt index 5d0d2ab330..987252aac4 100644 --- a/src/main/java/org/sonarlint/intellij/fs/DefaultVirtualFileSystemEventsHandler.kt +++ b/src/main/java/org/sonarlint/intellij/fs/DefaultVirtualFileSystemEventsHandler.kt @@ -51,6 +51,7 @@ open class DefaultVirtualFileSystemEventsHandler @NonInjectable constructor(priv events: List, eventTypeConverter: (VFileEvent) -> ModuleFileEvent.Type?, ) { + val openProjects = ProjectManager.getInstance().openProjects.filter { !it.isDisposed }.toList() val filesByModule = fileEventsByModules(events, openProjects, eventTypeConverter) val allFilesByModule = filesByModule.entries.associate { it.key to it.value.toList() } diff --git a/src/main/java/org/sonarlint/intellij/notifications/SonarLintProjectNotifications.kt b/src/main/java/org/sonarlint/intellij/notifications/SonarLintProjectNotifications.kt index 219007f751..ffaa90064c 100644 --- a/src/main/java/org/sonarlint/intellij/notifications/SonarLintProjectNotifications.kt +++ b/src/main/java/org/sonarlint/intellij/notifications/SonarLintProjectNotifications.kt @@ -71,7 +71,7 @@ class SonarLintProjectNotifications(private val myProject: Project) { type ).apply { isImportant = type != NotificationType.INFORMATION - icon = SonarLintIcons.SONARLINT + icon = SonarLintIcons.SONARQUBE_FOR_INTELLIJ action?.let { addAction(it) } notify(null) } @@ -112,7 +112,7 @@ class SonarLintProjectNotifications(private val myProject: Project) { "Project binding is invalid and has been removed, the connection has probably been deleted previously.", NotificationType.WARNING ).apply { - icon = SonarLintIcons.SONARLINT + icon = SonarLintIcons.SONARQUBE_FOR_INTELLIJ addAction(OpenProjectSettingsAction(myProject)) isImportant = true notify(myProject) @@ -129,7 +129,7 @@ class SonarLintProjectNotifications(private val myProject: Project) { addAction(OpenTrackedLinkAction("Download SonarQube Server", LinkTelemetry.SONARQUBE_EDITIONS_DOWNLOADS)) addAction(OpenInBrowserAction("Learn more", null, CONNECTED_MODE_BENEFITS_LINK)) addAction(DontAskAgainAction()) - icon = SonarLintIcons.SONARLINT + icon = SonarLintIcons.SONARQUBE_FOR_INTELLIJ notify(myProject) } } @@ -166,7 +166,7 @@ class SonarLintProjectNotifications(private val myProject: Project) { addAction(DisableBindingSuggestionsAction()) collapseDirection = Notification.CollapseActionsDirection.KEEP_LEFTMOST isImportant = true - icon = SonarLintIcons.SONARLINT + icon = SonarLintIcons.SONARQUBE_FOR_INTELLIJ notify(myProject) } } @@ -180,7 +180,7 @@ class SonarLintProjectNotifications(private val myProject: Project) { ).apply { Arrays.stream(mainActions).forEach { action: AnAction -> addAction(action) } isImportant = true - icon = SonarLintIcons.SONARLINT + icon = SonarLintIcons.SONARQUBE_FOR_INTELLIJ notify(myProject) } } @@ -212,9 +212,9 @@ class SonarLintProjectNotifications(private val myProject: Project) { NotificationType.INFORMATION ).apply { icon = if (isSonarCloud) { - SonarLintIcons.ICON_SONARCLOUD_16 + SonarLintIcons.ICON_SONARQUBE_CLOUD_16 } else { - SonarLintIcons.ICON_SONARQUBE_16 + SonarLintIcons.ICON_SONARQUBE_SERVER_16 } isImportant = true addAction(OpenInServerAction(label, smartNotificationParams.link, smartNotificationParams.category)) @@ -229,7 +229,7 @@ class SonarLintProjectNotifications(private val myProject: Project) { content, NotificationType.INFORMATION ).apply { - icon = SonarLintIcons.SONARLINT + icon = SonarLintIcons.SONARQUBE_FOR_INTELLIJ isImportant = true notify(myProject) } @@ -243,7 +243,7 @@ class SonarLintProjectNotifications(private val myProject: Project) { group.createNotification( title, content, NotificationType.ERROR ).apply { - icon = SonarLintIcons.SONARLINT + icon = SonarLintIcons.SONARQUBE_FOR_INTELLIJ isImportant = true addAction(ShowLogAction()) notify(myProject) @@ -254,7 +254,7 @@ class SonarLintProjectNotifications(private val myProject: Project) { group.createNotification( "", content, NotificationType.WARNING ).apply { - icon = SonarLintIcons.SONARLINT + icon = SonarLintIcons.SONARQUBE_FOR_INTELLIJ isImportant = true addAction(ShowLogAction()) notify(myProject) @@ -269,7 +269,7 @@ class SonarLintProjectNotifications(private val myProject: Project) { "Please refer to the SonarQube for IntelliJ tool window for more information.", NotificationType.WARNING ).apply { - icon = SonarLintIcons.SONARLINT + icon = SonarLintIcons.SONARQUBE_FOR_INTELLIJ setImportant(true) notify(myProject) } @@ -281,7 +281,7 @@ class SonarLintProjectNotifications(private val myProject: Project) { content, NotificationType.WARNING ).apply { - icon = SonarLintIcons.SONARLINT + icon = SonarLintIcons.SONARQUBE_FOR_INTELLIJ setImportant(true) Stream.of(*actions).forEach(this::addAction) notify(myProject) @@ -294,7 +294,7 @@ class SonarLintProjectNotifications(private val myProject: Project) { message, NotificationType.WARNING ).apply { - icon = SonarLintIcons.SONARLINT + icon = SonarLintIcons.SONARQUBE_FOR_INTELLIJ action?.let { addAction(it) } addAction(DontShowAgainAction(doNotShowAgainId)) notify(myProject) @@ -308,7 +308,7 @@ class SonarLintProjectNotifications(private val myProject: Project) { message, NotificationType.WARNING ).apply { - icon = SonarLintIcons.SONARLINT + icon = SonarLintIcons.SONARQUBE_FOR_INTELLIJ addAction(ShareConfigurationAction("Share configuration")) addAction(DontShowAgainAction(doNotShowAgainId)) notify(myProject) @@ -322,7 +322,7 @@ class SonarLintProjectNotifications(private val myProject: Project) { message, NotificationType.INFORMATION ).apply { - icon = SonarLintIcons.SONARLINT + icon = SonarLintIcons.SONARQUBE_FOR_INTELLIJ action?.let { addAction(it) } addAction(DontShowAgainAction(doNotShowAgainId)) notify(myProject) @@ -335,7 +335,7 @@ class SonarLintProjectNotifications(private val myProject: Project) { message, type ).apply { - icon = SonarLintIcons.SONARLINT + icon = SonarLintIcons.SONARQUBE_FOR_INTELLIJ Stream.of(*actions).forEach(this::addAction) notify(myProject) } diff --git a/src/main/java/org/sonarlint/intellij/sharing/AutomaticSharedConfigCreator.kt b/src/main/java/org/sonarlint/intellij/sharing/AutomaticSharedConfigCreator.kt index 9f49b08461..028a12905a 100644 --- a/src/main/java/org/sonarlint/intellij/sharing/AutomaticSharedConfigCreator.kt +++ b/src/main/java/org/sonarlint/intellij/sharing/AutomaticSharedConfigCreator.kt @@ -98,11 +98,11 @@ class AutomaticSharedConfigCreator( private val tokenGenerationButton = JButton("Generate Token") init { - title = if (isSQ) "Connect to This SonarQube Server?" else "Connect to SonarQube Cloud?" + title = if (isSQ) "Connect to This SonarQube Server Instance?" else "Connect to SonarQube Cloud?" val connectionNames = getGlobalSettings().serverNames connectionNameField.text = findFirstUniqueConnectionName(connectionNames, orgOrServerUrl) - val connectionActionName = if (isSQ) "Connect to This SonarQube Server" else "Connect to SonarQube Cloud" + val connectionActionName = if (isSQ) "Connect to This SonarQube Server Instance" else "Connect to SonarQube Cloud" createConnectionAction = object : DialogWrapperAction(connectionActionName) { init { putValue(DEFAULT_ACTION, true) @@ -168,7 +168,7 @@ class AutomaticSharedConfigCreator( .orElseThrow { IllegalStateException("Unable to find connection '${connectionNameField.text}'") } getService(project, ProjectBindingManager::class.java).bindTo(connection, projectKey, emptyMap(), bindingMode) - val connectionTypeMessage = if (isSQ) "SonarQube Server" else "SonarQube Cloud organization" + val connectionTypeMessage = if (isSQ) "SonarQube Server instance" else "SonarQube Cloud organization" SonarLintProjectNotifications.get(project).simpleNotification( "Project successfully bound", "Local project bound to project '$projectKey' of $connectionTypeMessage '${connection.name}'. " + @@ -230,7 +230,7 @@ class AutomaticSharedConfigCreator( if (isSQ) { redWarningIcon.icon = AllIcons.Ide.FatalError warningLabel.text = "Always ensure that your Server URL matches your SonarQube Server instance. " + - "Letting SonarQube for IntelliJ connect to an untrusted SonarQube Server is potentially dangerous." + "Letting SonarQube for IntelliJ connect to an untrusted SonarQube Server instance is potentially dangerous." val warningPanel = JBPanel>(BorderLayout()).apply { add(redWarningIcon, BorderLayout.WEST) add(warningLabel, BorderLayout.CENTER) diff --git a/src/main/java/org/sonarlint/intellij/sharing/ConfigurationSharing.kt b/src/main/java/org/sonarlint/intellij/sharing/ConfigurationSharing.kt index 19310d6fc0..8eefd4e461 100644 --- a/src/main/java/org/sonarlint/intellij/sharing/ConfigurationSharing.kt +++ b/src/main/java/org/sonarlint/intellij/sharing/ConfigurationSharing.kt @@ -129,7 +129,8 @@ class ConfigurationSharing { } val connectionKind = getService(project, ProjectBindingManager::class.java) - .tryGetServerConnection().map { if (it.isSonarCloud) "SonarQube Cloud organization" else "SonarQube Server" }.orElse(null) + .tryGetServerConnection().map { if (it.isSonarCloud) "SonarQube Cloud organization" else "SonarQube Server instance" } + .orElse(null) ?: run { SonarLintConsole.get(project).error("Connection is not present") return false diff --git a/src/main/java/org/sonarlint/intellij/ui/BindingSuggestionSelectionDialog.kt b/src/main/java/org/sonarlint/intellij/ui/BindingSuggestionSelectionDialog.kt index cb0d5a7e11..d162132836 100644 --- a/src/main/java/org/sonarlint/intellij/ui/BindingSuggestionSelectionDialog.kt +++ b/src/main/java/org/sonarlint/intellij/ui/BindingSuggestionSelectionDialog.kt @@ -61,7 +61,7 @@ class BindingSuggestionRenderer : val attrs = SimpleTextAttributes.REGULAR_BOLD_ATTRIBUTES getGlobalSettings().getServerConnectionByName(suggestion.connectionId) .ifPresentOrElse({ - icon = if (it.isSonarCloud) SonarLintIcons.ICON_SONARCLOUD_16 else SonarLintIcons.ICON_SONARQUBE_16 + icon = if (it.isSonarCloud) SonarLintIcons.ICON_SONARQUBE_CLOUD_16 else SonarLintIcons.ICON_SONARQUBE_SERVER_16 append(suggestion.projectName, attrs, true) append(" (" + suggestion.projectKey + ")", SimpleTextAttributes.GRAY_ATTRIBUTES, false) append(" on connection [" + suggestion.connectionId + "]", SimpleTextAttributes.GRAY_ATTRIBUTES, false) diff --git a/src/main/java/org/sonarlint/intellij/ui/CurrentFilePanel.java b/src/main/java/org/sonarlint/intellij/ui/CurrentFilePanel.java index 365bb403cb..35565fdd09 100644 --- a/src/main/java/org/sonarlint/intellij/ui/CurrentFilePanel.java +++ b/src/main/java/org/sonarlint/intellij/ui/CurrentFilePanel.java @@ -216,7 +216,7 @@ private void updateIcon(@Nullable VirtualFile file, Collection issues private static void doUpdateIcon(@Nullable VirtualFile file, Collection issues, ToolWindow toolWindow) { ApplicationManager.getApplication().assertIsDispatchThread(); boolean empty = file == null || issues.isEmpty(); - toolWindow.setIcon(empty ? SonarLintIcons.SONARLINT_TOOLWINDOW_EMPTY : SonarLintIcons.SONARLINT_TOOLWINDOW); + toolWindow.setIcon(empty ? SonarLintIcons.SONARQUBE_FOR_INTELLIJ_EMPTY_TOOLWINDOW : SonarLintIcons.SONARQUBE_FOR_INTELLIJ_TOOLWINDOW); } private void expandTree() { diff --git a/src/main/java/org/sonarlint/intellij/ui/inlay/FixSuggestionInlayPanel.kt b/src/main/java/org/sonarlint/intellij/ui/inlay/FixSuggestionInlayPanel.kt index 008cce4e9a..1c99af7c73 100644 --- a/src/main/java/org/sonarlint/intellij/ui/inlay/FixSuggestionInlayPanel.kt +++ b/src/main/java/org/sonarlint/intellij/ui/inlay/FixSuggestionInlayPanel.kt @@ -146,7 +146,7 @@ class FixSuggestionInlayPanel( add( JBLabel( "SonarQube for IntelliJ Fix Suggestion (fix ${suggestion.snippetIndex}/${suggestion.totalSnippets})", - SonarLintIcons.SONARLINT, SwingConstants.LEFT + SonarLintIcons.SONARQUBE_FOR_INTELLIJ, SwingConstants.LEFT ), BorderLayout.WEST ) add(titleRightSidePanel, BorderLayout.EAST) diff --git a/src/main/java/org/sonarlint/intellij/ui/nodes/IssueNode.java b/src/main/java/org/sonarlint/intellij/ui/nodes/IssueNode.java index 29f9c70627..528f2f16b3 100644 --- a/src/main/java/org/sonarlint/intellij/ui/nodes/IssueNode.java +++ b/src/main/java/org/sonarlint/intellij/ui/nodes/IssueNode.java @@ -83,7 +83,7 @@ private void doRender(TreeCellRenderer renderer) { setIcon(renderer, new CompoundIcon(CompoundIcon.Axis.X_AXIS, gap, connection.getProductIcon(), impactIcon)); } else { renderer.setIconToolTip(impactText + " impact on " + qualityText); - var serverIconEmptySpace = SonarLintIcons.ICON_SONARQUBE_16.getIconWidth() + gap; + var serverIconEmptySpace = SonarLintIcons.ICON_SONARQUBE_SERVER_16.getIconWidth() + gap; setIcon(renderer, new OffsetIcon(serverIconEmptySpace, new CompoundIcon(CompoundIcon.Axis.X_AXIS, gap, impactIcon))); } } else { @@ -104,7 +104,7 @@ private void doRender(TreeCellRenderer renderer) { setIcon(renderer, new CompoundIcon(CompoundIcon.Axis.X_AXIS, gap, connection.getProductIcon(), typeIcon)); } else { renderer.setIconToolTip(severityText + " " + typeStr); - var serverIconEmptySpace = SonarLintIcons.ICON_SONARQUBE_16.getIconWidth() + gap; + var serverIconEmptySpace = SonarLintIcons.ICON_SONARQUBE_SERVER_16.getIconWidth() + gap; setIcon(renderer, new OffsetIcon(serverIconEmptySpace, new CompoundIcon(CompoundIcon.Axis.X_AXIS, gap, typeIcon))); } } diff --git a/src/main/java/org/sonarlint/intellij/ui/traffic/light/SonarLintDashboardPanel.kt b/src/main/java/org/sonarlint/intellij/ui/traffic/light/SonarLintDashboardPanel.kt index e636f91624..d79ad28718 100644 --- a/src/main/java/org/sonarlint/intellij/ui/traffic/light/SonarLintDashboardPanel.kt +++ b/src/main/java/org/sonarlint/intellij/ui/traffic/light/SonarLintDashboardPanel.kt @@ -173,9 +173,9 @@ class SonarLintDashboardPanel(private val editor: Editor) { connectionHelp.isVisible = false connectionIcon.isVisible = true if (serverConnection.isSonarCloud) { - connectionIcon.icon = SonarLintIcons.ICON_SONARCLOUD_16 + connectionIcon.icon = SonarLintIcons.ICON_SONARQUBE_CLOUD_16 } else { - connectionIcon.icon = SonarLintIcons.ICON_SONARQUBE_16 + connectionIcon.icon = SonarLintIcons.ICON_SONARQUBE_SERVER_16 } settings.projectKey?.let { projectKey -> bindingLabel.isVisible = true diff --git a/src/main/java/org/sonarlint/intellij/ui/traffic/light/SonarLintTrafficLightWidget.kt b/src/main/java/org/sonarlint/intellij/ui/traffic/light/SonarLintTrafficLightWidget.kt index 8ae74934ac..754d22d47d 100644 --- a/src/main/java/org/sonarlint/intellij/ui/traffic/light/SonarLintTrafficLightWidget.kt +++ b/src/main/java/org/sonarlint/intellij/ui/traffic/light/SonarLintTrafficLightWidget.kt @@ -144,13 +144,13 @@ class SonarLintTrafficLightWidget( fun refresh(model: SonarLintDashboardModel) { if (!model.isAlive) { - iconAndFindingsCountLabel.icon = SonarLintIcons.SONARLINT_ACTION_ORANGE_12PX + iconAndFindingsCountLabel.icon = SonarLintIcons.SONARQUBE_FOR_INTELLIJ_ORANGE_13PX iconAndFindingsCountLabel.text = model.findingsCount().toString() } else if (model.hasFindings()) { - iconAndFindingsCountLabel.icon = SonarLintIcons.SONARLINT_ACTION_12PX + iconAndFindingsCountLabel.icon = SonarLintIcons.SONARQUBE_FOR_INTELLIJ_RED_13PX iconAndFindingsCountLabel.text = model.findingsCount().toString() } else { - iconAndFindingsCountLabel.icon = SonarLintIcons.SONARLINT_ACTION_GREEN_12PX + iconAndFindingsCountLabel.icon = SonarLintIcons.SONARQUBE_FOR_INTELLIJ_GREEN_13PX iconAndFindingsCountLabel.text = null } dashboardPopup.refresh(model) diff --git a/src/main/java/org/sonarlint/intellij/util/SonarGotItTooltipsUtils.kt b/src/main/java/org/sonarlint/intellij/util/SonarGotItTooltipsUtils.kt index a82a671cd5..80b6d84382 100644 --- a/src/main/java/org/sonarlint/intellij/util/SonarGotItTooltipsUtils.kt +++ b/src/main/java/org/sonarlint/intellij/util/SonarGotItTooltipsUtils.kt @@ -35,7 +35,7 @@ object SonarGotItTooltipsUtils { fun showTrafficLightToolTip(component: JComponent, parent: Disposable) { // we pick a random project service that is disposable with(GotItTooltip(TRAFFIC_LIGHT_TOOLTIP_ID, TRAFFIC_LIGHT_TOOLTIP_TEXT, parent)) { - withIcon(SonarLintIcons.SONARLINT) + withIcon(SonarLintIcons.SONARQUBE_FOR_INTELLIJ) withPosition(Balloon.Position.above) show(component) { it, _ -> Point(-5, it.height / 2) } } diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 3b94c816e9..1ef7ad9aaf 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -28,7 +28,7 @@

- SonarQube for IntelliJ by Sonar is a free IDE extension to find and fix coding issues in real-time, flagging issues as you code, just like a spell-checker. + SonarQube for IDE by Sonar is a free IDE extension to find and fix coding issues in real-time, flagging issues as you code, just like a spell-checker. More than a linter, it also delivers rich contextual guidance to help developers understand why there is an issue, assess the risk and educate them on how to fix it. This helps improve their skills, enhance their productivity, and take ownership of their code, taking linting to a different level. @@ -36,17 +36,17 @@

When paired with SonarQube Server or SonarQube Cloud in Connected Mode, - SonarQube for IntelliJ forms a powerful end-to-end code quality platform to enrich the CI/CD pipeline, ensuring any code edits or additions are clean. + SonarQube for IDE forms a powerful end-to-end code quality platform to enrich the CI/CD pipeline, ensuring any code edits or additions are clean. In Connected Mode, your team can share common language rulesets, project analysis settings and more.


- SonarQube for IntelliJ is a powerful open-source tool for developers of all experience and skill levels, empowering them + SonarQube for IDE is a powerful open-source tool for developers of all experience and skill levels, empowering them to deliver Clean Code - code fit for development and production. An essential linting tool for every developer.


- SonarQube for IntelliJ integrates with most JetBrains IDEs including + SonarQube for IDE integrates with most JetBrains IDEs including IntelliJ IDEA, CLion, GoLand, WebStorm, PHPStorm, PyCharm, Rider, Aqua, AppCode, Android Studio & RubyMine. Supported languages include C, C++, Java, Go, JavaScript, TypeScript, Python, C#, Kotlin, Ruby, HTML, CSS, PHP & PL/SQL. The full list of supported languages and rules is available in our docs. @@ -199,7 +199,8 @@ - @@ -289,7 +290,7 @@ + icon="org.sonarlint.intellij.SonarLintIcons.SONARQUBE_FOR_INTELLIJ_13PX"> @@ -305,20 +306,20 @@ class="org.sonarlint.intellij.actions.SonarAnalyzeFilesAction" text="Analyze with SonarQube for IntelliJ" description="Run SonarQube for IntelliJ analysis on selected file(s)" - icon="org.sonarlint.intellij.SonarLintIcons.SONARLINT_ACTION"> + icon="org.sonarlint.intellij.SonarLintIcons.SONARQUBE_FOR_INTELLIJ_13PX"> + icon="org.sonarlint.intellij.SonarLintIcons.SONARQUBE_FOR_INTELLIJ_13PX"> + icon="org.sonarlint.intellij.SonarLintIcons.SONARQUBE_FOR_INTELLIJ_13PX"> @@ -327,7 +328,7 @@ class="org.sonarlint.intellij.actions.SonarAnalyzeChangedFilesAction" text="Analyze VCS Changed Files with SonarQube for IntelliJ" description="Run a SonarQube for IntelliJ analysis on VCS changed files" - icon="org.sonarlint.intellij.SonarLintIcons.SONARLINT_ACTION"> + icon="org.sonarlint.intellij.SonarLintIcons.SONARQUBE_FOR_INTELLIJ_13PX"> @@ -335,7 +336,7 @@ class="org.sonarlint.intellij.actions.SonarAnalyzeAllFilesAction" text="Analyze All Files with SonarQube for IntelliJ" description="Run a SonarQube for IntelliJ analysis on all files in the project" - icon="org.sonarlint.intellij.SonarLintIcons.SONARLINT_ACTION"> + icon="org.sonarlint.intellij.SonarLintIcons.SONARQUBE_FOR_INTELLIJ_13PX"> diff --git a/src/main/resources/images/SonarCloud.png b/src/main/resources/images/SonarCloud.png deleted file mode 100644 index 7970d2a0f2..0000000000 Binary files a/src/main/resources/images/SonarCloud.png and /dev/null differ diff --git a/src/main/resources/images/SonarCloud_dark.png b/src/main/resources/images/SonarCloud_dark.png deleted file mode 100644 index 5bfad2097b..0000000000 Binary files a/src/main/resources/images/SonarCloud_dark.png and /dev/null differ diff --git a/src/main/resources/images/SonarQube.png b/src/main/resources/images/SonarQube.png deleted file mode 100644 index e0ae7398e2..0000000000 Binary files a/src/main/resources/images/SonarQube.png and /dev/null differ diff --git a/src/main/resources/images/SonarQube_dark.png b/src/main/resources/images/SonarQube_dark.png deleted file mode 100644 index f058da8e7c..0000000000 Binary files a/src/main/resources/images/SonarQube_dark.png and /dev/null differ diff --git a/src/main/resources/images/issue_annotation.png b/src/main/resources/images/issue_annotation.png deleted file mode 100644 index f46bf66ece..0000000000 Binary files a/src/main/resources/images/issue_annotation.png and /dev/null differ diff --git a/src/main/resources/images/onde-sonar-13.png b/src/main/resources/images/onde-sonar-13.png deleted file mode 100644 index 9eade15d68..0000000000 Binary files a/src/main/resources/images/onde-sonar-13.png and /dev/null differ diff --git a/src/main/resources/images/onde-sonar-16-execute.png b/src/main/resources/images/onde-sonar-16-execute.png deleted file mode 100644 index 8e261ce968..0000000000 Binary files a/src/main/resources/images/onde-sonar-16-execute.png and /dev/null differ diff --git a/src/main/resources/images/onde-sonar-16.png b/src/main/resources/images/onde-sonar-16.png deleted file mode 100644 index da84646430..0000000000 Binary files a/src/main/resources/images/onde-sonar-16.png and /dev/null differ diff --git a/src/main/resources/images/remove.png b/src/main/resources/images/remove.png deleted file mode 100644 index c6ff278b55..0000000000 Binary files a/src/main/resources/images/remove.png and /dev/null differ diff --git a/src/main/resources/images/resolved.svg b/src/main/resources/images/resolved.svg index eb3de76b51..4924de22b7 100644 --- a/src/main/resources/images/resolved.svg +++ b/src/main/resources/images/resolved.svg @@ -1,4 +1,4 @@ - + - - + - + + + + + + - - + + + - + \ No newline at end of file diff --git a/src/main/resources/images/resolved_dark.svg b/src/main/resources/images/resolved_dark.svg index 6bcc50da99..9dd855acc8 100644 --- a/src/main/resources/images/resolved_dark.svg +++ b/src/main/resources/images/resolved_dark.svg @@ -1,4 +1,3 @@ - - - - - - - - - + + + + + + + + diff --git a/src/main/resources/images/sonarcloud-16.png b/src/main/resources/images/sonarcloud-16.png deleted file mode 100644 index 7abe416f20..0000000000 Binary files a/src/main/resources/images/sonarcloud-16.png and /dev/null differ diff --git a/src/main/resources/images/sonarlint.png b/src/main/resources/images/sonarlint.png deleted file mode 100644 index 799485612e..0000000000 Binary files a/src/main/resources/images/sonarlint.png and /dev/null differ diff --git a/src/main/resources/images/sonarlint@2x.png b/src/main/resources/images/sonarlint@2x.png deleted file mode 100644 index d69dc112b9..0000000000 Binary files a/src/main/resources/images/sonarlint@2x.png and /dev/null differ diff --git a/src/main/resources/images/sonarlintAction.svg b/src/main/resources/images/sonarlintAction.svg deleted file mode 100644 index cfe9a5ab99..0000000000 --- a/src/main/resources/images/sonarlintAction.svg +++ /dev/null @@ -1,22 +0,0 @@ - - diff --git a/src/main/resources/images/sonarlintAction_12px.svg b/src/main/resources/images/sonarlintAction_12px.svg deleted file mode 100644 index 4fffe58f47..0000000000 --- a/src/main/resources/images/sonarlintAction_12px.svg +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - diff --git a/src/main/resources/images/sonarlintAction_green_12px.svg b/src/main/resources/images/sonarlintAction_green_12px.svg deleted file mode 100644 index 93ef400359..0000000000 --- a/src/main/resources/images/sonarlintAction_green_12px.svg +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - diff --git a/src/main/resources/images/sonarlintAction_orange_12px.svg b/src/main/resources/images/sonarlintAction_orange_12px.svg deleted file mode 100644 index 7311202c68..0000000000 --- a/src/main/resources/images/sonarlintAction_orange_12px.svg +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - diff --git a/src/main/resources/images/sonarlintToolWindow.svg b/src/main/resources/images/sonarlintToolWindow.svg deleted file mode 100644 index 6d7e3cfbc2..0000000000 --- a/src/main/resources/images/sonarlintToolWindow.svg +++ /dev/null @@ -1,22 +0,0 @@ - - diff --git a/src/main/resources/images/sonarlintToolWindowEmpty.svg b/src/main/resources/images/sonarlintToolWindowEmpty.svg deleted file mode 100644 index 6f30f7a2ee..0000000000 --- a/src/main/resources/images/sonarlintToolWindowEmpty.svg +++ /dev/null @@ -1,22 +0,0 @@ - - diff --git a/src/main/resources/images/sonarlintToolWindowEmpty_dark.svg b/src/main/resources/images/sonarlintToolWindowEmpty_dark.svg deleted file mode 100644 index 68d9edc4e2..0000000000 --- a/src/main/resources/images/sonarlintToolWindowEmpty_dark.svg +++ /dev/null @@ -1,22 +0,0 @@ - - diff --git a/src/main/resources/images/sonarlintToolWindow_dark.svg b/src/main/resources/images/sonarlintToolWindow_dark.svg deleted file mode 100644 index 30ec16ce2e..0000000000 --- a/src/main/resources/images/sonarlintToolWindow_dark.svg +++ /dev/null @@ -1,22 +0,0 @@ - - diff --git a/src/main/resources/images/sonarqube-48x200.png b/src/main/resources/images/sonarqube-48x200.png deleted file mode 100644 index fa45b5ff6f..0000000000 Binary files a/src/main/resources/images/sonarqube-48x200.png and /dev/null differ diff --git a/src/main/resources/images/sonarqube_cloud.png b/src/main/resources/images/sonarqube_cloud.png new file mode 100644 index 0000000000..6e87011cf8 Binary files /dev/null and b/src/main/resources/images/sonarqube_cloud.png differ diff --git a/src/main/resources/images/sonarqube_cloud_16px.svg b/src/main/resources/images/sonarqube_cloud_16px.svg new file mode 100644 index 0000000000..fb86854b8f --- /dev/null +++ b/src/main/resources/images/sonarqube_cloud_16px.svg @@ -0,0 +1,26 @@ + + + + + + diff --git a/src/main/resources/images/sonarqube_cloud_16px_dark.svg b/src/main/resources/images/sonarqube_cloud_16px_dark.svg new file mode 100644 index 0000000000..5a200bc10a --- /dev/null +++ b/src/main/resources/images/sonarqube_cloud_16px_dark.svg @@ -0,0 +1,26 @@ + + + + + + diff --git a/src/main/resources/images/sonarqube_cloud_dark.png b/src/main/resources/images/sonarqube_cloud_dark.png new file mode 100644 index 0000000000..3eb7d82d61 Binary files /dev/null and b/src/main/resources/images/sonarqube_cloud_dark.png differ diff --git a/src/main/resources/images/sonarqube_for_intellij.svg b/src/main/resources/images/sonarqube_for_intellij.svg new file mode 100644 index 0000000000..9d4c385826 --- /dev/null +++ b/src/main/resources/images/sonarqube_for_intellij.svg @@ -0,0 +1,26 @@ + + + + + + diff --git a/src/main/resources/images/sonarqube_for_intellij@2px_dark.svg b/src/main/resources/images/sonarqube_for_intellij@2px_dark.svg new file mode 100644 index 0000000000..0d794ff7b3 --- /dev/null +++ b/src/main/resources/images/sonarqube_for_intellij@2px_dark.svg @@ -0,0 +1,26 @@ + + + + + + diff --git a/src/main/resources/images/sonarqube_for_intellij@2x.svg b/src/main/resources/images/sonarqube_for_intellij@2x.svg new file mode 100644 index 0000000000..de4ec26d7b --- /dev/null +++ b/src/main/resources/images/sonarqube_for_intellij@2x.svg @@ -0,0 +1,26 @@ + + + + + + diff --git a/src/main/resources/images/sonarqube_for_intellij_13px.svg b/src/main/resources/images/sonarqube_for_intellij_13px.svg new file mode 100644 index 0000000000..27ed3497c0 --- /dev/null +++ b/src/main/resources/images/sonarqube_for_intellij_13px.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + diff --git a/src/main/resources/images/sonarqube_for_intellij_13px_dark.svg b/src/main/resources/images/sonarqube_for_intellij_13px_dark.svg new file mode 100644 index 0000000000..3f430f2236 --- /dev/null +++ b/src/main/resources/images/sonarqube_for_intellij_13px_dark.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + diff --git a/src/main/resources/images/sonarqube_for_intellij_32px.svg b/src/main/resources/images/sonarqube_for_intellij_32px.svg new file mode 100644 index 0000000000..de4ec26d7b --- /dev/null +++ b/src/main/resources/images/sonarqube_for_intellij_32px.svg @@ -0,0 +1,26 @@ + + + + + + diff --git a/src/main/resources/images/sonarqube_for_intellij_32px_dark.svg b/src/main/resources/images/sonarqube_for_intellij_32px_dark.svg new file mode 100644 index 0000000000..0d794ff7b3 --- /dev/null +++ b/src/main/resources/images/sonarqube_for_intellij_32px_dark.svg @@ -0,0 +1,26 @@ + + + + + + diff --git a/src/main/resources/images/sonarqube_for_intellij_dark.svg b/src/main/resources/images/sonarqube_for_intellij_dark.svg new file mode 100644 index 0000000000..ea00134356 --- /dev/null +++ b/src/main/resources/images/sonarqube_for_intellij_dark.svg @@ -0,0 +1,26 @@ + + + + + + diff --git a/src/main/resources/images/sonarqube_for_intellij_empty_toolwindow.svg b/src/main/resources/images/sonarqube_for_intellij_empty_toolwindow.svg new file mode 100644 index 0000000000..3f430f2236 --- /dev/null +++ b/src/main/resources/images/sonarqube_for_intellij_empty_toolwindow.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + diff --git a/src/main/resources/images/sonarqube_for_intellij_green_13px.svg b/src/main/resources/images/sonarqube_for_intellij_green_13px.svg new file mode 100644 index 0000000000..8297ca91b8 --- /dev/null +++ b/src/main/resources/images/sonarqube_for_intellij_green_13px.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + diff --git a/src/main/resources/images/sonarqube_for_intellij_green_13px_dark.svg b/src/main/resources/images/sonarqube_for_intellij_green_13px_dark.svg new file mode 100644 index 0000000000..6a3cb46174 --- /dev/null +++ b/src/main/resources/images/sonarqube_for_intellij_green_13px_dark.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + diff --git a/src/main/resources/images/sonarqube_for_intellij_orange_13px.svg b/src/main/resources/images/sonarqube_for_intellij_orange_13px.svg new file mode 100644 index 0000000000..fcb4eccd86 --- /dev/null +++ b/src/main/resources/images/sonarqube_for_intellij_orange_13px.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + diff --git a/src/main/resources/images/sonarqube_for_intellij_orange_13px_dark.svg b/src/main/resources/images/sonarqube_for_intellij_orange_13px_dark.svg new file mode 100644 index 0000000000..af0dbcbe9e --- /dev/null +++ b/src/main/resources/images/sonarqube_for_intellij_orange_13px_dark.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + diff --git a/src/main/resources/images/sonarqube_for_intellij_red_13px.svg b/src/main/resources/images/sonarqube_for_intellij_red_13px.svg new file mode 100644 index 0000000000..f9ebe97fb7 --- /dev/null +++ b/src/main/resources/images/sonarqube_for_intellij_red_13px.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + diff --git a/src/main/resources/images/sonarqube_for_intellij_red_13px_dark.svg b/src/main/resources/images/sonarqube_for_intellij_red_13px_dark.svg new file mode 100644 index 0000000000..a0e4eceaf2 --- /dev/null +++ b/src/main/resources/images/sonarqube_for_intellij_red_13px_dark.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + diff --git a/src/main/resources/images/sonarqube_for_intellij_toolwindow.svg b/src/main/resources/images/sonarqube_for_intellij_toolwindow.svg new file mode 100644 index 0000000000..aaa605a253 --- /dev/null +++ b/src/main/resources/images/sonarqube_for_intellij_toolwindow.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + diff --git a/src/main/resources/images/sonarqube_for_intellij_toolwindow_dark.svg b/src/main/resources/images/sonarqube_for_intellij_toolwindow_dark.svg new file mode 100644 index 0000000000..92096cd34f --- /dev/null +++ b/src/main/resources/images/sonarqube_for_intellij_toolwindow_dark.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + diff --git a/src/main/resources/images/sonarqube_server.png b/src/main/resources/images/sonarqube_server.png new file mode 100644 index 0000000000..68186ce3a9 Binary files /dev/null and b/src/main/resources/images/sonarqube_server.png differ diff --git a/src/main/resources/images/sonarqube_server_16px.svg b/src/main/resources/images/sonarqube_server_16px.svg new file mode 100644 index 0000000000..27feac2807 --- /dev/null +++ b/src/main/resources/images/sonarqube_server_16px.svg @@ -0,0 +1,29 @@ + + + + + + + + + diff --git a/src/main/resources/images/sonarqube_server_16px_dark.svg b/src/main/resources/images/sonarqube_server_16px_dark.svg new file mode 100644 index 0000000000..3842e76bfb --- /dev/null +++ b/src/main/resources/images/sonarqube_server_16px_dark.svg @@ -0,0 +1,29 @@ + + + + + + + + + diff --git a/src/main/resources/images/sonarqube_server_dark.png b/src/main/resources/images/sonarqube_server_dark.png new file mode 100644 index 0000000000..22dd2a6438 Binary files /dev/null and b/src/main/resources/images/sonarqube_server_dark.png differ diff --git a/src/main/resources/images/tip.png b/src/main/resources/images/tip.png deleted file mode 100644 index 2b62f2ac9b..0000000000 Binary files a/src/main/resources/images/tip.png and /dev/null differ diff --git a/src/test/java/org/sonarlint/intellij/SonarLintIconsTest.kt b/src/test/java/org/sonarlint/intellij/SonarLintIconsTest.kt index b9d4e6b2a0..1c3f06ae89 100644 --- a/src/test/java/org/sonarlint/intellij/SonarLintIconsTest.kt +++ b/src/test/java/org/sonarlint/intellij/SonarLintIconsTest.kt @@ -61,14 +61,29 @@ class SonarLintIconsTest { @Test fun testIcons() { - assertThat(SonarLintIcons.CLEAN).isNotNull - assertThat(SonarLintIcons.ICON_SONARQUBE_16).isNotNull - assertThat(SonarLintIcons.INFO).isNotNull + assertThat(SonarLintIcons.ICON_SONARQUBE_SERVER).isNotNull + assertThat(SonarLintIcons.ICON_SONARQUBE_CLOUD).isNotNull + assertThat(SonarLintIcons.ICON_SONARQUBE_SERVER_16).isNotNull + assertThat(SonarLintIcons.ICON_SONARQUBE_CLOUD_16).isNotNull + assertThat(SonarLintIcons.SONARQUBE_FOR_INTELLIJ_13PX).isNotNull + assertThat(SonarLintIcons.SONARQUBE_FOR_INTELLIJ_RED_13PX).isNotNull + assertThat(SonarLintIcons.SONARQUBE_FOR_INTELLIJ_GREEN_13PX).isNotNull + assertThat(SonarLintIcons.SONARQUBE_FOR_INTELLIJ_ORANGE_13PX).isNotNull + assertThat(SonarLintIcons.SONARQUBE_FOR_INTELLIJ).isNotNull + assertThat(SonarLintIcons.SONARQUBE_FOR_INTELLIJ_32PX).isNotNull assertThat(SonarLintIcons.PLAY).isNotNull - assertThat(SonarLintIcons.SONARLINT).isNotNull - assertThat(SonarLintIcons.SUSPEND).isNotNull + assertThat(SonarLintIcons.CLEAN).isNotNull assertThat(SonarLintIcons.TOOLS).isNotNull + assertThat(SonarLintIcons.SUSPEND).isNotNull + assertThat(SonarLintIcons.INFO).isNotNull assertThat(SonarLintIcons.WARN).isNotNull + assertThat(SonarLintIcons.SCM).isNotNull + assertThat(SonarLintIcons.PROJECT).isNotNull + assertThat(SonarLintIcons.NOT_CONNECTED).isNotNull + assertThat(SonarLintIcons.CONNECTED).isNotNull + assertThat(SonarLintIcons.CONNECTION_ERROR).isNotNull + assertThat(SonarLintIcons.RESOLVED).isNotNull + assertThat(SonarLintIcons.FOCUS).isNotNull } @Test diff --git a/src/test/java/org/sonarlint/intellij/editor/DisableRuleIntentionActionTests.java b/src/test/java/org/sonarlint/intellij/editor/DisableRuleIntentionActionTests.java index f89e532ec5..83baf9920d 100644 --- a/src/test/java/org/sonarlint/intellij/editor/DisableRuleIntentionActionTests.java +++ b/src/test/java/org/sonarlint/intellij/editor/DisableRuleIntentionActionTests.java @@ -45,13 +45,13 @@ void prepare() { @Test void text_should_mention_rule_key() { - assertThat(quickFix.getText()).isEqualTo("SonarQube for IntelliJ: Disable rule 'rule'"); + assertThat(quickFix.getText()).isEqualTo("SonarQube: Disable rule 'rule'"); } @Test void check_getters() { assertThat(quickFix.getIcon(0)).isEqualTo(AllIcons.Actions.Cancel); - assertThat(quickFix.getFamilyName()).isEqualTo("SonarQube for IntelliJ disable rule"); + assertThat(quickFix.getFamilyName()).isEqualTo("SonarQube disable rule"); assertThat(quickFix.startInWriteAction()).isFalse(); } diff --git a/src/test/java/org/sonarlint/intellij/mediumtests/StandaloneModeMediumTests.kt b/src/test/java/org/sonarlint/intellij/mediumtests/StandaloneModeMediumTests.kt index 49364f1750..1d05f74308 100644 --- a/src/test/java/org/sonarlint/intellij/mediumtests/StandaloneModeMediumTests.kt +++ b/src/test/java/org/sonarlint/intellij/mediumtests/StandaloneModeMediumTests.kt @@ -58,7 +58,7 @@ import org.sonarlint.intellij.util.getDocument import org.sonarsource.sonarlint.plugin.api.module.file.ModuleFileEvent class StandaloneModeMediumTests : AbstractSonarLintLightTests() { - private val diamondQuickFix = "SonarQube for IntelliJ: Replace with <>" + private val diamondQuickFix = "SonarQube: Replace with <>" @BeforeEach fun notifyProjectOpened() { @@ -422,9 +422,9 @@ class StandaloneModeMediumTests : AbstractSonarLintLightTests() { val file = myFixture.configureByFile("src/quick_fixes/overlapping_quick_fixes.input.java") analyze(file.virtualFile) - myFixture.launchAction(myFixture.findSingleIntention("SonarQube for IntelliJ: Use \"Arrays.toString(array)\" instead")) + myFixture.launchAction(myFixture.findSingleIntention("SonarQube: Use \"Arrays.toString(array)\" instead")) myFixture.editor.caretModel.currentCaret.moveToOffset(180) - myFixture.launchAction(myFixture.findSingleIntention("SonarQube for IntelliJ: Merge this if statement with the enclosing one")) + myFixture.launchAction(myFixture.findSingleIntention("SonarQube: Merge this if statement with the enclosing one")) //Their stripTrailingSpaces function don't work myFixture.checkResult(expectedFile.getDocument()!!.text.trim(), true) } diff --git a/src/test/java/org/sonarlint/intellij/notifications/SonarLintProjectNotificationsTests.kt b/src/test/java/org/sonarlint/intellij/notifications/SonarLintProjectNotificationsTests.kt index aa8a64a1b7..58616ab5e3 100644 --- a/src/test/java/org/sonarlint/intellij/notifications/SonarLintProjectNotificationsTests.kt +++ b/src/test/java/org/sonarlint/intellij/notifications/SonarLintProjectNotificationsTests.kt @@ -70,11 +70,11 @@ class SonarLintProjectNotificationsTests : AbstractSonarLintLightTests() { sonarLintProjectNotifications.notifyProjectBindingInvalidAndUnbound() Assertions.assertThat(notifications).hasSize(1) - Assertions.assertThat(notifications[0].title).isEqualTo("SonarLint - Invalid binding") + Assertions.assertThat(notifications[0].title).isEqualTo("SonarQube for IntelliJ - Invalid binding") Assertions.assertThat(notifications[0].content) .isEqualTo("Project binding is invalid and has been removed, the connection has probably been deleted previously.") Assertions.assertThat(notifications[0].type).isEqualTo(NotificationType.WARNING) - Assertions.assertThat(notifications[0].icon).isEqualTo(SonarLintIcons.SONARLINT) + Assertions.assertThat(notifications[0].icon).isEqualTo(SonarLintIcons.SONARQUBE_FOR_INTELLIJ) Assertions.assertThat(notifications[0].actions.size).isEqualTo(1) } @@ -85,10 +85,10 @@ class SonarLintProjectNotificationsTests : AbstractSonarLintLightTests() { sonarLintProjectNotifications.notifyLanguagePromotion(content) Assertions.assertThat(notifications).hasSize(1) - Assertions.assertThat(notifications[0].title).isEqualTo("SonarLint suggestions") + Assertions.assertThat(notifications[0].title).isEqualTo("SonarQube for IntelliJ suggestions") Assertions.assertThat(notifications[0].content).isEqualTo(content) Assertions.assertThat(notifications[0].type).isEqualTo(NotificationType.INFORMATION) - Assertions.assertThat(notifications[0].icon).isEqualTo(SonarLintIcons.SONARLINT) + Assertions.assertThat(notifications[0].icon).isEqualTo(SonarLintIcons.SONARQUBE_FOR_INTELLIJ) Assertions.assertThat(notifications[0].actions.size).isEqualTo(4) } @@ -103,7 +103,7 @@ class SonarLintProjectNotificationsTests : AbstractSonarLintLightTests() { Assertions.assertThat(notifications[0].content).isEqualTo(message) Assertions.assertThat(notifications[0].type).isEqualTo(NotificationType.INFORMATION) Assertions.assertThat(notifications[0].isExpired).isEqualTo(false) - Assertions.assertThat(notifications[0].icon).isEqualTo(SonarLintIcons.SONARLINT) + Assertions.assertThat(notifications[0].icon).isEqualTo(SonarLintIcons.SONARQUBE_FOR_INTELLIJ) Assertions.assertThat(notifications[0].actions).isEmpty() } @@ -134,10 +134,10 @@ class SonarLintProjectNotificationsTests : AbstractSonarLintLightTests() { sonarLintProjectNotifications.handle(param) Assertions.assertThat(notifications).hasSize(1) - Assertions.assertThat(notifications[0].title).isEqualTo("SonarQube Notification") + Assertions.assertThat(notifications[0].title).isEqualTo("SonarQube Server Notification") Assertions.assertThat(notifications[0].content).isEqualTo("text") Assertions.assertThat(notifications[0].type).isEqualTo(NotificationType.INFORMATION) - Assertions.assertThat(notifications[0].icon).isEqualTo(SonarLintIcons.ICON_SONARQUBE_16) + Assertions.assertThat(notifications[0].icon).isEqualTo(SonarLintIcons.ICON_SONARQUBE_SERVER_16) Assertions.assertThat(notifications[0].actions.size).isEqualTo(2) } @@ -157,10 +157,10 @@ class SonarLintProjectNotificationsTests : AbstractSonarLintLightTests() { sonarLintProjectNotifications.handle(param) Assertions.assertThat(notifications).hasSize(1) - Assertions.assertThat(notifications[0].title).isEqualTo("SonarCloud Notification") + Assertions.assertThat(notifications[0].title).isEqualTo("SonarQube Cloud Notification") Assertions.assertThat(notifications[0].content).isEqualTo("text") Assertions.assertThat(notifications[0].type).isEqualTo(NotificationType.INFORMATION) - Assertions.assertThat(notifications[0].icon).isEqualTo(SonarLintIcons.ICON_SONARCLOUD_16) + Assertions.assertThat(notifications[0].icon).isEqualTo(SonarLintIcons.ICON_SONARQUBE_CLOUD_16) Assertions.assertThat(notifications[0].actions.size).isEqualTo(2) } @@ -175,7 +175,7 @@ class SonarLintProjectNotificationsTests : AbstractSonarLintLightTests() { Assertions.assertThat(notifications[0].title).isBlank() Assertions.assertThat(notifications[0].content).isEqualTo(content) Assertions.assertThat(notifications[0].type).isEqualTo(NotificationType.INFORMATION) - Assertions.assertThat(notifications[0].icon).isEqualTo(SonarLintIcons.SONARLINT) + Assertions.assertThat(notifications[0].icon).isEqualTo(SonarLintIcons.SONARQUBE_FOR_INTELLIJ) Assertions.assertThat(notifications[0].actions).isEmpty() } @@ -191,7 +191,7 @@ class SonarLintProjectNotificationsTests : AbstractSonarLintLightTests() { Assertions.assertThat(notifications[0].title).isEqualTo(title) Assertions.assertThat(notifications[0].content).isEqualTo(content) Assertions.assertThat(notifications[0].type).isEqualTo(NotificationType.ERROR) - Assertions.assertThat(notifications[0].icon).isEqualTo(SonarLintIcons.SONARLINT) + Assertions.assertThat(notifications[0].icon).isEqualTo(SonarLintIcons.SONARQUBE_FOR_INTELLIJ) Assertions.assertThat(notifications[0].actions.size).isEqualTo(1) } @@ -206,7 +206,7 @@ class SonarLintProjectNotificationsTests : AbstractSonarLintLightTests() { Assertions.assertThat(notifications[0].title).isBlank() Assertions.assertThat(notifications[0].content).isEqualTo(content) Assertions.assertThat(notifications[0].type).isEqualTo(NotificationType.WARNING) - Assertions.assertThat(notifications[0].icon).isEqualTo(SonarLintIcons.SONARLINT) + Assertions.assertThat(notifications[0].icon).isEqualTo(SonarLintIcons.SONARQUBE_FOR_INTELLIJ) Assertions.assertThat(notifications[0].actions.size).isEqualTo(1) } @@ -215,14 +215,14 @@ class SonarLintProjectNotificationsTests : AbstractSonarLintLightTests() { sonarLintProjectNotifications.sendNotification() Assertions.assertThat(notifications).hasSize(1) - Assertions.assertThat(notifications[0].title).isEqualTo("SonarLint: secret(s) detected") + Assertions.assertThat(notifications[0].title).isEqualTo("SonarQube for IntelliJ: secret(s) detected") Assertions.assertThat(notifications[0].content).isEqualTo( - "SonarLint detected some secrets in one of the open files. " + + "SonarQube for IntelliJ detected some secrets in one of the open files. " + "We strongly advise you to review those secrets and ensure they are not committed into repositories. " + - "Please refer to the SonarLint tool window for more information." + "Please refer to the SonarQube for IntelliJ tool window for more information." ) Assertions.assertThat(notifications[0].type).isEqualTo(NotificationType.WARNING) - Assertions.assertThat(notifications[0].icon).isEqualTo(SonarLintIcons.SONARLINT) + Assertions.assertThat(notifications[0].icon).isEqualTo(SonarLintIcons.SONARQUBE_FOR_INTELLIJ) Assertions.assertThat(notifications[0].actions).isEmpty() } @@ -237,7 +237,7 @@ class SonarLintProjectNotificationsTests : AbstractSonarLintLightTests() { Assertions.assertThat(notifications[0].title).isBlank() Assertions.assertThat(notifications[0].content).isEqualTo(message) Assertions.assertThat(notifications[0].type).isEqualTo(NotificationType.WARNING) - Assertions.assertThat(notifications[0].icon).isEqualTo(SonarLintIcons.SONARLINT) + Assertions.assertThat(notifications[0].icon).isEqualTo(SonarLintIcons.SONARQUBE_FOR_INTELLIJ) Assertions.assertThat(notifications[0].actions.size).isEqualTo(1) } @@ -253,7 +253,7 @@ class SonarLintProjectNotificationsTests : AbstractSonarLintLightTests() { Assertions.assertThat(notifications[0].title).isEqualTo(title) Assertions.assertThat(notifications[0].content).isEqualTo(message) Assertions.assertThat(notifications[0].type).isEqualTo(NotificationType.WARNING) - Assertions.assertThat(notifications[0].icon).isEqualTo(SonarLintIcons.SONARLINT) + Assertions.assertThat(notifications[0].icon).isEqualTo(SonarLintIcons.SONARQUBE_FOR_INTELLIJ) Assertions.assertThat(notifications[0].actions.size).isEqualTo(2) } @@ -269,7 +269,7 @@ class SonarLintProjectNotificationsTests : AbstractSonarLintLightTests() { Assertions.assertThat(notifications[0].title).isEqualTo(title) Assertions.assertThat(notifications[0].content).isEqualTo(message) Assertions.assertThat(notifications[0].type).isEqualTo(NotificationType.INFORMATION) - Assertions.assertThat(notifications[0].icon).isEqualTo(SonarLintIcons.SONARLINT) + Assertions.assertThat(notifications[0].icon).isEqualTo(SonarLintIcons.SONARQUBE_FOR_INTELLIJ) Assertions.assertThat(notifications[0].actions.size).isEqualTo(1) } @@ -285,7 +285,7 @@ class SonarLintProjectNotificationsTests : AbstractSonarLintLightTests() { Assertions.assertThat(notifications[0].title).isEqualTo(title) Assertions.assertThat(notifications[0].content).isEqualTo(message) Assertions.assertThat(notifications[0].type).isEqualTo(type) - Assertions.assertThat(notifications[0].icon).isEqualTo(SonarLintIcons.SONARLINT) + Assertions.assertThat(notifications[0].icon).isEqualTo(SonarLintIcons.SONARQUBE_FOR_INTELLIJ) Assertions.assertThat(notifications[0].actions).isEmpty() }