Merge branch '2017.3' into dev

DenWav · DenWav · commit 382c5c94da73 · 2018-01-11T21:02:49.000-06:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -10,6 +10,8 @@
 
 import org.gradle.api.tasks.bundling.Jar
 import org.gradle.internal.jvm.Jvm
+import org.jetbrains.intellij.IntelliJPlugin
+import org.jetbrains.intellij.IntelliJPluginExtension
 import org.jetbrains.intellij.tasks.PublishTask
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import java.io.File
@@ -21,7 +23,7 @@ buildscript {
 }
 
 plugins {
-    id("org.jetbrains.kotlin.jvm") version "1.1.4-3" // kept in sync with IntelliJ's bundled dep
+    id("org.jetbrains.kotlin.jvm") version "1.2.10" // kept in sync with IntelliJ's bundled dep
     groovy
     idea
     id("org.jetbrains.intellij") version "0.2.17"
@@ -146,10 +148,6 @@ processResources {
 }
 
 test {
-    if (CI) {
-        systemProperty("slowCI", "true")
-    }
-
     dependsOn(configurations["testLibs"])
     doFirst {
         configurations["testLibs"].resolvedConfiguration.resolvedArtifacts.forEach {
diff --git a/gradle.properties b/gradle.properties
@@ -8,10 +8,10 @@
 # MIT License
 #
 # suppress inspection "UnusedProperty" for whole file
-ideaVersion = 2017.2.5
+ideaVersion = 2017.3.2
 javaVersion = 1.8
-kotlinVersion = 1.1.4-3
+kotlinVersion = 1.2.10
 
 group = com.demonwav.minecraft-dev
-version = 2017.2-1.0.0
+version = 2017.3-1.0.0
 downloadIdeaSources = true
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
diff --git a/readme.md b/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-2017.2--1.0.0-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
+Info and Documentation [![Current Release](https://img.shields.io/badge/release-2017.3--1.0.0-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.
diff --git a/src/main/kotlin/com/demonwav/mcdev/platform/mcp/at/completion/AtCompletionContributor.kt b/src/main/kotlin/com/demonwav/mcdev/platform/mcp/at/completion/AtCompletionContributor.kt
@@ -203,18 +203,14 @@ class AtCompletionContributor : CompletionContributor() {
         val srgResult = result.withPrefixMatcher(SrgPrefixMatcher(text))
 
         for (field in entryClass.fields) {
-            if (field.name == null) {
-                continue
-            }
-
-            if (!field.name!!.contains(text, ignoreCase = true)) {
+            if (!field.name.contains(text, ignoreCase = true)) {
                 continue
             }
 
             val memberReference = srgMap.findSrgField(field) ?: field.simpleQualifiedMemberReference
             srgResult.addElement(PrioritizedLookupElement.withPriority(
                 LookupElementBuilder
-                    .create(field.name!!)
+                    .create(field.name)
                     .withIcon(PlatformIcons.FIELD_ICON)
                     .withTailText(" (${memberReference.name})", true)
                     .withInsertHandler handler@ { context, _ ->
@@ -223,7 +219,7 @@ class AtCompletionContributor : CompletionContributor() {
 
                         // TODO: Fix visibility decrease
                         PsiDocumentManager.getInstance(context.project).doPostponedOperationsAndUnblockDocument(context.document)
-                        val comment = " # ${field.name!!}"
+                        val comment = " # ${field.name}"
                         context.document.insertString(context.editor.caretModel.offset, comment)
                         context.editor.caretModel.moveCaretRelatively(comment.length, 0, false, false, false)
                     },
diff --git a/src/main/kotlin/com/demonwav/mcdev/platform/mixin/action/GenerateShadowAction.kt b/src/main/kotlin/com/demonwav/mcdev/platform/mixin/action/GenerateShadowAction.kt
@@ -159,7 +159,7 @@ private fun shadowMethod(project: Project, psiClass: PsiClass, method: PsiMethod
 }
 
 private fun shadowField(project: Project, field: PsiField): PsiField {
-    val newField = JavaPsiFacade.getElementFactory(project).createField(field.name!!, field.type)
+    val newField = JavaPsiFacade.getElementFactory(project).createField(field.name, field.type)
     val newModifiers = newField.modifierList!!
 
     val modifiers = field.modifierList!!
diff --git a/src/main/kotlin/com/demonwav/mcdev/platform/mixin/config/reference/CompatibilityLevel.kt b/src/main/kotlin/com/demonwav/mcdev/platform/mixin/config/reference/CompatibilityLevel.kt
@@ -47,7 +47,7 @@ object CompatibilityLevel : PsiReferenceProvider() {
                     continue
                 }
 
-                list.add(LookupElementBuilder.create(field.name!!))
+                list.add(LookupElementBuilder.create(field.name))
             }
 
             return list.toArray()
diff --git a/src/main/kotlin/com/demonwav/mcdev/platform/mixin/folding/MixinFoldingBuilder.kt b/src/main/kotlin/com/demonwav/mcdev/platform/mixin/folding/MixinFoldingBuilder.kt
@@ -113,7 +113,7 @@ class MixinFoldingBuilder : CustomFoldingBuilder() {
                 val start = (expression as? CompositeElement)?.findChildByRole(ChildRole.LPARENTH) ?: return
                 val end = (innerCast as? CompositeElement)?.findChildByRole(ChildRole.RPARENTH) ?: return
 
-                descriptors.add(FoldingDescriptor(expression, TextRange(start.startOffset, end.startOffset + end.textLength)))
+                descriptors.add(FoldingDescriptor(expression.node, TextRange(start.startOffset, end.startOffset + end.textLength)))
             }
         }
 
diff --git a/src/main/kotlin/com/demonwav/mcdev/platform/mixin/inspection/MixinInspection.kt b/src/main/kotlin/com/demonwav/mcdev/platform/mixin/inspection/MixinInspection.kt
@@ -11,14 +11,14 @@
 package com.demonwav.mcdev.platform.mixin.inspection
 
 import com.demonwav.mcdev.platform.mixin.MixinModuleType
-import com.intellij.codeInspection.BaseJavaBatchLocalInspectionTool
+import com.intellij.codeInspection.AbstractBaseJavaLocalInspectionTool
 import com.intellij.codeInspection.InspectionManager
 import com.intellij.codeInspection.ProblemDescriptor
 import com.intellij.codeInspection.ProblemsHolder
 import com.intellij.psi.PsiElementVisitor
 import com.intellij.psi.PsiFile
 
-abstract class MixinInspection : BaseJavaBatchLocalInspectionTool() {
+abstract class MixinInspection : AbstractBaseJavaLocalInspectionTool() {
 
     protected abstract fun buildVisitor(holder: ProblemsHolder): PsiElementVisitor
 
diff --git a/src/main/kotlin/com/demonwav/mcdev/platform/mixin/inspection/shadow/ShadowFieldPrefixInspection.kt b/src/main/kotlin/com/demonwav/mcdev/platform/mixin/inspection/shadow/ShadowFieldPrefixInspection.kt
@@ -45,7 +45,7 @@ class ShadowFieldPrefixInspection : MixinInspection() {
             }
 
             // Check if field name starts with default shadow prefix
-            val fieldName = field.name ?: return
+            val fieldName = field.name
             if (fieldName.startsWith(DEFAULT_SHADOW_PREFIX)) {
                 holder.registerProblem(field.nameIdentifier, "Cannot use prefix for @Shadow fields",
                     QuickFixFactory.getInstance().createRenameElementFix(field, fieldName.removePrefix(DEFAULT_SHADOW_PREFIX)))
@@ -72,7 +72,7 @@ class ShadowFieldPrefixInspection : MixinInspection() {
 
             // Rename field (if necessary)
             val field = (shadow.owner as PsiModifierList).parent as PsiField
-            val fieldName = field.name!!
+            val fieldName = field.name
             if (fieldName.startsWith(prefixName)) {
                 // Rename field
                 QuickFixFactory.getInstance().createRenameElementFix(field, fieldName.removePrefix(prefixName)).applyFix()
diff --git a/src/main/kotlin/com/demonwav/mcdev/platform/mixin/reference/target/FieldTargetReference.kt b/src/main/kotlin/com/demonwav/mcdev/platform/mixin/reference/target/FieldTargetReference.kt
@@ -33,8 +33,8 @@ object FieldTargetReference : TargetReference.QualifiedHandler<PsiField>() {
 
     override fun createLookup(targetClass: PsiClass, m: PsiField, owner: PsiClass): LookupElementBuilder {
         return JavaLookupElementBuilder.forField(m, MixinMemberReference.toString(m.getQualifiedMemberReference(owner)), targetClass)
-                .withPresentableText(m.name!!)
-                .withLookupString(m.name!!)
+                .withPresentableText(m.name)
+                .withLookupString(m.name)
     }
 
     private class FindUsagesVisitor(private val targetClass: PsiClass, private val target: MemberReference, checkOnly: Boolean)
diff --git a/src/main/kotlin/com/demonwav/mcdev/platform/mixin/util/TargetClass.kt b/src/main/kotlin/com/demonwav/mcdev/platform/mixin/util/TargetClass.kt
@@ -166,7 +166,7 @@ private class FieldSignature(private val field: PsiField) {
     }
 
     override fun hashCode(): Int {
-        return 31 * field.name!!.hashCode() + TypeConversionUtil.erasure(field.type).hashCode()
+        return 31 * field.name.hashCode() + TypeConversionUtil.erasure(field.type).hashCode()
     }
 }
 
diff --git a/src/main/kotlin/com/demonwav/mcdev/util/MemberReference.kt b/src/main/kotlin/com/demonwav/mcdev/util/MemberReference.kt
@@ -133,22 +133,22 @@ fun PsiMethod.getQualifiedMemberReference(owner: PsiClass): MemberReference {
 
 @get:Contract(pure = true)
 val PsiField.simpleMemberReference
-    get() = MemberReference(name!!)
+    get() = MemberReference(name)
 
 @get:Contract(pure = true)
 val PsiField.memberReference
-    get() = MemberReference(name!!, descriptor)
+    get() = MemberReference(name, descriptor)
 
 @get:Contract(pure = true)
 val PsiField.simpleQualifiedMemberReference
-    get() = MemberReference(name!!, null, containingClass!!.fullQualifiedName)
+    get() = MemberReference(name, null, containingClass!!.fullQualifiedName)
 
 @get:Contract(pure = true)
 val PsiField.qualifiedMemberReference
-    get() = MemberReference(name!!, descriptor, containingClass!!.fullQualifiedName)
+    get() = MemberReference(name, descriptor, containingClass!!.fullQualifiedName)
 
 @Contract(pure = true)
 fun PsiField.getQualifiedMemberReference(owner: PsiClass): MemberReference {
-    return MemberReference(name!!, descriptor, owner.fullQualifiedName)
+    return MemberReference(name, descriptor, owner.fullQualifiedName)
 }
 
diff --git a/src/main/kotlin/com/demonwav/mcdev/util/class-utils.kt b/src/main/kotlin/com/demonwav/mcdev/util/class-utils.kt
@@ -212,7 +212,7 @@ fun PsiMethod.isMatchingMethod(pattern: PsiMethod): Boolean {
         && this.returnType.isErasureEquivalentTo(pattern.returnType)
 }
 
-fun PsiClass.findMatchingField(pattern: PsiField, checkBases: Boolean, name: String = pattern.name!!): PsiField? {
+fun PsiClass.findMatchingField(pattern: PsiField, checkBases: Boolean, name: String = pattern.name): PsiField? {
     return findFieldByName(name, checkBases)?.takeIf { it.isMatchingField(pattern) }
 }
 
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -28,13 +28,13 @@
       <div>
         Please report issues to <a href="https://github.com/minecraft-dev/MinecraftDev/issues">the issue tracker</a>!
         <p>
-        v. 2017.2-1.0.0
+        v. 2017.3-1.0.0
       </div>
     ]]>
     </change-notes>
 
     <!-- please see https://confluence.jetbrains.com/display/IDEADEV/Build+Number+Ranges for description -->
-    <idea-version since-build="172" until-build="172.*"/>
+    <idea-version since-build="173" until-build="173.*"/>
 
     <extensions defaultExtensionNs="com.intellij">
         <!-- This is grouped in the following order EXCEPT for localInspections and moduleTypes. All localInspections are grouped at the
diff --git a/src/test/kotlin/com/demonwav/mcdev/framework/BasePerformanceTest.kt b/src/test/kotlin/com/demonwav/mcdev/framework/BasePerformanceTest.kt
diff --git a/src/test/kotlin/com/demonwav/mcdev/framework/ProjectBuilder.kt b/src/test/kotlin/com/demonwav/mcdev/framework/ProjectBuilder.kt
@@ -11,6 +11,7 @@
 package com.demonwav.mcdev.framework
 
 import com.intellij.openapi.application.runWriteAction
+import com.intellij.openapi.project.rootManager
 import com.intellij.openapi.roots.ModuleRootModificationUtil
 import com.intellij.openapi.vfs.VfsUtil
 import com.intellij.openapi.vfs.VirtualFile
@@ -48,7 +49,7 @@ class ProjectBuilder(fixture: JavaCodeInsightTestFixture) {
     fun java(path: String, @Language("JAVA") code: String, configure: Boolean = true) = file(path, code, ".java", configure)
     fun at(path: String, @Language("Access Transformers") code: String, configure: Boolean = true) = file(path, code, "_at.cfg", configure)
 
-    fun dir(path: String, block: ProjectBuilder.() -> Unit) {
+    inline fun dir(path: String, block: ProjectBuilder.() -> Unit) {
         val oldIntermediatePath = intermediatePath
         if (intermediatePath.isEmpty()) {
             intermediatePath = path
@@ -84,10 +85,10 @@ class ProjectBuilder(fixture: JavaCodeInsightTestFixture) {
         runWriteAction {
             VfsUtil.markDirtyAndRefresh(false, true, true, root)
             // Make sure to always add the module content root
-            ModuleRootModificationUtil.updateModel(fixture.module) { model ->
-                model.contentEntries.firstOrNull { it.file == project.baseDir } ?:
-                    model.addContentEntry(project.baseDir)
+            if (fixture.module.rootManager.contentEntries.none { it.file == project.baseDir }) {
+                ModuleRootModificationUtil.addContentRoot(fixture.module, project.baseDir)
             }
+
             builder()
         }
     }
diff --git a/src/test/kotlin/com/demonwav/mcdev/framework/ProjectBuilderTest.kt b/src/test/kotlin/com/demonwav/mcdev/framework/ProjectBuilderTest.kt
@@ -10,23 +10,32 @@
 
 package com.demonwav.mcdev.framework
 
+import com.intellij.openapi.project.rootManager
 import com.intellij.openapi.roots.ModuleRootModificationUtil
+import com.intellij.openapi.vfs.VfsUtil
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
 
 abstract class ProjectBuilderTest : LightCodeInsightFixtureTestCase() {
 
     protected fun buildProject(builder: ProjectBuilder.() -> Unit) = ProjectBuilder(myFixture).build(builder)
 
     fun ProjectBuilder.src(block: ProjectBuilder.() -> Unit) {
+        val srcFolder = VfsUtil.createDirectoryIfMissing(project.baseDir, "src")
+        val entry = myFixture.module.rootManager.contentEntries.first { it.file == project.baseDir }
+        if (!entry.sourceFolderFiles.contains(srcFolder)) {
+            ModuleRootModificationUtil.updateModel(myFixture.module) { model ->
+                model.contentEntries.first { it.file == project.baseDir }.addSourceFolder(srcFolder, false)
+            }
+        }
+
         dir("src", block)
-        ModuleRootModificationUtil.updateModel(myFixture.module) { model ->
-            val contentEntry = model.contentEntries.firstOrNull { it.file == project.baseDir } ?:
-                model.addContentEntry(project.baseDir)
+    }
 
-            val srcFolder = project.baseDir.findChild("src")!!
-            if (!contentEntry.sourceFolderFiles.contains(srcFolder)) {
-                contentEntry.addSourceFolder(srcFolder, false)
-            }
+    override fun tearDown() {
+        ModuleRootModificationUtil.updateModel(myFixture.module) { model ->
+            model.removeContentEntry(model.contentEntries.first { it.file == project.baseDir })
         }
+
+        super.tearDown()
     }
 }
diff --git a/src/test/kotlin/com/demonwav/mcdev/framework/TestUtil.kt b/src/test/kotlin/com/demonwav/mcdev/framework/TestUtil.kt
@@ -22,13 +22,13 @@ import com.intellij.openapi.vfs.StandardFileSystems
 val mockJdk by lazy {
     val path = findLibraryPath("mockJDK")
     val rtFile = StandardFileSystems.local().findFileByPath(path)!!
-    val rt = StandardFileSystems.getJarRootForLocalFile(rtFile)!!
+    val rt = JarFileSystem.getInstance().getRootByLocal(rtFile)!!
     val home = rtFile.parent!!
     MockJdk("1.7", rt, home)
 }
 
 private fun findLibraryPath(name: String) = FileUtil.toSystemIndependentName(System.getProperty("testLibs.$name")!!)
-private fun findLibrary(name: String) = StandardFileSystems.jar().findFileByPath(findLibraryPath(name) + JarFileSystem.JAR_SEPARATOR)
+private fun findLibrary(name: String) = StandardFileSystems.jar().refreshAndFindFileByPath(findLibraryPath(name) + JarFileSystem.JAR_SEPARATOR)
 
 fun createLibrary(project: Project, name: String): Library {
     val table = LibraryTablesRegistrar.getInstance().getLibraryTable(project)
diff --git a/src/test/kotlin/com/demonwav/mcdev/platform/mixin/BaseMixinTest.kt b/src/test/kotlin/com/demonwav/mcdev/platform/mixin/BaseMixinTest.kt
@@ -13,12 +13,47 @@ package com.demonwav.mcdev.platform.mixin
 import com.demonwav.mcdev.framework.BaseMinecraftTest
 import com.demonwav.mcdev.framework.createLibrary
 import com.demonwav.mcdev.platform.PlatformType
-import com.intellij.openapi.module.Module
-import com.intellij.openapi.roots.ModifiableRootModel
+import com.demonwav.mcdev.util.runWriteTask
+import com.intellij.openapi.roots.ModuleRootModificationUtil
+import com.intellij.openapi.roots.libraries.Library
+import com.intellij.openapi.roots.libraries.LibraryTablesRegistrar
 
 abstract class BaseMixinTest : BaseMinecraftTest(PlatformType.MIXIN) {
 
-    override fun postConfigureModule(module: Module, model: ModifiableRootModel) {
-        model.addLibraryEntry(createLibrary(module.project, "mixin"))
+    private var library: Library? = null
+
+    override fun setUp() {
+        super.setUp()
+
+        runWriteTask {
+            library = createLibrary(project, "mixin")
+        }
+
+        ModuleRootModificationUtil.updateModel(myModule) { model ->
+            model.addLibraryEntry(library ?: throw IllegalStateException("Library not created"))
+            val orderEntries = model.orderEntries
+            val last = orderEntries.last()
+            System.arraycopy(orderEntries, 0, orderEntries, 1, orderEntries.size - 1)
+            orderEntries[0] = last
+            model.rearrangeOrderEntries(orderEntries)
+        }
+    }
+
+    override fun tearDown() {
+        library?.let { l ->
+            ModuleRootModificationUtil.updateModel(myModule) { model ->
+                model.removeOrderEntry(model.findLibraryOrderEntry(l) ?: throw IllegalStateException("Library not found"))
+            }
+
+            runWriteTask {
+                val table = LibraryTablesRegistrar.getInstance().getLibraryTable(project)
+                table.modifiableModel.let { model ->
+                    model.removeLibrary(l)
+                    model.commit()
+                }
+            }
+        }
+
+        super.tearDown()
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ private fun shadowMethod(project: Project, psiClass: PsiClass, method: PsiMethod`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`private fun shadowField(project: Project, field: PsiField): PsiField {`
`162`		`- val newField = JavaPsiFacade.getElementFactory(project).createField(field.name!!, field.type)`
	`162`	`+ val newField = JavaPsiFacade.getElementFactory(project).createField(field.name, field.type)`
`163`	`163`	`val newModifiers = newField.modifierList!!`
`164`	`164`
`165`	`165`	`val modifiers = field.modifierList!!`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ object CompatibilityLevel : PsiReferenceProvider() {`
`47`	`47`	`continue`
`48`	`48`	`}`
`49`	`49`
`50`		`- list.add(LookupElementBuilder.create(field.name!!))`
	`50`	`+ list.add(LookupElementBuilder.create(field.name))`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`return list.toArray()`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ class MixinFoldingBuilder : CustomFoldingBuilder() {`
`113`	`113`	`val start = (expression as? CompositeElement)?.findChildByRole(ChildRole.LPARENTH) ?: return`
`114`	`114`	`val end = (innerCast as? CompositeElement)?.findChildByRole(ChildRole.RPARENTH) ?: return`
`115`	`115`
`116`		`- descriptors.add(FoldingDescriptor(expression, TextRange(start.startOffset, end.startOffset + end.textLength)))`
	`116`	`+ descriptors.add(FoldingDescriptor(expression.node, TextRange(start.startOffset, end.startOffset + end.textLength)))`
`117`	`117`	`}`
`118`	`118`	`}`
`119`	`119`