diff --git a/README.md b/README.md index ab6cad6..0e46872 100644 --- a/README.md +++ b/README.md @@ -52,6 +52,10 @@ A language server for [tmux](https://github.com/tmux/tmux)'s tmux.conf. ![Completion](https://github.com/Freed-Wu/tmux-language-server/assets/32936898/eefc7ec5-c8ef-41ac-8194-e939dac7ae36) +## How Does It Work + +See [here](https://github.com/neomutt/lsp-tree-sitter#usage). + See [![readthedocs](https://shields.io/readthedocs/tmux-language-server)](https://tmux-language-server.readthedocs.io) to know more. diff --git a/requirements.txt b/requirements.txt index 28bd63b..6cac2b4 100755 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,4 @@ #!/usr/bin/env -S pip install -r -# ErrorFinder -tree-sitter-lsp >= 0.0.13 +lsp-tree-sitter tree-sitter-tmux diff --git a/requirements/colorize.txt b/requirements/colorize.txt index e3170b3..b0dfd7e 100755 --- a/requirements/colorize.txt +++ b/requirements/colorize.txt @@ -1,3 +1,3 @@ #!/usr/bin/env -S pip install -r -tree-sitter-lsp[colorize] +lsp-tree-sitter[colorize] diff --git a/requirements/misc.txt b/requirements/misc.txt index 7d9fc0f..28fa5a8 100755 --- a/requirements/misc.txt +++ b/requirements/misc.txt @@ -1,4 +1,4 @@ #!/usr/bin/env -S pip install -r # groff -tree-sitter-lsp[misc] >= 0.0.10 +lsp-tree-sitter[misc] >= 0.0.10 diff --git a/src/tmux_language_server/__main__.py b/src/tmux_language_server/__main__.py index 61ded86..d7551d4 100644 --- a/src/tmux_language_server/__main__.py +++ b/src/tmux_language_server/__main__.py @@ -75,8 +75,8 @@ def main(): args = get_parser().parse_args() if args.generate_schema or args.check or args.convert: - from tree_sitter_lsp.diagnose import check - from tree_sitter_lsp.utils import pprint + from lsp_tree_sitter.diagnose import check + from lsp_tree_sitter.utils import pprint from tree_sitter_tmux import parser from .finders import DIAGNOSTICS_FINDER_CLASSES diff --git a/src/tmux_language_server/finders.py b/src/tmux_language_server/finders.py index 190d856..eacd127 100644 --- a/src/tmux_language_server/finders.py +++ b/src/tmux_language_server/finders.py @@ -4,8 +4,8 @@ from dataclasses import dataclass +from lsp_tree_sitter.finders import ErrorFinder, QueryFinder, SchemaFinder from lsprotocol.types import DiagnosticSeverity -from tree_sitter_lsp.finders import ErrorFinder, QueryFinder, SchemaFinder from .schema import TmuxTrie from .utils import get_query, get_schema diff --git a/src/tmux_language_server/misc/__init__.py b/src/tmux_language_server/misc/__init__.py index 3ca057d..f650359 100644 --- a/src/tmux_language_server/misc/__init__.py +++ b/src/tmux_language_server/misc/__init__.py @@ -6,7 +6,7 @@ from typing import Any from bs4.element import NavigableString, Tag -from tree_sitter_lsp.misc import get_soup +from lsp_tree_sitter.misc import get_soup from .._metainfo import SOURCE, project diff --git a/src/tmux_language_server/schema.py b/src/tmux_language_server/schema.py index 8e368aa..0cf827c 100644 --- a/src/tmux_language_server/schema.py +++ b/src/tmux_language_server/schema.py @@ -4,10 +4,10 @@ from dataclasses import dataclass +from lsp_tree_sitter import UNI +from lsp_tree_sitter.schema import Trie from lsprotocol.types import Position, Range from tree_sitter import Node -from tree_sitter_lsp import UNI -from tree_sitter_lsp.schema import Trie DIRECTIVES = { "set_option_directive", diff --git a/src/tmux_language_server/server.py b/src/tmux_language_server/server.py index b16350d..5abaac1 100644 --- a/src/tmux_language_server/server.py +++ b/src/tmux_language_server/server.py @@ -4,6 +4,9 @@ from typing import Any +from lsp_tree_sitter.complete import get_completion_list_by_enum +from lsp_tree_sitter.diagnose import get_diagnostics +from lsp_tree_sitter.finders import PositionFinder from lsprotocol.types import ( TEXT_DOCUMENT_COMPLETION, TEXT_DOCUMENT_DID_CHANGE, @@ -23,9 +26,6 @@ TextDocumentPositionParams, ) from pygls.server import LanguageServer -from tree_sitter_lsp.complete import get_completion_list_by_enum -from tree_sitter_lsp.diagnose import get_diagnostics -from tree_sitter_lsp.finders import PositionFinder from tree_sitter_tmux import parser from .finders import DIAGNOSTICS_FINDER_CLASSES, ImportTmuxFinder