update
This commit is contained in:
+127
-107
@@ -1,59 +1,41 @@
|
||||
from collections.abc import Callable, Generator, Sequence
|
||||
from collections.abc import Callable
|
||||
from dataclasses import dataclass, field
|
||||
from difflib import Differ
|
||||
from itertools import chain
|
||||
from logging import DEBUG, INFO, basicConfig, debug, error, getLogger, info, warning
|
||||
from re import findall, finditer, fullmatch, match as rematch
|
||||
import re
|
||||
from time import time
|
||||
from logging import DEBUG, basicConfig, getLogger
|
||||
from pathlib import Path
|
||||
from typing import Any
|
||||
from cattrs import Converter
|
||||
from lsprotocol.types import (
|
||||
INLAY_HINT_RESOLVE,
|
||||
TEXT_DOCUMENT_DID_CHANGE,
|
||||
TEXT_DOCUMENT_DID_CLOSE,
|
||||
TEXT_DOCUMENT_DID_OPEN,
|
||||
TEXT_DOCUMENT_DID_SAVE,
|
||||
INITIALIZE,
|
||||
TEXT_DOCUMENT_DOCUMENT_SYMBOL,
|
||||
TEXT_DOCUMENT_HOVER,
|
||||
TEXT_DOCUMENT_INLAY_HINT,
|
||||
WORKSPACE_INLAY_HINT_REFRESH,
|
||||
WORKSPACE_SEMANTIC_TOKENS_REFRESH,
|
||||
CompletionItem,
|
||||
Diagnostic,
|
||||
DiagnosticSeverity,
|
||||
DidChangeTextDocumentParams,
|
||||
DidCloseTextDocumentParams,
|
||||
DidOpenTextDocumentParams,
|
||||
DidSaveTextDocumentParams,
|
||||
DocumentSymbol,
|
||||
DocumentSymbolParams,
|
||||
Hover,
|
||||
HoverParams,
|
||||
InitializeParams,
|
||||
InlayHint,
|
||||
InlayHintKind,
|
||||
InlayHintParams,
|
||||
MessageType,
|
||||
NotebookDocumentSyncOptions,
|
||||
Position,
|
||||
Range,
|
||||
SymbolKind,
|
||||
TextDocumentContentChangeEvent,
|
||||
TextDocumentContentChangeEvent_Type1,
|
||||
PublishDiagnosticsNotification,
|
||||
PublishDiagnosticsParams,
|
||||
ShowMessageParams,
|
||||
TextDocumentSyncKind,
|
||||
)
|
||||
from pygls.lsp.server import LanguageServer
|
||||
|
||||
from pygls.protocol import LanguageServerProtocol, default_converter
|
||||
from tree_sitter_skill import language as skill_lang
|
||||
from tree_sitter import Language, Node, Parser, Query, Tree
|
||||
|
||||
from pygls.server import LanguageServer
|
||||
from pygls.workspace import TextDocument
|
||||
|
||||
from .cache import Cache
|
||||
|
||||
SKILL_LANG = Language(skill_lang())
|
||||
SKILL_PARSER = Parser(SKILL_LANG)
|
||||
|
||||
|
||||
URI = str
|
||||
from skillls.checker import ParenMismatchError, ParenMismatchErrorKind
|
||||
from skillls.helpers import parse_file
|
||||
from skillls.types import URI, Node
|
||||
|
||||
basicConfig(
|
||||
filename="skillls.log",
|
||||
@@ -61,92 +43,130 @@ basicConfig(
|
||||
level=DEBUG,
|
||||
format="%(asctime)s [%(levelname)s]: %(message)s",
|
||||
)
|
||||
logger = getLogger()
|
||||
cache: Cache[str, CompletionItem] = Cache()
|
||||
|
||||
|
||||
def in_range(what: Position, area: Range) -> bool:
|
||||
return (what >= area.start) and (what <= area.end)
|
||||
|
||||
|
||||
def find_end(start: Position, lines: list[str]) -> Position:
|
||||
count = 0
|
||||
in_str: bool = False
|
||||
last = ""
|
||||
for row, line in enumerate(lines[start.line :]):
|
||||
if row == 0:
|
||||
line = line[start.character :]
|
||||
row += start.character
|
||||
for col, char in enumerate(line[start.character :] if row == 0 else line):
|
||||
match char:
|
||||
case "(":
|
||||
if not in_str:
|
||||
count += 1
|
||||
case ")":
|
||||
if not in_str:
|
||||
if count > 0:
|
||||
count -= 1
|
||||
if count == 0:
|
||||
return Position(start.line + row, col)
|
||||
case '"':
|
||||
if not (in_str and last == "\\"):
|
||||
in_str = not in_str
|
||||
case _:
|
||||
last = char
|
||||
|
||||
last = char
|
||||
|
||||
error(f"did not fin end for start at {start}")
|
||||
return Position(len(lines), len(lines[-1]))
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class Environment:
|
||||
range: Range
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class LetEnvironment(Environment):
|
||||
locals: set[str] = field(default_factory=set)
|
||||
|
||||
|
||||
def offset_range(range: Range, lines: int, cols: int = 0) -> Range:
|
||||
return Range(
|
||||
Position(
|
||||
range.start.line + lines,
|
||||
range.start.character + cols,
|
||||
),
|
||||
Position(
|
||||
range.end.line + lines,
|
||||
range.end.character + cols,
|
||||
),
|
||||
)
|
||||
logger = getLogger(__name__)
|
||||
|
||||
|
||||
class SkillLanguageServer(LanguageServer):
|
||||
ws_files: set[URI]
|
||||
opened_files: set[URI]
|
||||
scopes: dict[URI, list[Node]]
|
||||
errs: dict[URI, ExceptionGroup]
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
name: str,
|
||||
version: str,
|
||||
loop=None,
|
||||
protocol_cls: type[LanguageServerProtocol] = LanguageServerProtocol,
|
||||
converter_factory: Callable[[], Converter] = default_converter,
|
||||
text_document_sync_kind: TextDocumentSyncKind = TextDocumentSyncKind.Incremental,
|
||||
notebook_document_sync: NotebookDocumentSyncOptions | None = None,
|
||||
max_workers: int = 2,
|
||||
):
|
||||
super().__init__(
|
||||
name,
|
||||
version,
|
||||
loop,
|
||||
protocol_cls,
|
||||
converter_factory,
|
||||
text_document_sync_kind,
|
||||
notebook_document_sync,
|
||||
max_workers,
|
||||
)
|
||||
super().__init__(name, version, text_document_sync_kind, notebook_document_sync)
|
||||
self.ws_files = set()
|
||||
self.opened_files = set()
|
||||
self.scopes = {}
|
||||
self.errs = {}
|
||||
|
||||
def update_diagnostics(self) -> None:
|
||||
for uri in self.opened_files:
|
||||
diags: list[Diagnostic] = []
|
||||
if eg := self.errs.get(uri):
|
||||
for exc in eg.exceptions:
|
||||
match exc:
|
||||
case ParenMismatchError():
|
||||
diags.append(
|
||||
Diagnostic(
|
||||
message=f"[skill_ls] {Path.from_uri(uri).name}:{exc.loc.start.line} {exc.kind.value}",
|
||||
severity=DiagnosticSeverity.Error,
|
||||
range=exc.loc,
|
||||
)
|
||||
)
|
||||
|
||||
# if diags:
|
||||
self.text_document_publish_diagnostics(
|
||||
PublishDiagnosticsParams(
|
||||
uri=uri,
|
||||
version=self.workspace.get_text_document(uri).version,
|
||||
diagnostics=diags,
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
server = SkillLanguageServer("SkillLS", "0.2.0")
|
||||
|
||||
|
||||
@server.feature(INITIALIZE)
|
||||
def lsp_initialize(server: SkillLanguageServer, params: InitializeParams) -> None:
|
||||
init_options: dict[str, Any] = params.initialization_options or {}
|
||||
|
||||
logger.info("done init")
|
||||
logger.debug(init_options)
|
||||
ws_dir = server.workspace.root_path
|
||||
|
||||
logger.debug(ws_dir)
|
||||
|
||||
if ws_dir:
|
||||
root_dir = Path(ws_dir)
|
||||
for file in (*root_dir.rglob("*.il"), *root_dir.rglob("*.ocn")):
|
||||
uri = file.as_uri()
|
||||
logger.debug(uri)
|
||||
|
||||
server.ws_files.add(uri)
|
||||
try:
|
||||
server.scopes[uri] = parse_file(server.workspace.get_text_document(uri))
|
||||
if server.errs.get(uri):
|
||||
del server.errs[uri]
|
||||
except ExceptionGroup as eg:
|
||||
server.errs[uri] = eg
|
||||
|
||||
|
||||
@server.feature(TEXT_DOCUMENT_DID_OPEN)
|
||||
def on_open(server: SkillLanguageServer, params: DidOpenTextDocumentParams) -> None:
|
||||
server.opened_files.add(params.text_document.uri)
|
||||
|
||||
server.update_diagnostics()
|
||||
|
||||
|
||||
@server.feature(TEXT_DOCUMENT_DID_CLOSE)
|
||||
def on_close(server: SkillLanguageServer, params: DidCloseTextDocumentParams) -> None:
|
||||
server.opened_files.remove(params.text_document.uri)
|
||||
|
||||
|
||||
@server.feature(TEXT_DOCUMENT_DID_CHANGE)
|
||||
def on_change(server: SkillLanguageServer, params: DidChangeTextDocumentParams) -> None:
|
||||
try:
|
||||
server.scopes[params.text_document.uri] = parse_file(
|
||||
server.workspace.get_text_document(params.text_document.uri)
|
||||
)
|
||||
if server.errs.get(params.text_document.uri):
|
||||
del server.errs[params.text_document.uri]
|
||||
except ExceptionGroup as eg:
|
||||
server.errs[params.text_document.uri] = eg
|
||||
|
||||
server.update_diagnostics()
|
||||
|
||||
|
||||
@server.feature(TEXT_DOCUMENT_INLAY_HINT)
|
||||
def on_inlay(server: SkillLanguageServer, params: InlayHintParams) -> list[InlayHint]:
|
||||
hints: list[InlayHint] = []
|
||||
|
||||
for uri in server.opened_files:
|
||||
for node in server.scopes.get(uri, []):
|
||||
hints.append(
|
||||
InlayHint(
|
||||
label=node.node,
|
||||
kind=InlayHintKind.Type,
|
||||
padding_left=True,
|
||||
position=node.location.end,
|
||||
)
|
||||
)
|
||||
|
||||
return hints
|
||||
|
||||
|
||||
@server.feature(TEXT_DOCUMENT_DOCUMENT_SYMBOL)
|
||||
def on_symbols(
|
||||
server: SkillLanguageServer, params: DocumentSymbolParams
|
||||
) -> list[DocumentSymbol] | None:
|
||||
return [node.as_doc_symbol() for node in server.scopes[params.text_document.uri]]
|
||||
|
||||
|
||||
def main():
|
||||
|
||||
Reference in New Issue
Block a user