From 75910f448f0a8e07a3f9643502ce27a1b473c3d9 Mon Sep 17 00:00:00 2001 From: Pavel Dolgov Date: Tue, 28 Jun 2016 15:35:43 +0300 Subject: [PATCH] Java inspection: simplified "Make Type Generic" inspection's visitor, test added (IDEA-157727) --- .../miscGenerics/MakeTypeGenericInspection.java | 15 --------------- .../codeInspection/makeTypeGeneric/AtEquals.java | 5 +++++ .../makeTypeGeneric/AtEquals_after.java | 5 +++++ .../codeInspection/MakeTypeGenericTest.java | 4 ++++ 4 files changed, 14 insertions(+), 15 deletions(-) create mode 100644 java/java-tests/testData/codeInspection/makeTypeGeneric/AtEquals.java create mode 100644 java/java-tests/testData/codeInspection/makeTypeGeneric/AtEquals_after.java diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/miscGenerics/MakeTypeGenericInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/miscGenerics/MakeTypeGenericInspection.java index 9b02882aa85d..24aa629816f3 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/miscGenerics/MakeTypeGenericInspection.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/miscGenerics/MakeTypeGenericInspection.java @@ -36,21 +36,6 @@ public class MakeTypeGenericInspection extends BaseJavaBatchLocalInspectionTool @Override public void visitVariable(PsiVariable variable) { super.visitVariable(variable); - visitVariableImpl(variable); - } - - @Override - public void visitJavaToken(PsiJavaToken token) { - super.visitJavaToken(token); - if (token.getTokenType() == JavaTokenType.EQ) { - final PsiElement parent = token.getParent(); - if (parent instanceof PsiVariable) { - visitVariableImpl((PsiVariable)parent); - } - } - } - - private void visitVariableImpl(@NotNull PsiVariable variable) { if (variable.getTypeElement() != null) { final PsiType type = getSuggestedType(variable); if (type != null) { diff --git a/java/java-tests/testData/codeInspection/makeTypeGeneric/AtEquals.java b/java/java-tests/testData/codeInspection/makeTypeGeneric/AtEquals.java new file mode 100644 index 000000000000..3f69a300d348 --- /dev/null +++ b/java/java-tests/testData/codeInspection/makeTypeGeneric/AtEquals.java @@ -0,0 +1,5 @@ +import java.util.*; + +public class F { + List list = new ArrayList(); +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInspection/makeTypeGeneric/AtEquals_after.java b/java/java-tests/testData/codeInspection/makeTypeGeneric/AtEquals_after.java new file mode 100644 index 000000000000..7fd8764563fd --- /dev/null +++ b/java/java-tests/testData/codeInspection/makeTypeGeneric/AtEquals_after.java @@ -0,0 +1,5 @@ +import java.util.*; + +public class F { + List list = new ArrayList(); +} \ No newline at end of file diff --git a/java/java-tests/testSrc/com/intellij/codeInspection/MakeTypeGenericTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/MakeTypeGenericTest.java index e8a9e75447d0..8672eea313c1 100644 --- a/java/java-tests/testSrc/com/intellij/codeInspection/MakeTypeGenericTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInspection/MakeTypeGenericTest.java @@ -57,6 +57,10 @@ public class MakeTypeGenericTest extends LightCodeInsightFixtureTestCase { doTest("Change type of list to java.util.List"); } + public void testAtEquals() { + doTest("Change type of list to java.util.List"); + } + public void testImplementedRaw() { assertIntentionNotAvailable("Change type of"); }