Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JellyFileTypeSchema class is delete to maintain compatibility with future IntelliJ versions #186

Merged
merged 1 commit into from
Jul 25, 2024
Merged

JellyFileTypeSchema class is delete to maintain compatibility with future IntelliJ versions #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 0 additions & 26 deletions src/main/java/io/jenkins/stapler/idea/jelly/JellyFileTypeSchema.java
View file
Open in desktop

This file was deleted.

14 changes: 11 additions & 3 deletions ...java/org/kohsuke/stapler/idea/descriptor/StaplerCustomJellyTagLibraryXmlNSDescriptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 0 additions & 2 deletions src/main/resources/META-INF/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down