From 413c989acd581bd14f466f5c8f82568849c147dc Mon Sep 17 00:00:00 2001 From: Tor Norbye Date: Tue, 6 Nov 2018 12:58:25 +0100 Subject: [PATCH] Don't suggest using streams if minSdkVersion < 24 This CL makes the Guava inspection check the JavaFeature support lookup instead of being hardcoded to Java 8. This is the same logical change that was made in commit f995b33d86b6673a111de944aba77bce88d8c775 to various other inspections. Bug: https://issuetracker.google.com/118596848 --- .../typeMigration/inspections/GuavaInspection.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/typeMigration/src/com/intellij/refactoring/typeMigration/inspections/GuavaInspection.java b/java/typeMigration/src/com/intellij/refactoring/typeMigration/inspections/GuavaInspection.java index 530b69237533..e20019442301 100644 --- a/java/typeMigration/src/com/intellij/refactoring/typeMigration/inspections/GuavaInspection.java +++ b/java/typeMigration/src/com/intellij/refactoring/typeMigration/inspections/GuavaInspection.java @@ -8,12 +8,12 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.AtomicNotNullLazyValue; +import com.intellij.pom.java.JavaFeature; import com.intellij.psi.*; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.search.GlobalSearchScopesCore; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiTypesUtil; -import com.intellij.psi.util.PsiUtil; import com.intellij.refactoring.typeMigration.TypeMigrationProcessor; import com.intellij.refactoring.typeMigration.TypeMigrationRules; import com.intellij.refactoring.typeMigration.rules.TypeConversionRule; @@ -56,7 +56,7 @@ public class GuavaInspection extends AbstractBaseJavaLocalInspectionTool { @NotNull @Override public PsiElementVisitor buildVisitor(@NotNull final ProblemsHolder holder, boolean isOnTheFly) { - if (!PsiUtil.isLanguageLevel8OrHigher(holder.getFile())) { + if (!JavaFeature.STREAMS.isFeatureSupported(holder.getFile())) { return PsiElementVisitor.EMPTY_VISITOR; } return new JavaElementVisitor() {