From ec67bbd5cb3a5c870ac124041c06507faefe8835 Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Thu, 18 Oct 2018 11:01:40 +0700 Subject: [PATCH] ControlFlowStatementVisitorBase: length check Fixes EA-130021 - assert: BaseInspectionVisitor.registerErrorAtOffset --- .../ig/style/ControlFlowStatementVisitorBase.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ControlFlowStatementVisitorBase.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ControlFlowStatementVisitorBase.java index 442f28117f9d..02134da287c0 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ControlFlowStatementVisitorBase.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ControlFlowStatementVisitorBase.java @@ -110,8 +110,10 @@ public abstract class ControlFlowStatementVisitorBase extends BaseInspectionVisi if (parent != null) { int parentStart = parent.getTextRange().getStartOffset(); int startOffset = rangeStart.getTextRange().getStartOffset(); - registerErrorAtOffset(parent, startOffset - parentStart, omittedBodyBounds.getFirst().getTextRange().getStartOffset() - startOffset, - keywordText); + int length = omittedBodyBounds.getFirst().getTextRange().getStartOffset() - startOffset; + if (length > 0) { + registerErrorAtOffset(parent, startOffset - parentStart, length, keywordText); + } } } @@ -122,10 +124,13 @@ public abstract class ControlFlowStatementVisitorBase extends BaseInspectionVisi if (parent != null) { int parentStart = parent.getTextRange().getStartOffset(); int startOffset = afterOmitted.getTextRange().getEndOffset(); - registerErrorAtOffset(parent, startOffset - parentStart, rangeEnd.getTextRange().getEndOffset() - startOffset, - keywordText); + int length = rangeEnd.getTextRange().getEndOffset() - startOffset; + if (length > 0) { + registerErrorAtOffset(parent, startOffset - parentStart, length, + keywordText); + } } } } } -} +} \ No newline at end of file