Merge pull request #911 from bash-lsp/downgrade-tree-sitter

Downgrade tree sitter bash

Author: skovhus

Diff for: server/CHANGELOG.md

@@ -2,8 +2,9 @@
 
 ## 5.0.0 (beta)
 
-- Drop support for Node.js 14 that is no longer maintained (security updates ended 30 Apr 2023)
-- Internal changes: switch from yarn classic to pnpm
+- Downgrade tree sitter to a stable version https://github.com/bash-lsp/bash-language-server/pull/911
+- Drop support for Node.js 14 that is no longer maintained (security updates ended 30 Apr 2023) https://github.com/bash-lsp/bash-language-server/pull/893
+- Internal changes: switch from yarn classic to pnpm https://github.com/bash-lsp/bash-language-server/pull/893
 
 ## 4.10.3
 

Diff for: server/package.json

@@ -3,7 +3,7 @@
   "description": "A language server for Bash",
   "author": "Mads Hartmann",
   "license": "MIT",
-  "version": "5.0.0-rc1",
+  "version": "5.0.0-rc2",
   "main": "./out/server.js",
   "typings": "./out/server.d.ts",
   "bin": {

Diff for: server/parser.info

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

Diff for: server/src/__tests__/analyzer.test.ts

@@ -144,7 +144,9 @@ describe('analyze', () => {
     expect(diagnostics3).toEqual([])
   })
 
-  it('handles tree-sitter crashes gracefully', async () => {
+  it('ensures tree-sitter does not crash', async () => {
+    // newer version of tree-sitter will crash on this file and never respond
+    // to new queries.
     const analyzer = await getAnalyzer({ runBackgroundAnalysis: false })
 
     // Parse the file
@@ -153,11 +155,6 @@ describe('analyze', () => {
       document: FIXTURE_DOCUMENT.CRASH,
     })
 
-    expect(loggerWarn).toHaveBeenCalled()
-    expect(loggerWarn.mock.calls).toEqual([
-      [expect.stringContaining('Tree sitter crashed while parsing')],
-    ])
-
     const result = analyzer.findAllSourcedUris({ uri: FIXTURE_URI.CRASH })
     expect(result).toEqual(new Set([]))
   })

Diff for: server/src/analyser.ts

@@ -70,14 +70,8 @@ export default class Analyzer {
   }): LSP.Diagnostic[] {
     const diagnostics: LSP.Diagnostic[] = []
     const fileContent = document.getText()
-    let tree: Parser.Tree
 
-    try {
-      tree = this.parser.parse(fileContent)
-    } catch (error) {
-      logger.warn(`Tree sitter crashed while parsing ${uri}: ${error}`)
-      return []
-    }
+    const tree = this.parser.parse(fileContent)
 
     const globalDeclarations = getGlobalDeclarations({ tree, uri })