👽 Fix #17, use tree-sitter-bash

.pre-commit-config.yaml

@@ -3,7 +3,7 @@ exclude: ^templates/.*|.*\.json$
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
       - id: check-added-large-files
       - id: fix-byte-order-marker
@@ -51,7 +51,7 @@ repos:
         exclude_types:
           - zsh
   - repo: https://github.com/rhysd/actionlint
-    rev: v1.6.26
+    rev: v1.7.0
     hooks:
       - id: actionlint
   - repo: https://github.com/adrienverge/yamllint
@@ -73,7 +73,7 @@ repos:
           - mdformat-config
           - mdformat-web
   - repo: https://github.com/DavidAnson/markdownlint-cli2
-    rev: v0.12.1
+    rev: v0.13.0
     hooks:
       - id: markdownlint-cli2
         additional_dependencies:
@@ -83,12 +83,12 @@ repos:
     hooks:
       - id: shfmt
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.2.1
+    rev: v0.4.4
     hooks:
       - id: ruff
       - id: ruff-format
   - repo: https://github.com/kumaraditya303/mirrors-pyright
-    rev: v1.1.350
+    rev: v1.1.362
     hooks:
       - id: pyright
 

requirements.txt

@@ -8,4 +8,4 @@ lsp-tree-sitter
 platformdirs
 # validate uri
 rfc3987
-tree-sitter-languages
+tree-sitter-bash

src/termux_language_server/__main__.py

@@ -83,13 +83,11 @@ def main():
         from lsp_tree_sitter.diagnose import check
         from lsp_tree_sitter.format import format
         from lsp_tree_sitter.utils import pprint
-        from tree_sitter_languages import get_parser as _get_parser
 
         from .finders import DIAGNOSTICS_FINDER_CLASSES, FORMAT_FINDER_CLASSES
         from .schema import BashTrie
-        from .utils import get_filetype
+        from .utils import get_filetype, parser
 
-        parser = _get_parser("bash")
         if args.generate_schema:
             from .misc import get_schema
 

src/termux_language_server/server.py

@@ -31,7 +31,6 @@
     TextEdit,
 )
 from pygls.server import LanguageServer
-from tree_sitter_languages import get_parser
 
 from .finders import (
     DIAGNOSTICS_FINDER_CLASSES,
@@ -45,7 +44,7 @@
     search_package_document,
     search_package_names,
 )
-from .utils import get_filetype, get_schema
+from .utils import get_filetype, get_schema, parser
 
 
 class TermuxLanguageServer(LanguageServer):
@@ -60,7 +59,6 @@ def __init__(self, *args: Any) -> None:
         """
         super().__init__(*args)
         self.trees = {}
-        self.parser = get_parser("bash")
 
         @self.feature(TEXT_DOCUMENT_DID_OPEN)
         @self.feature(TEXT_DOCUMENT_DID_CHANGE)
@@ -75,9 +73,7 @@ def did_change(params: DidChangeTextDocumentParams) -> None:
             if filetype == "":
                 return None
             document = self.workspace.get_document(params.text_document.uri)
-            self.trees[document.uri] = self.parser.parse(
-                document.source.encode()
-            )
+            self.trees[document.uri] = parser.parse(document.source.encode())
             diagnostics = get_diagnostics(
                 document.uri,
                 self.trees[document.uri],

src/termux_language_server/utils.py

@@ -6,13 +6,16 @@
 import os
 from typing import Any, Literal
 
-from tree_sitter import Query
-from tree_sitter_languages import get_language
+from tree_sitter import Language, Parser, Query
+from tree_sitter_bash import language as get_language_ptr
 
 from . import FILETYPE
 
 SCHEMAS = {}
 QUERIES = {}
+language = Language(get_language_ptr(), "bash")
+parser = Parser()
+parser.set_language(language)
 
 
 def get_query(name: str, filetype: str = "bash") -> Query:
@@ -34,7 +37,6 @@ def get_query(name: str, filetype: str = "bash") -> Query:
             )
         ) as f:
             text = f.read()
-        language = get_language(filetype)
         QUERIES[name] = language.query(text)
     return QUERIES[name]
 

tests/test_schema.py

@@ -4,8 +4,7 @@
 
 from lsp_tree_sitter.finders import SchemaFinder
 from termux_language_server.schema import BashTrie
-from termux_language_server.utils import get_filetype, get_schema
-from tree_sitter_languages import get_parser
+from termux_language_server.utils import get_filetype, get_schema, parser
 
 PATH = os.path.dirname(__file__)
 
@@ -24,7 +23,7 @@ def test_SchemaFinder() -> None:
         assert filetype == "build.sh"
         with open(path, "rb") as f:
             text = f.read()
-        tree = get_parser("bash").parse(text)
+        tree = parser.parse(text)
         finder = SchemaFinder(get_schema(filetype), BashTrie)
         diagnostics = finder.get_diagnostics(path, tree)
         assert len(diagnostics) > 0