fix: update font scaling logic to not use hard coded values (#264)

* fix: update font scaling logic to not use hard coded values

* chore: allow resource checks to run on main and master branches

* formatting: update comments in BaseHtmlProvider.java

* fix: update font size handling for unit tests

* fix: pmd checks - ignore empty catch block in uts

* fix: pmd checks - ignore empty catch block in uts

Author: andrewrobinsonhodges-snyk

.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

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)",
@@ -135,19 +135,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/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; }