Skip to content

Commit

Permalink
👽 Rename dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Freed-Wu committed Feb 29, 2024
1 parent fe971d9 commit 94ccfbd
Show file tree
Hide file tree
Showing 15 changed files with 27 additions and 28 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ Other features:

## How Does It Work

See [here](https://github.com/neomutt/tree-sitter-lsp#schema).
See [here](https://github.com/neomutt/lsp-tree-sitter#schema).

Read
[![readthedocs](https://shields.io/readthedocs/termux-language-server)](https://termux-language-server.readthedocs.io)
Expand Down
3 changes: 1 addition & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@
# https://python-jsonschema.readthedocs.io/en/stable/validate/#validating-formats
# validate hostname
fqdn
lsp-tree-sitter
# ~/.config/pacman/template.md.j2
platformdirs
# validate uri
rfc3987
tree-sitter-languages
# ErrorFinder
tree-sitter-lsp >= 0.0.13
2 changes: 1 addition & 1 deletion requirements/colorize.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/usr/bin/env -S pip install -r

tree-sitter-lsp[colorize]
lsp-tree-sitter[colorize]
2 changes: 1 addition & 1 deletion requirements/misc.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env -S pip install -r

license-expression
tree-sitter-lsp[misc]
lsp-tree-sitter[misc]
6 changes: 3 additions & 3 deletions src/termux_language_server/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ def main():
args = get_parser().parse_args()

if args.generate_schema or args.format or args.check or args.convert:
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 tree_sitter_lsp.diagnose import check
from tree_sitter_lsp.format import format
from tree_sitter_lsp.utils import pprint

from .finders import DIAGNOSTICS_FINDER_CLASSES, FORMAT_FINDER_CLASSES
from .schema import BashTrie
Expand Down
14 changes: 7 additions & 7 deletions src/termux_language_server/finders.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@
from dataclasses import dataclass

from jinja2 import Template
from lsp_tree_sitter import UNI, Finder
from lsp_tree_sitter.finders import (
ErrorFinder,
QueryFinder,
SchemaFinder,
UnFixedOrderFinder,
)
from lsprotocol.types import (
CompletionItemKind,
DiagnosticSeverity,
Expand All @@ -15,13 +22,6 @@
TextEdit,
)
from tree_sitter import Node, Tree
from tree_sitter_lsp import UNI, Finder
from tree_sitter_lsp.finders import (
ErrorFinder,
QueryFinder,
SchemaFinder,
UnFixedOrderFinder,
)

from . import CSV, FILETYPE
from .schema import BashTrie
Expand Down
2 changes: 1 addition & 1 deletion src/termux_language_server/misc/color_map.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from typing import Any

from tree_sitter_lsp.misc import get_soup
from lsp_tree_sitter.misc import get_soup

from .._metainfo import SOURCE, project

Expand Down
2 changes: 1 addition & 1 deletion src/termux_language_server/misc/ebuild.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from typing import Any

from tree_sitter_lsp.misc import get_soup
from lsp_tree_sitter.misc import get_soup

from .._metainfo import SOURCE, project
from .licenses import ATOM
Expand Down
2 changes: 1 addition & 1 deletion src/termux_language_server/misc/make_conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from typing import Any

from tree_sitter_lsp.misc import get_soup
from lsp_tree_sitter.misc import get_soup

from .._metainfo import SOURCE, project

Expand Down
2 changes: 1 addition & 1 deletion src/termux_language_server/misc/makepkg_conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from typing import Any

from tree_sitter_lsp.misc import get_soup
from lsp_tree_sitter.misc import get_soup

from .._metainfo import SOURCE, project

Expand Down
2 changes: 1 addition & 1 deletion src/termux_language_server/misc/pkgbuild.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import os
from typing import Any

from lsp_tree_sitter.misc import get_md_tokens, get_soup
from markdown_it.token import Token
from tree_sitter_lsp.misc import get_md_tokens, get_soup

from .._metainfo import SOURCE, project
from .licenses import LICENSES
Expand Down
2 changes: 1 addition & 1 deletion src/termux_language_server/misc/termux.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from typing import Any

from tree_sitter_lsp.misc import get_soup
from lsp_tree_sitter.misc import get_soup

from .. import CSV
from .._metainfo import SOURCE, project
Expand Down
4 changes: 2 additions & 2 deletions src/termux_language_server/schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
from dataclasses import dataclass
from typing import Literal

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


@dataclass
Expand Down
8 changes: 4 additions & 4 deletions src/termux_language_server/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
import re
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 lsp_tree_sitter.format import get_text_edits
from lsprotocol.types import (
TEXT_DOCUMENT_COMPLETION,
TEXT_DOCUMENT_DID_CHANGE,
Expand All @@ -28,10 +32,6 @@
)
from pygls.server import LanguageServer
from tree_sitter_languages import get_parser
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_lsp.format import get_text_edits

from .finders import (
DIAGNOSTICS_FINDER_CLASSES,
Expand Down
2 changes: 1 addition & 1 deletion tests/test_schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import os

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 tree_sitter_lsp.finders import SchemaFinder

PATH = os.path.dirname(__file__)

Expand Down

0 comments on commit 94ccfbd

Please sign in to comment.