From 76eb7fee1882b5f8c61c41b0632b5e86a16d9b4e Mon Sep 17 00:00:00 2001
From: Mikhail Mazurkevich <mikhail.mazurkevich@jetbrains.com>
Date: Thu, 30 Jan 2020 16:12:12 +0300
Subject: [PATCH] [intellij-sh] EA-220609 Add check that annotated element
 contains the given range

GitOrigin-RevId: 074086c59b8cb5efff286d03e007910f7e83190c
---
 .../intellij/sh/shellcheck/ShShellcheckExternalAnnotator.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/sh/src/com/intellij/sh/shellcheck/ShShellcheckExternalAnnotator.java b/plugins/sh/src/com/intellij/sh/shellcheck/ShShellcheckExternalAnnotator.java
index ad39bbc46022..d8d32535acfc 100644
--- a/plugins/sh/src/com/intellij/sh/shellcheck/ShShellcheckExternalAnnotator.java
+++ b/plugins/sh/src/com/intellij/sh/shellcheck/ShShellcheckExternalAnnotator.java
@@ -119,8 +119,8 @@ public class ShShellcheckExternalAnnotator extends ExternalAnnotator<ShShellchec
       int endOffset = ShShellcheckUtil.calcOffset(sequence, document.getLineStartOffset(result.endLine - 1), result.endColumn);
       TextRange range = TextRange.create(startOffset, endOffset == startOffset ? endOffset + 1 : endOffset);
 
-      boolean isInOuter = ContainerUtil.exists(rangesOfOuterElements, it -> it.contains(range));
-      if (isInOuter) continue;
+      // We skip results which out of scope for current file or intersect with outer language elements
+      if (!file.getTextRange().contains(range) || ContainerUtil.exists(rangesOfOuterElements, it -> it.contains(range))) continue;
 
       long code = result.code;
       String message = result.message;