Merge pull request #90 from duemir/update-baseline

Compatibility baseline is changed to 2020.3

Jenkinsfile

@@ -33,7 +33,7 @@ pipeline {
                                 if (isUnix()) {
                                     command = "./${command}"
                                 }
-                                infra.runWithJava(command, "8", extraEnv)
+                                infra.runWithJava(command, "11", extraEnv)
                             }
                         }
                         post {

build.gradle

@@ -4,9 +4,13 @@ plugins {
 }
 
 group = "org.kohsuke.stapler.idea"
-version = "2.0.4"
+version = "2.0.5-SNAPSHOT"
 
-sourceCompatibility = 1.8
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(11)
+    }
+}
 
 repositories {
     mavenCentral()
@@ -48,9 +52,13 @@ intellij {
 }
 
 patchPluginXml {
-    sinceBuild = "162.00"
+    sinceBuild = "203.00"
     untilBuild = ""
     changeNotes = """
+      <h3>2.0.5</h3>
+      <ul>
+        <li>Compatibility baseline is changed to 2020.3 which also changes Java level to 11.</li>
+      </ul>
       <h3>2.0.4</h3>
       <ul>
         <li>Avoid <code>java.lang.NullPointerException</code> at <code>org.kohsuke.stapler.idea.JellyDocumentationProvider.generateDoc()</code>
@@ -79,7 +87,7 @@ runPluginVerifier {
     // Rather arbitrarily chosen first releases of last three year.
     // Product version in use statistics say last 3 major releases. It does not define "major release" though but
     // but educated guess is that `year.version` is what is considered major.
-    ideVersions = ["2019.1.4", "2020.1.3", "2021.1"]
+    ideVersions = ["2020.3.2", "2021.3.3", "2022.1"]
 }
 
 publishPlugin {

gradle.properties

@@ -1,5 +1,5 @@
 # https://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html
 # the first year based version (2016.2)
-ideaVersion=2016.2
-platformPlugins=properties
+ideaVersion=2020.3
+platformPlugins=properties,java
 intellijPublishToken=

src/main/java/org/kohsuke/stapler/idea/GotoViewAction.java

@@ -37,7 +37,7 @@
 public class GotoViewAction extends GotoActionBase {
 
     @Override
-    public void gotoActionPerformed(AnActionEvent anactionevent) {
+    public void gotoActionPerformed(@NotNull AnActionEvent anactionevent) {
         PsiElement context = getPsiContext(anactionevent);
 
         final Project project = anactionevent.getData(PlatformDataKeys.PROJECT);
@@ -81,12 +81,12 @@ public String getPromptText() {
             }
 
             @Override
-            public String getNotInMessage() {
+            public @NotNull String getNotInMessage() {
                 return "getNotInMessage";
             }
 
             @Override
-            public String getNotFoundMessage() {
+            public @NotNull String getNotFoundMessage() {
                 return "getNotFoundMessage";
             }
 
@@ -95,11 +95,6 @@ public String getCheckBoxName() {
                 return null;    // no check box
             }
 
-            @Override
-            public char getCheckBoxMnemonic() {
-                return '\0';
-            }
-
             @Override
             public boolean loadInitialCheckBoxState() {
                 return false;
@@ -111,13 +106,13 @@ public void saveInitialCheckBoxState(boolean state) {
             }
 
             @Override
-            public ListCellRenderer getListCellRenderer() {
+            public @NotNull ListCellRenderer getListCellRenderer() {
                 return new DefaultPsiElementCellRenderer();
             }
 
             @NotNull
             @Override
-            public String[] getNames(boolean checkBoxState) {
+            public String @NotNull [] getNames(boolean checkBoxState) {
                 List<String> r = new ArrayList<>();
                 for (PsiPackage pkg : viewPackages) {
                     for (PsiDirectory dir : pkg.getDirectories()) {
@@ -133,7 +128,7 @@ public String[] getNames(boolean checkBoxState) {
 
             @Override
             @NotNull
-            public Object[] getElementsByName(String name, boolean checkBoxState, String pattern) {
+            public Object @NotNull [] getElementsByName(@NotNull String name, boolean checkBoxState, @NotNull String pattern) {
                 for (PsiPackage pkg : viewPackages) {
                     for (PsiDirectory dir : pkg.getDirectories()) {
                         for (PsiFile file : dir.getFiles()) {
@@ -147,12 +142,12 @@ public Object[] getElementsByName(String name, boolean checkBoxState, String pat
 
             @Override
             @NotNull
-            public String[] getSeparators() {
+            public String @NotNull [] getSeparators() {
                 return ArrayUtils.EMPTY_STRING_ARRAY;
             }
 
             @Override
-            public String getElementName(Object obj) {
+            public String getElementName(@NotNull Object obj) {
                 if (obj instanceof PsiFile) {
                     return ((PsiFile) obj).getName();
                 } else {
@@ -161,7 +156,7 @@ public String getElementName(Object obj) {
             }
 
             @Override
-            public String getFullName(Object obj) {
+            public String getFullName(@NotNull Object obj) {
                 if (obj instanceof PsiFile) {
                     VirtualFile virtualfile = ((PsiFile) obj).getVirtualFile();
                     return virtualfile == null ? null : virtualfile.getPath();

src/main/java/org/kohsuke/stapler/idea/I18nRefactorAction.java

@@ -29,6 +29,7 @@
 import com.intellij.psi.PsiPackage;
 import com.intellij.psi.PsiType;
 import com.intellij.util.IncorrectOperationException;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
@@ -42,7 +43,7 @@ public class I18nRefactorAction extends EditorAction {
     public I18nRefactorAction() {
         super(new EditorActionHandler() {
             @Override
-            public void doExecute(final Editor editor, @Nullable Caret caret, DataContext dataContext) {
+            public void doExecute(final @NotNull Editor editor, @Nullable Caret caret, DataContext dataContext) {
                 if (editor == null) // be defensive
                     return;
 

src/main/java/org/kohsuke/stapler/idea/JellyAnnotator.java

@@ -2,6 +2,7 @@
 
 import com.intellij.lang.annotation.AnnotationHolder;
 import com.intellij.lang.annotation.Annotator;
+import com.intellij.lang.annotation.HighlightSeverity;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.xml.XmlTag;
 import com.intellij.xml.XmlElementDescriptor;
@@ -36,7 +37,9 @@ public void annotate(@NotNull PsiElement psi, @NotNull AnnotationHolder holder)
             XmlElementDescriptor e = ns.getElementDescriptor(tag);
             if(e instanceof AnyXmlElementDescriptor) {
                 PsiElement startTagName = tag.getFirstChild().getNextSibling();
-                holder.createErrorAnnotation(startTagName,"Undefined element");
+                holder.newAnnotation(HighlightSeverity.ERROR, "Undefined jelly element")
+                        .range(startTagName)
+                        .create();
             }
         }
     }

src/main/java/org/kohsuke/stapler/idea/JellyCompletionContributor.java

@@ -67,10 +67,10 @@ public class JellyCompletionContributor extends CompletionContributor {
     public JellyCompletionContributor() {
         extend(CompletionType.BASIC, // in case of XML completion, this always seems to be BASIC
                 XML_ELEMENT_NAME_PATTERN,
-                new CompletionProvider<CompletionParameters>() {
+                new CompletionProvider<>() {
                     // REFERENCE: spring plugin adds CompletionContributor as well.
                     @Override
-                    protected void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext context, @NotNull CompletionResultSet result) {
+                    protected void addCompletions(@NotNull CompletionParameters parameters, @NotNull ProcessingContext context, @NotNull CompletionResultSet result) {
                         XmlElement name = (XmlElement)parameters.getPosition();
 
                         // do this only inside Jelly files

src/main/java/org/kohsuke/stapler/idea/JellyTagLibReferenceProvider.java

@@ -36,7 +36,7 @@ public class JellyTagLibReferenceProvider extends PsiReferenceProvider {
      */
     @Override
     @NotNull
-    public PsiReference[] getReferencesByElement(@NotNull PsiElement e, @NotNull ProcessingContext processingContext) {
+    public PsiReference @NotNull [] getReferencesByElement(@NotNull PsiElement e, @NotNull ProcessingContext processingContext) {
         /*
         This was the old way of marking references to tag files, but
         with the custom XmlNSDescriptor this is no longer necessary
@@ -88,7 +88,7 @@ private PsiReference[] onAttributeValue(final XmlAttributeValue xav) {
         if(p.getAttribute("it")==null
         && p.getAttribute("from")==null) {
             // the page must be coming from the same object
-            return array(new PsiReferenceBase<XmlAttributeValue>(xav,
+            return array(new PsiReferenceBase<>(xav,
                     TextRange.from(1,xav.getTextLength()-2)) {
                 private final String page = xav.getValue();
                 @Override
@@ -140,7 +140,7 @@ public PsiFile resolve() {
 
                 @Override
                 @NotNull
-                public Object[] getVariants() {
+                public Object @NotNull [] getVariants() {
                     return ArrayUtils.EMPTY_OBJECT_ARRAY;
                 }
             });

src/main/java/org/kohsuke/stapler/idea/StaplerFacetConfiguration.java

@@ -4,9 +4,6 @@
 import com.intellij.facet.ui.FacetEditorContext;
 import com.intellij.facet.ui.FacetEditorTab;
 import com.intellij.facet.ui.FacetValidatorsManager;
-import com.intellij.openapi.util.InvalidDataException;
-import com.intellij.openapi.util.WriteExternalException;
-import org.jdom.Element;
 
 /**
  * @author Kohsuke Kawaguchi
@@ -17,12 +14,4 @@ public FacetEditorTab[] createEditorTabs(FacetEditorContext editorContext, Facet
         // nothing to configure
         return new FacetEditorTab[0];
     }
-
-    @Override
-    public void readExternal(Element element) throws InvalidDataException {
-    }
-
-    @Override
-    public void writeExternal(Element element) throws WriteExternalException {
-    }
 }

src/main/java/org/kohsuke/stapler/idea/descriptor/AnyElementDescriptorImpl.java

@@ -9,6 +9,7 @@
 import com.intellij.xml.XmlNSDescriptor;
 import com.intellij.xml.impl.schema.AnyXmlAttributeDescriptor;
 import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -97,7 +98,7 @@ public void init(PsiElement element) {
     }
 
     @Override
-    public Object[] getDependences() {
+    public Object @NotNull [] getDependencies() {
         // TODO
         throw new UnsupportedOperationException();
     }

src/main/java/org/kohsuke/stapler/idea/descriptor/XmlAttributeDescriptorImpl.java

@@ -3,6 +3,7 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.xml.XmlElement;
 import com.intellij.xml.XmlAttributeDescriptor;
+import org.jetbrains.annotations.NotNull;
 import org.kohsuke.stapler.idea.dom.model.AttributeTag;
 
 /**
@@ -98,7 +99,7 @@ public void init(PsiElement element) {
     }
 
     @Override
-    public Object[] getDependences() {
+    public Object @NotNull [] getDependencies() {
         return new Object[]{def.tag};
     }
 }

src/main/java/org/kohsuke/stapler/idea/descriptor/XmlElementDescriptorImpl.java

@@ -11,6 +11,7 @@
 import com.intellij.xml.XmlElementDescriptor;
 import com.intellij.xml.XmlNSDescriptor;
 import com.intellij.xml.impl.dtd.BaseXmlElementDescriptorImpl;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.kohsuke.stapler.idea.dom.model.AttributeTag;
 import org.kohsuke.stapler.idea.dom.model.DocumentationTag;
@@ -157,7 +158,7 @@ public void init(PsiElement element) {
     }
 
     @Override
-    public Object[] getDependences() {
+    public Object @NotNull [] getDependencies() {
         return new Object[] {nsDescriptor,tagFile};
     }
 

src/main/java/org/kohsuke/stapler/idea/descriptor/XmlNSDescriptorImpl.java

@@ -67,7 +67,7 @@ public XmlElementDescriptor getElementDescriptor(@NotNull XmlTag tag) {
      */
     @Override
     @NotNull
-    public XmlElementDescriptor[] getRootElementsDescriptors(@Nullable XmlDocument document) {
+    public XmlElementDescriptor @NotNull [] getRootElementsDescriptors(@Nullable XmlDocument document) {
         List<XmlElementDescriptor> r = new ArrayList<>();
         for(PsiFile f : dir.getFiles()) {
             if(!f.getName().endsWith(".jelly"))     continue;
@@ -115,7 +115,7 @@ public void init(PsiElement element) {
     }
 
     @Override
-    public Object[] getDependences() {
+    public Object @NotNull [] getDependencies() {
         return new Object[]{dir};
     }
 

src/main/java/org/kohsuke/stapler/idea/descriptor/XmlSchemaProviderImpl.java

@@ -1,6 +1,6 @@
 package org.kohsuke.stapler.idea.descriptor;
 
-import com.intellij.openapi.fileTypes.StdFileTypes;
+import com.intellij.ide.highlighter.XmlFileType;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.util.Key;
 import com.intellij.psi.PsiDirectory;
@@ -26,7 +26,7 @@ public XmlFile getSchema(@NotNull String url, @Nullable Module module, @NotNull
         if(d==null)     return null;
 
         XmlFile pseudoSchema = (XmlFile) PsiFileFactory.getInstance(module.getProject()).createFileFromText(
-                url + ".xml", StdFileTypes.XML, "<schema uri=\"" + url + "\" xmlns='" + JellyTaglibMetadataContributor.DUMMY_SCHEMA_URL + "'>");
+                url + ".xml", XmlFileType.INSTANCE , "<schema uri=\"" + url + "\" xmlns='" + JellyTaglibMetadataContributor.DUMMY_SCHEMA_URL + "'>");
         pseudoSchema.putUserData(MODULE,d.getDir());
         return pseudoSchema;
     }