Merge pull request #54 from gaoflow/fix-53-language-pack-1-9

Fix Dart and R parsers for tree-sitter-language-pack 1.9

Author: GoodbyePlanet

pyproject.toml

@@ -31,7 +31,7 @@ dependencies = [
     "tree-sitter-bash>=0.25.0",
     "tree-sitter-sql>=0.3.0",
     "tree-sitter-lua>=0.5.0",
-    "tree-sitter-language-pack>=1.5.0,<1.6.3",
+    "tree-sitter-language-pack>=1.9.0,<1.10.0",
     "pydantic-settings>=2.14.1",
     "pyyaml>=6.0",
     "httpx>=0.28.0",

server/parser/dart.py

@@ -6,6 +6,7 @@
 from tree_sitter_language_pack import get_parser
 
 from server.parser.base import CodeSymbol, _node_text
+from server.parser.tree_sitter_compat import root_node_for_tree
 
 _FLUTTER_WIDGET_BASES = {
     "StatelessWidget",
@@ -282,7 +283,7 @@ def language(self) -> str:
         return "dart"
 
     def parse_file(self, source: bytes, file_path: str) -> list[CodeSymbol]:
-        tree = self._parser.parse(source)
+        tree = self._parser.parse(source.decode("utf-8", errors="replace"))
         symbols: list[CodeSymbol] = []
-        _walk(tree.root_node, source, file_path, symbols)
+        _walk(root_node_for_tree(tree), source, file_path, symbols)
         return symbols

server/parser/r.py

@@ -4,6 +4,7 @@
 from tree_sitter_language_pack import get_parser
 
 from server.parser.base import CodeSymbol, _node_text
+from server.parser.tree_sitter_compat import root_node_for_tree
 
 
 def _docstring(node: Node, source: bytes) -> str | None:
@@ -123,9 +124,9 @@ def language(self) -> str:
         return "r"
 
     def parse_file(self, source: bytes, file_path: str) -> list[CodeSymbol]:
-        tree = self._parser.parse(source)
+        tree = self._parser.parse(source.decode("utf-8", errors="replace"))
         symbols: list[CodeSymbol] = []
-        for child in tree.root_node.children:
+        for child in root_node_for_tree(tree).children:
             if child.type == "binary_operator":
                 sym = _parse_assignment(child, source, file_path)
                 if sym:

server/parser/tree_sitter_compat.py

@@ -0,0 +1,67 @@
+from __future__ import annotations
+
+from typing import Any
+
+
+class LanguagePackNode:
+    def __init__(
+        self,
+        node: Any,
+        parent: LanguagePackNode | None = None,
+        index: int | None = None,
+    ) -> None:
+        self._node = node
+        self._parent = parent
+        self._index = index
+
+    @property
+    def type(self) -> str:
+        return self._node.kind()
+
+    @property
+    def children(self) -> list[LanguagePackNode]:
+        return [
+            LanguagePackNode(self._node.child(i), self, i)
+            for i in range(self._node.child_count())
+        ]
+
+    @property
+    def start_byte(self) -> int:
+        return self._node.start_byte()
+
+    @property
+    def end_byte(self) -> int:
+        return self._node.end_byte()
+
+    @property
+    def start_point(self) -> tuple[int, int]:
+        point = self._node.start_position()
+        return (point.row, point.column)
+
+    @property
+    def end_point(self) -> tuple[int, int]:
+        point = self._node.end_position()
+        return (point.row, point.column)
+
+    @property
+    def prev_sibling(self) -> LanguagePackNode | None:
+        if self._parent is None or self._index is None or self._index == 0:
+            return None
+        index = self._index - 1
+        return LanguagePackNode(self._parent._node.child(index), self._parent, index)
+
+    def child_by_field_name(self, name: str) -> LanguagePackNode | None:
+        child = self._node.child_by_field_name(name)
+        if child is None:
+            return None
+        for index in range(self._node.child_count()):
+            if self._node.child(index) == child:
+                return LanguagePackNode(child, self, index)
+        return LanguagePackNode(child)
+
+
+def root_node_for_tree(tree: Any) -> Any:
+    root_node = tree.root_node() if callable(tree.root_node) else tree.root_node
+    if hasattr(root_node, "children"):
+        return root_node
+    return LanguagePackNode(root_node)