Изменение логики работы findTerminalNodeContainsPosition. Теперь конец рэнжа не считается включающим позицию.

Author: nixel2007

src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingCommonModuleMethodDiagnostic.java

@@ -58,7 +58,7 @@ public class MissingCommonModuleMethodDiagnostic extends AbstractDiagnostic {
   private final LocationRepository locationRepository;
 
   private static String getMethodNameByLocation(BSLParserRuleContext node, Range range) {
-    return Trees.findTerminalNodeContainsPosition(node, range.getEnd())
+    return Trees.findTerminalNodeContainsPosition(node, range.getStart())
       .map(ParseTree::getText)
       .orElseThrow();
   }

src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/Ranges.java

@@ -30,6 +30,8 @@
 import org.antlr.v4.runtime.tree.TerminalNode;
 import org.eclipse.lsp4j.Position;
 import org.eclipse.lsp4j.Range;
+import org.eclipse.lsp4j.jsonrpc.util.Preconditions;
+import org.eclipse.lsp4j.util.Positions;
 
 import java.util.Collection;
 import java.util.List;
@@ -144,7 +146,11 @@ public boolean containsRange(Range bigger, Range smaller) {
   }
 
   public boolean containsPosition(Range range, Position position) {
-    return org.eclipse.lsp4j.util.Ranges.containsPosition(range, position);
+    Preconditions.checkNotNull(range, "range");
+    Preconditions.checkNotNull(position, "position");
+    return range.getStart().equals(position)
+      || (Positions.isBefore(range.getStart(), position)
+        && Positions.isBefore(position, range.getEnd()));
   }
 
   /**

src/test/java/com/github/_1c_syntax/bsl/languageserver/providers/DefinitionProviderTest.java

@@ -76,7 +76,7 @@ void testDefinitionOfLocalMethod() {
     var methodSymbol = documentContext.getSymbolTree().getMethodSymbol("ИмяФункции").orElseThrow();
 
     var params = new DefinitionParams();
-    params.setPosition(new Position(4, 10));
+    params.setPosition(new Position(4, 9));
 
     // when
     var definitions = definitionProvider.getDefinition(documentContext, params);

src/test/java/com/github/_1c_syntax/bsl/languageserver/providers/SelectionRangeProviderTest.java

@@ -71,7 +71,7 @@ void testGlobalMethodCallCapturesSemicolon() {
   @Test
   void testStatementCapturesStatementBlockAfterStatement() {
     // given
-    var params = selection(4, 20);
+    var params = selection(4, 19);
 
     // when
     var selectionRanges = provider.getSelectionRange(documentContext, params);
@@ -89,7 +89,7 @@ void testStatementCapturesStatementBlockAfterStatement() {
   @Test
   void testStatementCapturesStatementBlockBeforeStatement() {
     // given
-    var params = selection(6, 20);
+    var params = selection(6, 19);
 
     // when
     var selectionRanges = provider.getSelectionRange(documentContext, params);
@@ -107,7 +107,7 @@ void testStatementCapturesStatementBlockBeforeStatement() {
   @Test
   void testStatementCapturesStatementBlockAroundStatement() {
     // given
-    var params = selection(5, 20);
+    var params = selection(5, 19);
 
     // when
     var selectionRanges = provider.getSelectionRange(documentContext, params);

src/test/java/com/github/_1c_syntax/bsl/languageserver/references/AnnotationReferenceFinderTest.java

@@ -113,21 +113,21 @@ void findReferenceOfAnnotationParameterValue() {
      6, 24,  6, 19,  6, 27
      8, 10,  8,  4,  9, 12
      9, 10,  8,  4,  9, 12
-    11, 20, 11, 19, 11, 21
-    12, 20, 12, 19, 12, 22
-    13, 20, 13, 19, 13, 25
-    14, 20, 14, 19, 14, 29
-    15, 20, 15, 19, 15, 31
-    16, 20, 16, 19, 16, 23
-    18,  5, 18,  4, 18,  6
-    19,  5, 19,  4, 19,  7
-    20,  5, 20,  4, 20, 12
-    21,  5, 21,  4, 22, 12
-    22,  5, 21,  4, 22, 12
-    23,  5, 23,  4, 23, 10
-    24,  5, 24,  4, 24, 14
-    25,  5, 25,  4, 25, 16
-    26,  5, 26,  4, 26,  8
+    11, 19, 11, 19, 11, 21
+    12, 19, 12, 19, 12, 22
+    13, 19, 13, 19, 13, 25
+    14, 19, 14, 19, 14, 29
+    15, 19, 15, 19, 15, 31
+    16, 19, 16, 19, 16, 23
+    18,  4, 18,  4, 18,  6
+    19,  4, 19,  4, 19,  7
+    20,  4, 20,  4, 20, 12
+    21,  4, 21,  4, 22, 12
+    22,  4, 21,  4, 22, 12
+    23,  4, 23,  4, 23, 10
+    24,  4, 24,  4, 24, 14
+    25,  4, 25,  4, 25, 16
+    26,  4, 26,  4, 26,  8
     """
   )
   void findReferenceOfAnnotationParameterValue_allLiterals(int positionLine, int positionCharacter, int selectionRangeStartLine, int selectionRangeStartCharacter, int selectionRangeEndLine, int selectionRangeEndCharacter) {

src/test/java/com/github/_1c_syntax/bsl/languageserver/references/ReferenceIndexFillerTest.java

@@ -203,7 +203,7 @@ void testFindVariablesRangesCallStatement() {
 
     var referencedSymbol = referenceIndex.getReference(
       documentContext.getUri(),
-      new Position(33, 10)
+      new Position(33, 9)
     );
     assertThat(referencedSymbol).isPresent();
     assertThat(referencedSymbol).get()