Merge pull request #1148 from Jimmyscene/main

Upgrade dependencies

scripts/upgrade-tree-sitter.sh

@@ -5,7 +5,7 @@ set -euox pipefail
 cd server
 pnpm add web-tree-sitter
 pnpm add --save-dev tree-sitter-cli https://github.com/tree-sitter/tree-sitter-bash
-npx tree-sitter build-wasm node_modules/tree-sitter-bash
+npx tree-sitter build --wasm node_modules/tree-sitter-bash
 
 curl 'https://api.github.com/repos/tree-sitter/tree-sitter-bash/commits/master' | jq .commit.url > parser.info
 echo "tree-sitter-cli $(cat package.json | jq '.devDependencies["tree-sitter-cli"]')" >> parser.info

server/package.json

@@ -23,7 +23,7 @@
     "turndown": "7.1.3",
     "vscode-languageserver": "8.0.2",
     "vscode-languageserver-textdocument": "1.0.11",
-    "web-tree-sitter": "0.20.8",
+    "web-tree-sitter": "0.22.5",
     "zod": "3.22.4"
   },
   "scripts": {

server/parser.info

@@ -1,2 +1,2 @@
-"https://api.github.com/repos/tree-sitter/tree-sitter-bash/git/commits/4488aa41406547e478636a4fcfd24f5bbc3f2f74"
-tree-sitter-cli "0.20.7"
+"https://api.github.com/repos/tree-sitter/tree-sitter-bash/git/commits/f8fb3274f72a30896075585b32b0c54cad65c086"
+tree-sitter-cli "0.22.5"

server/src/__tests__/server.test.ts

@@ -1431,7 +1431,6 @@ describe('server', () => {
       ['variable in let expression', 110, 4],
       ['variable in binary expression', 111, 9],
       ['variable in postfix expression', 111, 17],
-      ['variable in arithmetic expansion', 112, 14],
     ])('returns null for non-renamable symbol: %s', async (_, line, character) => {
       expect(await getPrepareRenameResult(line, character)).toBeNull()
     })
@@ -1741,9 +1740,9 @@ describe('server', () => {
     describe('Edge or not covered cases', () => {
       it('only includes variables typed as variable_name', async () => {
         const iRanges = await getFirstChangeRanges(getRenameRequestResult(106, 4))
-        // This should be 6 if all instances within let and arithmetic
+        // This should be 6 if all instances within let, postfix, and binary
         // expressions are included.
-        expect(iRanges.length).toBe(2)
+        expect(iRanges.length).toBe(3)
 
         const lineRanges = await getFirstChangeRanges(getRenameRequestResult(118, 10))
         // This should be 2 if the declaration of `line` is included.

server/src/analyser.ts

@@ -128,7 +128,7 @@ export default class Analyzer {
         })
     }
 
-    if (tree.rootNode.hasError()) {
+    if (tree.rootNode.hasError) {
       logger.warn(`Error while parsing ${uri}: syntax error`)
     }
 

server/src/util/sourcing.ts

@@ -109,7 +109,11 @@ function getSourcedPathInfoFromNode({
       }
 
       if (argumentNode.type === 'string' || argumentNode.type === 'raw_string') {
-        if (argumentNode.namedChildren.length === 0) {
+        const children = argumentNode.namedChildren
+        if (
+          children.length === 0 ||
+          (children.length === 1 && children[0].type === 'string_content')
+        ) {
           return {
             sourcedPath: argumentNode.text.slice(1, -1),
           }

testing/fixtures/renaming.sh

@@ -121,13 +121,13 @@ done < somefile.txt
 
 # Complex nesting affects self-assignment handling
 
-1() {
+f1() {
 	local var="var"
 
-	2() (
+	f2() (
 		var=$var
 
-		3() {
+		f3() {
 			declare var="$var"
 		}
 	)