Merge pull request #653 from bash-lsp/support-loop-variables

Support resolving loop variables

server/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Bash Language Server
 
+## 4.2.1
+
+- Add support for resolving loop variables https://github.com/bash-lsp/bash-language-server/pull/653
+
 ## 4.2.0
 
 - Improve heuristic for resolving variables by taking the scope into account, both locally and when sourcing files. https://github.com/bash-lsp/bash-language-server/pull/649

server/package.json

@@ -3,7 +3,7 @@
   "description": "A language server for Bash",
   "author": "Mads Hartmann",
   "license": "MIT",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "publisher": "mads-hartmann",
   "main": "./out/server.js",
   "typings": "./out/server.d.ts",

server/src/__tests__/analyzer.test.ts

@@ -152,7 +152,6 @@ describe('findDeclarationLocations', () => {
   })
 
   it('returns local declarations', () => {
-    analyzer.analyze({ uri: CURRENT_URI, document: FIXTURE_DOCUMENT.INSTALL })
     const result = analyzer.findDeclarationLocations({
       position: { character: 12, line: 12 },
       uri: FIXTURE_URI.SCOPE,
@@ -176,6 +175,31 @@ describe('findDeclarationLocations', () => {
       ]
     `)
   })
+
+  it('returns local declarations for loop variables', () => {
+    const result = analyzer.findDeclarationLocations({
+      position: { character: 18, line: 39 },
+      uri: FIXTURE_URI.SCOPE,
+      word: 'i',
+    })
+    expect(result).toMatchInlineSnapshot(`
+      Array [
+        Object {
+          "range": Object {
+            "end": Object {
+              "character": 5,
+              "line": 37,
+            },
+            "start": Object {
+              "character": 4,
+              "line": 37,
+            },
+          },
+          "uri": "file://${FIXTURE_FOLDER}scope.sh",
+        },
+      ]
+    `)
+  })
 })
 
 describe('findReferences', () => {

server/src/util/declarations.ts

@@ -129,6 +129,16 @@ export function getLocalDeclarations({
           }
         } else if (TreeSitterUtil.isDefinition(childNode)) {
           symbol = nodeToSymbolInformation({ node: childNode, uri })
+        } else if (childNode.type === 'for_statement') {
+          const variableNode = childNode.child(1)
+          if (variableNode && variableNode.type === 'variable_name') {
+            symbol = LSP.SymbolInformation.create(
+              variableNode.text,
+              LSP.SymbolKind.Variable,
+              TreeSitterUtil.range(variableNode),
+              uri,
+            )
+          }
         }
 
         if (symbol) {

testing/fixtures/scope.sh

@@ -34,3 +34,8 @@ echo "${X}"
 f
 
 echo "${GLOBAL_2}"
+
+for i in 1 2 3 4 5
+do
+ echo "$GLOBAL_1 $i"
+done