Add check for correct TextRange

jlagerweij · Apr 14, 2018 · 8852e0a · 8852e0a
1 parent 529bd1e
commit 8852e0a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -19,4 +19,4 @@ repositories {
 }
 
 group 'org.elm.tools.external'
-version '1.2.0'
+version '1.3.0'
diff --git a/src/main/java/org/elm/tools/external/annotator/ElmMakeExternalAnnotator.java b/src/main/java/org/elm/tools/external/annotator/ElmMakeExternalAnnotator.java
@@ -40,7 +40,7 @@ public AnnotatorFile collectInformation(@NotNull PsiFile file, @NotNull Editor e
 
     /** Called first; in our case, just return file and do nothing */
     @Override
-    @Nullable
+    @NotNull
     public AnnotatorFile collectInformation(@NotNull PsiFile file) {
         return new AnnotatorFile(file);
     }
@@ -116,7 +116,11 @@ public void apply(@NotNull PsiFile file,
     }
 
     private void annotateForIssue(@NotNull AnnotationHolder holder, Document document, Problems issue, PsiFile file) {
-        TextRange selector = findAnnotationLocation(document, issue);
+        Optional<TextRange> optionalSelector = findAnnotationLocation(document, issue);
+        if (!optionalSelector.isPresent()) {
+            return;
+        }
+        final TextRange selector = optionalSelector.get();
 
         Annotation annotation;
         if (issue.type.equals("warning")) {
@@ -140,16 +144,20 @@ private void annotateForIssue(@NotNull AnnotationHolder holder, Document documen
     }
 
     @NotNull
-    private TextRange findAnnotationLocation(Document document, Problems issue) {
+    private Optional<TextRange> findAnnotationLocation(Document document, Problems issue) {
         Region region = issue.subregion != null ? issue.subregion : issue.region;
 
         int offsetStart = StringUtil.lineColToOffset(document.getText(), region.start.line - 1, region.start.column - 1);
         int offsetEnd = StringUtil.lineColToOffset(document.getText(), region.end.line - 1, region.end.column - 1);
 
+        if (offsetStart == -1 && offsetEnd == -1) {
+            return Optional.empty();
+        }
+
         if (isMultiLineRegion(region)) {
             offsetEnd = document.getLineEndOffset(region.start.line - 1);
         }
-        return new TextRange(offsetStart, offsetEnd);
+        return Optional.of(new TextRange(offsetStart, offsetEnd));
     }
 
     private boolean isMultiLineRegion(Region region) {

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin>
     <id>org.elm.tools.external</id>
     <name>Elm External Tools</name>
-    <version>1.2.0</version>
+    <version>1.3.0</version>
     <vendor url="http://www.github.com/jlagerweij">
         Jos Lagerweij
     </vendor>
@@ -19,6 +19,7 @@
 
     <change-notes><![CDATA[
       <ul>
+            <li><b>1.3.0</b> <em>(2018-04-14)</em> - Add check for correct TextRange</li>
             <li><b>1.2.0</b> <em>(2018-04-10)</em> - Fix issue with saving preferences.</li>
             <li><b>1.1.0</b> <em>(2018-02-20)</em> - Add node path configuration. Visible only if the elm-make is a script.</li>
             <li><b>1.0.1</b> <em>(2018-02-10)</em> - Minor name change</li>