From cd8c6a31d48f721ed33dc429baec0cc318bd56cb Mon Sep 17 00:00:00 2001 From: Nikita Eshkeev Date: Fri, 8 May 2020 20:05:57 +0300 Subject: [PATCH] [codeInsight] Cleanup RedundantStringOperationInspection This patch cleans up the code from the reported warnings Signed-off-by: Nikita Eshkeev GitOrigin-RevId: 655d37ae08c3cf7509c5c406afe47d4184a58986 --- .../ig/redundancy/RedundantStringOperationInspection.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/RedundantStringOperationInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/RedundantStringOperationInspection.java index 1ab397cf7553..e964608e660c 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/RedundantStringOperationInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/RedundantStringOperationInspection.java @@ -315,7 +315,7 @@ public class RedundantStringOperationInspection extends AbstractBaseJavaLocalIns // s.lastIndexOf(..., s.length()) or s.lastIndexOf(..., s.length() - 1) if (stripped instanceof PsiBinaryExpression) { PsiBinaryExpression binOp = (PsiBinaryExpression)stripped; - if (binOp.getOperationTokenType().equals(JavaTokenType.MINUS) && + if (binOp.getOperationTokenType() == JavaTokenType.MINUS && ExpressionUtils.isLiteral(PsiUtil.skipParenthesizedExprDown(binOp.getROperand()), 1)) { stripped = binOp.getLOperand(); } @@ -672,7 +672,7 @@ public class RedundantStringOperationInspection extends AbstractBaseJavaLocalIns private static void extractSideEffects(PsiExpression result, PsiStatement statement) { List sideEffects = SideEffectChecker.extractSideEffectExpressions(result); - if (Collections.singletonList(result).equals(sideEffects)) return; + if (Objects.equals(Collections.singletonList(result), sideEffects)) return; PsiStatement[] statements = StatementExtractor.generateStatements(sideEffects, result); if (statements.length > 0) {