MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[groovy] cleanup

Browse Source 
- 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.
This commit is contained in:
Daniil Ovchinnikov
2017-07-07 13:42:29 +03:00
parent 623b57a2fa
commit a1fefa9eb0
10 changed files with 14 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/GroovyBundle.properties
+2
View File
@@ -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
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/BaseInspection.java
+2 -1
View File
@@ -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";
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyAssignmentCanBeOperatorAssignmentInspection.java
-13
View File
@@ -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) {
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyAssignmentToForLoopParameterInspection.java
-16
View File
@@ -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
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyAssignmentToMethodParameterInspection.java
-16
View File
@@ -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
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyNestedAssignmentInspection.java
-15
View File
@@ -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) {
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyResultOfAssignmentUsedInspection.java
-15
View File
@@ -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) {
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovySillyAssignmentInspection.java
-16
View File
@@ -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
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyUncheckedAssignmentOfMemberOfRawTypeInspection.java
-14
View File
@@ -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) {
plugins/groovy/src/META-INF/plugin.xml
+10 -8
View File
@@ -27,6 +27,8 @@
<depends optional="true" config-file="groovy-byte-code-viewer.xml">ByteCodeViewer</depends>
<depends optional="true" config-file="duplicates-groovy.xml">com.intellij.modules.ultimate</depends>
<resource-bundle>org.jetbrains.plugins.groovy.GroovyBundle</resource-bundle>
<extensionPoints>
<extensionPoint name="methodComparator" interface="org.jetbrains.plugins.groovy.lang.resolve.GrMethodComparator"/>
<extensionPoint name="membersContributor" interface="org.jetbrains.plugins.groovy.lang.resolve.NonCodeMembersContributor"/>
@@ -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"/>
<localInspection language="Groovy" groupPath="Groovy" shortName="GroovyResultOfAssignmentUsed" displayName="Result of assignment used"
groupName="Assignment issues"
groupKey="inspection.assignment.issues"
enabledByDefault="false" level="WARNING"
implementationClass="org.jetbrains.plugins.groovy.codeInspection.assignment.GroovyResultOfAssignmentUsedInspection"/>
<localInspection language="Groovy" groupPath="Groovy" shortName="GroovyAssignmentCanBeOperatorAssignment"
displayName="Assignment replaceable with operator assignment"
groupName="Assignment issues" enabledByDefault="false" level="WARNING"
groupKey="inspection.assignment.issues" enabledByDefault="false" level="WARNING"
implementationClass="org.jetbrains.plugins.groovy.codeInspection.assignment.GroovyAssignmentCanBeOperatorAssignmentInspection"/>
<localInspection language="Groovy" groupPath="Groovy" shortName="GroovyAssignmentToForLoopParameter"
displayName="Assignment to for-loop parameter"
groupName="Assignment issues" enabledByDefault="false" level="WARNING"
groupKey="inspection.assignment.issues" enabledByDefault="false" level="WARNING"
implementationClass="org.jetbrains.plugins.groovy.codeInspection.assignment.GroovyAssignmentToForLoopParameterInspection"/>
<localInspection language="Groovy" groupPath="Groovy" shortName="GroovyAssignmentToMethodParameter"
displayName="Assignment to method parameter"
groupName="Assignment issues" enabledByDefault="false" level="WARNING"
groupKey="inspection.assignment.issues" enabledByDefault="false" level="WARNING"
implementationClass="org.jetbrains.plugins.groovy.codeInspection.assignment.GroovyAssignmentToMethodParameterInspection"/>
<localInspection language="Groovy" groupPath="Groovy" shortName="GroovyNestedAssignment" displayName="Nested assignment"
groupName="Assignment issues"
groupKey="inspection.assignment.issues"
enabledByDefault="false" level="WARNING"
implementationClass="org.jetbrains.plugins.groovy.codeInspection.assignment.GroovyNestedAssignmentInspection"/>
<localInspection language="Groovy" groupPath="Groovy" shortName="GroovySillyAssignment" displayName="Silly assignment"
groupName="Assignment issues" enabledByDefault="true"
groupKey="inspection.assignment.issues" enabledByDefault="true"
level="WARNING"
implementationClass="org.jetbrains.plugins.groovy.codeInspection.assignment.GroovySillyAssignmentInspection"/>
<localInspection language="Groovy" groupPath="Groovy" shortName="GroovyUncheckedAssignmentOfMemberOfRawType"
displayName="Unchecked assignment from members of raw type"
groupName="Assignment issues" enabledByDefault="true" level="WARNING"
groupKey="inspection.assignment.issues" enabledByDefault="true" level="WARNING"
implementationClass="org.jetbrains.plugins.groovy.codeInspection.assignment.GroovyUncheckedAssignmentOfMemberOfRawTypeInspection"/>
<localInspection language="Groovy" groupPath="Groovy" shortName="GroovyContinueOrBreakFromFinallyBlock"
displayName="'continue' or 'break' inside 'finally' block"