[not to merge] Support IntelliJ 2020.1

Changelog.md

@@ -1,6 +1,17 @@
-#### 2020-04-16:
+#### 2020-04-16
+ - 2020.1: A possible fix for exception `Non-idempotent computation`
  - [#792](https://github.com/BashSupport/BashSupport/issues/792): Added NO_SPACING formatting for variable concatenation using += operator (contributed by schilli91)
+ - Version 1.7.17
 
+#### 2020-02-26
+ - Compatibility with 2020.1 eap
+ - Added a link to a comparision of Shell and BashSupport to the notification about conflicting plugins
+ - Version 1.7.16
+
+#### 2019-11-22:
+ - Really apply compatibility fixes for 2019.3
+ - Version 1.7.15
+
 #### 2019-11-20:
  - Fixes for 2019.3
  - Version 1.7.14
@@ -27,12 +38,19 @@
  - [#764](https://github.com/BashSupport/BashSupport/issues/764): Variables declared in included files were not always properly resolved.
  - Fix exception about IndexPatternBuilder incorrect Bash comment ranges
 
+#### 2019-07-04:
+ - A notification is displayed for 192.x and later if both BashSupport and JetBrains Shell are enabled at the same time. It allows to disable one of the plugins.
+ - Version 1.7.11
+
 #### 2019-06-21:
  - [#682](https://github.com/BashSupport/BashSupport/issues/682): Parse heredocs in pipeline commands
  - [#662](https://github.com/BashSupport/BashSupport/issues/662): Enter handler to insert a line continuation in Bash files
  - [#658](https://github.com/BashSupport/BashSupport/issues/658): Fix broken highlighting of heredocs.
  - [#656](https://github.com/BashSupport/BashSupport/issues/656): Fix multiline highlighting of todo/fixme comments
 
+#### 2019-06-15:
+ - Version 1.7.10
+
 #### 2019-05-28:
  - Version 1.7.8
  - Version 1.7.9

build-all-branches.bash

@@ -1,28 +1,10 @@
 #!/usr/bin/env bash
+set -e
 test -f "$HOME/.jdk8" && . $HOME/.jdk8
 
-function ideaBranch {
-    if [[ "$1" == 191.* || "$1" == 2019.1.* ]]; then
-        echo "191"
-    elif [[ "$1" == 183.* || "$1" == 2018.3.* ]]; then
-        echo "183"
-    elif [[ "$1" == 182.* || "$1" == 2018.2.* ]]; then
-        echo "182"
-    elif [[ "$1" == 181.* || "$1" == 2018.1.* ]]; then
-        echo "181"
-    elif [[ "$1" == 173.* || "$1" == 2017.3.* ]]; then
-        echo "173"
-    elif [[ "$1" == 172.* || "$1" == 2017.2.* ]]; then
-        echo "172"
-    elif [[ "$1" == 171.* || "$1" == 2017.1.* ]]; then
-        echo "171"
-    fi
-}
-
-for v in "2019.1.3" "2018.3.6" "2018.2.3" "2018.1.6" "2017.3.5" "2017.2.6" "2017.1.6" "2016.3.8" "2016.2.5" "2016.1.4"; do
-    branch="$(ideaBranch $v)"
-    echo "## Building with version $v, IDEA branch $branch..."
-    _JAVA_OPTIONS="" JAVA_OPTS="" gradle -Dbash.skipUrls="true" -PideaVersion="$v" -PideaBranch="$branch" clean build
+for v in "2020.1"; do
+    echo "## Building with version $v..."
+    _JAVA_OPTIONS="" JAVA_OPTS="" gradle -Dbash.skipUrls="true" -PideaVersion="$v" -PideaBranch="201" clean build
 
     status=$?
     if [[ $status -ne 0 ]]; then

build.gradle

@@ -1,13 +1,13 @@
 buildscript {
     dependencies {
-        // this is the version included in the earlies SDK we're supporting
-        // this is IJ 145.x, which includes Kotlin 1.0.3
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.0.7"
+        // this is the version included in the SDK we're supporting
+        // this is IJ 192.x, which includes Kotlin 1.3.31
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.31"
     }
 }
 
 plugins {
-    id "org.jetbrains.intellij" version "0.4.8"
+    id "org.jetbrains.intellij" version "0.4.18"
 }
 
 repositories {
@@ -16,7 +16,7 @@ repositories {
     mavenCentral()
 }
 
-version = "${new File('pluginVersion.txt').getText('UTF-8')}"
+version = "${new File("${project.rootDir}/pluginVersion.txt").getText('UTF-8')}"
 
 allprojects {
     apply plugin: 'java'
@@ -34,16 +34,16 @@ allprojects {
 
     compileKotlin {
         kotlinOptions {
-            apiVersion = 1.0
-            languageVersion = 1.0
+            apiVersion = 1.3
+            languageVersion = 1.3
             noStdlib = true
             noReflect = true
         }
     }
 
     sourceSets {
         main {
-            java.srcDirs 'src'
+            java.srcDirs = ['src']
             resources.srcDir 'resources'
         }
         test {
@@ -60,12 +60,12 @@ allprojects {
         version ideaVersion
         type "IC"
         pluginName 'BashSupport'
-        plugins 'IntelliLang', 'terminal'
+        plugins = ['IntelliLang', 'terminal']
         downloadSources Boolean.valueOf(sources)
 
         patchPluginXml {
-            sinceBuild '145.0'
-            untilBuild '191.*'
+            sinceBuild '201.0'
+            untilBuild '201.*'
         }
     }
 
@@ -77,14 +77,13 @@ allprojects {
 
     apply plugin: 'jacoco'
     jacoco {
-        toolVersion = "0.7.9"
+        toolVersion = "0.8.5"
         reportsDir = file("$buildDir/reports/coverage")
     }
     test {
         finalizedBy jacocoTestReport
         jacoco {
             enabled true
-            append false
             includes ["com.ansorgit.*"]
         }
     }
@@ -101,6 +100,9 @@ allprojects {
     // test logging configuration, shows test progress and messages to standard error
     // see https://docs.gradle.org/current/javadoc/org/gradle/api/tasks/testing/logging/TestLogEvent.html
     test {
+        // 192.x has the Java functionality in a plugin now.
+        // Our tests are using code of this package, but the plugin itself must not depend on the Java plugin.
+        intellij.plugins += 'java'
         testLogging {
             events = [
                 org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED,

gradle.properties

@@ -1,5 +1,16 @@
-ideaBranch=145
-ideaVersion=2016.1.4
+# Available idea versions:
+# https://www.jetbrains.com/intellij-repository/releases
+# https://www.jetbrains.com/intellij-repository/snapshots
+
+ideaBranch=201
+ideaVersion=2020.1
+
+#ideaBranch=193
+#ideaVersion=2019.3.3
+
+#ideaBranch=201
+#ideaVersion=201.5616.10-EAP-SNAPSHOT
+
 javaVersion=1.8
 sources=true
 pluginChannels=eap

pluginVersion.txt

@@ -1 +1 @@
-1.7.14.145
+1.7.18.201