Rename getNodeAtLineAndColumn -> getNodeAtPosition

Signed-off-by: Ben Sherman <bentshermann@gmail.com>

Author: bentsherman

src/main/java/nextflow/lsp/ast/ASTNodeCache.java

@@ -274,14 +274,12 @@ public URI getURI(ASTNode node) {
     }
 
     /**
-     * Get the most specific ast node at a given location in a file.
+     * Get the most specific ast node at a given position in a file.
      *
      * @param uri
-     * @param line
-     * @param column
+     * @param position
      */
-    public ASTNode getNodeAtLineAndColumn(URI uri, int line, int column) {
-        var position = new Position(line, column);
+    public ASTNode getNodeAtPosition(URI uri, Position position) {
         var nodeToRange = new HashMap<ASTNode, Range>();
         var nodes = nodesByURI.get(uri);
         if( nodes == null )
@@ -321,14 +319,13 @@ public ASTNode getNodeAtLineAndColumn(URI uri, int line, int column) {
     }
 
     /**
-     * Get the tree of nodes at a given location in a file.
+     * Get the tree of nodes at a given position in a file.
      *
      * @param uri
-     * @param line
-     * @param column
+     * @param position
      */
-    public List<ASTNode> getNodesAtLineAndColumn(URI uri, int line, int column) {
-        var offsetNode = getNodeAtLineAndColumn(uri, line, column);
+    public List<ASTNode> getNodesAtPosition(URI uri, Position position) {
+        var offsetNode = getNodeAtPosition(uri, position);
         var result = new ArrayList<ASTNode>();
         ASTNode current = offsetNode;
         while( current != null ) {

src/main/java/nextflow/lsp/services/config/ConfigCompletionProvider.java

@@ -73,7 +73,7 @@ public Either<List<CompletionItem>, CompletionList> completion(TextDocumentIdent
         if( !ast.hasAST(uri) )
             return Either.forLeft(Collections.emptyList());
 
-        var nodeStack = ast.getNodesAtLineAndColumn(uri, position.getLine(), position.getCharacter());
+        var nodeStack = ast.getNodesAtPosition(uri, position);
         if( nodeStack.isEmpty() )
             return Either.forLeft(TOPLEVEL_ITEMS);
 

src/main/java/nextflow/lsp/services/config/ConfigHoverProvider.java

@@ -63,7 +63,7 @@ public Hover hover(TextDocumentIdentifier textDocument, Position position) {
         }
 
         var uri = URI.create(textDocument.getUri());
-        var nodeStack = ast.getNodesAtLineAndColumn(uri, position.getLine(), position.getCharacter());
+        var nodeStack = ast.getNodesAtPosition(uri, position);
         if( nodeStack.isEmpty() )
             return null;
 

src/main/java/nextflow/lsp/services/script/ScriptCallHierarchyProvider.java

@@ -74,7 +74,7 @@ public List<CallHierarchyItem> prepare(TextDocumentIdentifier textDocument, Posi
         }
 
         var uri = URI.create(textDocument.getUri());
-        var offsetNode = asMethodOrCallX(ast.getNodeAtLineAndColumn(uri, position.getLine(), position.getCharacter()));
+        var offsetNode = asMethodOrCallX(ast.getNodeAtPosition(uri, position));
         if( offsetNode == null )
             return Collections.emptyList();
 
@@ -120,7 +120,7 @@ public List<CallHierarchyIncomingCall> incomingCalls(CallHierarchyItem item) {
 
         var uri = URI.create(item.getUri());
         var position = item.getRange().getStart();
-        var offsetNode = ast.getNodeAtLineAndColumn(uri, position.getLine(), position.getCharacter());
+        var offsetNode = ast.getNodeAtPosition(uri, position);
         if( offsetNode == null )
             return Collections.emptyList();
 
@@ -178,7 +178,7 @@ public List<CallHierarchyOutgoingCall> outgoingCalls(CallHierarchyItem item) {
 
         var uri = URI.create(item.getUri());
         var position = item.getRange().getStart();
-        var offsetNode = ast.getNodeAtLineAndColumn(uri, position.getLine(), position.getCharacter());
+        var offsetNode = ast.getNodeAtPosition(uri, position);
         if( offsetNode == null )
             return Collections.emptyList();
 

src/main/java/nextflow/lsp/services/script/ScriptCompletionProvider.java

@@ -110,7 +110,7 @@ public Either<List<CompletionItem>, CompletionList> completion(TextDocumentIdent
         if( !ast.hasAST(uri) )
             return Either.forLeft(Collections.emptyList());
 
-        var nodeStack = ast.getNodesAtLineAndColumn(uri, position.getLine(), position.getCharacter());
+        var nodeStack = ast.getNodesAtPosition(uri, position);
         if( nodeStack.isEmpty() )
             return Either.forLeft(DECLARATION_SNIPPETS);
 

src/main/java/nextflow/lsp/services/script/ScriptDefinitionProvider.java

@@ -52,7 +52,7 @@ public Either<List<? extends Location>, List<? extends LocationLink>> definition
         }
 
         var uri = URI.create(textDocument.getUri());
-        var offsetNode = ast.getNodeAtLineAndColumn(uri, position.getLine(), position.getCharacter());
+        var offsetNode = ast.getNodeAtPosition(uri, position);
         if( offsetNode == null )
             return Either.forLeft(Collections.emptyList());
 

src/main/java/nextflow/lsp/services/script/ScriptHoverProvider.java

@@ -63,7 +63,7 @@ public Hover hover(TextDocumentIdentifier textDocument, Position position) {
         }
 
         var uri = URI.create(textDocument.getUri());
-        var nodeStack = ast.getNodesAtLineAndColumn(uri, position.getLine(), position.getCharacter());
+        var nodeStack = ast.getNodesAtPosition(uri, position);
         if( nodeStack.isEmpty() )
             return null;
 

src/main/java/nextflow/lsp/services/script/ScriptReferenceProvider.java

@@ -62,7 +62,7 @@ public List<? extends Location> references(TextDocumentIdentifier textDocument,
         }
 
         var uri = URI.create(textDocument.getUri());
-        var offsetNode = ast.getNodeAtLineAndColumn(uri, position.getLine(), position.getCharacter());
+        var offsetNode = ast.getNodeAtPosition(uri, position);
         if( offsetNode == null )
             return Collections.emptyList();
 
@@ -96,7 +96,7 @@ public WorkspaceEdit rename(TextDocumentIdentifier textDocument, Position positi
         }
 
         var uri = URI.create(textDocument.getUri());
-        var offsetNode = ast.getNodeAtLineAndColumn(uri, position.getLine(), position.getCharacter());
+        var offsetNode = ast.getNodeAtPosition(uri, position);
         if( offsetNode == null )
             return null;