Merge branch 'develop'

1c-syntax · Jan 28, 2020 · e472db1 · e472db1
2 parents 3c80423 + 75d5156
commit e472db1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/.../java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CodeOutOfRegionDiagnostic.java b/.../java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CodeOutOfRegionDiagnostic.java
@@ -71,14 +71,11 @@ public ParseTree visitFile(BSLParser.FileContext ctx) {
     if (regions.isEmpty() && !ctx.getTokens().isEmpty()) {
 
       List<DiagnosticRelatedInformation> relatedInformation = createRelatedInformations(ctx);
-
-      var ctxStart = ctx.getStart();
-      diagnosticStorage.addDiagnostic(
-        Ranges.create(ctxStart.getLine(),
-          ctxStart.getCharPositionInLine(),
-          ctxStart.getLine(),
-          ctxStart.getCharPositionInLine()),
-        relatedInformation);
+      if(!relatedInformation.isEmpty()) {
+        diagnosticStorage.addDiagnostic(
+          relatedInformation.get(0).getLocation().getRange(),
+          relatedInformation);
+      }
       return ctx;
     }
 

diff --git a/...a/com/github/_1c_syntax/bsl/languageserver/diagnostics/CodeOutOfRegionDiagnosticTest.java b/...a/com/github/_1c_syntax/bsl/languageserver/diagnostics/CodeOutOfRegionDiagnosticTest.java
@@ -67,7 +67,7 @@ void testNoRegions() {
 
     assertThat(diagnostics).hasSize(1);
     assertThat(diagnostics, true)
-      .hasRange(5, 0, 0)
+      .hasRange(4, 0, 5, 8)
     ;
     assertThat(diagnostics.get(0).getRelatedInformation())
       .isNotNull()
@@ -83,7 +83,7 @@ void testCodeBlock() {
 
     assertThat(diagnostics).hasSize(1);
     assertThat(diagnostics, true)
-      .hasRange(1, 0, 0);
+      .hasRange(0, 0, 0, 23);
 
   }