introduce @IntentionName, @IntentionFamilyName, @IntentionText

GitOrigin-RevId: ddf23972cd2ad0f9d75ee6c83690f01ac87f72d7
This commit is contained in:
Dmitry.Krasilschikov
2020-04-20 15:12:03 +00:00
committed by intellij-monorepo-bot
parent 5bbe039a4a
commit f36a3d1710
23 changed files with 98 additions and 48 deletions
@@ -5,8 +5,8 @@ import com.intellij.codeInspection.LocalInspectionTool;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.ProblemsHolder;
import com.intellij.codeInspection.util.IntentionFamilyName;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.NlsContexts;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiElementVisitor;
import org.intellij.lang.regexp.RegExpBundle;
@@ -60,7 +60,7 @@ public class RedundantNestedCharacterClassInspection extends LocalInspectionTool
private static class RedundantNestedCharacterClassFix implements LocalQuickFix {
@Override
public @NlsContexts.ListItem @NotNull String getFamilyName() {
public @IntentionFamilyName @NotNull String getFamilyName() {
return RegExpBundle.message("inspection.quick.fix.replace.redundant.character.class.with.contents");
}
@@ -3,7 +3,7 @@ package com.intellij.codeInspection.numeric;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.codeInspection.util.IntentionFamilyName;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.NlsContexts;
import com.intellij.psi.JavaPsiFacade;
@@ -34,7 +34,7 @@ final class ConvertNumericLiteralQuickFix implements LocalQuickFix {
}
@Override
public @NlsContexts.ListItem @NotNull String getFamilyName() {
public @IntentionFamilyName @NotNull String getFamilyName() {
return myFamilyName;
}
@@ -1,11 +1,12 @@
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.codeInsight.intention;
import com.intellij.codeInspection.util.IntentionFamilyName;
import com.intellij.codeInspection.util.IntentionText;
import com.intellij.openapi.application.Application;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Iconable;
import com.intellij.openapi.util.NlsContexts;
import com.intellij.psi.PsiFile;
import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NotNull;
@@ -36,7 +37,7 @@ public interface IntentionAction extends FileModifier {
* @return the text to show in the intention popup.
* @see #isAvailable(Project, Editor, PsiFile)
*/
@NlsContexts.ListItem
@IntentionText
@NotNull
String getText();
@@ -50,7 +51,7 @@ public interface IntentionAction extends FileModifier {
* @see IntentionManager#registerIntentionAndMetaData(IntentionAction, String...)
*/
@NotNull
@NlsContexts.ListItem
@IntentionFamilyName
String getFamilyName();
/**
@@ -0,0 +1,14 @@
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.codeInspection.util;
import com.intellij.openapi.util.NlsContext;
import org.jetbrains.annotations.Nls;
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
@NlsContext(prefix = "intention.family.name")
@Nls(capitalization = Nls.Capitalization.Sentence)
@Target(ElementType.TYPE_USE)
public @interface IntentionFamilyName {
}
@@ -0,0 +1,13 @@
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.codeInspection.util;
import com.intellij.openapi.util.NlsContext;
import org.jetbrains.annotations.Nls;
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
@NlsContext(prefix = "intention.name")
@Nls(capitalization = Nls.Capitalization.Sentence)
@Target(ElementType.TYPE_USE)
public @interface IntentionName {
}
@@ -0,0 +1,14 @@
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.codeInspection.util;
import com.intellij.openapi.util.NlsContext;
import org.jetbrains.annotations.Nls;
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
@NlsContext(prefix = "intention.text")
@Nls(capitalization = Nls.Capitalization.Sentence)
@Target(ElementType.TYPE_USE)
public @interface IntentionText {
}
@@ -9,13 +9,13 @@ import com.intellij.codeInspection.InspectionManager;
import com.intellij.codeInspection.LocalInspectionTool;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.util.IntentionFamilyName;
import com.intellij.openapi.actionSystem.ShortcutProvider;
import com.intellij.openapi.actionSystem.ShortcutSet;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.options.ConfigurableUi;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.NlsContexts;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiElement;
@@ -132,7 +132,7 @@ public abstract class BaseCommitMessageInspection extends LocalInspectionTool {
implements LowPriorityAction, IntentionAction, ShortcutProvider {
@Override
public @NlsContexts.ListItem @NotNull String getFamilyName() {
public @IntentionFamilyName @NotNull String getFamilyName() {
return ReformatCommitMessageAction.NAME;
}
@@ -3,12 +3,12 @@ package com.intellij.vcs.commit.message;
import com.intellij.codeInspection.InspectionManager;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.util.IntentionFamilyName;
import com.intellij.lang.Language;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.options.ConfigurableUi;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.NlsContexts;
import com.intellij.openapi.util.TextRange;
import com.intellij.openapi.vcs.VcsBundle;
import com.intellij.openapi.vcs.ui.CommitMessage;
@@ -70,7 +70,7 @@ public class BodyLimitInspection extends BaseCommitMessageInspection {
protected class WrapLineQuickFix extends BaseCommitMessageQuickFix {
@Override
public @NlsContexts.ListItem @NotNull String getFamilyName() {
public @IntentionFamilyName @NotNull String getFamilyName() {
return "Wrap line";
}
@@ -3,9 +3,9 @@ package com.intellij.vcs.commit.message;
import com.intellij.codeInspection.InspectionManager;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.util.IntentionFamilyName;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.NlsContexts;
import com.intellij.openapi.util.TextRange;
import com.intellij.openapi.vcs.VcsBundle;
import com.intellij.psi.PsiFile;
@@ -50,7 +50,7 @@ public class SubjectBodySeparationInspection extends BaseCommitMessageInspection
protected static class AddBlankLineQuickFix extends BaseCommitMessageQuickFix {
@Override
public @NlsContexts.ListItem @NotNull String getFamilyName() {
public @IntentionFamilyName @NotNull String getFamilyName() {
return VcsBundle.getString("settings.commit.message.body.add.blank.line.fix");
}
@@ -5,8 +5,9 @@ import com.intellij.codeInsight.BlockUtils;
import com.intellij.codeInsight.daemon.impl.quickfix.DeleteElementFix;
import com.intellij.codeInspection.*;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.util.IntentionFamilyName;
import com.intellij.codeInspection.util.IntentionName;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.NlsContexts;
import com.intellij.openapi.util.TextRange;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*;
@@ -473,12 +474,12 @@ public class RedundantStringOperationInspection extends AbstractBaseJavaLocalIns
}
@Override
public @NlsContexts.ListItem @NotNull String getName() {
public @IntentionName @NotNull String getName() {
return CommonQuickFixBundle.message("fix.replace.x.with.y", myText, myConverted);
}
@Override
public @NlsContexts.ListItem @NotNull String getFamilyName() {
public @IntentionFamilyName @NotNull String getFamilyName() {
return CommonQuickFixBundle.message("fix.replace.x.with.y", "substring()", "charAt()");
}
@@ -514,12 +515,12 @@ public class RedundantStringOperationInspection extends AbstractBaseJavaLocalIns
}
@Override
public @NlsContexts.ListItem @NotNull String getName() {
public @IntentionName @NotNull String getName() {
return CommonQuickFixBundle.message("fix.replace.x.with.y", myText, myConverted);
}
@Override
public @NlsContexts.ListItem @NotNull String getFamilyName() {
public @IntentionFamilyName @NotNull String getFamilyName() {
return CommonQuickFixBundle.message("fix.replace.x.with.y", "substring()", "charAt()");
}
@@ -5,11 +5,12 @@ import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.codeInspection.NlsCapitalizationUtil;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.i18n.NlsInfo;
import com.intellij.codeInspection.util.IntentionFamilyName;
import com.intellij.codeInspection.util.IntentionName;
import com.intellij.lang.properties.psi.Property;
import com.intellij.lang.properties.psi.impl.PropertiesFileImpl;
import com.intellij.lang.properties.references.PropertyReference;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.NlsContexts;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*;
import com.intellij.psi.xml.XmlElement;
@@ -226,12 +227,12 @@ public class PluginXmlCapitalizationInspection extends DevKitPluginXmlInspection
}
@Override
public @NlsContexts.ListItem @NotNull String getName() {
public @IntentionName @NotNull String getName() {
return "Properly capitalize '" + escapedValue + '\'';
}
@Override
public @NlsContexts.ListItem @NotNull String getFamilyName() {
public @IntentionFamilyName @NotNull String getFamilyName() {
return "Properly capitalize";
}
@@ -7,6 +7,7 @@ import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.ProblemHighlightType;
import com.intellij.codeInspection.ui.ListTable;
import com.intellij.codeInspection.ui.ListWrappingTableModel;
import com.intellij.codeInspection.util.IntentionFamilyName;
import com.intellij.diagnostic.ITNReporter;
import com.intellij.ide.plugins.IdeaPluginDescriptorImpl;
import com.intellij.ide.plugins.PluginManager;
@@ -23,7 +24,9 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.ModuleRootManager;
import com.intellij.openapi.ui.panel.ComponentPanelBuilder;
import com.intellij.openapi.ui.panel.PanelGridBuilder;
import com.intellij.openapi.util.*;
import com.intellij.openapi.util.BuildNumber;
import com.intellij.openapi.util.ClearableLazyValue;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.pom.NavigatableAdapter;
@@ -491,7 +494,7 @@ public final class PluginXmlDomInspection extends DevKitPluginXmlInspectionBase
DevKitBundle.message("inspections.plugin.xml.ep.qualifiedName.superfluous"), null,
new LocalQuickFix() {
@Override
public @NlsContexts.ListItem @NotNull String getFamilyName() {
public @IntentionFamilyName @NotNull String getFamilyName() {
return DevKitBundle.message("inspections.plugin.xml.ep.qualifiedName.superfluous.fix");
}
@@ -5,8 +5,8 @@ import com.intellij.codeInspection.InspectionManager;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.ProblemHighlightType;
import com.intellij.codeInspection.ProblemsHolder;
import com.intellij.codeInspection.util.IntentionFamilyName;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.NlsContexts;
import com.intellij.psi.*;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.util.ui.JBEmptyBorder;
@@ -53,7 +53,7 @@ public class UseDPIAwareEmptyBorderInspection extends DevKitInspectionBase {
&& ConvertToJBBorderQuickFix.canSimplify(expression)) {
return manager.createProblemDescriptor(expression, "Simplify", new ConvertToJBBorderQuickFix() {
@Override
public @NlsContexts.ListItem @NotNull String getFamilyName() {
public @IntentionFamilyName @NotNull String getFamilyName() {
return "Simplify";
}
}, ProblemHighlightType.GENERIC_ERROR_OR_WARNING, isOnTheFly);
@@ -3,8 +3,8 @@ package org.jetbrains.idea.devkit.inspections.quickfix;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.util.IntentionFamilyName;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.NlsContexts;
import com.intellij.psi.*;
import com.intellij.psi.codeStyle.JavaCodeStyleManager;
import org.jetbrains.annotations.NotNull;
@@ -14,7 +14,7 @@ import org.jetbrains.annotations.NotNull;
*/
public class ChangeToPairCreateQuickFix implements LocalQuickFix {
@Override
public @NlsContexts.ListItem @NotNull String getFamilyName() {
public @IntentionFamilyName @NotNull String getFamilyName() {
return "Replace with 'Pair.create()'";
}
@@ -3,8 +3,9 @@ package org.jetbrains.idea.devkit.inspections.quickfix;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.util.IntentionFamilyName;
import com.intellij.codeInspection.util.IntentionName;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.NlsContexts;
import com.intellij.psi.JavaPsiFacade;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiElementFactory;
@@ -23,12 +24,12 @@ public class ConvertToGrayQuickFix implements LocalQuickFix {
}
@Override
public @NlsContexts.ListItem @NotNull String getName() {
public @IntentionName @NotNull String getName() {
return "Convert to Gray._" + myNum;
}
@Override
public @NlsContexts.ListItem @NotNull String getFamilyName() {
public @IntentionFamilyName @NotNull String getFamilyName() {
return "Convert to Gray";
}
@@ -3,9 +3,9 @@ package org.jetbrains.idea.devkit.inspections.quickfix;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.util.IntentionFamilyName;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.NlsContexts;
import com.intellij.psi.*;
import com.intellij.psi.codeStyle.JavaCodeStyleManager;
import com.intellij.psi.util.PsiEditorUtil;
@@ -17,7 +17,7 @@ import org.jetbrains.annotations.NotNull;
*/
public class ConvertToJBBorderQuickFix implements LocalQuickFix {
@Override
public @NlsContexts.ListItem @NotNull String getFamilyName() {
public @IntentionFamilyName @NotNull String getFamilyName() {
return "Convert to JBUI.Borders.empty(...)";
}
@@ -3,8 +3,9 @@ package org.jetbrains.idea.devkit.inspections.quickfix;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.util.IntentionFamilyName;
import com.intellij.codeInspection.util.IntentionName;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.NlsContexts;
import com.intellij.psi.JavaPsiFacade;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiElementFactory;
@@ -24,12 +25,12 @@ public class ConvertToJBColorConstantQuickFix implements LocalQuickFix {
}
@Override
public @NlsContexts.ListItem @NotNull String getName() {
public @IntentionName @NotNull String getName() {
return "Convert to JBColor." + myConstantName;
}
@Override
public @NlsContexts.ListItem @NotNull String getFamilyName() {
public @IntentionFamilyName @NotNull String getFamilyName() {
return "Use JBColor constant";
}
@@ -3,9 +3,9 @@ package org.jetbrains.idea.devkit.inspections.quickfix;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.util.IntentionFamilyName;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.NlsContexts;
import com.intellij.psi.JavaPsiFacade;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiElementFactory;
@@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull;
*/
public class ConvertToJBColorQuickFix implements LocalQuickFix {
@Override
public @NlsContexts.ListItem @NotNull String getFamilyName() {
public @IntentionFamilyName @NotNull String getFamilyName() {
return "Convert to JBColor";
}
@@ -3,9 +3,9 @@ package org.jetbrains.idea.devkit.inspections.quickfix;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.util.IntentionFamilyName;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.NlsContexts;
import com.intellij.psi.*;
import com.intellij.psi.codeStyle.JavaCodeStyleManager;
import com.intellij.psi.util.PsiEditorUtil;
@@ -17,7 +17,7 @@ import org.jetbrains.annotations.NotNull;
*/
public class ConvertToJBInsetsQuickFix implements LocalQuickFix {
@Override
public @NlsContexts.ListItem @NotNull String getFamilyName() {
public @IntentionFamilyName @NotNull String getFamilyName() {
return "Convert to JBUI.insets(...)";
}
@@ -3,8 +3,9 @@ package org.jetbrains.idea.devkit.inspections.quickfix;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.util.IntentionFamilyName;
import com.intellij.codeInspection.util.IntentionName;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.NlsContexts;
import com.intellij.psi.*;
import com.intellij.psi.codeStyle.JavaCodeStyleManager;
import org.jetbrains.annotations.NotNull;
@@ -21,12 +22,12 @@ public class UseCoupleQuickFix implements LocalQuickFix {
}
@Override
public @NlsContexts.ListItem @NotNull String getName() {
public @IntentionName @NotNull String getName() {
return myText;
}
@Override
public @NlsContexts.ListItem @NotNull String getFamilyName() {
public @IntentionFamilyName @NotNull String getFamilyName() {
return "Replace 'Pair' with 'Couple'";
}
@@ -3,9 +3,9 @@ package org.jetbrains.idea.maven.dom.inspections;
import com.intellij.codeHighlighting.HighlightDisplayLevel;
import com.intellij.codeInspection.*;
import com.intellij.codeInspection.util.IntentionFamilyName;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.NlsContexts;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
@@ -97,7 +97,7 @@ public class MavenPropertyInParentInspection extends XmlSuppressableInspectionTo
String finalResolvedValue = resolvedValue;
fix = new LocalQuickFix() {
@Override
public @NlsContexts.ListItem @NotNull String getFamilyName() {
public @IntentionFamilyName @NotNull String getFamilyName() {
return MavenDomBundle.message("refactoring.inline.property");
}
@@ -3,9 +3,9 @@ package org.jetbrains.idea.maven.dom.inspections;
import com.intellij.codeHighlighting.HighlightDisplayLevel;
import com.intellij.codeInspection.*;
import com.intellij.codeInspection.util.IntentionFamilyName;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.NlsContexts;
import com.intellij.psi.PsiFile;
import com.intellij.psi.xml.XmlFile;
import com.intellij.psi.xml.XmlTag;
@@ -60,7 +60,7 @@ public class MavenRedundantGroupIdInspection extends XmlSuppressableInspectionTo
LocalQuickFix fix = new LocalQuickFix() {
@Override
public @NlsContexts.ListItem @NotNull String getFamilyName() {
public @IntentionFamilyName @NotNull String getFamilyName() {
return MavenDomBundle.message("inspection.redundant.groupId.fix");
}
@@ -7,11 +7,11 @@ import com.intellij.codeInspection.DefaultXmlSuppressionProvider;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.codeInspection.LocalQuickFixProvider;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.util.IntentionFamilyName;
import com.intellij.lang.properties.IProperty;
import com.intellij.lang.properties.PropertiesLanguage;
import com.intellij.lang.properties.psi.PropertiesFile;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.NlsContexts;
import com.intellij.openapi.util.TextRange;
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VirtualFile;
@@ -576,7 +576,7 @@ public class MavenPropertyPsiReference extends MavenPsiReference implements Loca
public LocalQuickFix @Nullable [] getQuickFixes() {
return new LocalQuickFix[]{new LocalQuickFix() {
@Override
public @NlsContexts.ListItem @NotNull String getFamilyName() {
public @IntentionFamilyName @NotNull String getFamilyName() {
return MavenDomBundle.message("fix.ignore.unresolved.maven.property");
}