diff --git a/README.md b/README.md index 1779809a..e126da07 100644 --- a/README.md +++ b/README.md @@ -5,13 +5,15 @@ Plugin to support Thrift language in IntelliJ How to build =============== -```bahs +[JDK 11 or later](https://adoptium.net/) is required to build from source. + +```bash ./gradlew :thrift:buildPlugin ``` How to run locally with new changes =============== -```bahs +```bash ./gradlew :thrift:runIde ``` diff --git a/build.gradle b/build.gradle index 72e4de18..d8810d81 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id "org.jetbrains.intellij" version "0.6.5" + id "org.jetbrains.intellij" version "1.5.3" apply false } subprojects { @@ -8,7 +8,6 @@ subprojects { repositories { mavenLocal() - jcenter() mavenCentral() maven { setUrl("https://repo.gradle.org/gradle/repo") } maven { setUrl("https://maven.google.com/") } @@ -16,10 +15,14 @@ subprojects { apply plugin: 'org.jetbrains.intellij' intellij { - version project.property("ideaVersion") - plugins = ['copyright', 'java', 'org.intellij.scala:2021.3.14'] - downloadSources Boolean.valueOf(sources) - sameSinceUntilBuild Boolean.valueOf(isEAP) + version = project.property('ideaVersion') + plugins = ['copyright', 'java', 'org.intellij.scala:2022.1.13'] + downloadSources = Boolean.valueOf(project.property('sources') as String) + sameSinceUntilBuild = Boolean.valueOf(project.property('isEAP') as String) + } + + tasks.named('patchPluginXml') { + sinceBuild = project.property('ideaSinceVersion') } test { diff --git a/gradle.properties b/gradle.properties index f84890ff..1796b412 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,7 @@ -ideaVersion = 2021.3 -sources = true -isEAP = false +ideaVersion=2022.1 +ideaSinceVersion=212.4746.92 +sources=true +isEAP=false org.gradle.daemon=true org.gradle.caching=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 62d4c053..41d9927a 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 be52383e..aa991fce 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.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index fbd7c515..1b6c7873 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -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 - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 5093609d..107acd32 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -54,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -64,21 +64,6 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line @@ -86,7 +71,7 @@ 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% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell diff --git a/jps-plugin/build.gradle b/jps-plugin/build.gradle index 5705b8e5..2c6abe3b 100644 --- a/jps-plugin/build.gradle +++ b/jps-plugin/build.gradle @@ -1,4 +1,4 @@ -jar.archiveName = "thrift-jps.jar" +jar.archiveFileName = "thrift-jps.jar" java { sourceCompatibility = JavaVersion.VERSION_1_8 diff --git a/jps-plugin/src/main/java/com/intellij/plugins/thrift/jps/ThriftFacetConfigurationSerializer.java b/jps-plugin/src/main/java/com/intellij/plugins/thrift/jps/ThriftFacetConfigurationSerializer.java index f91867a6..66c204f0 100644 --- a/jps-plugin/src/main/java/com/intellij/plugins/thrift/jps/ThriftFacetConfigurationSerializer.java +++ b/jps-plugin/src/main/java/com/intellij/plugins/thrift/jps/ThriftFacetConfigurationSerializer.java @@ -34,8 +34,4 @@ protected ThriftCompilerOptions loadExtension(@NotNull Element facetConfiguratio return configuration; } - - @Override - protected void saveExtension(ThriftCompilerOptions extension, Element facetConfigurationTag, JpsModule module) { - } } diff --git a/jps-plugin/src/main/java/com/intellij/plugins/thrift/jps/ThriftProjectExtensionSerializer.java b/jps-plugin/src/main/java/com/intellij/plugins/thrift/jps/ThriftProjectExtensionSerializer.java index 5543ef53..f67a5929 100644 --- a/jps-plugin/src/main/java/com/intellij/plugins/thrift/jps/ThriftProjectExtensionSerializer.java +++ b/jps-plugin/src/main/java/com/intellij/plugins/thrift/jps/ThriftProjectExtensionSerializer.java @@ -42,11 +42,6 @@ public void loadExtension(@NotNull JpsProject project, @NotNull Element componen } } - @Override - public void saveExtension(@NotNull JpsProject project, @NotNull Element componentTag) { - - } - /** *

Converts a String to a Boolean.

diff --git a/thrift/build.gradle b/thrift/build.gradle index 816ef9f5..e128714a 100644 --- a/thrift/build.gradle +++ b/thrift/build.gradle @@ -1,4 +1,4 @@ -jar.archiveName = "plugin.jar" +jar.archiveFileName = "plugin.jar" patchPluginXml { version = System.getenv().getOrDefault("CIRRUS_TAG", "1.0") @@ -23,5 +23,5 @@ sourceSets { dependencies { - compile project(':jps-plugin') + implementation project(':jps-plugin') } \ No newline at end of file diff --git a/thrift/src/main/java/com/intellij/plugins/thrift/GeneratorIcons.java b/thrift/src/main/java/com/intellij/plugins/thrift/GeneratorIcons.java index 63e48805..2f9f023a 100644 --- a/thrift/src/main/java/com/intellij/plugins/thrift/GeneratorIcons.java +++ b/thrift/src/main/java/com/intellij/plugins/thrift/GeneratorIcons.java @@ -4,7 +4,7 @@ import com.intellij.plugins.thrift.config.target.GeneratorType; import javax.swing.*; -import java.util.HashMap; +import java.util.EnumMap; import java.util.Map; public final class GeneratorIcons { @@ -21,17 +21,12 @@ private static class LazyHolder { static final GeneratorIcons INSTANCE = new GeneratorIcons(); } - private Map icons = new HashMap(); + private final Map icons = new EnumMap<>(GeneratorType.class); private GeneratorIcons() { for (final GeneratorType generatorType : GeneratorType.values()) { - IconLoader.LazyIcon lazyIcon = new IconLoader.LazyIcon() { - @Override - protected Icon compute() { - return IconLoader.getIcon(generatorType.getIconName()); - } - }; + Icon lazyIcon = IconLoader.createLazy(() -> IconLoader.getIcon(generatorType.getIconName(), GeneratorIcons.class)); icons.put(generatorType, lazyIcon); } } diff --git a/thrift/src/main/java/com/intellij/plugins/thrift/ThriftFileTypeLoader.java b/thrift/src/main/java/com/intellij/plugins/thrift/ThriftFileTypeLoader.java deleted file mode 100644 index 6a766acb..00000000 --- a/thrift/src/main/java/com/intellij/plugins/thrift/ThriftFileTypeLoader.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.intellij.plugins.thrift; - -import com.intellij.openapi.fileTypes.FileTypeConsumer; -import com.intellij.openapi.fileTypes.FileTypeFactory; -import org.jetbrains.annotations.NotNull; - -/** - * Created by fkorotkov. - */ -public class ThriftFileTypeLoader extends FileTypeFactory { - @Override - public void createFileTypes(@NotNull FileTypeConsumer fileTypeConsumer) { - fileTypeConsumer.consume(ThriftFileType.INSTANCE); - } -} 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 b42a6f1e..3ea07735 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 @@ -11,6 +11,7 @@ import com.intellij.openapi.ui.Messages; import com.intellij.openapi.ui.TextBrowseFolderListener; import com.intellij.openapi.ui.TextFieldWithBrowseButton; +import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; @@ -20,7 +21,6 @@ import com.intellij.ui.components.JBTextField; import com.intellij.util.ui.JBInsets; import org.apache.commons.lang.StringUtils; -import org.apache.sanselan.util.IOUtils; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -261,16 +261,12 @@ public String readVersion() { process.waitFor(); byte[] stdOut; - InputStream stdOutIS = process.getInputStream(); - try { - stdOut = IOUtils.getInputStreamBytes(stdOutIS); - if (stdOut == null || stdOut.length == 0) { + try (InputStream stdOutIS = process.getInputStream()) { + stdOut = FileUtil.loadBytes(stdOutIS); + if (stdOut.length == 0) { return null; } } - finally { - stdOutIS.close(); - } return new String(stdOut); } diff --git a/thrift/src/main/java/com/intellij/plugins/thrift/config/ThriftPlugin.java b/thrift/src/main/java/com/intellij/plugins/thrift/config/ThriftPlugin.java index 8492cf5f..bdb87933 100644 --- a/thrift/src/main/java/com/intellij/plugins/thrift/config/ThriftPlugin.java +++ b/thrift/src/main/java/com/intellij/plugins/thrift/config/ThriftPlugin.java @@ -19,7 +19,7 @@ @Storage(ThriftProjectExtensionSerializer.CONFIG_FILE_NAME) } ) -public class ThriftPlugin implements NamedComponent, PersistentStateComponent, ProjectComponent { +public class ThriftPlugin implements NamedComponent, PersistentStateComponent { private ThriftConfig myConfig; @Nullable diff --git a/thrift/src/main/java/com/intellij/plugins/thrift/config/facet/ThriftFacetSupportProvider.java b/thrift/src/main/java/com/intellij/plugins/thrift/config/facet/ThriftFacetSupportProvider.java index 14eb8930..53e2edcd 100644 --- a/thrift/src/main/java/com/intellij/plugins/thrift/config/facet/ThriftFacetSupportProvider.java +++ b/thrift/src/main/java/com/intellij/plugins/thrift/config/facet/ThriftFacetSupportProvider.java @@ -1,6 +1,5 @@ package com.intellij.plugins.thrift.config.facet; -import com.intellij.facet.Facet; import com.intellij.facet.ui.FacetBasedFrameworkSupportProvider; import com.intellij.ide.util.frameworkSupport.FrameworkVersion; import com.intellij.openapi.roots.ModifiableRootModel; @@ -10,13 +9,13 @@ * * @author xBlackCat */ -public class ThriftFacetSupportProvider extends FacetBasedFrameworkSupportProvider { +public class ThriftFacetSupportProvider extends FacetBasedFrameworkSupportProvider { protected ThriftFacetSupportProvider() { super(ThriftFacet.TYPE); } @Override - protected void setupConfiguration(Facet facet, ModifiableRootModel rootModel, FrameworkVersion version) { - + protected void setupConfiguration(ThriftFacet facet, ModifiableRootModel rootModel, FrameworkVersion version) { + // Do nothing } } diff --git a/thrift/src/main/java/com/intellij/plugins/thrift/util/ThriftPsiUtil.java b/thrift/src/main/java/com/intellij/plugins/thrift/util/ThriftPsiUtil.java index 609a2f4c..c86c17cb 100644 --- a/thrift/src/main/java/com/intellij/plugins/thrift/util/ThriftPsiUtil.java +++ b/thrift/src/main/java/com/intellij/plugins/thrift/util/ThriftPsiUtil.java @@ -56,16 +56,9 @@ public static PsiFile resolveInclude(@Nullable ThriftInclude include) { final VirtualFile includedVirtualFile = ContainerUtil.find( FilenameIndex.getVirtualFilesByName( - include.getProject(), PathUtil.getFileName(includePath), GlobalSearchScope.allScope(include.getProject()) - ), - new Condition() { - @Override - public boolean value(VirtualFile file) { - return file.getPath().endsWith(includePath); - } - } + ), file -> file.getPath().endsWith(includePath) ); return includedVirtualFile != null ? include.getManager().findFile(includedVirtualFile) : null; diff --git a/thrift/src/main/java/icons/ThriftIcons.java b/thrift/src/main/java/icons/ThriftIcons.java index 24e54a0d..a4910e95 100644 --- a/thrift/src/main/java/icons/ThriftIcons.java +++ b/thrift/src/main/java/icons/ThriftIcons.java @@ -5,12 +5,12 @@ import javax.swing.*; public class ThriftIcons { - public static final Icon CONST = IconLoader.getIcon("/icons/const.png"); - public static final Icon ENUM = IconLoader.getIcon("/icons/enum.png"); - public static final Icon EXCEPTION = IconLoader.getIcon("/icons/exception.png"); - public static final Icon SERVICE = IconLoader.getIcon("/icons/service.png"); - public static final Icon STRUCT = IconLoader.getIcon("/icons/struct.png"); - public static final Icon TYPEDEF = IconLoader.getIcon("/icons/typedef.png"); - public static final Icon UNION = IconLoader.getIcon("/icons/union.png"); - public static final Icon FACET = IconLoader.getIcon("/icons/faceticon.png"); + public static final Icon CONST = IconLoader.getIcon("/icons/const.png", ThriftIcons.class); + public static final Icon ENUM = IconLoader.getIcon("/icons/enum.png", ThriftIcons.class); + public static final Icon EXCEPTION = IconLoader.getIcon("/icons/exception.png", ThriftIcons.class); + public static final Icon SERVICE = IconLoader.getIcon("/icons/service.png", ThriftIcons.class); + public static final Icon STRUCT = IconLoader.getIcon("/icons/struct.png", ThriftIcons.class); + public static final Icon TYPEDEF = IconLoader.getIcon("/icons/typedef.png", ThriftIcons.class); + public static final Icon UNION = IconLoader.getIcon("/icons/union.png", ThriftIcons.class); + public static final Icon FACET = IconLoader.getIcon("/icons/faceticon.png", ThriftIcons.class); } diff --git a/thrift/src/main/resources/META-INF/plugin.xml b/thrift/src/main/resources/META-INF/plugin.xml index 25f3f035..1e5ac5db 100644 --- a/thrift/src/main/resources/META-INF/plugin.xml +++ b/thrift/src/main/resources/META-INF/plugin.xml @@ -4,11 +4,11 @@ Support for Thrift language @fedor - + com.intellij.modules.platform com.intellij.modules.lang @@ -22,7 +22,7 @@ - + + text="Go to Thrift Source"> diff --git a/thrift/src/test/java/com/intellij/plugins/thrift/ThriftCodeInsightFixtureTestCase.java b/thrift/src/test/java/com/intellij/plugins/thrift/ThriftCodeInsightFixtureTestCase.java index 504624bf..621fabc8 100644 --- a/thrift/src/test/java/com/intellij/plugins/thrift/ThriftCodeInsightFixtureTestCase.java +++ b/thrift/src/test/java/com/intellij/plugins/thrift/ThriftCodeInsightFixtureTestCase.java @@ -1,12 +1,12 @@ package com.intellij.plugins.thrift; import com.intellij.plugins.thrift.util.ThriftTestUtils; -import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase; /** * Created by fkorotkov. */ -abstract public class ThriftCodeInsightFixtureTestCase extends LightCodeInsightFixtureTestCase { +abstract public class ThriftCodeInsightFixtureTestCase extends LightJavaCodeInsightFixtureTestCase { @Override protected String getTestDataPath() { return ThriftTestUtils.BASE_TEST_DATA_PATH + "/" + getBasePath(); diff --git a/thrift/src/test/java/com/intellij/plugins/thrift/inspections/ThriftInspectionTestBase.java b/thrift/src/test/java/com/intellij/plugins/thrift/inspections/ThriftInspectionTestBase.java index 69e4b1c8..66ecafe5 100644 --- a/thrift/src/test/java/com/intellij/plugins/thrift/inspections/ThriftInspectionTestBase.java +++ b/thrift/src/test/java/com/intellij/plugins/thrift/inspections/ThriftInspectionTestBase.java @@ -1,9 +1,9 @@ package com.intellij.plugins.thrift.inspections; import com.intellij.codeInspection.LocalInspectionTool; -import com.intellij.plugins.thrift.ThriftCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase; -abstract public class ThriftInspectionTestBase extends ThriftCodeInsightFixtureTestCase { +abstract public class ThriftInspectionTestBase extends LightJavaCodeInsightFixtureTestCase { private final String myPath; Class inspection; @@ -26,6 +26,7 @@ protected String getBasePath() { return myPath; } + @SuppressWarnings("unchecked") protected void doTest() { myFixture.enableInspections(this.inspection); myFixture.configureByFile(getTestName(true) + ".thrift");