Merge branch 'dev' into 2018.1

Author: DenWav

build.gradle.kts

@@ -36,7 +36,6 @@ val CI = System.getenv("CI") != null
 
 val ideaVersion: String by extra
 val javaVersion: String by extra
-val kotlinVersion: String by extra
 val downloadIdeaSources: String by extra
 
 // for publishing nightlies
@@ -236,9 +235,6 @@ java.sourceSets[SourceSet.MAIN_SOURCE_SET_NAME].java.srcDir(generate)
 // Remove gen directory on clean
 clean.delete(generate)
 
-// Workaround for KT-16764
-compileKotlin.inputs.dir(generate)
-
 runIde {
     maxHeapSize = "2G"
 
@@ -251,7 +247,7 @@ runIde {
 }
 
 inline operator fun <T : Task> T.invoke(a: T.() -> Unit): T = apply(a)
-fun DependencyHandlerScope.kotlin(module: String) = kotlin(module, kotlinVersion) as String
+fun DependencyHandlerScope.kotlin(module: String) = kotlin(module, null) as String
 fun intellijPlugin(name: String) = mapOf(
     "group" to "org.jetbrains.plugins",
     "name" to name,

gradle.properties

@@ -10,8 +10,7 @@
 # suppress inspection "UnusedProperty" for whole file
 ideaVersion = 181-SNAPSHOT
 javaVersion = 1.8
-kotlinVersion = 1.2.10
 
 group = com.demonwav.minecraft-dev
-version = 2018.1-1.1.0
+version = 2018.1-1.1.1
 downloadIdeaSources = true

readme.md

@@ -10,7 +10,7 @@ Minecraft Development for IntelliJ
 |**CircleCI**|[![Travis Build Status](https://img.shields.io/circleci/project/github/minecraft-dev/MinecraftDev/dev.svg?style=flat-square)](https://circleci.com/gh/minecraft-dev/MinecraftDev)|
 | **Travis** |[![CircleCI Build Status](https://img.shields.io/travis/minecraft-dev/MinecraftDev/dev.svg?style=flat-square)](https://travis-ci.org/minecraft-dev/MinecraftDev/)|
 
-Info and Documentation [![Current Release](https://img.shields.io/badge/release-2018.1--1.1.0-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
+Info and Documentation [![Current Release](https://img.shields.io/badge/release-2018.1--1.1.1-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
 ----------------------
 
 Visit [https://minecraftdev.org](https://minecraftdev.org) for information about the project, change logs, features, FAQs, and chat.

settings.gradle renamed to settings.gradle.kts

@@ -13,7 +13,7 @@ package com.demonwav.mcdev.error
 import com.intellij.errorreport.bean.ErrorBean
 import com.intellij.openapi.application.ApplicationNamesInfo
 import com.intellij.openapi.application.ex.ApplicationInfoEx
-import com.intellij.util.SystemProperties
+import com.intellij.openapi.util.SystemInfo
 
 object IdeaITNProxy {
     fun getKeyValuePairs(error: ErrorBean,
@@ -26,9 +26,9 @@ object IdeaITNProxy {
         params["Plugin Name"] = error.pluginName
         params["Plugin Version"] = error.pluginVersion
 
-        params["OS Name"] = SystemProperties.getOsName()
-        params["Java Version"] = SystemProperties.getJavaVersion()
-        params["Java VM Vendor"] = SystemProperties.getJavaVmVendor()
+        params["OS Name"] = SystemInfo.OS_NAME
+        params["Java Version"] = SystemInfo.JAVA_VERSION
+        params["Java VM Vendor"] = SystemInfo.JAVA_VENDOR
 
         params["App Name"] = namesInfo.productName
         params["App Full Name"] = namesInfo.fullProductName

src/main/kotlin/com/demonwav/mcdev/error/IdeaITNProxy.kt

@@ -17,7 +17,7 @@ import com.intellij.openapi.vfs.VirtualFile
 object NbtFileType : FileType {
     override fun getDefaultExtension() = "nbt"
     override fun getIcon() = PlatformAssets.MINECRAFT_ICON
-    override fun getCharset(file: VirtualFile, content: ByteArray) = null
+    override fun getCharset(file: VirtualFile, content: ByteArray): String? = null
     override fun getName() = "NBT"
     override fun getDescription() = "Named Binary Tag"
     override fun isBinary() = true

src/main/kotlin/com/demonwav/mcdev/nbt/filetype/NbtFileType.kt

@@ -0,0 +1,34 @@
+/*
+ * Minecraft Dev for IntelliJ
+ *
+ * https://minecraftdev.org
+ *
+ * Copyright (c) 2017 minecraft-dev
+ *
+ * MIT License
+ */
+
+package com.demonwav.mcdev.nbt.filetype
+
+import com.demonwav.mcdev.nbt.MalformedNbtFileException
+import com.demonwav.mcdev.nbt.Nbt
+import com.intellij.openapi.fileTypes.FileType
+import com.intellij.openapi.fileTypes.FileTypeRegistry
+import com.intellij.openapi.util.io.ByteSequence
+import com.intellij.openapi.vfs.VirtualFile
+import java.io.IOException
+
+class NbtFileTypeDetector : FileTypeRegistry.FileTypeDetector {
+    override fun getVersion() = 1
+
+    override fun detect(file: VirtualFile, firstBytes: ByteSequence, firstCharsIfText: CharSequence?): FileType? {
+        return try {
+            Nbt.buildTagTree(file.inputStream, 100)
+            NbtFileType
+        } catch (e: MalformedNbtFileException) {
+            null
+        } catch (e: IOException) {
+            null
+        }
+    }
+}

src/main/kotlin/com/demonwav/mcdev/nbt/filetype/NbtFileTypeDetector.kt

@@ -17,5 +17,5 @@ object NbttFileType : LanguageFileType(NbttLanguage) {
     override fun getIcon() = PlatformAssets.MINECRAFT_ICON
     override fun getName() = "NBTT"
     override fun getDefaultExtension() = "nbtt"
-    override fun getDescription() = "NBT Text Representation"
+    override fun getDescription() = "NBT Text Representation (don't use this one)"
 }

src/main/kotlin/com/demonwav/mcdev/nbt/lang/NbttFileType.kt

@@ -56,7 +56,7 @@ fun writeString(sb: StringBuilder, s: String): StringBuilder {
         return sb.append('"').append(s.replace("\n", "\\n")).append('"')
     }
 
-    if (s == "bytes" || s == "ints" || s == "longs") {
+    if (s == "bytes" || s == "ints" || s == "longs" || s == "true" || s == "false") {
         // keywords must be quoted
         return sb.append('"').append(s).append('"')
     }

src/main/kotlin/com/demonwav/mcdev/nbt/tags/NbtTag.kt

@@ -13,14 +13,14 @@ package com.demonwav.mcdev.util
 import com.intellij.openapi.components.ProjectComponent
 import com.intellij.openapi.project.Project
 
-abstract class AbstractProjectComponent(var projectRef: Project?) : ProjectComponent {
+abstract class AbstractProjectComponent(private var projectRef: Project?) : ProjectComponent {
 
     protected val project
         get() = projectRef!!
 
     override fun getComponentName(): String = javaClass.name
 
-    override final fun disposeComponent() {
+    final override fun disposeComponent() {
         projectRef = null
     }