From a1fefa9eb0d97337ed7a7194ca5a49cc623b318f Mon Sep 17 00:00:00 2001 From: Daniil Ovchinnikov Date: Fri, 7 Jul 2017 13:27:14 +0300 Subject: [PATCH] [groovy] cleanup - specify default resource bundle for the plugin; - clean assignment inspections: - - add group sting to bundle; - - use group key in plugin.xml; - - get rid of getGroupDisplayName() and getDisplayName() in classes. --- .../plugins/groovy/GroovyBundle.properties | 2 ++ .../groovy/codeInspection/BaseInspection.java | 3 ++- ...nmentCanBeOperatorAssignmentInspection.java | 13 ------------- ...AssignmentToForLoopParameterInspection.java | 16 ---------------- ...yAssignmentToMethodParameterInspection.java | 16 ---------------- .../GroovyNestedAssignmentInspection.java | 15 --------------- ...GroovyResultOfAssignmentUsedInspection.java | 15 --------------- .../GroovySillyAssignmentInspection.java | 16 ---------------- ...dAssignmentOfMemberOfRawTypeInspection.java | 14 -------------- plugins/groovy/src/META-INF/plugin.xml | 18 ++++++++++-------- 10 files changed, 14 insertions(+), 114 deletions(-) diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/GroovyBundle.properties b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/GroovyBundle.properties index 1410d78be7ef..ff1c220248db 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/GroovyBundle.properties +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/GroovyBundle.properties @@ -390,3 +390,5 @@ selfType.class.does.not.inherit=@SelfType: Class ''{0}'' does not inherit ''{1}' select.module.description=Which module to use classpath of? select.module.title=Select module... +### Inspection groups ### +inspection.assignment.issues=Assignment issues diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/BaseInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/BaseInspection.java index b2e070aac8d3..1bc66235d38e 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/BaseInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/BaseInspection.java @@ -22,12 +22,13 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.plugins.groovy.GroovyBundle; import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElementVisitor; public abstract class BaseInspection extends GroovySuppressableInspectionTool { private final String m_shortName = InspectionProfileEntry.getShortName(getClass().getSimpleName()); - public static final String ASSIGNMENT_ISSUES = "Assignment issues"; + @Deprecated public static final String ASSIGNMENT_ISSUES = GroovyBundle.message("inspection.assignment.issues"); public static final String CONFUSING_CODE_CONSTRUCTS = "Potentially confusing code constructs"; public static final String CONTROL_FLOW = "Control Flow"; public static final String PROBABLE_BUGS = "Probable bugs"; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyAssignmentCanBeOperatorAssignmentInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyAssignmentCanBeOperatorAssignmentInspection.java index 9fc718647396..0901be6ddc63 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyAssignmentCanBeOperatorAssignmentInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyAssignmentCanBeOperatorAssignmentInspection.java @@ -52,19 +52,6 @@ public class GroovyAssignmentCanBeOperatorAssignmentInspection */ public boolean ignoreObscureOperators = false; - @Override - @Nls - @NotNull - public String getGroupDisplayName() { - return ASSIGNMENT_ISSUES; - } - - @Override - @NotNull - public String getDisplayName() { - return "Assignment replaceable with operator assignment"; - } - @Override @NotNull public String buildErrorString(Object... infos) { diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyAssignmentToForLoopParameterInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyAssignmentToForLoopParameterInspection.java index bb38ff4fe862..65b6ed18ab2c 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyAssignmentToForLoopParameterInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyAssignmentToForLoopParameterInspection.java @@ -18,7 +18,6 @@ package org.jetbrains.plugins.groovy.codeInspection.assignment; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiReference; import com.intellij.psi.util.PsiTreeUtil; -import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.groovy.codeInspection.BaseInspection; @@ -32,25 +31,10 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.params.GrParameter; public class GroovyAssignmentToForLoopParameterInspection extends BaseInspection { - @Override - @Nls - @NotNull - public String getGroupDisplayName() { - return ASSIGNMENT_ISSUES; - } - - @Override - @Nls - @NotNull - public String getDisplayName() { - return "Assignment to for-loop parameter"; - } - @Override @Nullable protected String buildErrorString(Object... args) { return "Assignment to for-loop parameter '#ref' #loc"; - } @NotNull diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyAssignmentToMethodParameterInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyAssignmentToMethodParameterInspection.java index ebe05e3e45e0..0b416db91c7b 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyAssignmentToMethodParameterInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyAssignmentToMethodParameterInspection.java @@ -18,7 +18,6 @@ package org.jetbrains.plugins.groovy.codeInspection.assignment; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiReference; import com.intellij.psi.tree.IElementType; -import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.groovy.codeInspection.BaseInspection; @@ -33,25 +32,10 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.params.GrParameter; public class GroovyAssignmentToMethodParameterInspection extends BaseInspection { - @Override - @Nls - @NotNull - public String getGroupDisplayName() { - return ASSIGNMENT_ISSUES; - } - - @Override - @Nls - @NotNull - public String getDisplayName() { - return "Assignment to method parameter"; - } - @Override @Nullable protected String buildErrorString(Object... args) { return "Assignment to method parameter '#ref' #loc"; - } @Override diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyNestedAssignmentInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyNestedAssignmentInspection.java index 1cf9e3ceb4ec..19b84c80561e 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyNestedAssignmentInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyNestedAssignmentInspection.java @@ -16,7 +16,6 @@ package org.jetbrains.plugins.groovy.codeInspection.assignment; import com.intellij.psi.PsiElement; -import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.groovy.codeInspection.BaseInspection; @@ -25,20 +24,6 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrAssign public class GroovyNestedAssignmentInspection extends BaseInspection { - @Override - @Nls - @NotNull - public String getGroupDisplayName() { - return ASSIGNMENT_ISSUES; - } - - @Override - @Nls - @NotNull - public String getDisplayName() { - return "Nested assignment"; - } - @Override @Nullable protected String buildErrorString(Object... args) { diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyResultOfAssignmentUsedInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyResultOfAssignmentUsedInspection.java index d802e2473487..2c52e43c4c36 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyResultOfAssignmentUsedInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyResultOfAssignmentUsedInspection.java @@ -17,7 +17,6 @@ package org.jetbrains.plugins.groovy.codeInspection.assignment; import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel; import com.intellij.psi.PsiElement; -import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.groovy.codeInspection.BaseInspection; @@ -43,20 +42,6 @@ public class GroovyResultOfAssignmentUsedInspection extends BaseInspection { return optionsPanel; } - @Override - @Nls - @NotNull - public String getGroupDisplayName() { - return ASSIGNMENT_ISSUES; - } - - @Override - @Nls - @NotNull - public String getDisplayName() { - return "Result of assignment used"; - } - @Override @Nullable protected String buildErrorString(Object... args) { diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovySillyAssignmentInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovySillyAssignmentInspection.java index c33e25758a83..8d80647262f0 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovySillyAssignmentInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovySillyAssignmentInspection.java @@ -17,7 +17,6 @@ package org.jetbrains.plugins.groovy.codeInspection.assignment; import com.intellij.psi.PsiElement; import com.intellij.psi.tree.IElementType; -import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.groovy.codeInspection.BaseInspection; @@ -30,25 +29,10 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrRefere public class GroovySillyAssignmentInspection extends BaseInspection { - @Override - @Nls - @NotNull - public String getGroupDisplayName() { - return ASSIGNMENT_ISSUES; - } - - @Override - @Nls - @NotNull - public String getDisplayName() { - return "Silly assignment"; - } - @Override @Nullable protected String buildErrorString(Object... args) { return "Silly assignment #loc"; - } @Override diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyUncheckedAssignmentOfMemberOfRawTypeInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyUncheckedAssignmentOfMemberOfRawTypeInspection.java index d3b379cc15a3..6c00bcacaf2f 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyUncheckedAssignmentOfMemberOfRawTypeInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyUncheckedAssignmentOfMemberOfRawTypeInspection.java @@ -20,7 +20,6 @@ import com.intellij.psi.*; import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.TypeConversionUtil; -import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.groovy.GroovyBundle; import org.jetbrains.plugins.groovy.codeInspection.BaseInspection; @@ -45,12 +44,6 @@ import org.jetbrains.plugins.groovy.lang.psi.util.PsiUtil; * @author Maxim.Medvedev */ public class GroovyUncheckedAssignmentOfMemberOfRawTypeInspection extends BaseInspection { - @Override - @Nls - @NotNull - public String getGroupDisplayName() { - return ASSIGNMENT_ISSUES; - } @Override protected String buildErrorString(Object... args) { @@ -70,13 +63,6 @@ public class GroovyUncheckedAssignmentOfMemberOfRawTypeInspection extends BaseIn return new Visitor(); } - @Override - @Nls - @NotNull - public String getDisplayName() { - return "Unchecked assignment from members of raw type"; - } - private static class Visitor extends BaseInspectionVisitor { @Override public void visitReturnStatement(@NotNull GrReturnStatement returnStatement) { diff --git a/plugins/groovy/src/META-INF/plugin.xml b/plugins/groovy/src/META-INF/plugin.xml index 78350f242cad..37fd9be88f85 100644 --- a/plugins/groovy/src/META-INF/plugin.xml +++ b/plugins/groovy/src/META-INF/plugin.xml @@ -27,6 +27,8 @@ ByteCodeViewer com.intellij.modules.ultimate + org.jetbrains.plugins.groovy.GroovyBundle + @@ -715,38 +717,38 @@ groupPath="Groovy" shortName="GroovyAssignabilityCheck" displayName="Incompatible type assignments" - groupName="Assignment issues" + groupKey="inspection.assignment.issues" enabledByDefault="true" level="WARNING" implementationClass="org.jetbrains.plugins.groovy.codeInspection.assignment.GroovyAssignabilityCheckInspection"/>