Merge branch 'dev' into 2018.3 and fix compile

Author: DenWav

build.gradle.kts

@@ -82,14 +82,27 @@ dependencies {
     compile(files(Jvm.current().toolsJar))
 
     compile(files(gradleToolingExtensionJar))
-    "gradle-tooling-extension"("com.jetbrains.intellij.gradle:gradle-tooling-extension:$ideaVersion")
 
     "jflex"("org.jetbrains.idea:jflex:1.7.0-b7f882a")
     "jflex-skeleton"("org.jetbrains.idea:jflex:1.7.0-c1fdf11:idea@skeleton")
     "grammar-kit"("org.jetbrains.idea:grammar-kit:1.5.1")
 
     "testLibs"("org.jetbrains.idea:mockJDK:1.7-4d76c50")
     "testLibs"("org.spongepowered:mixin:0.7-SNAPSHOT:thin")
+
+    // Better way to do this?
+    if (!ideaVersion.endsWith("SNAPSHOT")) {
+        afterEvaluate {
+            // This needs to happen after build number is resolved
+            // intellij.ideaDependency.buildNumber == intellij.type-<buildnumber>
+            // gradle-tooling-extension isn't released with major intellij versions like intellij is
+            // intellij.type is typically IC
+            // build number is IC-number, so + 1 is needed to remove the -
+            "gradle-tooling-extension"("com.jetbrains.intellij.gradle:gradle-tooling-extension:${intellij.ideaDependency.buildNumber.substring(intellij.type.length + 1)}")
+        }
+    } else {
+        "gradle-tooling-extension"("com.jetbrains.intellij.gradle:gradle-tooling-extension:$ideaVersion")
+    }
 }
 
 intellij {

src/main/kotlin/com/demonwav/mcdev/nbt/lang/format/NbttLanguageCodeStyleSettingsProvider.kt

@@ -3,7 +3,7 @@
  *
  * https://minecraftdev.org
  *
- * Copyright (c) 2017 minecraft-dev
+ * Copyright (c) 2018 minecraft-dev
  *
  * MIT License
  */

src/main/kotlin/com/demonwav/mcdev/platform/mixin/action/FindMixinsAction.kt

@@ -39,8 +39,8 @@ class FindMixinsAction : AnAction() {
         private const val TOOL_WINDOW_ID = "Find Mixins"
     }
 
-    override fun actionPerformed(e: AnActionEvent?) {
-        val project = e!!.getData(PROJECT) ?: return
+    override fun actionPerformed(e: AnActionEvent) {
+        val project = e.getData(PROJECT) ?: return
         val file = e.getData(PSI_FILE) ?: return
         val caret = e.getData(CARET) ?: return
         val editor = e.getData(EDITOR) ?: return