User: rednesto Date: 15 May 25 21:58 Revision: a99c97b8268129d2f63077e9e4ef9963cfd0f684 Summary: Fix deprecation warnings TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=10007&personal=false Index: src/main/kotlin/platform/mixin/action/GenerateAccessorHandler.kt =================================================================== --- src/main/kotlin/platform/mixin/action/GenerateAccessorHandler.kt (revision af450cedc82bfa6abf7508dda5e057cf30156020) +++ src/main/kotlin/platform/mixin/action/GenerateAccessorHandler.kt (revision a99c97b8268129d2f63077e9e4ef9963cfd0f684) @@ -42,7 +42,7 @@ import com.intellij.codeInsight.generation.PsiFieldMember import com.intellij.codeInsight.generation.PsiMethodMember import com.intellij.codeInsight.hint.HintManager -import com.intellij.codeInsight.intention.AddAnnotationFix +import com.intellij.codeInsight.intention.AddAnnotationPsiFix import com.intellij.codeInsight.intention.impl.CreateClassDialog import com.intellij.ide.util.ChooseElementsDialog import com.intellij.ide.util.EditorHelper @@ -310,8 +310,11 @@ "@${MixinConstants.Annotations.MIXIN}(targets=\"${targetClass.fullQualifiedName}\")" } val annotation = factory.createAnnotationFromText(annotationText, clazz) - AddAnnotationFix(MixinConstants.Annotations.MIXIN, clazz, annotation.parameterList.attributes) - .applyFix() + AddAnnotationPsiFix.addPhysicalAnnotationTo( + MixinConstants.Annotations.MIXIN, + annotation.parameterList.attributes, + clazz.modifierList + ) val module = clazz.findModule() ?: return@compute null val configToWrite = MixinModule.getBestWritableConfigForMixinClass( @@ -427,7 +430,11 @@ ) target.typeElement?.let { method.parameterList.parameters[0].typeElement?.replace(it) } if (target.modifierList?.hasExplicitModifier(PsiModifier.FINAL) == true) { - AddAnnotationFix(MixinConstants.Annotations.MUTABLE, method).applyFix() + AddAnnotationPsiFix.addPhysicalAnnotationTo( + MixinConstants.Annotations.MUTABLE, + emptyArray(), + method.modifierList + ) } accessors.add(method) } Index: src/main/kotlin/platform/mixin/expression/MEExpressionInjector.kt =================================================================== --- src/main/kotlin/platform/mixin/expression/MEExpressionInjector.kt (revision af450cedc82bfa6abf7508dda5e057cf30156020) +++ src/main/kotlin/platform/mixin/expression/MEExpressionInjector.kt (revision a99c97b8268129d2f63077e9e4ef9963cfd0f684) @@ -23,7 +23,6 @@ import com.demonwav.mcdev.platform.mixin.util.MixinConstants import com.demonwav.mcdev.util.findContainingModifierList import com.demonwav.mcdev.util.findContainingNameValuePair -import com.intellij.lang.injection.InjectedLanguageManager import com.intellij.lang.injection.MultiHostInjector import com.intellij.lang.injection.MultiHostRegistrar import com.intellij.openapi.util.Key @@ -44,7 +43,6 @@ import com.intellij.psi.util.PsiUtil import com.intellij.psi.util.parentOfType import com.intellij.util.SmartList -import org.intellij.plugins.intelliLang.inject.InjectorUtils class MEExpressionInjector : MultiHostInjector { companion object { @@ -139,22 +137,15 @@ } } + registrar.frankensteinInjection(isFrankenstein) + registrar.doneInjecting() modifierList.putUserData( ME_EXPRESSION_INJECTION, MEExpressionInjection(modCount, METHOD_GET_INJECTED_RESULT.invoke(registrar)) ) - - if (isFrankenstein) { - InjectorUtils.putInjectedFileUserData( - context, - MEExpressionLanguage, - InjectedLanguageManager.FRANKENSTEIN_INJECTION, - true - ) - } + } - } private fun iterateConcatenation(element: PsiElement, consumer: (PsiElement) -> Unit) { when (element) { Index: src/main/kotlin/platform/mixin/inspection/addedMembers/MissingUniqueAnnotationInspection.kt =================================================================== --- src/main/kotlin/platform/mixin/inspection/addedMembers/MissingUniqueAnnotationInspection.kt (revision af450cedc82bfa6abf7508dda5e057cf30156020) +++ src/main/kotlin/platform/mixin/inspection/addedMembers/MissingUniqueAnnotationInspection.kt (revision a99c97b8268129d2f63077e9e4ef9963cfd0f684) @@ -21,7 +21,8 @@ package com.demonwav.mcdev.platform.mixin.inspection.addedMembers import com.demonwav.mcdev.platform.mixin.util.MixinConstants -import com.intellij.codeInsight.intention.AddAnnotationFix +import com.intellij.codeInsight.intention.AddAnnotationModCommandAction +import com.intellij.codeInspection.LocalQuickFix import com.intellij.codeInspection.ProblemsHolder import com.intellij.psi.PsiField import com.intellij.psi.PsiMethod @@ -34,7 +35,7 @@ holder.registerProblem( field.nameIdentifier, "Missing @Unique annotation", - AddAnnotationFix(MixinConstants.Annotations.UNIQUE, field) + LocalQuickFix.from(AddAnnotationModCommandAction(MixinConstants.Annotations.UNIQUE, field))!!, ) } } @@ -44,7 +45,7 @@ holder.registerProblem( method.nameIdentifier ?: return, "Missing @Unique annotation", - AddAnnotationFix(MixinConstants.Annotations.UNIQUE, method) + LocalQuickFix.from(AddAnnotationModCommandAction(MixinConstants.Annotations.UNIQUE, method))!! ) } } Index: src/main/kotlin/platform/mixin/inspection/injector/InjectCouldBeOverwriteInspection.kt =================================================================== --- src/main/kotlin/platform/mixin/inspection/injector/InjectCouldBeOverwriteInspection.kt (revision af450cedc82bfa6abf7508dda5e057cf30156020) +++ src/main/kotlin/platform/mixin/inspection/injector/InjectCouldBeOverwriteInspection.kt (revision a99c97b8268129d2f63077e9e4ef9963cfd0f684) @@ -34,7 +34,7 @@ import com.demonwav.mcdev.util.findAnnotations import com.demonwav.mcdev.util.hasImplicitReturnStatement import com.intellij.analysis.AnalysisScope -import com.intellij.codeInsight.intention.AddAnnotationFix +import com.intellij.codeInsight.intention.AddAnnotationPsiFix import com.intellij.codeInsight.intention.FileModifier.SafeFieldForPreview import com.intellij.codeInspection.CleanupLocalInspectionTool import com.intellij.codeInspection.InspectionManager @@ -313,7 +313,11 @@ val newMethod = oldMethod.replace(templateMethod) as PsiMethod // add the @Overwrite annotation - AddAnnotationFix(MixinConstants.Annotations.OVERWRITE, newMethod).applyFix() + AddAnnotationPsiFix.addPhysicalAnnotationTo( + MixinConstants.Annotations.OVERWRITE, + emptyArray(), + newMethod.modifierList + ) // if the old method includes the parameters of the target method, use those if (!newParameterList.isEmpty) { Index: src/main/kotlin/platform/mixin/inspection/overwrite/OverwriteModifiersInspection.kt =================================================================== --- src/main/kotlin/platform/mixin/inspection/overwrite/OverwriteModifiersInspection.kt (revision af450cedc82bfa6abf7508dda5e057cf30156020) +++ src/main/kotlin/platform/mixin/inspection/overwrite/OverwriteModifiersInspection.kt (revision a99c97b8268129d2f63077e9e4ef9963cfd0f684) @@ -30,8 +30,9 @@ import com.demonwav.mcdev.util.findAnnotation import com.demonwav.mcdev.util.findKeyword import com.demonwav.mcdev.util.isAccessModifier -import com.intellij.codeInsight.intention.AddAnnotationFix +import com.intellij.codeInsight.intention.AddAnnotationModCommandAction import com.intellij.codeInsight.intention.QuickFixFactory +import com.intellij.codeInspection.LocalQuickFix import com.intellij.codeInspection.ProblemHighlightType import com.intellij.codeInspection.ProblemsHolder import com.intellij.psi.PsiAnnotation @@ -114,7 +115,7 @@ nameIdentifier, "Missing @${internalNameToShortName(internalName)} annotation", ProblemHighlightType.WARNING, - AddAnnotationFix(qualifiedName, method, targetAnnPsi.parameterList.attributes), + LocalQuickFix.from(AddAnnotationModCommandAction(qualifiedName, method, targetAnnPsi.parameterList.attributes))!!, ) } else { holder.registerProblem( Index: src/main/kotlin/platform/mixin/inspection/shadow/ShadowFinalInspection.kt =================================================================== --- src/main/kotlin/platform/mixin/inspection/shadow/ShadowFinalInspection.kt (revision af450cedc82bfa6abf7508dda5e057cf30156020) +++ src/main/kotlin/platform/mixin/inspection/shadow/ShadowFinalInspection.kt (revision a99c97b8268129d2f63077e9e4ef9963cfd0f684) @@ -24,7 +24,8 @@ import com.demonwav.mcdev.platform.mixin.util.MixinConstants.Annotations.FINAL import com.demonwav.mcdev.platform.mixin.util.MixinConstants.Annotations.MUTABLE import com.demonwav.mcdev.util.findContainingClass -import com.intellij.codeInsight.intention.AddAnnotationFix +import com.intellij.codeInsight.intention.AddAnnotationModCommandAction +import com.intellij.codeInspection.LocalQuickFix import com.intellij.codeInspection.ProblemsHolder import com.intellij.psi.JavaElementVisitor import com.intellij.psi.PsiClass @@ -61,7 +62,7 @@ holder.registerProblem( expression, "@Final fields cannot be modified", - AddAnnotationFix(MUTABLE, field), + LocalQuickFix.from(AddAnnotationModCommandAction(MUTABLE, field))!!, ) } } Index: src/main/kotlin/platform/mixin/inspection/shadow/ShadowModifiersInspection.kt =================================================================== --- src/main/kotlin/platform/mixin/inspection/shadow/ShadowModifiersInspection.kt (revision af450cedc82bfa6abf7508dda5e057cf30156020) +++ src/main/kotlin/platform/mixin/inspection/shadow/ShadowModifiersInspection.kt (revision a99c97b8268129d2f63077e9e4ef9963cfd0f684) @@ -29,8 +29,9 @@ import com.demonwav.mcdev.platform.mixin.util.MixinTargetMember import com.demonwav.mcdev.platform.mixin.util.accessLevel import com.demonwav.mcdev.util.findKeyword -import com.intellij.codeInsight.intention.AddAnnotationFix +import com.intellij.codeInsight.intention.AddAnnotationModCommandAction import com.intellij.codeInsight.intention.QuickFixFactory +import com.intellij.codeInspection.LocalQuickFix import com.intellij.codeInspection.ProblemHighlightType import com.intellij.codeInspection.ProblemsHolder import com.intellij.codeInspection.RemoveAnnotationQuickFix @@ -118,7 +119,7 @@ holder.registerProblem( annotation, "@Shadow for final member should be annotated as @Final", - AddAnnotationFix(FINAL, member), + LocalQuickFix.from(AddAnnotationModCommandAction(FINAL, member))!!, ) } else { holder.registerProblem( Index: src/main/kotlin/platform/sponge/inspection/SpongeInjectionInspection.kt =================================================================== --- src/main/kotlin/platform/sponge/inspection/SpongeInjectionInspection.kt (revision af450cedc82bfa6abf7508dda5e057cf30156020) +++ src/main/kotlin/platform/sponge/inspection/SpongeInjectionInspection.kt (revision a99c97b8268129d2f63077e9e4ef9963cfd0f684) @@ -29,7 +29,7 @@ import com.demonwav.mcdev.util.findModule import com.demonwav.mcdev.util.fullQualifiedName import com.demonwav.mcdev.util.mapFirstNotNull -import com.intellij.codeInsight.intention.AddAnnotationFix +import com.intellij.codeInsight.intention.AddAnnotationModCommandAction import com.intellij.codeInsight.intention.QuickFixFactory import com.intellij.codeInspection.AbstractBaseJavaLocalInspectionTool import com.intellij.codeInspection.InspectionManager @@ -165,7 +165,7 @@ variable.nameIdentifier ?: variable, "Injected Assets must be annotated with @AssetId.", ProblemHighlightType.GENERIC_ERROR, - AddAnnotationFix(SpongeConstants.ASSET_ID_ANNOTATION, annotationsOwner), + LocalQuickFix.from(AddAnnotationModCommandAction(SpongeConstants.ASSET_ID_ANNOTATION, annotationsOwner))!!, ) } else { variable.findModule()?.let { module -> @@ -239,8 +239,8 @@ variable.nameIdentifier ?: variable, "An injected ${classType.name} must be annotated with either @ConfigDir or @DefaultConfig.", ProblemHighlightType.GENERIC_ERROR, - AddAnnotationFix(SpongeConstants.CONFIG_DIR_ANNOTATION, annotationsOwner), - AddAnnotationFix(SpongeConstants.DEFAULT_CONFIG_ANNOTATION, annotationsOwner), + LocalQuickFix.from(AddAnnotationModCommandAction(SpongeConstants.CONFIG_DIR_ANNOTATION, annotationsOwner))!!, + LocalQuickFix.from(AddAnnotationModCommandAction(SpongeConstants.DEFAULT_CONFIG_ANNOTATION, annotationsOwner))!!, ) } } @@ -252,7 +252,7 @@ variable.nameIdentifier ?: variable, "Injected ${classType.name} must be annotated with @DefaultConfig.", ProblemHighlightType.GENERIC_ERROR, - AddAnnotationFix(SpongeConstants.DEFAULT_CONFIG_ANNOTATION, annotationsOwner), + LocalQuickFix.from(AddAnnotationModCommandAction(SpongeConstants.DEFAULT_CONFIG_ANNOTATION, annotationsOwner))!!, ) }