Skip to content

Commit 599166c

Browse files
committed
Use Kotlin workaround for KT-16424
Full issue link: https://youtrack.jetbrains.com/issue/KT-16424
1 parent e3cd0d4 commit 599166c

File tree

3 files changed

+3
-30
lines changed

3 files changed

+3
-30
lines changed

src/main/java/com/demonwav/mcdev/util/KotlinIsBroken.java

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/main/kotlin/com/demonwav/mcdev/platform/mixin/inspection/shadow/ShadowFieldPrefixInspection.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ package com.demonwav.mcdev.platform.mixin.inspection.shadow
1313
import com.demonwav.mcdev.platform.mixin.inspection.MixinInspection
1414
import com.demonwav.mcdev.platform.mixin.util.MixinConstants.Annotations.SHADOW
1515
import com.demonwav.mcdev.platform.mixin.util.MixinConstants.DEFAULT_SHADOW_PREFIX
16-
import com.demonwav.mcdev.util.KotlinIsBroken
1716
import com.demonwav.mcdev.util.annotationFromValue
1817
import com.demonwav.mcdev.util.constantStringValue
1918
import com.demonwav.mcdev.util.findAnnotation
@@ -68,7 +67,7 @@ class ShadowFieldPrefixInspection : MixinInspection() {
6867
// Delete prefix
6968
val shadow = element.annotationFromValue!!
7069
runWriteAction {
71-
KotlinIsBroken.removeAnnotationAttribute(shadow, "prefix")
70+
shadow.setDeclaredAttributeValue<PsiAnnotationMemberValue>("prefix", null)
7271
}
7372

7473
// Rename field (if necessary)

src/main/kotlin/com/demonwav/mcdev/util/quickfix/RemoveAnnotationAttributeQuickFix.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,16 @@
1010

1111
package com.demonwav.mcdev.util.quickfix
1212

13-
import com.demonwav.mcdev.util.KotlinIsBroken
1413
import com.demonwav.mcdev.util.annotationFromValue
1514
import com.intellij.codeInspection.LocalQuickFix
1615
import com.intellij.codeInspection.ProblemDescriptor
1716
import com.intellij.openapi.project.Project
17+
import com.intellij.psi.PsiAnnotationMemberValue
1818

1919
class RemoveAnnotationAttributeQuickFix(val annotation: String, val attribute: String) : LocalQuickFix {
2020
override fun getFamilyName() = "Remove $attribute from $annotation"
2121

2222
override fun applyFix(project: Project, descriptor: ProblemDescriptor) {
23-
KotlinIsBroken.removeAnnotationAttribute(descriptor.psiElement.annotationFromValue!!, attribute)
23+
descriptor.psiElement.annotationFromValue?.setDeclaredAttributeValue<PsiAnnotationMemberValue?>(attribute, null)
2424
}
25-
2625
}

0 commit comments

Comments
 (0)