From c8701a0b81ba26f0480014b956ce3ac65c0d608a Mon Sep 17 00:00:00 2001 From: Knut Funkel Date: Mon, 10 Mar 2025 11:35:43 +0100 Subject: [PATCH 1/5] fix: new severity icons [IDE-897] --- CHANGELOG.md | 1 + plugin/icons/dark-critical-severity.png | Bin 0 -> 619 bytes plugin/icons/dark-high-severity.png | Bin 0 -> 584 bytes plugin/icons/dark-low-severity.png | Bin 0 -> 523 bytes plugin/icons/dark-medium-severity.png | Bin 0 -> 643 bytes .../io/snyk/eclipse/plugin/utils/SnykIcons.java | 8 ++++---- 6 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 plugin/icons/dark-critical-severity.png create mode 100644 plugin/icons/dark-high-severity.png create mode 100644 plugin/icons/dark-low-severity.png create mode 100644 plugin/icons/dark-medium-severity.png diff --git a/CHANGELOG.md b/CHANGELOG.md index ebfd00c5..1a9ff4aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - add option for using a folder as reference instead of a branch in net-new scanning - add scan summary to custom UI, updating scan statuses live - added support for DeepCode AI Fixes +- new severity icons ## [3.0.0] ### Changes diff --git a/plugin/icons/dark-critical-severity.png b/plugin/icons/dark-critical-severity.png new file mode 100644 index 0000000000000000000000000000000000000000..1ac87b0d1c8d3d71d2c6e9cbe5c65fa4ade029b3 GIT binary patch literal 619 zcmV-x0+juUP)y60TDaWbN0I$+>?ckqf+w2HKAE{~b*gWi;;v!y%QlrB9Gd#S^ z>Q{F*o6Oqo6$r4tXv}X_b;#tlv$c+*9Ks3MRmx5;Xo41@J(}|%Al1VFnZ5f z;*8PQ8TVsy<##^sXMqL&fIczF9$Cm$x7gpTx7&Lz{uzGn5gfn3LHhsz002ovPDHLk FV1l2V8_)m% literal 0 HcmV?d00001 diff --git a/plugin/icons/dark-high-severity.png b/plugin/icons/dark-high-severity.png new file mode 100644 index 0000000000000000000000000000000000000000..591958204a36ab1d780ba71c62659223853bb65b GIT binary patch literal 584 zcmV-O0=NB%P)lEzD;ob|AH zf17PHaHy?YlaQc`%1-COjaDjLwFNABdWV19mh*@#EsHX-R^3e7I$2LN1k2 zj(bPh=t`yCx4M*5Lu=u^!pen249&Xu`v*72|GoZ( z^Dp)Wk<@q}?BnIiNXTAbR$7*493T?c*fhpyJnpQ@NW^YnUnA?n?!WPPeTk;<{rQ=< z`J!y-1sl?GAyL=y`Z0$7CQcoGsy!B+LDUwq;`xaD7~5fv z<@y4BK8$INKH-gLb0$1Q=n?+7!`M&hV@lUSiJ}%?eU;8KUakpm+Fq7n_sbFX)A%Pf W2Ny@!R1~5B0000hBb>0;~r{O;bJgHW-_O-9+n zEE8L+NJ66#K&y2L%jJ7jKv9X7LSz^-&c)D_YBKu12hHY15p!Ks_Ppx}AtF^C5rSRw zEJDai19OZ{r&sKF1deO~3a!#n$9QUv7P>o)r^<&)u1;gZ=&!Hk%I!f*RE8x%>VZ zRNo0+6@ud6udl=J%Zcegg{2c`emVRG&0`IAqy( zOii5G(VZqDn`PN~oTkptkvE7%L4y=iP!g^| zbT}zULm&q8Z@k0o%lbs{mDb2Y;u0PA$-0NU&S< zH{mcyQ27DdGDJ=C7ygEbgH7frR<@f?39emBFw7J9;O`FGd>fr)l*JwGYD{MgVxPqN z&k@-cBSnq`6fRqOCf(W3vC%niGm(!G25%Eo?F562AgFTl|`!#)S8Rw&QoZ~z1qf1z=T2DtDMKdjO@_UH+ zxRpE4Ev^?(4HS?W6Y7>6A`K>~(?17qHgUGL0()i-rzL58yvpt;pcuTZ1$dS;8dw1&ffN= zG@B>Vs$E+OfBgU*V~r-EViTPz;?3XHCj2)SI+i zLLwsiSKPsHJVwkd?Rs|+=t!t+$nx>-mdl72i$7EG*?!2Q{ZF!A=M{;I@xL(jxMf>+ d9;09M{}0gjJeMS*xhMbt002ovPDHLkV1i3%6N>-< literal 0 HcmV?d00001 diff --git a/plugin/src/main/java/io/snyk/eclipse/plugin/utils/SnykIcons.java b/plugin/src/main/java/io/snyk/eclipse/plugin/utils/SnykIcons.java index b2c9135e..e9388b6b 100644 --- a/plugin/src/main/java/io/snyk/eclipse/plugin/utils/SnykIcons.java +++ b/plugin/src/main/java/io/snyk/eclipse/plugin/utils/SnykIcons.java @@ -15,10 +15,10 @@ public class SnykIcons { public static final ImageDescriptor IAC_DISABLED = Activator.getImageDescriptor("/icons/iac_disabled.png"); public static final ImageDescriptor SEVERITY_CRITICAL = Activator - .getImageDescriptor("/icons/severity_critical.png"); - public static final ImageDescriptor SEVERITY_HIGH = Activator.getImageDescriptor("/icons/severity_high.png"); - public static final ImageDescriptor SEVERITY_MEDIUM = Activator.getImageDescriptor("/icons/severity_medium.png"); - public static final ImageDescriptor SEVERITY_LOW = Activator.getImageDescriptor("/icons/severity_low.png"); + .getImageDescriptor("/icons/dark-critical-severity.png"); + public static final ImageDescriptor SEVERITY_HIGH = Activator.getImageDescriptor("/icons/dark-high-severity.png"); + public static final ImageDescriptor SEVERITY_MEDIUM = Activator.getImageDescriptor("/icons/dark-medium-severity.png"); + public static final ImageDescriptor SEVERITY_LOW = Activator.getImageDescriptor("/icons/dark-low-severity.png"); public static final ImageDescriptor ENABLED = Activator.getImageDescriptor("/icons/enabled.png"); public static final ImageDescriptor DISABLED = Activator.getImageDescriptor("/icons/transparent.png"); From 98d6f953cb78edb93f2013147d7192aa35be6e0b Mon Sep 17 00:00:00 2001 From: Knut Funkel Date: Mon, 10 Mar 2025 16:49:29 +0100 Subject: [PATCH 2/5] fix: fix unable to lookup product --- .../plugin/domain/ProductConstants.java | 83 +++++++++---------- .../views/snyktoolview/SnykToolView.java | 1 - .../SnykExtendedLanguageClient.java | 4 +- 3 files changed, 44 insertions(+), 44 deletions(-) diff --git a/plugin/src/main/java/io/snyk/eclipse/plugin/domain/ProductConstants.java b/plugin/src/main/java/io/snyk/eclipse/plugin/domain/ProductConstants.java index 197a34a9..b0939a18 100644 --- a/plugin/src/main/java/io/snyk/eclipse/plugin/domain/ProductConstants.java +++ b/plugin/src/main/java/io/snyk/eclipse/plugin/domain/ProductConstants.java @@ -4,46 +4,45 @@ public final class ProductConstants { - public static final String SCAN_STATE_IN_PROGRESS = "inProgress"; - public static final String SCAN_STATE_SUCCESS = "success"; - public static final String SCAN_STATE_ERROR = "error"; - - public static final String SCAN_PARAMS_OSS = "oss"; - public static final String SCAN_PARAMS_CODE = "code"; - public static final String SCAN_PARAMS_IAC = "iac"; - - public static final String DIAGNOSTIC_SOURCE_SNYK_OSS = "Snyk Open Source"; - public static final String DIAGNOSTIC_SOURCE_SNYK_CODE = "Snyk Code"; - public static final String DIAGNOSTIC_SOURCE_SNYK_IAC = "Snyk IaC"; - - public static final String DISPLAYED_OSS = "Snyk Open Source"; - public static final String DISPLAYED_CODE_SECURITY = "Code Security"; - public static final String DISPLAYED_CODE_QUALITY = "Code Quality"; - public static final String DISPLAYED_IAC = "Configuration"; - - public static final String SEVERITY_CRITICAL = "critical"; - public static final String SEVERITY_HIGH = "high"; - public static final String SEVERITY_MEDIUM = "medium"; - public static final String SEVERITY_LOW = "low"; - - public static final String FILTERABLE_ISSUE_OPEN_SOURCE = "Open Source"; - public static final String FILTERABLE_ISSUE_CODE_SECURITY = "Code Security"; - public static final String FILTERABLE_ISSUE_CODE_QUALITY = "Code Quality"; - public static final String FILTERABLE_ISSUE_INFRASTRUCTURE_AS_CODE = "Infrastructure As Code"; - - public static final Map FILTERABLE_ISSUE_TYPE_TO_DISPLAY = Map.of( - FILTERABLE_ISSUE_CODE_QUALITY, DISPLAYED_CODE_QUALITY, - FILTERABLE_ISSUE_CODE_SECURITY, DISPLAYED_CODE_SECURITY, - FILTERABLE_ISSUE_INFRASTRUCTURE_AS_CODE, DISPLAYED_IAC, - FILTERABLE_ISSUE_OPEN_SOURCE, DISPLAYED_OSS); - - public static final Map LSP_SOURCE_TO_SCAN_PARAMS = Map.of( - DIAGNOSTIC_SOURCE_SNYK_CODE, SCAN_PARAMS_CODE, - DIAGNOSTIC_SOURCE_SNYK_IAC, SCAN_PARAMS_IAC, - DIAGNOSTIC_SOURCE_SNYK_OSS, SCAN_PARAMS_OSS); - - // code cannot be mapped easily - public static final Map SCAN_PARAMS_TO_DISPLAYED = Map.of( - SCAN_PARAMS_OSS, DISPLAYED_OSS, - SCAN_PARAMS_IAC, DISPLAYED_IAC); + public static final String SCAN_STATE_IN_PROGRESS = "inProgress"; + public static final String SCAN_STATE_SUCCESS = "success"; + public static final String SCAN_STATE_ERROR = "error"; + + public static final String SCAN_PARAMS_OSS = "oss"; + public static final String SCAN_PARAMS_CODE = "code"; + public static final String SCAN_PARAMS_IAC = "iac"; + + public static final String DIAGNOSTIC_SOURCE_SNYK_OSS = "Snyk Open Source"; + public static final String DIAGNOSTIC_SOURCE_SNYK_CODE = "Snyk Code"; + public static final String DIAGNOSTIC_SOURCE_SNYK_IAC = "Snyk IaC"; + + public static final String DISPLAYED_OSS = "Snyk Open Source"; + public static final String DISPLAYED_CODE_SECURITY = "Code Security"; + public static final String DISPLAYED_CODE_QUALITY = "Code Quality"; + public static final String DISPLAYED_IAC = "Configuration"; + + public static final String SEVERITY_CRITICAL = "critical"; + public static final String SEVERITY_HIGH = "high"; + public static final String SEVERITY_MEDIUM = "medium"; + public static final String SEVERITY_LOW = "low"; + + public static final String FILTERABLE_ISSUE_OPEN_SOURCE = "Open Source"; + public static final String FILTERABLE_ISSUE_CODE_SECURITY = "Code Security"; + public static final String FILTERABLE_ISSUE_CODE_QUALITY = "Code Quality"; + public static final String FILTERABLE_ISSUE_INFRASTRUCTURE_AS_CODE = "Infrastructure As Code"; + + public static final Map FILTERABLE_ISSUE_TYPE_TO_DISPLAY = Map.of(FILTERABLE_ISSUE_CODE_QUALITY, + DISPLAYED_CODE_QUALITY, FILTERABLE_ISSUE_CODE_SECURITY, DISPLAYED_CODE_SECURITY, + FILTERABLE_ISSUE_INFRASTRUCTURE_AS_CODE, DISPLAYED_IAC, FILTERABLE_ISSUE_OPEN_SOURCE, DISPLAYED_OSS); + + public static final Map LSP_SOURCE_TO_SCAN_PARAMS = Map.of(DIAGNOSTIC_SOURCE_SNYK_CODE, + SCAN_PARAMS_CODE, DIAGNOSTIC_SOURCE_SNYK_IAC, SCAN_PARAMS_IAC, DIAGNOSTIC_SOURCE_SNYK_OSS, SCAN_PARAMS_OSS); + + public static final Map LSP_SOURCE_TO_DISPLAYED = Map.of(DIAGNOSTIC_SOURCE_SNYK_CODE, + DISPLAYED_CODE_SECURITY, DIAGNOSTIC_SOURCE_SNYK_IAC, DISPLAYED_IAC, DIAGNOSTIC_SOURCE_SNYK_OSS, + DISPLAYED_OSS); + + // code cannot be mapped easily + public static final Map SCAN_PARAMS_TO_DISPLAYED = Map.of(SCAN_PARAMS_OSS, DISPLAYED_OSS, + SCAN_PARAMS_IAC, DISPLAYED_IAC); } diff --git a/plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/SnykToolView.java b/plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/SnykToolView.java index 11fc02a5..004a1d93 100644 --- a/plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/SnykToolView.java +++ b/plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/SnykToolView.java @@ -43,7 +43,6 @@ import org.eclipse.ui.menus.CommandContributionItemParameter; import org.eclipse.ui.part.ViewPart; -import io.snyk.eclipse.plugin.domain.ProductConstants; import io.snyk.eclipse.plugin.preferences.Preferences; import io.snyk.eclipse.plugin.properties.FolderConfigs; import io.snyk.eclipse.plugin.utils.ResourceUtils; diff --git a/plugin/src/main/java/io/snyk/languageserver/protocolextension/SnykExtendedLanguageClient.java b/plugin/src/main/java/io/snyk/languageserver/protocolextension/SnykExtendedLanguageClient.java index 84e948a4..77155591 100644 --- a/plugin/src/main/java/io/snyk/languageserver/protocolextension/SnykExtendedLanguageClient.java +++ b/plugin/src/main/java/io/snyk/languageserver/protocolextension/SnykExtendedLanguageClient.java @@ -69,6 +69,7 @@ import io.snyk.eclipse.plugin.analytics.AbstractTask; import io.snyk.eclipse.plugin.analytics.AnalyticsEventTask; import io.snyk.eclipse.plugin.analytics.TaskProcessor; +import io.snyk.eclipse.plugin.domain.ProductConstants; import io.snyk.eclipse.plugin.preferences.Preferences; import io.snyk.eclipse.plugin.properties.FolderConfigs; import io.snyk.eclipse.plugin.utils.ResourceUtils; @@ -473,7 +474,8 @@ public CompletableFuture showDocument( return CompletableFuture.supplyAsync(() -> { openToolView(); - this.toolView.selectTreeNode(issue, uriDetails.product()); + String display_product = ProductConstants.LSP_SOURCE_TO_DISPLAYED.get(uriDetails.product()); + this.toolView.selectTreeNode(issue, display_product); return new ShowDocumentResult(true); }); } From 17dfdc7838a866e8ba5fb25948ee325f26b8c485 Mon Sep 17 00:00:00 2001 From: Knut Funkel Date: Mon, 10 Mar 2025 16:50:19 +0100 Subject: [PATCH 3/5] fix: added new colors for details view --- .../java/io/snyk/eclipse/plugin/html/BaseHtmlProvider.java | 4 +++- .../java/io/snyk/eclipse/plugin/html/CodeHtmlProvider.java | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/plugin/src/main/java/io/snyk/eclipse/plugin/html/BaseHtmlProvider.java b/plugin/src/main/java/io/snyk/eclipse/plugin/html/BaseHtmlProvider.java index 8cb14dcf..88903e45 100644 --- a/plugin/src/main/java/io/snyk/eclipse/plugin/html/BaseHtmlProvider.java +++ b/plugin/src/main/java/io/snyk/eclipse/plugin/html/BaseHtmlProvider.java @@ -107,7 +107,9 @@ public String replaceCssVariables(String html) { // Replace CSS variables with actual color values htmlStyled = htmlStyled.replace("var(--text-color)", - getColorAsHex("org.eclipse.ui.workbench.ACTIVE_TAB_TEXT_COLOR", "#000000")); + getColorAsHex("org.eclipse.ui.workbench.ACTIVE_TAB_SELECTED_TEXT_COLOR", "#000000")); + htmlStyled = htmlStyled.replace("var(--dimmed-text-color)", + getColorAsHex("org.eclipse.ui.workbench.ACTIVE_TAB_TEXT_COLOR", "#4F5456")); htmlStyled = htmlStyled.replace("var(--ide-background-color)", getColorAsHex("org.eclipse.ui.workbench.ACTIVE_NOFOCUS_TAB_BG_START", "#FFFFFF")); diff --git a/plugin/src/main/java/io/snyk/eclipse/plugin/html/CodeHtmlProvider.java b/plugin/src/main/java/io/snyk/eclipse/plugin/html/CodeHtmlProvider.java index 4a4899af..3ad97d13 100644 --- a/plugin/src/main/java/io/snyk/eclipse/plugin/html/CodeHtmlProvider.java +++ b/plugin/src/main/java/io/snyk/eclipse/plugin/html/CodeHtmlProvider.java @@ -72,6 +72,8 @@ public String replaceCssVariables(String html) { htmlStyled = htmlStyled.replace("var(--disabled-background-color)", super.getColorAsHex("org.eclipse.ui.workbench.ACTIVE_TAB_OUTER_KEYLINE_COLOR", "#CCCCCC")); htmlStyled = htmlStyled.replace("var(--vscode-input-border)", super.getColorAsHex("BUTTON_COLOR", "#375578")); + htmlStyled = htmlStyled.replace("var(--warning-text)", super.getColorAsHex("WARNING_TEXT_COLOR", "#000000")); + htmlStyled = htmlStyled.replace("var(--warning-background)", super.getColorAsHex("WARNING_BACKGROUND_COLOR", "#c8a000")); String htmlWithScripts = replaceAIFixScripts(htmlStyled); From 5d947a6c427feda5bac0f05e3f843c59d4943549 Mon Sep 17 00:00:00 2001 From: Knut Funkel Date: Tue, 11 Mar 2025 10:29:05 +0100 Subject: [PATCH 4/5] fix: rename icons and handle case with not matching product identifier --- plugin/icons/dark-critical-severity.png | Bin 619 -> 0 bytes plugin/icons/dark-high-severity.png | Bin 584 -> 0 bytes plugin/icons/dark-low-severity.png | Bin 523 -> 0 bytes plugin/icons/dark-medium-severity.png | Bin 643 -> 0 bytes plugin/icons/severity_critical.png | Bin 1087 -> 619 bytes plugin/icons/severity_high.png | Bin 232 -> 584 bytes plugin/icons/severity_low.png | Bin 228 -> 523 bytes plugin/icons/severity_medium.png | Bin 320 -> 643 bytes .../plugin/domain/ProductConstants.java | 27 +++++++++++------- .../snyk/eclipse/plugin/utils/SnykIcons.java | 8 +++--- .../views/snyktoolview/SnykToolView.java | 7 +++++ 11 files changed, 28 insertions(+), 14 deletions(-) delete mode 100644 plugin/icons/dark-critical-severity.png delete mode 100644 plugin/icons/dark-high-severity.png delete mode 100644 plugin/icons/dark-low-severity.png delete mode 100644 plugin/icons/dark-medium-severity.png diff --git a/plugin/icons/dark-critical-severity.png b/plugin/icons/dark-critical-severity.png deleted file mode 100644 index 1ac87b0d1c8d3d71d2c6e9cbe5c65fa4ade029b3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 619 zcmV-x0+juUP)y60TDaWbN0I$+>?ckqf+w2HKAE{~b*gWi;;v!y%QlrB9Gd#S^ z>Q{F*o6Oqo6$r4tXv}X_b;#tlv$c+*9Ks3MRmx5;Xo41@J(}|%Al1VFnZ5f z;*8PQ8TVsy<##^sXMqL&fIczF9$Cm$x7gpTx7&Lz{uzGn5gfn3LHhsz002ovPDHLk FV1l2V8_)m% diff --git a/plugin/icons/dark-high-severity.png b/plugin/icons/dark-high-severity.png deleted file mode 100644 index 591958204a36ab1d780ba71c62659223853bb65b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 584 zcmV-O0=NB%P)lEzD;ob|AH zf17PHaHy?YlaQc`%1-COjaDjLwFNABdWV19mh*@#EsHX-R^3e7I$2LN1k2 zj(bPh=t`yCx4M*5Lu=u^!pen249&Xu`v*72|GoZ( z^Dp)Wk<@q}?BnIiNXTAbR$7*493T?c*fhpyJnpQ@NW^YnUnA?n?!WPPeTk;<{rQ=< z`J!y-1sl?GAyL=y`Z0$7CQcoGsy!B+LDUwq;`xaD7~5fv z<@y4BK8$INKH-gLb0$1Q=n?+7!`M&hV@lUSiJ}%?eU;8KUakpm+Fq7n_sbFX)A%Pf W2Ny@!R1~5B0000hBb>0;~r{O;bJgHW-_O-9+n zEE8L+NJ66#K&y2L%jJ7jKv9X7LSz^-&c)D_YBKu12hHY15p!Ks_Ppx}AtF^C5rSRw zEJDai19OZ{r&sKF1deO~3a!#n$9QUv7P>o)r^<&)u1;gZ=&!Hk%I!f*RE8x%>VZ zRNo0+6@ud6udl=J%Zcegg{2c`emVRG&0`IAqy( zOii5G(VZqDn`PN~oTkptkvE7%L4y=iP!g^| zbT}zULm&q8Z@k0o%lbs{mDb2Y;u0PA$-0NU&S< zH{mcyQ27DdGDJ=C7ygEbgH7frR<@f?39emBFw7J9;O`FGd>fr)l*JwGYD{MgVxPqN z&k@-cBSnq`6fRqOCf(W3vC%niGm(!G25%Eo?F562AgFTl|`!#)S8Rw&QoZ~z1qf1z=T2DtDMKdjO@_UH+ zxRpE4Ev^?(4HS?W6Y7>6A`K>~(?17qHgUGL0()i-rzL58yvpt;pcuTZ1$dS;8dw1&ffN= zG@B>Vs$E+OfBgU*V~r-EViTPz;?3XHCj2)SI+i zLLwsiSKPsHJVwkd?Rs|+=t!t+$nx>-mdl72i$7EG*?!2Q{ZF!A=M{;I@xL(jxMf>+ d9;09M{}0gjJeMS*xhMbt002ovPDHLkV1i3%6N>-< diff --git a/plugin/icons/severity_critical.png b/plugin/icons/severity_critical.png index 335c8735c5eed78e7864ad1c3d2b1e7fb8b599c8..1ac87b0d1c8d3d71d2c6e9cbe5c65fa4ade029b3 100644 GIT binary patch delta 577 zcmV-H0>1sf2MYLWmS#J@@f zL=^Ppa?KxM7`k|}#)j{|dVF|jFmX1WR43uMfECfQ*GY8UO`yqf9PhF@mgXwqOBZf9 z@I0@olVr3P>B>w_3?Xrz_I34CY)o^cgMYs7BZ^MBwN8ts#M?>*AM15^Lqj-STf+%I zO1GCJ)ePdep~+I2e=BKSnw!Jd^>y60TDaWbN0I$+>?ckqf+w2HKAE{~b*sFVeqKg-Q!3$0vnhLM?d+gOh_>l(K0nUpuAHpX-iPUFyqlO1_v+{f!Qvub zh*G1%`ZGMd%<5NnHk-`a?iE^}Xyxa{#jIQ+_4hBZ3Y1xzXx9c{Z$)*;f#EkRWdoKPNe(w<+zraEJ P00000NkvXXu0mjfnJpPU literal 1087 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|T2doC(|mmy zw18|523AHP24;{FAY@>aVqgWc85q16rQz%#Mh&PMCI*J~Oa>OHnkXO*0v4nJa0`PlBg3pY5xV%QuQiw3qZOUY$~jP%-qzHM1_jnoV;SI3R@+x3M(KRB&@Hb09I0xZL1XF8=&Bv zUzDm~re~mMpk&9TprBw=l#*r@P?Wt5Z@Sn2DRmzV368|&p4rRy77T3YHG z80i}s=>k>g7FXt#Bv$C=6)QswftllyTAW;zSx}OhpQivaH!&%{w8U0P31kr*K-^i9 znTD__uNdkrpa=CqGWv#k2KsQbfm&@qqE`MznW;dVLFU^T+JIG}h(YbK(Fa+MJ106;}xS$h^g4i%AW0P|!za!Q2=HuAn7Mic(WpR3;qgIP$HQC;eJn`o=RN<>k-M z%{2Dk{CB15{QrNPmTEjWYI$JB!`fTsXA=}&M0dacsybu+>C-`HjaS?{cXr{9-OYFI z`!`q3U3*o5Ww*`o_(_(jVH;M4O`JD>@tvGQTca3w6+WGsc)@J%jt0-*6wgPC%d!@o z;mVVfdGPm{+N7D1{AMYiUS61ZZ*!geeKWHQ)^=^Nk&G`o3@t>=%~z~h`|$8Ju~Q{t zE)uSSS;A9xSihu5G<+DyN&S&al*oSo-o2x5eM<+He1J zESeU%Y4&pUWiuC*)bdL599ytGI3fNp%dH|w`S0Hgx9#TkW4=1aN2o>V7gJx5nR{>B ziOp5t-vR@7ant z@hB&Uk5hjwKYeAT?n2wB v^u(vU?l;ez|GlU;@MG&sNu$?lTHjdpvcI~$U2S#%l#4uF{an^LB{Ts5#8`e= diff --git a/plugin/icons/severity_high.png b/plugin/icons/severity_high.png index e4b1b919b22d282f429b19d6afa93ded573e6b41..591958204a36ab1d780ba71c62659223853bb65b 100644 GIT binary patch delta 509 zcmVM>dIv#F8V%IKdISITCvU z%Qx_zz<6)KUcj<%0P+EhBM1;0iGYxeh>$?yvqCUkyz1_mZI&L5s=B_fUUv)T*6BKW z3yLjO830-UV&)2>l@p9U9%7QlOQW3iuy}u)Z8LDFty`0jpnr?XPUpdmRw`Vz1uS`b zhkx9b^N1`hi!!lR-B;+Z?BmLOxMgQTE|pP^dq>&mN~PVmx|CBxYsEQpLG#eDN0YGp z;}`Pf_dZDpvio@h?`SjKkXT#|9iEV{?4ibXa7gGtxwQEW`P;$=+i$wr%&)$YhC($4 zxra_BBzBuo7Jmvp<66XzKoQUhwsOKL;gbW)P0rHhSG-=^@Ot;ds+TVM+PaD&w=N<{ zm$?&2rArSrR>=u^!pen249&Xu`v*72|GoZ(^Dp)Wk<@q}?BnIiNXTAbR$7*493T?c z*fhpyJnpQ@NW^YnUnA?n?!WPPeTk;<{rQ=<`J!0?UQL5ZRkUwxI%GG49;Z`xj#VfV`s_S5($H3t_**i;mv00000NkvXXu0mjfLID0e delta 155 zcmV;M0A&Bj1n2>fReu0|NklJQ3dRk>O5O@Z-L>S6|C)#9n*rr7sS|ltx%EIru<-F^?ukmFj zkVt-k;%VUDoX5f27k+h+U%+L7k$`nT8u2K>FrzCF3~3kV3lxz8AeJx=eB1y4002ov JPDHLkV1i%ZKtuol diff --git a/plugin/icons/severity_low.png b/plugin/icons/severity_low.png index d8f6697f9f953464245e4ced2a90110e6d75ba76..5ee730cb99a19dc11ed62f0658c172932b3e6985 100644 GIT binary patch delta 448 zcmV;x0YCoa0gD8XReu4XNkleSfo*@-_xg-kpO`vB~7+20(Vm zy8syGQMsZ$IUfxMw>uY)_TqB@z=l#nAO0~!oEAifl0aRii+`_DVpL>wxXs?i5akLH zVnxDKKnNI;N0L~i6ku1gR}N)NVbvW?M%lwG6I-iDLZcBtt91#><$F~?QHhp9WEeBf z#n6;$GWxy;&E`cBb6r&Syz2=eB2^v{f?e}0LdZ%3bBs=>SL}EMj%)x5tn$9Q zUv7P>o)r^<&)u1;gZ=&!Hk%I!f*RE8x%>VZRNo0+6@ud6udl=J%Zcegg{2c`emVRG&0`IAqy(Oii5G(K($aBAaE|d7P%s&*WN~K87Sm qv0sx%#pq~KuwabMljQ!*#s2^*mQ@@i@PKXr0000t delta 151 zcmV;I0BHY<1mppbReu0^Nkl=Ho0)qvRReu5)Nkl1gh5dL&c!|crM<&u;3c5ilOzHh#n zGdS_QPq0Ej9Wbi^Re1-0r+iK=&|XNeTl6>KFi24O0oyV}O@Hzi{)UKyP39<8wwq1~ zu3bwo%oF(F?+)918=Yj7#U1TxOlJ&YpTzpl5!n_aMUDg%E?asg-PzBv(K&B3k&h7u zZxdAQ1cQtquH1bhaQiRrA0u-0-cz_=U)jEq+c*sZ$S6k8W*6$XbgPN!>armF zHGORv=c9F;<9|Evqf1z=T2DtDMKdjO@_UH+xRpE4Ev^?(4HS?W6Y7>6A`K>~(?17q zHgUGL0()i-rz*42qDs1+iZ{Sp^BF^6Sr8Ju-(yCos3V;0o9b=6qp<^RgkSr*r zL(MJdE~pE!3N|TtXru`d8e+a6CrLE$w=D5$H&$Y{>HQ z?v~4l7cz@KQ}Nk;$fNyFvR~&FiHq^SF!i`)TX!C#U-bVE(Dyu-B%-+}00000NkvXX Hu0mjfWSogVe=A!L420yn*#3dIe9AdIGP| zD|iCy4JwG@WV$&<&>{$pNx`7tFQ)ybm*mgOOTy1~95at$37`u%1Y?NVKE_E8LexM3 z(yP1Kz;x=?`^1ndtMg=nB2O#rhY^D5+O8cI%xaHv??v3|{%n|2WoS_g9et`FL{(0c zz}euHg5fu$!9$8Fh2ehA&>oDw){$>;*(O%YETPJ1gPYh`eLb$IGWrUINI$;IIl;d) tHZZ-Q&;XM_qCUba73N039a-vjeggJiGU_-H3U~kj002ovPDHLkV1i+0a~J>s diff --git a/plugin/src/main/java/io/snyk/eclipse/plugin/domain/ProductConstants.java b/plugin/src/main/java/io/snyk/eclipse/plugin/domain/ProductConstants.java index b0939a18..c6a1caba 100644 --- a/plugin/src/main/java/io/snyk/eclipse/plugin/domain/ProductConstants.java +++ b/plugin/src/main/java/io/snyk/eclipse/plugin/domain/ProductConstants.java @@ -31,18 +31,25 @@ public final class ProductConstants { public static final String FILTERABLE_ISSUE_CODE_QUALITY = "Code Quality"; public static final String FILTERABLE_ISSUE_INFRASTRUCTURE_AS_CODE = "Infrastructure As Code"; - public static final Map FILTERABLE_ISSUE_TYPE_TO_DISPLAY = Map.of(FILTERABLE_ISSUE_CODE_QUALITY, - DISPLAYED_CODE_QUALITY, FILTERABLE_ISSUE_CODE_SECURITY, DISPLAYED_CODE_SECURITY, - FILTERABLE_ISSUE_INFRASTRUCTURE_AS_CODE, DISPLAYED_IAC, FILTERABLE_ISSUE_OPEN_SOURCE, DISPLAYED_OSS); - - public static final Map LSP_SOURCE_TO_SCAN_PARAMS = Map.of(DIAGNOSTIC_SOURCE_SNYK_CODE, - SCAN_PARAMS_CODE, DIAGNOSTIC_SOURCE_SNYK_IAC, SCAN_PARAMS_IAC, DIAGNOSTIC_SOURCE_SNYK_OSS, SCAN_PARAMS_OSS); - - public static final Map LSP_SOURCE_TO_DISPLAYED = Map.of(DIAGNOSTIC_SOURCE_SNYK_CODE, - DISPLAYED_CODE_SECURITY, DIAGNOSTIC_SOURCE_SNYK_IAC, DISPLAYED_IAC, DIAGNOSTIC_SOURCE_SNYK_OSS, + public static final Map FILTERABLE_ISSUE_TYPE_TO_DISPLAY = Map.of( + FILTERABLE_ISSUE_CODE_QUALITY, DISPLAYED_CODE_QUALITY, + FILTERABLE_ISSUE_CODE_SECURITY, DISPLAYED_CODE_SECURITY, + FILTERABLE_ISSUE_INFRASTRUCTURE_AS_CODE, DISPLAYED_IAC, + FILTERABLE_ISSUE_OPEN_SOURCE, DISPLAYED_OSS); + + public static final Map LSP_SOURCE_TO_SCAN_PARAMS = Map.of( + DIAGNOSTIC_SOURCE_SNYK_CODE, SCAN_PARAMS_CODE, + DIAGNOSTIC_SOURCE_SNYK_IAC, SCAN_PARAMS_IAC, + DIAGNOSTIC_SOURCE_SNYK_OSS, SCAN_PARAMS_OSS); + + public static final Map LSP_SOURCE_TO_DISPLAYED = Map.of( + DIAGNOSTIC_SOURCE_SNYK_CODE, DISPLAYED_CODE_SECURITY, + DIAGNOSTIC_SOURCE_SNYK_IAC, DISPLAYED_IAC, + DIAGNOSTIC_SOURCE_SNYK_OSS, DISPLAYED_OSS); // code cannot be mapped easily - public static final Map SCAN_PARAMS_TO_DISPLAYED = Map.of(SCAN_PARAMS_OSS, DISPLAYED_OSS, + public static final Map SCAN_PARAMS_TO_DISPLAYED = Map.of( + SCAN_PARAMS_OSS, DISPLAYED_OSS, SCAN_PARAMS_IAC, DISPLAYED_IAC); } diff --git a/plugin/src/main/java/io/snyk/eclipse/plugin/utils/SnykIcons.java b/plugin/src/main/java/io/snyk/eclipse/plugin/utils/SnykIcons.java index e9388b6b..b2c9135e 100644 --- a/plugin/src/main/java/io/snyk/eclipse/plugin/utils/SnykIcons.java +++ b/plugin/src/main/java/io/snyk/eclipse/plugin/utils/SnykIcons.java @@ -15,10 +15,10 @@ public class SnykIcons { public static final ImageDescriptor IAC_DISABLED = Activator.getImageDescriptor("/icons/iac_disabled.png"); public static final ImageDescriptor SEVERITY_CRITICAL = Activator - .getImageDescriptor("/icons/dark-critical-severity.png"); - public static final ImageDescriptor SEVERITY_HIGH = Activator.getImageDescriptor("/icons/dark-high-severity.png"); - public static final ImageDescriptor SEVERITY_MEDIUM = Activator.getImageDescriptor("/icons/dark-medium-severity.png"); - public static final ImageDescriptor SEVERITY_LOW = Activator.getImageDescriptor("/icons/dark-low-severity.png"); + .getImageDescriptor("/icons/severity_critical.png"); + public static final ImageDescriptor SEVERITY_HIGH = Activator.getImageDescriptor("/icons/severity_high.png"); + public static final ImageDescriptor SEVERITY_MEDIUM = Activator.getImageDescriptor("/icons/severity_medium.png"); + public static final ImageDescriptor SEVERITY_LOW = Activator.getImageDescriptor("/icons/severity_low.png"); public static final ImageDescriptor ENABLED = Activator.getImageDescriptor("/icons/enabled.png"); public static final ImageDescriptor DISABLED = Activator.getImageDescriptor("/icons/transparent.png"); diff --git a/plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/SnykToolView.java b/plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/SnykToolView.java index 004a1d93..f44618ff 100644 --- a/plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/SnykToolView.java +++ b/plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/SnykToolView.java @@ -480,6 +480,13 @@ protected void outputCommandResult(Object result) { @Override public void selectTreeNode(Issue issue, String product) { + // If snykUri did not return a usable product, we search the whole tree, if not, + // we only search for the issue in specified product treenodes. + if (product.isEmpty()) { + selectTreenodeForIssue(getRoot(), issue); + return; + } + ProductTreeNode productNode = getProductNode(product, issue.filePath()); selectTreenodeForIssue((TreeNode) productNode, issue); } From ce8ae1d4deec43e27638a823804891031cea74b7 Mon Sep 17 00:00:00 2001 From: Knut Funkel Date: Tue, 11 Mar 2025 12:29:04 +0100 Subject: [PATCH 5/5] fix: reverting unneed changes --- .../io/snyk/eclipse/plugin/domain/ProductConstants.java | 6 ------ .../eclipse/plugin/views/snyktoolview/SnykToolView.java | 7 ------- .../protocolextension/SnykExtendedLanguageClient.java | 4 +--- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/plugin/src/main/java/io/snyk/eclipse/plugin/domain/ProductConstants.java b/plugin/src/main/java/io/snyk/eclipse/plugin/domain/ProductConstants.java index c6a1caba..cc4bc3b7 100644 --- a/plugin/src/main/java/io/snyk/eclipse/plugin/domain/ProductConstants.java +++ b/plugin/src/main/java/io/snyk/eclipse/plugin/domain/ProductConstants.java @@ -42,12 +42,6 @@ public final class ProductConstants { DIAGNOSTIC_SOURCE_SNYK_IAC, SCAN_PARAMS_IAC, DIAGNOSTIC_SOURCE_SNYK_OSS, SCAN_PARAMS_OSS); - public static final Map LSP_SOURCE_TO_DISPLAYED = Map.of( - DIAGNOSTIC_SOURCE_SNYK_CODE, DISPLAYED_CODE_SECURITY, - DIAGNOSTIC_SOURCE_SNYK_IAC, DISPLAYED_IAC, - DIAGNOSTIC_SOURCE_SNYK_OSS, - DISPLAYED_OSS); - // code cannot be mapped easily public static final Map SCAN_PARAMS_TO_DISPLAYED = Map.of( SCAN_PARAMS_OSS, DISPLAYED_OSS, diff --git a/plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/SnykToolView.java b/plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/SnykToolView.java index f44618ff..004a1d93 100644 --- a/plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/SnykToolView.java +++ b/plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/SnykToolView.java @@ -480,13 +480,6 @@ protected void outputCommandResult(Object result) { @Override public void selectTreeNode(Issue issue, String product) { - // If snykUri did not return a usable product, we search the whole tree, if not, - // we only search for the issue in specified product treenodes. - if (product.isEmpty()) { - selectTreenodeForIssue(getRoot(), issue); - return; - } - ProductTreeNode productNode = getProductNode(product, issue.filePath()); selectTreenodeForIssue((TreeNode) productNode, issue); } diff --git a/plugin/src/main/java/io/snyk/languageserver/protocolextension/SnykExtendedLanguageClient.java b/plugin/src/main/java/io/snyk/languageserver/protocolextension/SnykExtendedLanguageClient.java index 77155591..84e948a4 100644 --- a/plugin/src/main/java/io/snyk/languageserver/protocolextension/SnykExtendedLanguageClient.java +++ b/plugin/src/main/java/io/snyk/languageserver/protocolextension/SnykExtendedLanguageClient.java @@ -69,7 +69,6 @@ import io.snyk.eclipse.plugin.analytics.AbstractTask; import io.snyk.eclipse.plugin.analytics.AnalyticsEventTask; import io.snyk.eclipse.plugin.analytics.TaskProcessor; -import io.snyk.eclipse.plugin.domain.ProductConstants; import io.snyk.eclipse.plugin.preferences.Preferences; import io.snyk.eclipse.plugin.properties.FolderConfigs; import io.snyk.eclipse.plugin.utils.ResourceUtils; @@ -474,8 +473,7 @@ public CompletableFuture showDocument( return CompletableFuture.supplyAsync(() -> { openToolView(); - String display_product = ProductConstants.LSP_SOURCE_TO_DISPLAYED.get(uriDetails.product()); - this.toolView.selectTreeNode(issue, display_product); + this.toolView.selectTreeNode(issue, uriDetails.product()); return new ShowDocumentResult(true); }); }