Merge branch 'dev' into 2018.3

Author: DenWav

build.gradle.kts

@@ -8,9 +8,13 @@
  * MIT License
  */
 
+import net.minecrell.gradle.licenser.header.HeaderFormat
+import net.minecrell.gradle.licenser.header.HeaderFormatRegistry
+import net.minecrell.gradle.licenser.header.HeaderStyle
 import org.gradle.internal.jvm.Jvm
 import org.jetbrains.intellij.tasks.PublishTask
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import kotlin.reflect.KClass
 
 buildscript {
     repositories {
@@ -19,38 +23,38 @@ buildscript {
 }
 
 plugins {
-    id("org.jetbrains.kotlin.jvm") version "1.2.50" // kept in sync with IntelliJ's bundled dep
+    id("org.jetbrains.kotlin.jvm") version "1.2.51" // kept in sync with IntelliJ's bundled dep
     groovy
     idea
-    id("org.jetbrains.intellij") version "0.3.4"
-    id("net.minecrell.licenser") version "0.4"
+    id("org.jetbrains.intellij") version "0.3.9"
+    id("net.minecrell.licenser") version "0.4.1"
 }
 
 defaultTasks("build")
 
 val CI = System.getenv("CI") != null
 
-val ideaVersion: String by extra
-val downloadIdeaSources: String by extra
+val ideaVersion: String by project
+val downloadIdeaSources: String by project
 
 // for publishing nightlies
-val repoUsername: String by extra
-val repoPassword: String by extra
-val repoChannel: String by extra
+val repoUsername: String by project
+val repoPassword: String by project
+val repoChannel: String by project
 
-val compileKotlin by tasks
-val processResources: AbstractCopyTask by tasks
-val test: Test by tasks
-val runIde: JavaExec by tasks
-val publishPlugin: PublishTask by tasks
-val clean: Delete by tasks
+val compileKotlin by tasks.existing
+val processResources by tasks.existing<AbstractCopyTask>()
+val test by tasks.existing<Test>()
+val runIde by tasks.existing<JavaExec>()
+val publishPlugin by tasks.existing<PublishTask>()
+val clean by tasks.existing<Delete>()
 
 configurations {
-    "gradle-tooling-extension" { extendsFrom("idea"()) }
-    "jflex"()
-    "jflex-skeleton"()
-    "grammar-kit"()
-    "testLibs" { isTransitive = false }
+    register("gradle-tooling-extension") { extendsFrom(configurations["idea"]) }
+    register("jflex")
+    register("jflex-skeleton")
+    register("grammar-kit")
+    register("testLibs") { isTransitive = false }
 }
 
 repositories {
@@ -63,16 +67,14 @@ repositories {
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
+}
 
-    sourceSets {
-        "gradle-tooling-extension" {
-            configurations[compileOnlyConfigurationName].extendsFrom(configurations["gradle-tooling-extension"])
-        }
+val gradleToolingExtension = sourceSets.create("gradle-tooling-extension") {
+    configurations.named<Configuration>(compileOnlyConfigurationName) {
+        extendsFrom(configurations["gradle-tooling-extension"])
     }
 }
-
-val gradleToolingExtension = java.sourceSets["gradle-tooling-extension"]!!
-val gradleToolingExtensionJar = task<Jar>(gradleToolingExtension.jarTaskName) {
+val gradleToolingExtensionJar = tasks.register<Jar>(gradleToolingExtension.jarTaskName) {
     from(gradleToolingExtension.output)
     classifier = "gradle-tooling-extension"
 }
@@ -83,26 +85,20 @@ dependencies {
 
     compile(files(gradleToolingExtensionJar))
 
+    // gradle-intellij-plugin doesn't attach sources properly for Kotlin unless it's manually defined here
+    // compileOnly since it's only here for reference
+    compileOnly(kotlin("stdlib-jdk8"))
+
     "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")
-    }
+    // For non-SNAPSHOT versions (unless Jetbrains fixes this...) find the version with:
+    // intellij.ideaDependency.buildNumber.substring(intellij.type.length + 1)
+    "gradle-tooling-extension"("com.jetbrains.intellij.gradle:gradle-tooling-extension:183-EAP-SNAPSHOT")
 }
 
 intellij {
@@ -131,16 +127,16 @@ publishPlugin {
     }
 }
 
-tasks.withType<JavaCompile> {
+tasks.withType<JavaCompile>().configureEach {
     options.encoding = "UTF-8"
     options.compilerArgs = listOf("-proc:none")
 }
 
-tasks.withType<KotlinCompile> {
+tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
 }
 
-tasks.withType<GroovyCompile> {
+tasks.withType<GroovyCompile>().configureEach {
     options.compilerArgs = listOf("-proc:none")
 }
 
@@ -168,22 +164,42 @@ idea {
     }
 }
 
-// License header formatting
 license {
     header = file("copyright.txt")
-    include("**/*.java", "**/*.kt", "**/*.kts", "**/*.groovy", "**/*.gradle", "**/*.xml", "**/*.properties", "**/*.html")
-    exclude("com/demonwav/mcdev/platform/mcp/at/gen/**", "com/demonwav/mcdev/nbt/lang/gen/**", "com/demonwav/mcdev/i18n/lang/gen/**")
+    style["flex"] = HeaderStyle.BLOCK_COMMENT.format
+    style["bnf"] = HeaderStyle.BLOCK_COMMENT.format
+
+    include(
+        "**/*.java",
+        "**/*.kt",
+        "**/*.kts",
+        "**/*.groovy",
+        "**/*.gradle",
+        "**/*.xml",
+        "**/*.properties",
+        "**/*.html",
+        "**/*.flex",
+        "**/*.bnf"
+    )
+    exclude(
+        "com/demonwav/mcdev/platform/mcp/at/gen/**",
+        "com/demonwav/mcdev/nbt/lang/gen/**",
+        "com/demonwav/mcdev/i18n/lang/gen/**"
+    )
 
     tasks {
-        "gradle" {
+        register("gradle") {
             files = project.files("build.gradle.kts", "settings.gradle.kts", "gradle.properties")
         }
+        register("grammars") {
+            files = project.fileTree("src/main/grammars")
+        }
     }
 }
 
 // Credit for this intellij-rust
 // https://github.com/intellij-rust/intellij-rust/blob/d6b82e6aa2f64b877a95afdd86ec7b84394678c3/build.gradle#L131-L181
-fun generateLexer(name: String, flex: String, pack: String) = task<JavaExec>(name) {
+fun generateLexer(name: String, flex: String, pack: String) = tasks.register<JavaExec>(name) {
     val src = "src/main/grammars/$flex.flex"
     val dst = "gen/com/demonwav/mcdev/$pack"
     val output = "$dst/$flex.java"
@@ -206,12 +222,12 @@ fun generateLexer(name: String, flex: String, pack: String) = task<JavaExec>(nam
     outputs.file(output)
 }
 
-fun generatePsiAndParser(name: String, bnf: String, pack: String) = task<JavaExec>(name) {
-    val src = "src/main/grammars/$bnf.bnf".replace("/", File.separator)
+fun generatePsiAndParser(name: String, bnf: String, pack: String) = tasks.register<JavaExec>(name) {
+    val src = "src/main/grammars/$bnf.bnf".replace('/', File.separatorChar)
     val dstRoot = "gen"
-    val dst = "$dstRoot/com/demonwav/mcdev/$pack".replace("/", File.separator)
-    val psiDir = "$dst/psi/".replace("/", File.separator)
-    val parserDir = "$dst/parser/".replace("/", File.separator)
+    val dst = "$dstRoot/com/demonwav/mcdev/$pack".replace('/', File.separatorChar)
+    val psiDir = "$dst/psi/".replace('/', File.separatorChar)
+    val parserDir = "$dst/parser/".replace('/', File.separatorChar)
 
     doFirst {
         delete(psiDir, parserDir)
@@ -240,27 +256,34 @@ val generateI18nPsiAndParser = generatePsiAndParser("generateI18nPsiAndParser",
 
 val generateI18nTemplateLexer = generateLexer("generateI18nTemplateLexer", "I18nTemplateLexer", "i18n/lang/gen/")
 
-val generate = task("generate") {
+val generate = tasks.register("generate") {
     group = "minecraft"
     description = "Generates sources needed to compile the plugin."
-    dependsOn(generateAtLexer, generateAtPsiAndParser, generateNbttLexer, generateNbttPsiAndParser, generateI18nLexer, generateI18nPsiAndParser, generateI18nTemplateLexer)
+    dependsOn(
+        generateAtLexer,
+        generateAtPsiAndParser,
+        generateNbttLexer,
+        generateNbttPsiAndParser,
+        generateI18nLexer,
+        generateI18nPsiAndParser,
+        generateI18nTemplateLexer
+    )
     outputs.dir("gen")
 }
 
-java.sourceSets[SourceSet.MAIN_SOURCE_SET_NAME].java.srcDir(generate)
+sourceSets.named<SourceSet>("main") { java.srcDir(generate) }
 
 // Remove gen directory on clean
-clean.delete(generate)
+clean { delete(generate) }
 
 runIde {
     maxHeapSize = "2G"
 
-    (findProperty("intellijJre") as? String)?.let(this::setExecutable)
-
     System.getProperty("debug")?.let {
         systemProperty("idea.ProcessCanceledException", "disabled")
         systemProperty("idea.debug.mode", "true")
     }
 }
 
-inline operator fun <T : Task> T.invoke(a: T.() -> Unit): T = apply(a)
+inline fun <reified T : Task> TaskContainer.existing() = existing(T::class)
+inline fun <reified T : Task> TaskContainer.register(name: String, configuration: Action<in T>) = register(name, T::class, configuration)

gradle.properties

@@ -9,8 +9,9 @@
 #
 
 # suppress inspection "UnusedProperty" for whole file
-ideaVersion = 183-SNAPSHOT
+ideaVersion = 183-EAP-SNAPSHOT
 
+name = MinecraftDev
 group = com.demonwav.minecraft-dev
-version = 2018.3-1.2.9
+version = 2018.3-1.2.10
 downloadIdeaSources = true

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,5 @@
-#Sat Jan 13 14:35:28 CST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 <component name="CopyrightManager">
   <copyright>
     <option name="myName" value="Minecraft" />
-    <option name="notice" value="Minecraft Dev for IntelliJ&#10;&#10;https://minecraftdev.org&#10;&#10;Copyright (c) 2017 minecraft-dev&#10;&#10;MIT License" />
+    <option name="notice" value="Minecraft Dev for IntelliJ&#10;&#10;https://minecraftdev.org&#10;&#10;Copyright (c) 2018 minecraft-dev&#10;&#10;MIT License" />
   </copyright>
-</component>
+</component>

idea-configs/copyright/Minecraft.xml

@@ -11,7 +11,7 @@ Minecraft Development for IntelliJ
 |   **Travis (macOS)**   |[![Travis macOS Build Status](https://travis-matrix-badges.herokuapp.com/repos/minecraft-dev/MinecraftDev/branches/dev/2)](https://travis-ci.org/minecraft-dev/MinecraftDev/)|
 | **TeamCity (Windows)** |[![TeamCity Windows Build Status](https://tc.demonwav.com/app/rest/builds/buildType:(id:MinecraftDev_WindowsBuild)/statusIcon)](https://ci.demonwav.com/viewType.html?buildTypeId=MinecraftDev_WindowsBuild)|
 
-Info and Documentation [![Current Release](https://img.shields.io/badge/release-2018.3--1.2.9-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
+Info and Documentation [![Current Release](https://img.shields.io/badge/release-2018.3--1.2.10-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
 ----------------------
 
 <a href="https://discord.gg/j6UNcfr"><img src="https://i.imgur.com/JXu9C1G.png" height="48px"></img></a>

readme.md

@@ -8,4 +8,5 @@
  * MIT License
  */
 
-rootProject.name = "MinecraftDev"
+val name: String by settings
+rootProject.name = name

settings.gradle.kts

@@ -3,7 +3,7 @@
  *
  * https://minecraftdev.org
  *
- * Copyright (c) 2017 minecraft-dev
+ * Copyright (c) 2018 minecraft-dev
  *
  * MIT License
  */
@@ -28,34 +28,46 @@ import static com.intellij.psi.TokenType.*;
 %implements FlexLexer
 %function advance
 %type IElementType
+
+%s CLASS_NAME
+%s MEMBER_NAME
+%s TYPES
+
 %unicode
 
 PRIMITIVE=[ZBCSIFDJV]
-CLASS_VALUE=\[*([ZBCSIFDJ]|L[^;\n]+;)
+CLASS_VALUE=(\[+[ZBCSIFDJ]|(\[*L[^;\n]+;))
 KEYWORD_ELEMENT=(public|private|protected|default)([-+]f)?
-NAME_ELEMENT=[a-zA-Z0-9_]+|<init>
-CLASS_NAME_ELEMENT=[a-zA-Z_$0-9\.]*[a-zA-Z_$0-9]
+NAME_ELEMENT=([\p{L}_\p{Sc}][\p{L}\p{N}_\p{Sc}]*)|<init>
+CLASS_NAME_ELEMENT=([\p{L}_\p{Sc}][\p{L}\p{N}_\p{Sc}]*\.)*[\p{L}_\p{Sc}][\p{L}\p{N}_\p{Sc}]*
 COMMENT=#.*
 CRLF=\n|\r|\r\n
 WHITE_SPACE=\s
 
 %%
 
 <YYINITIAL> {
-    {CRLF}                                      { return CRLF; }
-    {WHITE_SPACE}                               { return WHITE_SPACE; }
+    {KEYWORD_ELEMENT}                           { yybegin(CLASS_NAME); return KEYWORD_ELEMENT; }
+}
 
-    "("                                         { return OPEN_PAREN; }
-    ")"                                         { return CLOSE_PAREN; }
-    "*" | "*()"                                 { return ASTERISK_ELEMENT; }
+<CLASS_NAME> {
+    {CLASS_NAME_ELEMENT}                        { yybegin(MEMBER_NAME); return CLASS_NAME_ELEMENT; }
+}
 
-    {PRIMITIVE} ({PRIMITIVE}|{CLASS_VALUE})*    { zzMarkedPos = zzStartRead + 1; return PRIMITIVE; }
+<MEMBER_NAME> {
+    "*" | "*()"                                 { return ASTERISK_ELEMENT; }
+    {NAME_ELEMENT}                              { yybegin(TYPES); return NAME_ELEMENT; }
+}
 
+<TYPES> {
+    "("                                         { return OPEN_PAREN; }
+    ")"                                         { return CLOSE_PAREN; }
     {CLASS_VALUE}                               { return CLASS_VALUE; }
-    {KEYWORD_ELEMENT}                           { return KEYWORD_ELEMENT; }
-    {NAME_ELEMENT}                              { return NAME_ELEMENT; }
-    {CLASS_NAME_ELEMENT}                        { return CLASS_NAME_ELEMENT; }
-    {COMMENT}                                   { return COMMENT; }
+    {PRIMITIVE} ({PRIMITIVE}|{CLASS_VALUE})*    { zzMarkedPos = zzStartRead + 1; return PRIMITIVE; }
 }
 
+{CRLF}                                          { yybegin(YYINITIAL); return CRLF; }
+{WHITE_SPACE}                                   { return WHITE_SPACE; }
+
+{COMMENT}                                       { return COMMENT; }
 [^]                                             { return BAD_CHARACTER; }