👽 Upgrade APIs of tree-sitter

Author: Freed-Wu

requirements.txt

@@ -1,4 +1,4 @@
 #!/usr/bin/env -S pip install -r
 
 lsp-tree-sitter
-tree-sitter-muttrc
+tree-sitter-muttrc >= 0.0.4

src/mutt_language_server/__main__.py

@@ -76,10 +76,10 @@ def main() -> None:
     if args.generate_schema or args.check or args.convert:
         from lsp_tree_sitter.diagnose import check
         from lsp_tree_sitter.utils import pprint
-        from tree_sitter_muttrc import parser
 
         from .finders import DIAGNOSTICS_FINDER_CLASSES
         from .schema import MuttTrie
+        from .utils import parser
 
         if args.generate_schema:
             from .misc import get_schema

src/mutt_language_server/server.py

@@ -25,10 +25,9 @@
     TextDocumentPositionParams,
 )
 from pygls.server import LanguageServer
-from tree_sitter_muttrc import parser
 
 from .finders import DIAGNOSTICS_FINDER_CLASSES, ImportMuttFinder
-from .utils import get_schema
+from .utils import get_schema, parser
 
 
 class MuttLanguageServer(LanguageServer):

src/mutt_language_server/utils.py

@@ -6,12 +6,16 @@
 import os
 from typing import Any
 
-from tree_sitter import Query
+from tree_sitter import Language, Parser, Query
+from tree_sitter_muttrc import language as get_language_ptr
 
 from . import FILETYPE
 
 SCHEMAS = {}
 QUERIES = {}
+language = Language(get_language_ptr(), "muttrc")
+parser = Parser()
+parser.set_language(language)
 
 
 def get_query(name: str, filetype: FILETYPE = "neomuttrc") -> Query:
@@ -33,8 +37,6 @@ def get_query(name: str, filetype: FILETYPE = "neomuttrc") -> Query:
             )
         ) as f:
             text = f.read()
-        from tree_sitter_muttrc import language
-
         QUERIES[name] = language.query(text)
     return QUERIES[name]