[All] 2020.3 compatibility (#339)

Author: cedricziel

.github/workflows/gradle.yml

@@ -24,19 +24,27 @@ jobs:
     strategy:
       matrix:
         include:
-        - idea_version: "IU-2020.2"
-          php_plugin_version: "202.6397.94"
-          psi_viewer_plugin_version: "202-SNAPSHOT"
+#        - idea_version: "IU-2020.2"
+#          java_version: "1.8"
+#          php_plugin_version: "202.6397.94"
+#          psi_viewer_plugin_version: "202-SNAPSHOT"
+#          grammar_kit_plugin_version: "2020.2.1"
+#          since_build: "202"
+#          until_build: "202.*"
+        - idea_version: "IU-203.5981.41-EAP-SNAPSHOT"
+          java_version: "1.11"
+          php_plugin_version: "203.5981.43"
+          psi_viewer_plugin_version: "203-SNAPSHOT"
           grammar_kit_plugin_version: "2020.2.1"
-          since_build: "202"
-          until_build: "202.*"
+          since_build: "203"
+          until_build: "203.*"
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
+    - name: Set up JDK
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: ${{ matrix.java_version }}
     - name: Cache Gradle packages
       uses: actions/cache@v2
       with:

.travis.yml

@@ -2,7 +2,7 @@ sudo: false
 dist: xenial
 language: java
 jdk:
-- openjdk8
+- openjdk11
 
 before_cache:
 - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
@@ -17,7 +17,7 @@ cache:
 
 matrix:
   include:
-  - env: IDEA_VERSION="IU-2020.2" PHP_PLUGIN_VERSION="202.6397.94" PSI_VIEWER_PLUGIN_VERSION="202-SNAPSHOT" GRAMMAR_KIT_PLUGIN_VERSION="2020.2.1" SINCE_BUILD="202" UNTIL_BUILD="202.*"
+  - env: IDEA_VERSION="IU-203.5981.41-EAP-SNAPSHOT" PHP_PLUGIN_VERSION="203.5981.43" PSI_VIEWER_PLUGIN_VERSION="203-SNAPSHOT" GRAMMAR_KIT_PLUGIN_VERSION="2020.2.1" SINCE_BUILD="203" UNTIL_BUILD="203.*"
 
 before_install:
 - "export ORG_GRADLE_PROJECT_ideaVersion=${IDEA_VERSION}"

build.gradle

@@ -1,22 +1,16 @@
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 
-buildscript {
-    repositories {
-        mavenCentral()
-
-        maven { url "https://jetbrains.bintray.com/intellij-third-party-dependencies" }
-
-        maven { url 'https://jitpack.io' }
-        maven { url 'http://dl.bintray.com/jetbrains/intellij-plugin-service' }
-    }
-}
-
 plugins {
-    id "org.jetbrains.intellij" version "0.4.26"
-    id "org.jetbrains.grammarkit" version "${grammarKitPluginVersion}"
+    id "org.jetbrains.intellij" version "0.6.3"
+    id "org.jetbrains.grammarkit" version "${grammarKitPluginVersion}" apply false
     id 'com.palantir.git-version' version "0.12.3"
 }
 
+repositories {
+    mavenCentral()
+    jcenter()
+}
+
 def details = versionDetails()
 
 group 'com.cedricziel.idea'
@@ -50,18 +44,25 @@ allprojects {
 
 subprojects {
     apply plugin: 'idea'
-    apply plugin: 'org.jetbrains.grammarkit'
     apply plugin: 'org.jetbrains.intellij'
     apply plugin: 'java'
+    apply plugin: "org.jetbrains.grammarkit"
 
     repositories {
         mavenCentral()
+        jcenter()
     }
 
     intellij {
         version ideaVersion
         sameSinceUntilBuild Boolean.valueOf(isEAP)
         updateSinceUntilBuild true
+
+        tasks {
+            "buildSearchableOptions" {
+                enabled = false
+            }
+        }
     }
 
     publishPlugin {
@@ -78,7 +79,6 @@ subprojects {
     }
 
     grammarKit {
-        grammarKitRelease = grammarKitRelease
         jflexRelease = jFlexRelease
     }
 

gradle.properties

@@ -7,29 +7,15 @@ isEAP = false
 jFlexRelease = 1.7.0-1
 
 grammarKitPluginVersion = 2020.2.1
-ideaVersion = IU-2020.2
-phpPluginVersion = 202.6397.94
-psiViewerPluginVersion = 202-SNAPSHOT
-customSinceBuild=202
-customUntilBuild=202.*
+ideaVersion = IU-203.5981.41-EAP-SNAPSHOT
+phpPluginVersion = 203.5981.43
+psiViewerPluginVersion = 203-SNAPSHOT
+customSinceBuild=203
+customUntilBuild=203.*
 
-#grammarKitPluginVersion = 2020.1
-#ideaVersion = IU-2020.1.1
-#phpPluginVersion = 201.7223.91
-#psiViewerPluginVersion = 201-SNAPSHOT
-#customSinceBuild=201
-#customUntilBuild=201.*
-
-#grammarKitPluginVersion = 2019.3
-#ideaVersion = IU-2019.3.4
-#phpPluginVersion = 193.6911.15
-#psiViewerPluginVersion = 193-SNAPSHOT
-#customSinceBuild=193
-#customUntilBuild=193.*
-
-#grammarKitPluginVersion = 2018.3
-#ideaVersion = IU-2019.2
-#phpPluginVersion = 192.5728.108
-#psiViewerPluginVersion = 192-SNAPSHOT
-#customSinceBuild=192
-#customUntilBuild=192.*
+#grammarKitPluginVersion = 2020.2.1
+#ideaVersion = IU-2020.2
+#phpPluginVersion = 202.6397.94
+#psiViewerPluginVersion = 202-SNAPSHOT
+#customSinceBuild=202
+#customUntilBuild=202.*

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -7,7 +7,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#      https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -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
@@ -125,10 +126,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# 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
@@ -154,19 +156,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     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" ;;
+        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
 
@@ -175,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # 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"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

gradlew

@@ -5,7 +5,7 @@
 @rem you may not use this file except in compliance with the License.
 @rem You may obtain a copy of the License at
 @rem
-@rem      http://www.apache.org/licenses/LICENSE-2.0
+@rem      https://www.apache.org/licenses/LICENSE-2.0
 @rem
 @rem Unless required by applicable law or agreed to in writing, software
 @rem distributed under the License is distributed on an "AS IS" BASIS,
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -37,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.
@@ -51,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%
@@ -61,28 +64,14 @@ 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
 
 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

gradlew.bat

@@ -1,5 +1,6 @@
-import org.jetbrains.grammarkit.tasks.GenerateLexer
-import org.jetbrains.grammarkit.tasks.GenerateParser
+import org.jetbrains.grammarkit.tasks.*
+
+apply plugin: 'org.jetbrains.grammarkit'
 
 def htmlFixer = { htmlFile -> file(htmlFile).text.replace('<html>', '').replace('</html>', '') }
 

lang-fluid/build.gradle

@@ -1,6 +1,6 @@
 package com.cedricziel.idea.fluid;
 
-import com.intellij.CommonBundle;
+import com.intellij.AbstractBundle;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
@@ -21,7 +21,7 @@ private FluidBundle() {
 
     public static String message(@NotNull @PropertyKey(resourceBundle = PATH_TO_BUNDLE) String key, @NotNull Object... params) {
 
-        return CommonBundle.message(getBundle(), key, params);
+        return AbstractBundle.message(getBundle(), key, params);
     }
 
     private static ResourceBundle getBundle() {