From 64dcd44a4da77b10e0dc9e090c4d5e9daaf67087 Mon Sep 17 00:00:00 2001
From: Bastian Doetsch <bastian.doetsch@snyk.io>
Date: Thu, 7 Mar 2024 09:03:22 +0100
Subject: [PATCH] fix: make sure to have annotators available for languages
 [IDE-181] (#485)

* fix: make sure to have annotators available for languages

IntelliJ sometimes uses the annotator without explicit language definition (""), e.g for Java, but sometimes, e.g. for Kotlin, it needs a dedicated definition. This is just empirical on my machine, but as it doesn't cost much to define them, here they are.

* docs: update CHANGELOG.md
---
 CHANGELOG.md                                            | 1 +
 src/main/resources/META-INF/optional/withCsharp.xml     | 2 ++
 src/main/resources/META-INF/optional/withGo.xml         | 4 ++++
 src/main/resources/META-INF/optional/withHTML.xml       | 2 ++
 src/main/resources/META-INF/optional/withJava.xml       | 4 ++++
 src/main/resources/META-INF/optional/withJavaScript.xml | 2 ++
 src/main/resources/META-INF/optional/withKotlin.xml     | 2 ++
 src/main/resources/META-INF/optional/withPHP.xml        | 2 ++
 src/main/resources/META-INF/optional/withPython.xml     | 2 ++
 9 files changed, 21 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 64ce02abd..114bd6ba4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## [2.7.7]
 ### Fixed
 - (LS Preview) do not hang on missing answers to message requests, timeout after 5s
+- Provide language-specific annotators for Snyk Code issues
 
 ## [2.7.6]
 ### Fixed
diff --git a/src/main/resources/META-INF/optional/withCsharp.xml b/src/main/resources/META-INF/optional/withCsharp.xml
index 418f6d0aa..846bba4d8 100644
--- a/src/main/resources/META-INF/optional/withCsharp.xml
+++ b/src/main/resources/META-INF/optional/withCsharp.xml
@@ -1,4 +1,6 @@
 <idea-plugin>
   <extensions defaultExtensionNs="com.intellij">
+    <externalAnnotator language="C#" implementationClass="snyk.code.annotator.SnykCodeAnnotatorLS"/>
+    <externalAnnotator language="C#" implementationClass="snyk.code.annotator.SnykCodeAnnotator"/>
   </extensions>
 </idea-plugin>
diff --git a/src/main/resources/META-INF/optional/withGo.xml b/src/main/resources/META-INF/optional/withGo.xml
index 142bd28e2..3efa1d886 100644
--- a/src/main/resources/META-INF/optional/withGo.xml
+++ b/src/main/resources/META-INF/optional/withGo.xml
@@ -2,5 +2,9 @@
   <extensions defaultExtensionNs="com.intellij">
     <externalAnnotator language="vgo" implementationClass="snyk.oss.annotator.OSSGoModAnnotator"/>
     <externalAnnotator language="go" implementationClass="snyk.oss.annotator.OSSGoModAnnotator"/>
+    <externalAnnotator language="vgo" implementationClass="snyk.code.annotator.SnykCodeAnnotatorLS"/>
+    <externalAnnotator language="vgo" implementationClass="snyk.code.annotator.SnykCodeAnnotator"/>
+    <externalAnnotator language="go" implementationClass="snyk.code.annotator.SnykCodeAnnotatorLS"/>
+    <externalAnnotator language="go" implementationClass="snyk.code.annotator.SnykCodeAnnotator"/>
   </extensions>
 </idea-plugin>
diff --git a/src/main/resources/META-INF/optional/withHTML.xml b/src/main/resources/META-INF/optional/withHTML.xml
index 418f6d0aa..cdc6a17ed 100644
--- a/src/main/resources/META-INF/optional/withHTML.xml
+++ b/src/main/resources/META-INF/optional/withHTML.xml
@@ -1,4 +1,6 @@
 <idea-plugin>
   <extensions defaultExtensionNs="com.intellij">
+    <externalAnnotator language="HTML" implementationClass="snyk.code.annotator.SnykCodeAnnotatorLS"/>
+    <externalAnnotator language="HTML" implementationClass="snyk.code.annotator.SnykCodeAnnotator"/>
   </extensions>
 </idea-plugin>
diff --git a/src/main/resources/META-INF/optional/withJava.xml b/src/main/resources/META-INF/optional/withJava.xml
index 57c5d7cae..6215e4aeb 100644
--- a/src/main/resources/META-INF/optional/withJava.xml
+++ b/src/main/resources/META-INF/optional/withJava.xml
@@ -2,5 +2,9 @@
   <extensions defaultExtensionNs="com.intellij">
     <externalAnnotator language="JAVA" implementationClass="snyk.oss.annotator.OSSMavenAnnotator"/>
     <externalAnnotator language="Groovy" implementationClass="snyk.oss.annotator.OSSGradleAnnotator"/>
+    <externalAnnotator language="JAVA" implementationClass="snyk.code.annotator.SnykCodeAnnotatorLS"/>
+    <externalAnnotator language="JAVA" implementationClass="snyk.code.annotator.SnykCodeAnnotator"/>
+    <externalAnnotator language="Groovy" implementationClass="snyk.code.annotator.SnykCodeAnnotatorLS"/>
+    <externalAnnotator language="Groovy" implementationClass="snyk.code.annotator.SnykCodeAnnotator"/>
   </extensions>
 </idea-plugin>
diff --git a/src/main/resources/META-INF/optional/withJavaScript.xml b/src/main/resources/META-INF/optional/withJavaScript.xml
index 418f6d0aa..021496bfd 100644
--- a/src/main/resources/META-INF/optional/withJavaScript.xml
+++ b/src/main/resources/META-INF/optional/withJavaScript.xml
@@ -1,4 +1,6 @@
 <idea-plugin>
   <extensions defaultExtensionNs="com.intellij">
+    <externalAnnotator language="JavaScript" implementationClass="snyk.code.annotator.SnykCodeAnnotatorLS"/>
+    <externalAnnotator language="JavaScript" implementationClass="snyk.code.annotator.SnykCodeAnnotator"/>
   </extensions>
 </idea-plugin>
diff --git a/src/main/resources/META-INF/optional/withKotlin.xml b/src/main/resources/META-INF/optional/withKotlin.xml
index 8995548a6..f7570358c 100644
--- a/src/main/resources/META-INF/optional/withKotlin.xml
+++ b/src/main/resources/META-INF/optional/withKotlin.xml
@@ -1,5 +1,7 @@
 <idea-plugin>
   <extensions defaultExtensionNs="com.intellij">
     <externalAnnotator language="kotlin" implementationClass="snyk.oss.annotator.OSSGradleAnnotator"/>
+    <externalAnnotator language="kotlin" implementationClass="snyk.code.annotator.SnykCodeAnnotatorLS"/>
+    <externalAnnotator language="kotlin" implementationClass="snyk.code.annotator.SnykCodeAnnotator"/>
   </extensions>
 </idea-plugin>
diff --git a/src/main/resources/META-INF/optional/withPHP.xml b/src/main/resources/META-INF/optional/withPHP.xml
index 418f6d0aa..b3499a289 100644
--- a/src/main/resources/META-INF/optional/withPHP.xml
+++ b/src/main/resources/META-INF/optional/withPHP.xml
@@ -1,4 +1,6 @@
 <idea-plugin>
   <extensions defaultExtensionNs="com.intellij">
+    <externalAnnotator language="PHP" implementationClass="snyk.code.annotator.SnykCodeAnnotatorLS"/>
+    <externalAnnotator language="PHP" implementationClass="snyk.code.annotator.SnykCodeAnnotator"/>
   </extensions>
 </idea-plugin>
diff --git a/src/main/resources/META-INF/optional/withPython.xml b/src/main/resources/META-INF/optional/withPython.xml
index 418f6d0aa..535e84c2d 100644
--- a/src/main/resources/META-INF/optional/withPython.xml
+++ b/src/main/resources/META-INF/optional/withPython.xml
@@ -1,4 +1,6 @@
 <idea-plugin>
   <extensions defaultExtensionNs="com.intellij">
+    <externalAnnotator language="Python" implementationClass="snyk.code.annotator.SnykCodeAnnotatorLS"/>
+    <externalAnnotator language="Python" implementationClass="snyk.code.annotator.SnykCodeAnnotator"/>
   </extensions>
 </idea-plugin>