Merge branch 'main' into fix/IDE-897_new_severity_icons

Author: acke

.github/workflows/resource-check.yml

@@ -1,7 +1,7 @@
 name: Static Resource Checking
 on:
   push:
-    branches: [ master ]
+    branches: [ main, master ]
   pull_request:
 
 jobs:
@@ -14,7 +14,7 @@ jobs:
       - name: Check Static Resources
         run: |
           declare -A resources
-          # Add each resource as a key, value pair, mapping the local resource to the reference file (which should be stored in the lanaguage server repository). For example:
+          # Add each resource as a key, value pair, mapping the local resource to the reference file (which should be stored in the language server repository). For example:
           # resources["<path_to_local_file>"]="<url_of_reference_file>"
           resources["plugin/src/main/resources/ui/html/ScanSummaryInit.html"]="https://raw.githubusercontent.com/snyk/snyk-ls/refs/heads/main/shared_ide_resources/ui/html/ScanSummaryInit.html"
           for key in ${!resources[@]}; do

CHANGELOG.md

@@ -7,6 +7,9 @@
 - added support for DeepCode AI Fixes
 - new severity icons
 
+### Fixes
+- fixes open & ignored issue filtering toggles
+
 ## [3.0.0]
 ### Changes
 - process api URL from hasAuthenticated message

plugin/src/main/java/io/snyk/eclipse/plugin/html/BaseHtmlProvider.java

