From 46a7dbfc0d2d9cefa502724a6895ff953885ec08 Mon Sep 17 00:00:00 2001 From: nik Date: Fri, 7 Apr 2017 13:54:40 +0300 Subject: [PATCH] devkit: don't highlight usages of Pair constructor if diamonds can be used new Pair<>(...) is shorter than Pair.create so it makes no sense to highlight usages of Pair constructor if language level is 1.7 or newer. --- .../src/inspections/internal/DontUseNewPairInspection.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/devkit/src/inspections/internal/DontUseNewPairInspection.java b/plugins/devkit/src/inspections/internal/DontUseNewPairInspection.java index df72ee90f79b..9f984b732dec 100644 --- a/plugins/devkit/src/inspections/internal/DontUseNewPairInspection.java +++ b/plugins/devkit/src/inspections/internal/DontUseNewPairInspection.java @@ -17,7 +17,9 @@ package org.jetbrains.idea.devkit.inspections.internal; import com.intellij.codeInspection.ProblemHighlightType; import com.intellij.codeInspection.ProblemsHolder; +import com.intellij.pom.java.LanguageLevel; import com.intellij.psi.*; +import com.intellij.psi.util.PsiUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.idea.devkit.inspections.DevKitInspectionBase; import org.jetbrains.idea.devkit.inspections.quickfix.ChangeToPairCreateQuickFix; @@ -41,7 +43,7 @@ public class DontUseNewPairInspection extends DevKitInspectionBase { && ((PsiClassType)type).rawType().equalsToText(PAIR_FQN) && params != null && expression.getArgumentList() != null - //&& !PsiUtil.getLanguageLevel(expression).isAtLeast(LanguageLevel.JDK_1_7) //diamonds + && !PsiUtil.getLanguageLevel(expression).isAtLeast(LanguageLevel.JDK_1_7) //diamonds ) { final PsiType[] types = ((PsiClassType)type).getParameters(); if (Arrays.equals(types, params.getExpressionTypes())) {