From faa8cd173938f2f3a58bba010459165cc6502c11 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Wed, 10 Jun 2015 14:45:04 +0300 Subject: [PATCH] javac quirks: change according to javac version instead of language level (IDEA-141312) --- .../compiler/JavacQuirksInspectionVisitor.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/compiler/JavacQuirksInspectionVisitor.java b/java/java-analysis-impl/src/com/intellij/codeInspection/compiler/JavacQuirksInspectionVisitor.java index d120fd80411f..92cbca249a75 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/compiler/JavacQuirksInspectionVisitor.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/compiler/JavacQuirksInspectionVisitor.java @@ -19,6 +19,8 @@ import com.intellij.codeInsight.daemon.JavaErrorMessages; import com.intellij.codeInspection.InspectionsBundle; import com.intellij.codeInspection.ProblemHighlightType; import com.intellij.codeInspection.ProblemsHolder; +import com.intellij.openapi.projectRoots.JavaSdkVersion; +import com.intellij.openapi.projectRoots.JavaVersionService; import com.intellij.patterns.ElementPattern; import com.intellij.pom.java.LanguageLevel; import com.intellij.psi.*; @@ -70,11 +72,11 @@ public class JavacQuirksInspectionVisitor extends JavaElementVisitor { @Override public void visitIdentifier(PsiIdentifier identifier) { super.visitIdentifier(identifier); - final LanguageLevel languageLevel = PsiUtil.getLanguageLevel(identifier); - if (languageLevel.isAtLeast(LanguageLevel.JDK_1_8)) { + final JavaSdkVersion version = JavaVersionService.getInstance().getJavaSdkVersion(identifier); + if (version != null && version.isAtLeast(JavaSdkVersion.JDK_1_8)) { if ("_".equals(identifier.getText())) { myHolder.registerProblem(identifier, JavaErrorMessages.message("underscore.identifier"), - languageLevel.isAtLeast(LanguageLevel.JDK_1_9) ? ProblemHighlightType.ERROR : ProblemHighlightType.GENERIC_ERROR_OR_WARNING); + version.isAtLeast(JavaSdkVersion.JDK_1_9) ? ProblemHighlightType.ERROR : ProblemHighlightType.GENERIC_ERROR_OR_WARNING); } } }