From a7795e78bc5deb464a388c154b625b26ea750e0e Mon Sep 17 00:00:00 2001 From: Bart van Helvert Date: Thu, 23 Feb 2023 11:04:57 +0100 Subject: [PATCH] [intelliLang] Improve AddAnnotationFixWithoutArg name From IJ-CR-101667 GitOrigin-RevId: 013368380b80b989598aab4687ba28eaba18b7ab --- ...WithoutArg.java => AddAnnotationFixWithoutArgFix.java} | 8 ++++---- .../plugins/intelliLang/pattern/PatternValidator.java | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) rename java/java-analysis-impl/src/com/intellij/codeInsight/intention/{AddAnnotationFixWithoutArg.java => AddAnnotationFixWithoutArgFix.java} (87%) diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/intention/AddAnnotationFixWithoutArg.java b/java/java-analysis-impl/src/com/intellij/codeInsight/intention/AddAnnotationFixWithoutArgFix.java similarity index 87% rename from java/java-analysis-impl/src/com/intellij/codeInsight/intention/AddAnnotationFixWithoutArg.java rename to java/java-analysis-impl/src/com/intellij/codeInsight/intention/AddAnnotationFixWithoutArgFix.java index b5a4f22d4145..100b469e7493 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/intention/AddAnnotationFixWithoutArg.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/intention/AddAnnotationFixWithoutArgFix.java @@ -13,10 +13,10 @@ import com.intellij.util.ui.EDT; import org.jetbrains.annotations.NotNull; -public class AddAnnotationFixWithoutArg extends AddAnnotationFix { - public AddAnnotationFixWithoutArg(@NotNull String fqn, - @NotNull PsiModifierListOwner modifierListOwner, - String @NotNull ... annotationsToRemove) { +public class AddAnnotationFixWithoutArgFix extends AddAnnotationFix { + public AddAnnotationFixWithoutArgFix(@NotNull String fqn, + @NotNull PsiModifierListOwner modifierListOwner, + String @NotNull ... annotationsToRemove) { super(fqn, modifierListOwner, annotationsToRemove); } diff --git a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/pattern/PatternValidator.java b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/pattern/PatternValidator.java index 7615035008c6..029fb9b8e0b1 100644 --- a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/pattern/PatternValidator.java +++ b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/pattern/PatternValidator.java @@ -15,7 +15,7 @@ */ package org.intellij.plugins.intelliLang.pattern; -import com.intellij.codeInsight.intention.AddAnnotationFixWithoutArg; +import com.intellij.codeInsight.intention.AddAnnotationFixWithoutArgFix; import com.intellij.codeInspection.LocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; import com.intellij.codeInspection.ProblemsHolder; @@ -228,8 +228,8 @@ public class PatternValidator extends LocalInspectionTool { } } final String classname = configuration.getAdvancedConfiguration().getSubstAnnotationPair().first; - if (owner != null && AddAnnotationFixWithoutArg.isApplicable(owner, classname)) { - fixes.add(new AddAnnotationFixWithoutArg(classname, owner)); + if (owner != null && AddAnnotationFixWithoutArgFix.isApplicable(owner, classname)) { + fixes.add(new AddAnnotationFixWithoutArgFix(classname, owner)); } else { fixes.add(new IntroduceVariableFix(false)); }