Partially revert with plugin changes (#10)

arhont375 · May 15, 2023 · 8ba82f3 · 8ba82f3
1 parent 14dda68
commit 8ba82f3
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/thrift/src/main/resources/META-INF/plugin.xml b/thrift/src/main/resources/META-INF/plugin.xml
@@ -21,7 +21,8 @@
   <depends>com.intellij.modules.vcs</depends>
   <depends>com.intellij.modules.xml</depends>
   <depends>com.intellij.modules.xdebugger</depends>
-  <depends>com.intellij.java</depends>
+  <depends optional="true" config-file="withJava.xml">com.intellij.modules.java</depends>
+  <depends optional="true" config-file="withScala.xml">org.intellij.scala</depends>
 
   <application-components>
     <!-- Add your application components here -->
@@ -99,11 +100,4 @@
       <add-to-group group-id="RunContextPopupGroup" anchor="first"/>
     </action>
   </actions>
-
-  <extensions defaultExtensionNs="com.intellij">
-    <codeInsight.lineMarkerProvider language="JAVA"
-                                    implementationClass="com.intellij.plugins.thrift.editor.GoToThriftDefinitionMarkerProvider"/>
-    <codeInsight.lineMarkerProvider language="Scala"
-                                    implementationClass="com.intellij.plugins.thrift.editor.GoToThriftDefinitionMarkerProvider"/>
-  </extensions>
 </idea-plugin>
diff --git a/thrift/src/main/resources/META-INF/withJava.xml b/thrift/src/main/resources/META-INF/withJava.xml
@@ -0,0 +1,6 @@
+<idea-plugin>
+    <extensions defaultExtensionNs="com.intellij">
+        <codeInsight.lineMarkerProvider language="JAVA"
+                                        implementationClass="com.intellij.plugins.thrift.editor.GoToThriftDefinitionMarkerProvider"/>
+    </extensions>
+</idea-plugin>
diff --git a/thrift/src/main/resources/META-INF/withScala.xml b/thrift/src/main/resources/META-INF/withScala.xml
@@ -0,0 +1,6 @@
+<idea-plugin>
+    <extensions defaultExtensionNs="com.intellij">
+        <codeInsight.lineMarkerProvider language="Scala"
+                                        implementationClass="com.intellij.plugins.thrift.editor.GoToThriftDefinitionMarkerProvider"/>
+    </extensions>
+</idea-plugin>