@@ -103,7 +103,7 @@ public String replaceCssVariables(String html) {
 		htmlStyled = htmlStyled.replace("<style nonce=\"ideNonce\" data-ide-style></style>", css);
 		htmlStyled = htmlStyled.replace("var(--default-font)",
 				" ui-sans-serif, \"SF Pro Text\", \"Segoe UI\", \"Ubuntu\", Tahoma, Geneva, Verdana, sans-serif;");
-		htmlStyled = htmlStyled.replace("var(--main-font-size)", getScaledFontSize());
+		htmlStyled = htmlStyled.replace("var(--main-font-size)", getRelativeFontSize(getDefaultFontSize()));
 
 		// Replace CSS variables with actual color values
 		htmlStyled = htmlStyled.replace("var(--text-color)",
@@ -137,19 +137,31 @@ public String replaceCssVariables(String html) {
 		return htmlStyled;
 	}
 
-	private String getScaledFontSize() {
-		int defaultHeight;
+	@SuppressWarnings("PMD.EmptyCatchBlock")
+	private int getDefaultFontSize() {
+		int fontSize =  13;
 		try {
-			defaultHeight = getCurrentTheme().getFontRegistry().getFontData(JFaceResources.TEXT_FONT)[0].getHeight();
+			fontSize = getCurrentTheme().getFontRegistry().getFontData(JFaceResources.TEXT_FONT)[0].getHeight();
 		} catch (IllegalStateException e) {
-			defaultHeight = 13;
+			// TODO improve the logic here. Expected only in unit tests.
 		}
-		// Language server HTML assumes a base font size of 10px. The default Eclipse
-		// font size is 17px (13pt), so we
-		// apply a scaling factor here. This ensures that HTML fonts scale correctly if
-		// the user changes the text size.
-		int scaledHeight = (int) (defaultHeight / 1.7);
-		return scaledHeight + "pt";
+		return fontSize;
+	}
+
+    // Utility function to scale Eclipse fonts appropriately for use in HTML elements that have been designed with
+    // px values in mind.
+	private String getRelativeFontSize(int inputFontSizePt) {
+		// Target size is the base size for which the HTML element was designed.
+		int targetSizePx = 10;
+		int startingFontSizePt = inputFontSizePt > 0 ? inputFontSizePt : getDefaultFontSize();
+
+		// FontRegistry uses pt sizes, not px, so we convert here, using standard web values from
+		// https://www.w3.org/TR/css3-values/#absolute-lengths
+		double pxToPtMultiplier = 72.0 / 96.0;
+		double targetSizePt = targetSizePx * pxToPtMultiplier;
+
+		// CSS allows 3 decimal places of precision for calculations.
+		return String.format("%.3frem", targetSizePt / startingFontSizePt);
 	}
 
 	public String getColorAsHex(String colorKey, String defaultColor) {

plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/TreeViewerFilter.java

@@ -48,7 +48,7 @@ private boolean isIssueVisible(IssueTreeNode issueNode) {
 	    }
 
 	    for (var filter : this.filters.values()) {
-	        if (!filter.test(issue)) {
+	        if (filter.test(issue)) {
 	            return false;
 	        }
 	    }

plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/filters/BaseFilter.java

@@ -23,9 +23,9 @@ public void applyFilter() {
 		boolean booleanPref = this.preferences.getBooleanPref(this.filterName);
 
 		if (booleanPref) {
-			this.filterManager.removeTreeFilter(this.filterName);
+			this.filterManager.removeTreeFilter(this.filterName); // Showing "a thing" removes it from being filtered out.
 		} else {
-			this.filterManager.addTreeFilter(this.filterName, predicate);
+			this.filterManager.addTreeFilter(this.filterName, predicate); // Hiding (unchecking) "a thing" adds a filter to filter it out.
 		}
 	}
-}
+}

plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/filters/FixableFilter.java

@@ -8,15 +8,17 @@
 import io.snyk.languageserver.protocolextension.messageObjects.scanResults.Issue;
 
 public class FixableFilter extends BaseFilter {	
-	private static final Predicate<Issue> predicate = issue -> issue.hasFix();
+	private static final Predicate<Issue> predicate = issue -> !issue.hasFix(); // Inverse predicate, see below.
 
 	public FixableFilter(TreeFilterManager tfm) {
 		super(FILTER_SHOW_ONLY_FIXABLE, predicate, tfm);
 	}
 
 	@Override
 	public void applyFilter() {
-		// this is inverse to the other filters, so we need to overwrite the BaseFilter logic
+		// This is inverse to the other filters, so we need to overwrite the BaseFilter logic.
+		// Deselecting show fixable issues should not hide fixable issues and show all issues.
+		// Therefore when deactivated we cannot have a filter added, so the logic is flipped.
 		boolean booleanPref = preferences.getBooleanPref(this.filterName);
 
 		if (booleanPref) {

plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/filters/IgnoresIgnoredIssuesFilter.java

@@ -14,4 +14,4 @@ public IgnoresIgnoredIssuesFilter(TreeFilterManager tfm) {
 		super(FILTER_IGNORES_SHOW_IGNORED_ISSUES, predicate, tfm);
 	}
 
-}
+}

plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/filters/IgnoresOpenIssuesFilter.java

@@ -1,16 +1,16 @@
 package io.snyk.eclipse.plugin.views.snyktoolview.filters;
 
-import static io.snyk.eclipse.plugin.preferences.Preferences.FILTER_IGNORES_SHOW_IGNORED_ISSUES;
+import static io.snyk.eclipse.plugin.preferences.Preferences.FILTER_IGNORES_SHOW_OPEN_ISSUES;
 
 import java.util.function.Predicate;
 
 import io.snyk.eclipse.plugin.views.snyktoolview.TreeFilterManager;
 import io.snyk.languageserver.protocolextension.messageObjects.scanResults.Issue;
 
-public class IgnoresOpenIssuesFilter extends BaseFilter {	
+public class IgnoresOpenIssuesFilter extends BaseFilter {
 	private static final Predicate<Issue> predicate = issue -> !issue.isIgnored();
 
 	public IgnoresOpenIssuesFilter(TreeFilterManager tfm) {
-		super(FILTER_IGNORES_SHOW_IGNORED_ISSUES, predicate, tfm);
+		super(FILTER_IGNORES_SHOW_OPEN_ISSUES, predicate, tfm);
 	}
-}
+}

plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/filters/ProductFilter.java

@@ -22,7 +22,7 @@ public ProductFilter(TreeFilterManager tfm, String filterName) {
 	@SuppressWarnings("rawtypes")
 	private static Predicate getPredicate(String filterName) {
 		String filterableIssueType = preferenceToProductConstants.get(filterName);
-		Predicate<Issue> predicate = issue -> !issue.filterableIssueType().equals(filterableIssueType);
+		Predicate<Issue> predicate = issue -> issue.filterableIssueType().equals(filterableIssueType);
 		return predicate;
 	}
-}
+}

plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/filters/SeverityFilter.java

@@ -21,7 +21,7 @@ public SeverityFilter(TreeFilterManager tfm, String preferenceKey) {
 	@SuppressWarnings("rawtypes")
 	private static Predicate getPredicate(String preferenceKey) {
 		String severityCondition = preferenceToProductConstants.get(preferenceKey);
-		Predicate<Issue> predicate = issue -> !issue.severity().equals(severityCondition);
+		Predicate<Issue> predicate = issue -> issue.severity().equals(severityCondition);
 		return predicate;
-	}	
-}
+	}
+}

plugin/src/main/java/io/snyk/languageserver/SnykIssueCache.java

@@ -56,8 +56,8 @@ public void clearAll() {
 	 * @param path The file path for which issues should be removed
 	 */
 	public void removeAllIssuesForPath(String path) {
-		codeSecurityIssues.clear();
-		codeQualityIssues.clear();
+		codeSecurityIssues.remove(path);
+		codeQualityIssues.remove(path);
 		ossIssues.remove(path);
 		iacIssues.remove(path);
 	}

plugin/src/main/resources/ui/html/ScanSummaryInit.html

@@ -31,7 +31,7 @@
       to { transform: rotate(360deg); }
     }
 
-    .snx-h1 { font-size: 2rem; font-weight: 600; margin: .8rem 0; }
+    .snx-h1 { font-size: 1.6rem; font-weight: 400; margin: .4rem 0; }
 
     .snx-status { display:flex; align-items:center; padding: .4rem 1.2rem; background-color: rgba(255,255,255,.1); border-radius: 1rem; }
 

tests/src/test/java/io/snyk/eclipse/plugin/views/snyktoolview/TreeViewerFilterTest.java

@@ -43,10 +43,10 @@ void testSelect_IssueTreeNodeWithMatchingFilter() {
         Issue issue = mock(Issue.class);
         when(issueNode.getIssue()).thenReturn(issue);
 
-        Predicate<Issue> predicate = i -> true; // Always matches
+        Predicate<Issue> predicate = i -> true; // Always matches, so filtered out.
         filter.putFilterPredicate("test", predicate);
 
-        assertTrue(filter.select(mockViewer, null, issueNode));
+        assertFalse(filter.select(mockViewer, null, issueNode));
     }
 
     @Test
@@ -55,10 +55,10 @@ void testSelect_IssueTreeNodeWithNonMatchingFilter() {
         Issue issue = mock(Issue.class);
         when(issueNode.getIssue()).thenReturn(issue);
 
-        Predicate<Issue> predicate = i -> false; // Never matches
+        Predicate<Issue> predicate = i -> false; // Never matches, so not filtered out.
         filter.putFilterPredicate("test", predicate);
 
-        assertFalse(filter.select(mockViewer, null, issueNode));
+        assertTrue(filter.select(mockViewer, null, issueNode));
     }
 
     @Test
@@ -85,13 +85,17 @@ void testSelect_FileTreeNodeWithNoVisibleChildren() {
 
     @Test
     void testRemoveFilterPredicate() {
-        Predicate<Issue> predicate = i -> false;
+        IssueTreeNode issueNode = mock(IssueTreeNode.class);
+        Issue issue = mock(Issue.class);
+        when(issueNode.getIssue()).thenReturn(issue);
+
+        Predicate<Issue> predicate = i -> true; // Always matches, so filtered out.
         filter.putFilterPredicate("test", predicate);
 
-        assertTrue(filter.select(mockViewer, null, mock(IssueTreeNode.class)));
+        assertFalse(filter.select(mockViewer, null, issueNode));
 
         filter.removeFilterPredicate("test");
 
-        assertTrue(filter.select(mockViewer, null, mock(IssueTreeNode.class)));
+        assertTrue(filter.select(mockViewer, null, issueNode));
     }
-}
+}