Merge pull request #186 from jenkinsci/delete-jellyfiletypeschema

JellyFileTypeSchema class is delete to maintain compatibility with future IntelliJ versions
jenkinsci · Jul 25, 2024 · 0b68ce3 · 0b68ce3
2 parents c1482a1 + 74c12bb
commit 0b68ce3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 31 deletions.
diff --git a/src/main/java/io/jenkins/stapler/idea/jelly/JellyFileTypeSchema.java b/src/main/java/io/jenkins/stapler/idea/jelly/JellyFileTypeSchema.java
diff --git a/...java/org/kohsuke/stapler/idea/descriptor/StaplerCustomJellyTagLibraryXmlNSDescriptor.java b/...java/org/kohsuke/stapler/idea/descriptor/StaplerCustomJellyTagLibraryXmlNSDescriptor.java
@@ -20,13 +20,21 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static io.jenkins.stapler.idea.jelly.JellyFileTypeSchema.JELLY_EXTENSION;
-import static io.jenkins.stapler.idea.jelly.JellyFileTypeSchema.STAPLER_JELLY_TAG_EXTENSION;
-
 /**
  * @author Kohsuke Kawaguchi
  */
 public class StaplerCustomJellyTagLibraryXmlNSDescriptor implements XmlNSDescriptorEx {
+    /**
+     * Extension introduced by Stapler Framework to differentiate Jelly views from Tag Libraries that are made up of script files.
+     * For example:
+     * <a href="https://github.com/jenkinsci/stapler/blob/1709.ve4c10835694b_/jelly/src/main/java/org/kohsuke/stapler/jelly/CustomTagLibrary.java#L128">CustomTagLibrary.java#L128</a>
+     * <a href="https://github.com/jenkinsci/stapler/blob/1709.ve4c10835694b_/jelly/src/main/java/org/kohsuke/stapler/jelly/ThisTagLibrary.java#L77">ThisTagLibrary.java#L77</a>
+     */
+    private static final String STAPLER_JELLY_TAG_EXTENSION = "jellytag";
+    /**
+     * Default extension of the Apache Commons Jelly
+     */
+    private static final String JELLY_EXTENSION = "jelly";
     /*
      * Stapler's `CustomTagLibrary`[1] introduces its own tag extension in addition to standard Jelly Extension.
      * It is also extensible using `JellyTagFileLoader`-s, the only instance of which is `GroovyTagFileLoader`[2]

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -22,8 +22,6 @@
               fieldName="INSTANCE"
               language="Jelly"
               extensions="jelly;jellytag"/>
-    <!-- Categorizes the Jelly files into separate category for JetBrains' stats. Also contains utilities for checking if a file is a Jelly file -->
-    <fileTypeUsageSchemaDescriptor schema="jelly" implementationClass="io.jenkins.stapler.idea.jelly.JellyFileTypeSchema"/>
     <!-- ? -->
     <!--    <dom.fileDescription implementation="org.kohsuke.stapler.idea.dom.model.JellyDomDescription"/>-->
     <!-- Completion for Jelly Tags -->