From 4fac0ed9aac765a52055d5d47ae96bca88956d52 Mon Sep 17 00:00:00 2001 From: Pavel Dolgov Date: Mon, 4 Jul 2016 16:52:57 +0300 Subject: [PATCH] Java inspection: don't check for non-physical elements in "Make Type Generic" inspection, it's already done in the inspection infrastructure (IDEA-157727) --- .../miscGenerics/MakeTypeGenericInspection.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) 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 80e9800921c2..60c8a24e3503 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 @@ -38,15 +38,17 @@ public class MakeTypeGenericInspection extends BaseJavaBatchLocalInspectionTool public void visitVariable(PsiVariable variable) { super.visitVariable(variable); final PsiTypeElement variableTypeElement = variable.getTypeElement(); - if (variableTypeElement != null && variableTypeElement.isPhysical()) { + if (variableTypeElement != null) { final PsiType type = getSuggestedType(variable); if (type != null) { final String typeText = type.getCanonicalText(); - final String message = InspectionsBundle.message("inspection.raw.variable.type.make.generic.text", variable.getName(), typeText); - final PsiElement beforeInitializer = PsiTreeUtil.skipSiblingsBackward(variable.getInitializer(), PsiWhiteSpace.class, PsiComment.class); - final PsiElement endElement = beforeInitializer != null && beforeInitializer.isPhysical() ? beforeInitializer : variableTypeElement; + final String message = + InspectionsBundle.message("inspection.raw.variable.type.make.generic.text", variable.getName(), typeText); + final PsiElement beforeInitializer = + PsiTreeUtil.skipSiblingsBackward(variable.getInitializer(), PsiWhiteSpace.class, PsiComment.class); final ProblemDescriptor descriptor = - holder.getManager().createProblemDescriptor(variableTypeElement, endElement, + holder.getManager().createProblemDescriptor(variableTypeElement, + beforeInitializer != null ? beforeInitializer : variableTypeElement, message, ProblemHighlightType.GENERIC_ERROR_OR_WARNING, isOnTheFly, new MyLocalQuickFix(message)); holder.registerProblem(descriptor);