Skip to content

Commit 6f5f4c7

Browse files
fix: homogenize info node texts [IDE-936] (#277)
fix: homogenize info node texts
1 parent f214503 commit 6f5f4c7

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

plugin/src/main/java/io/snyk/languageserver/protocolextension/SnykExtendedLanguageClient.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ public CompletableFuture<ShowDocumentResult> showDocument(ShowDocumentParams par
456456

457457
private Issue getIssueFromCache(String product, String issueId) {
458458
Issue issue = null;
459-
IssueCacheHolder issueCacheHolder = IssueCacheHolder.getInstance();
459+
IssueCacheHolder issueCacheHolder = IssueCacheHolder.getInstance();
460460
List<IProject> openProjects = ResourceUtils.getAccessibleTopLevelProjects();
461461
for (IProject iProject : openProjects) {
462462
issue = issueCacheHolder.getCacheInstance(iProject)
@@ -568,7 +568,7 @@ private void addInfoNodes(ProductTreeNode productNode, String folderPath, SnykIs
568568
if (totalCount == 0) {
569569
toolView.addInfoNode(productNode, new InfoTreeNode(CONGRATS_NO_ISSUES_FOUND));
570570
} else {
571-
String text = "✋ " + totalCount + " issue" + getPlural(totalCount) + " found by Snyk";
571+
String text = "✋ " + totalCount + " issue" + getPlural(totalCount) + " found";
572572
if (ignoredCount > 0) {
573573
text += ", " + ignoredCount + " ignored";
574574
}

tests/src/test/java/io/snyk/languageserver/protocolextension/SnykExtendedLanguageClientTest.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ protected void setUp() {
8181
pref.store(Preferences.AUTH_TOKEN_KEY, "dummy");
8282
pref.store(Preferences.MANAGE_BINARIES_AUTOMATICALLY, "false");
8383
toolWindowMock = mock(ISnykToolView.class);
84-
84+
8585
}
8686

8787
@AfterEach
@@ -156,7 +156,7 @@ void testSendsPluginInstalledEventAndRefreshFeatureFlagOnFirstStart() {
156156
mockedAnalyticsSender.when(() -> TaskProcessor.getInstance()).thenReturn(asMock);
157157

158158
cut = new SnykExtendedLanguageClient();
159-
159+
160160
verify(asMock, timeout(5000).times(2)).registerTask(any(), any());
161161
verifyNoMoreInteractions(asMock);
162162
}
@@ -280,7 +280,7 @@ void testSnykScanSuccessAddsInfoNodes_IssuesFound_nothingFixable() {
280280
param.setFolderPath("a/b/c");
281281

282282
int issueCount = 3;
283-
String expectedFirstInfoNode = "✋ " + issueCount + " issue" + getPlural(issueCount) + " found by Snyk";
283+
String expectedFirstInfoNode = "✋ " + issueCount + " issue" + getPlural(issueCount) + " found";
284284
String expectedSecondInfoNode = ISnykToolView.NO_FIXABLE_ISSUES;
285285
String expectedThirdInfoNode = CONGRATS_NO_ISSUES_FOUND;
286286

@@ -299,7 +299,7 @@ void testSnykScanSuccessAddsInfoNodes_IssuesFound_singleFixable() {
299299
param.setStatus(SCAN_STATE_SUCCESS);
300300
param.setProduct(SCAN_PARAMS_CODE);
301301
param.setFolderPath("a/b/c");
302-
String expectedFirstInfoNode = "✋ 1 issue found by Snyk";
302+
String expectedFirstInfoNode = "✋ 1 issue found";
303303
String expectedSecondInfoNode = "⚡️ 1 issue can be fixed automatically";
304304
String expectedThirdInfoNode = CONGRATS_NO_ISSUES_FOUND;
305305

@@ -317,7 +317,7 @@ void testSnykScanSuccessAddsInfoNodes_IssuesFound_multipleFixable() {
317317
param.setStatus(SCAN_STATE_SUCCESS);
318318
param.setProduct(SCAN_PARAMS_CODE);
319319
param.setFolderPath("a/b/c");
320-
String expectedFirstInfoNode = "✋ 4 issues found by Snyk";
320+
String expectedFirstInfoNode = "✋ 4 issues found";
321321
String expectedSecondInfoNode = "⚡️ 2 issues can be fixed automatically";
322322
String expectedThirdInfoNode = CONGRATS_NO_ISSUES_FOUND;
323323

@@ -337,7 +337,7 @@ void testSnykScanSuccessAddsInfoNodes_IssuesFound_oneIgnored() {
337337
param.setStatus(SCAN_STATE_SUCCESS);
338338
param.setProduct(SCAN_PARAMS_CODE);
339339
param.setFolderPath("a/b/c");
340-
String expectedFirstInfoNode = "✋ 4 issues found by Snyk, 1 ignored";
340+
String expectedFirstInfoNode = "✋ 4 issues found, 1 ignored";
341341
String expectedSecondInfoNode = "⚡️ 2 issues can be fixed automatically";
342342
String expectedThirdInfoNode = CONGRATS_NO_ISSUES_FOUND;
343343

@@ -357,7 +357,7 @@ void testSnykScanSuccessAddsInfoNodes_IssuesFound_onlyIgnoredDisplayed() {
357357
pref.store(Preferences.ACTIVATE_SNYK_CODE_SECURITY, "true");
358358
pref.store(Preferences.ACTIVATE_SNYK_CODE_QUALITY, "true");
359359

360-
String expectedFirstInfoNode = "✋ 4 issues found by Snyk, 4 ignored";
360+
String expectedFirstInfoNode = "✋ 4 issues found, 4 ignored";
361361
String expectedSecondInfoNode = "⚡️ 2 issues can be fixed automatically";
362362
String expectedThirdInfoNode = "Adjust your Issue View Options to see ignored issues.";
363363

@@ -376,7 +376,7 @@ void testSnykScanSuccessAddsInfoNodes_IssuesFound_onlyOpenDisplayed() {
376376
pref.store(Preferences.ACTIVATE_SNYK_CODE_SECURITY, "true");
377377
pref.store(Preferences.ACTIVATE_SNYK_CODE_QUALITY, "true");
378378

379-
String expectedFirstInfoNode = "✋ 4 issues found by Snyk";
379+
String expectedFirstInfoNode = "✋ 4 issues found";
380380
String expectedSecondInfoNode = "⚡️ 2 issues can be fixed automatically";
381381
String expectedThirdInfoNode = "Adjust your Issue View Options to see open issues.";
382382

0 commit comments

Comments
 (0)