Fix up some things, everything is still broken

DenWav · DenWav · commit 298781d67dae · 2018-01-08T21:45:38.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
@@ -146,10 +148,6 @@ processResources {
 }
 
 test {
-    if (CI) {
-        systemProperty("slowCI", "true")
-    }
-
     dependsOn(configurations["testLibs"])
     doFirst {
         configurations["testLibs"].resolvedConfiguration.resolvedArtifacts.forEach {
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/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
@@ -46,7 +46,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)))
@@ -73,7 +73,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/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
@@ -48,7 +48,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
diff --git a/src/test/kotlin/com/demonwav/mcdev/framework/TestUtil.kt b/src/test/kotlin/com/demonwav/mcdev/framework/TestUtil.kt
@@ -22,7 +22,7 @@ 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)
 }
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,39 @@ 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()
+
+        library = createLibrary(project, "mixin")
+        ModuleRootModificationUtil.updateModel(myModule) { model ->
+            model.addLibraryEntry(library ?: throw IllegalStateException("Library not created"))
+        }
+    }
+
+    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
`@@ -33,8 +33,8 @@ object FieldTargetReference : TargetReference.QualifiedHandler<PsiField>() {`
`33`	`33`
`34`	`34`	`override fun createLookup(targetClass: PsiClass, m: PsiField, owner: PsiClass): LookupElementBuilder {`
`35`	`35`	`return JavaLookupElementBuilder.forField(m, MixinMemberReference.toString(m.getQualifiedMemberReference(owner)), targetClass)`
`36`		`- .withPresentableText(m.name!!)`
`37`		`- .withLookupString(m.name!!)`
	`36`	`+ .withPresentableText(m.name)`
	`37`	`+ .withLookupString(m.name)`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`private class FindUsagesVisitor(private val targetClass: PsiClass, private val target: MemberReference, checkOnly: Boolean)`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ private class FieldSignature(private val field: PsiField) {`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`override fun hashCode(): Int {`
`169`		`- return 31 * field.name!!.hashCode() + TypeConversionUtil.erasure(field.type).hashCode()`
	`169`	`+ return 31 * field.name.hashCode() + TypeConversionUtil.erasure(field.type).hashCode()`
`170`	`170`	`}`
`171`	`171`	`}`
`172`	`172`
Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ fun PsiMethod.isMatchingMethod(pattern: PsiMethod): Boolean {`
`212`	`212`	`&& this.returnType.isErasureEquivalentTo(pattern.returnType)`
`213`	`213`	`}`
`214`	`214`
`215`		`-fun PsiClass.findMatchingField(pattern: PsiField, checkBases: Boolean, name: String = pattern.name!!): PsiField? {`
	`215`	`+fun PsiClass.findMatchingField(pattern: PsiField, checkBases: Boolean, name: String = pattern.name): PsiField? {`
`216`	`216`	`return findFieldByName(name, checkBases)?.takeIf { it.isMatchingField(pattern) }`
`217`	`217`	`}`
`218`	`218`