From 8fa99ba91033cef3de0186f5268be533c1e3efae Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Mon, 4 Jun 2018 16:07:03 +0700 Subject: [PATCH] ComparisonToNaNInspection: support >=, >, <, <= comparisons IDEA-193102 --- .../siyeh/ig/numeric/ComparisonToNaNInspection.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ComparisonToNaNInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ComparisonToNaNInspection.java index 0f8e4590bbc4..80ab3b9b7748 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ComparisonToNaNInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ComparisonToNaNInspection.java @@ -43,11 +43,11 @@ public class ComparisonToNaNInspection extends BaseInspection { public String buildErrorString(Object... infos) { final PsiBinaryExpression comparison = (PsiBinaryExpression)infos[0]; final IElementType tokenType = comparison.getOperationTokenType(); - if (tokenType.equals(JavaTokenType.EQEQ)) { - return InspectionGadgetsBundle.message("comparison.to.nan.problem.descriptor1"); + if (!tokenType.equals(JavaTokenType.NE)) { + return InspectionGadgetsBundle.message("comparison.to.nan.problem.descriptor2"); } else { - return InspectionGadgetsBundle.message("comparison.to.nan.problem.descriptor2"); + return InspectionGadgetsBundle.message("comparison.to.nan.problem.descriptor1"); } } @@ -58,7 +58,8 @@ public class ComparisonToNaNInspection extends BaseInspection { @Override public InspectionGadgetsFix buildFix(Object... infos) { - return new ComparisonToNaNFix(); + final PsiBinaryExpression comparison = (PsiBinaryExpression)infos[0]; + return ComparisonUtils.isEqualityComparison(comparison) ? new ComparisonToNaNFix() : null; } private static class ComparisonToNaNFix extends InspectionGadgetsFix { @@ -114,7 +115,7 @@ public class ComparisonToNaNInspection extends BaseInspection { @Override public void visitBinaryExpression(@NotNull PsiBinaryExpression expression) { super.visitBinaryExpression(expression); - if (!ComparisonUtils.isEqualityComparison(expression)) { + if (!ComparisonUtils.isComparison(expression)) { return; } final PsiExpression lhs = expression.getLOperand();