Intellij 203 (#97)

* IntelliJ 203 support

* Optimize imports

* Optimize imports

* JDK 11

* No verify

.cirrus.yml

@@ -1,5 +1,5 @@
 container:
-  image: gradle:latest
+  image: gradle:jdk11
 
 task:
   name: Tests

build.gradle

@@ -1,12 +1,10 @@
 plugins {
-    id "org.jetbrains.intellij" version "0.4.21"
+    id "org.jetbrains.intellij" version "0.6.1"
 }
 
 version = "${version}.$buildNumber"
 subprojects {
     apply plugin: 'java'
-    sourceCompatibility = javaVersion
-    targetCompatibility = javaVersion
     tasks.withType(JavaCompile) { options.encoding = 'UTF-8' }
 
     repositories {

gradle.properties

@@ -1,6 +1,4 @@
-ideaVersion = 202.6397-EAP-CANDIDATE-SNAPSHOT
-javaVersion = 1.8
-javaTargetVersion = 1.8
+ideaVersion = 203-EAP-SNAPSHOT
 buildNumber = SNAPSHOT
 sources = true
 isEAP = false

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

gradlew.bat

@@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%*
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 

jps-plugin/src/main/java/com/intellij/plugins/thrift/config/target/GeneratorType.java

@@ -1,9 +1,5 @@
 package com.intellij.plugins.thrift.config.target;
 
-import com.intellij.openapi.util.IconLoader;
-
-import javax.swing.*;
-
 /**
  * 26.06.2014 14:38
  *

thrift/src/main/java/com/intellij/plugins/thrift/ThriftBundle.java

@@ -2,7 +2,6 @@
 
 
 import com.intellij.AbstractBundle;
-import com.intellij.CommonBundle;
 import com.intellij.reference.SoftReference;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;

thrift/src/main/java/com/intellij/plugins/thrift/annotator/ThriftColorAnnotator.java

@@ -1,6 +1,5 @@
 package com.intellij.plugins.thrift.annotator;
 
-import com.intellij.lang.annotation.Annotation;
 import com.intellij.lang.annotation.AnnotationHolder;
 import com.intellij.lang.annotation.Annotator;
 import com.intellij.lang.annotation.HighlightSeverity;

thrift/src/main/java/com/intellij/plugins/thrift/completion/ThriftTypeHandler.java

@@ -8,7 +8,6 @@
 import com.intellij.plugins.thrift.lang.psi.ThriftGenericType;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
-import com.intellij.psi.util.PsiTreeUtil;
 import org.jetbrains.annotations.NotNull;
 
 /**

thrift/src/main/java/com/intellij/plugins/thrift/config/ThriftCompilerConfigurable.java

@@ -1,7 +1,6 @@
 package com.intellij.plugins.thrift.config;
 
 import com.intellij.ide.ui.UISettings;
-import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory;
 import com.intellij.openapi.options.BaseConfigurable;
 import com.intellij.openapi.options.ConfigurationException;

thrift/src/main/java/com/intellij/plugins/thrift/config/facet/ThriftFacetConf.java

@@ -15,8 +15,6 @@
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.ui.popup.JBPopupFactory;
 import com.intellij.openapi.ui.popup.ListPopup;
-import com.intellij.openapi.util.InvalidDataException;
-import com.intellij.openapi.util.WriteExternalException;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.VirtualFileManager;
@@ -30,7 +28,6 @@
 import com.intellij.ui.popup.PopupFactoryImpl;
 import com.intellij.util.ui.UIUtil;
 import org.apache.commons.lang.NotImplementedException;
-import org.jdom.Element;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

thrift/src/main/java/com/intellij/plugins/thrift/editor/GoToThriftDefinition.java

@@ -1,10 +1,5 @@
 package com.intellij.plugins.thrift.editor;
 
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.time.Duration;
-import java.util.List;
-
 import com.google.common.base.Stopwatch;
 import com.intellij.codeInsight.daemon.impl.PsiElementListNavigator;
 import com.intellij.ide.util.PsiElementListCellRenderer;
@@ -22,11 +17,15 @@
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.search.GlobalSearchScope;
-
 import org.apache.commons.compress.utils.Lists;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.time.Duration;
+import java.util.List;
+
 public class GoToThriftDefinition extends AnAction {
   static Logger logger = Logger.getInstance(GoToThriftDefinition.class);
 

thrift/src/main/java/com/intellij/plugins/thrift/editor/GoToThriftDefinitionMarkerProvider.java

@@ -3,13 +3,6 @@
 
 package com.intellij.plugins.thrift.editor;
 
-import java.time.Duration;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.Sets;
 import com.intellij.codeInsight.daemon.RelatedItemLineMarkerInfo;
@@ -24,10 +17,11 @@
 import com.intellij.psi.PsiIdentifier;
 import com.intellij.psi.PsiModifierList;
 import com.intellij.psi.search.GlobalSearchScope;
-
+import icons.ThriftIcons;
 import org.jetbrains.annotations.NotNull;
 
-import icons.ThriftIcons;
+import java.time.Duration;
+import java.util.*;
 
 public class GoToThriftDefinitionMarkerProvider extends RelatedItemLineMarkerProvider {
   static Logger logger = Logger.getInstance(GoToThriftDefinition.class);

thrift/src/main/java/com/intellij/plugins/thrift/editor/ThriftLineMarkerProvider.java

@@ -18,7 +18,6 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.awt.event.MouseEvent;
-import java.util.Collection;
 import java.util.List;
 
 /**

thrift/src/main/java/com/intellij/plugins/thrift/inspections/ThriftUnresolvedIncludeInspection.java

@@ -6,13 +6,11 @@
 import com.intellij.codeInspection.ProblemHighlightType;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.plugins.thrift.ThriftBundle;
-import com.intellij.plugins.thrift.lang.psi.ThriftCustomType;
 import com.intellij.plugins.thrift.lang.psi.ThriftInclude;
 import com.intellij.plugins.thrift.lang.psi.ThriftVisitor;
 import com.intellij.plugins.thrift.util.ThriftPsiUtil;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiReference;
 import com.intellij.util.ArrayUtil;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;

thrift/src/main/resources/META-INF/plugin.xml

@@ -4,6 +4,10 @@
   <description>Support for Thrift language</description>
   <change-notes>
     <![CDATA[
+      <p>1.4:</p>
+      <ul>
+        <li>Compatibility with IntelliJ 2020.3</li>
+      </ul>
       <p>1.2:</p>
       <ul>
         <li>Compatibility with IntelliJ 2020.2</li>
@@ -109,7 +113,7 @@
       ]]>
   </change-notes>
   <vendor>@fedor</vendor>
-  <idea-version since-build="202.*"/><!-- Will be patched by the plugin -->
+  <idea-version since-build="203.*"/><!-- Will be patched by the plugin -->
 
   <depends>com.intellij.modules.platform</depends>
   <depends>com.intellij.modules.lang</depends>

thrift/src/test/java/com/intellij/plugins/thrift/completion/ThriftCompletionTestBase.java

@@ -6,7 +6,6 @@
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.plugins.thrift.ThriftCodeInsightFixtureTestCase;
 import com.intellij.testFramework.UsefulTestCase;
-import org.apache.commons.lang.StringUtils;
 
 import java.util.*;