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

Java inspection: don't offer "Make Type Generic" inspection at variable initializer (IDEA-157727)

Browse Source
This commit is contained in:
Pavel Dolgov
2016-06-28 18:04:59 +03:00
parent 57cf830d55
commit eca5f9ad13
3 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInspection/miscGenerics/MakeTypeGenericInspection.java
+10 -2
View File
@@ -18,6 +18,7 @@ package com.intellij.codeInspection.miscGenerics;
import com.intellij.codeInspection.*;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.TypeConversionUtil;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
@@ -42,7 +43,14 @@ public class MakeTypeGenericInspection extends BaseJavaBatchLocalInspectionTool
final String typeText = type.getCanonicalText();
final String message =
InspectionsBundle.message("inspection.raw.variable.type.make.generic.text", variable.getName(), typeText);
holder.registerProblem(variable, message, new MyLocalQuickFix(message));
final PsiElement beforeInitializer =
PsiTreeUtil.skipSiblingsBackward(variable.getInitializer(), PsiWhiteSpace.class, PsiComment.class);
final ProblemDescriptor descriptor =
holder.getManager().createProblemDescriptor(variable.getTypeElement(),
beforeInitializer != null ? beforeInitializer : variable.getTypeElement(),
message, ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
isOnTheFly, new MyLocalQuickFix(message));
holder.registerProblem(descriptor);
}
}
}
@@ -96,7 +104,7 @@ public class MakeTypeGenericInspection extends BaseJavaBatchLocalInspectionTool
@Override
public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) {
final PsiElement element = descriptor.getPsiElement();
final PsiElement element = descriptor.getStartElement().getParent();
if (element instanceof PsiVariable) {
final PsiVariable variable = (PsiVariable)element;
final PsiTypeElement typeElement = variable.getTypeElement();
java/java-tests/testData/codeInspection/makeTypeGeneric/AtInitializer.java
+5
View File
@@ -0,0 +1,5 @@
import java.util.*;
public class F {
List list = new ArrayList<caret><String>();
}
java/java-tests/testSrc/com/intellij/codeInspection/MakeTypeGenericTest.java
+4
View File
@@ -61,6 +61,10 @@ public class MakeTypeGenericTest extends LightCodeInsightFixtureTestCase {
doTest("Change type of list to java.util.List<java.lang.String>");
}
public void testAtInitializer() {
assertIntentionNotAvailable("Change type of list to java.util.List<java.lang.String>");
}
public void testImplementedRaw() {
assertIntentionNotAvailable("Change type of");
}