diff --git a/.cirrus.yml b/.cirrus.yml index 79d64f63..c8c95765 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,5 +1,5 @@ container: - image: gradle:latest + image: gradle:jdk11 task: name: Tests diff --git a/build.gradle b/build.gradle index 05599634..a05077fa 100644 --- a/build.gradle +++ b/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 { diff --git a/gradle.properties b/gradle.properties index 9e350740..ba9926a5 100644 --- a/gradle.properties +++ b/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 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f3d88b1c..62d4c053 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bb8b2fc2..be52383e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/gradlew b/gradlew index 2fe81a7d..fbd7c515 100755 --- a/gradlew +++ b/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 diff --git a/gradlew.bat b/gradlew.bat index 62bd9b9c..5093609d 100644 --- a/gradlew.bat +++ b/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% diff --git a/jps-plugin/src/main/java/com/intellij/plugins/thrift/config/target/GeneratorType.java b/jps-plugin/src/main/java/com/intellij/plugins/thrift/config/target/GeneratorType.java index 4b1c922f..1d75a22e 100644 --- a/jps-plugin/src/main/java/com/intellij/plugins/thrift/config/target/GeneratorType.java +++ b/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 * diff --git a/thrift/src/main/java/com/intellij/plugins/thrift/ThriftBundle.java b/thrift/src/main/java/com/intellij/plugins/thrift/ThriftBundle.java index 019dd6e8..b3a162f6 100644 --- a/thrift/src/main/java/com/intellij/plugins/thrift/ThriftBundle.java +++ b/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; diff --git a/thrift/src/main/java/com/intellij/plugins/thrift/annotator/ThriftColorAnnotator.java b/thrift/src/main/java/com/intellij/plugins/thrift/annotator/ThriftColorAnnotator.java index ac88ab68..919a948c 100644 --- a/thrift/src/main/java/com/intellij/plugins/thrift/annotator/ThriftColorAnnotator.java +++ b/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; diff --git a/thrift/src/main/java/com/intellij/plugins/thrift/completion/ThriftTypeHandler.java b/thrift/src/main/java/com/intellij/plugins/thrift/completion/ThriftTypeHandler.java index 317f81f3..1a4e33e2 100644 --- a/thrift/src/main/java/com/intellij/plugins/thrift/completion/ThriftTypeHandler.java +++ b/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; /** diff --git a/thrift/src/main/java/com/intellij/plugins/thrift/config/ThriftCompilerConfigurable.java b/thrift/src/main/java/com/intellij/plugins/thrift/config/ThriftCompilerConfigurable.java index 63c2181e..b42a6f1e 100644 --- a/thrift/src/main/java/com/intellij/plugins/thrift/config/ThriftCompilerConfigurable.java +++ b/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; diff --git a/thrift/src/main/java/com/intellij/plugins/thrift/config/facet/ThriftFacetConf.java b/thrift/src/main/java/com/intellij/plugins/thrift/config/facet/ThriftFacetConf.java index dbd1b5ac..47317b3b 100644 --- a/thrift/src/main/java/com/intellij/plugins/thrift/config/facet/ThriftFacetConf.java +++ b/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; diff --git a/thrift/src/main/java/com/intellij/plugins/thrift/editor/GoToThriftDefinition.java b/thrift/src/main/java/com/intellij/plugins/thrift/editor/GoToThriftDefinition.java index ebc9ca27..0f329346 100644 --- a/thrift/src/main/java/com/intellij/plugins/thrift/editor/GoToThriftDefinition.java +++ b/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); diff --git a/thrift/src/main/java/com/intellij/plugins/thrift/editor/GoToThriftDefinitionMarkerProvider.java b/thrift/src/main/java/com/intellij/plugins/thrift/editor/GoToThriftDefinitionMarkerProvider.java index 06ebc384..335e6efb 100644 --- a/thrift/src/main/java/com/intellij/plugins/thrift/editor/GoToThriftDefinitionMarkerProvider.java +++ b/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); diff --git a/thrift/src/main/java/com/intellij/plugins/thrift/editor/ThriftLineMarkerProvider.java b/thrift/src/main/java/com/intellij/plugins/thrift/editor/ThriftLineMarkerProvider.java index 88bfe108..52948b5a 100644 --- a/thrift/src/main/java/com/intellij/plugins/thrift/editor/ThriftLineMarkerProvider.java +++ b/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; /** diff --git a/thrift/src/main/java/com/intellij/plugins/thrift/inspections/ThriftUnresolvedIncludeInspection.java b/thrift/src/main/java/com/intellij/plugins/thrift/inspections/ThriftUnresolvedIncludeInspection.java index c35d60bc..11c102cc 100644 --- a/thrift/src/main/java/com/intellij/plugins/thrift/inspections/ThriftUnresolvedIncludeInspection.java +++ b/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; diff --git a/thrift/src/main/java/com/intellij/plugins/thrift/lang/lexer/_ThriftLexer.java b/thrift/src/main/java/com/intellij/plugins/thrift/lang/lexer/_ThriftLexer.java index 151ec21d..d5261fee 100644 --- a/thrift/src/main/java/com/intellij/plugins/thrift/lang/lexer/_ThriftLexer.java +++ b/thrift/src/main/java/com/intellij/plugins/thrift/lang/lexer/_ThriftLexer.java @@ -1,8 +1,10 @@ /* The following code was generated by JFlex 1.4.3 on 12/23/14 2:01 PM */ package com.intellij.plugins.thrift.lang.lexer; -import com.intellij.lexer.*; + +import com.intellij.lexer.FlexLexer; import com.intellij.psi.tree.IElementType; + import static com.intellij.plugins.thrift.lang.lexer.ThriftTokenTypes.*; diff --git a/thrift/src/main/resources/META-INF/plugin.xml b/thrift/src/main/resources/META-INF/plugin.xml index d8b5a927..db22f4fc 100644 --- a/thrift/src/main/resources/META-INF/plugin.xml +++ b/thrift/src/main/resources/META-INF/plugin.xml @@ -4,6 +4,10 @@ Support for Thrift language 1.4:

+

1.2: