Tree Sitter Upgrade #5

Open
acereca wants to merge 7 commits from 4-tree-sitter-upgrade into main
5 changed files with 21 additions and 23 deletions
Showing only changes of commit 6459d63f2b - Show all commits
+5 -4
View File
@@ -11,7 +11,7 @@ dependencies = [
] ]
requires-python = ">= 3.11" requires-python = ">= 3.11"
[project.optional-dependencies] [dependency-groups]
dev = [ dev = [
"black", "black",
"mypy", "mypy",
@@ -30,14 +30,15 @@ requires = [
skillls = "skillls.main:main" skillls = "skillls.main:main"
[tools.black] [tool.black]
line-length = 100 line-length = 100
target-version = "py311" target-version = "py311"
include = "skillls" include = "skillls"
[tools.ruff] [tool.ruff]
line-length = 100 line-length = 100
include = ['ALL'] target-version = "py311"
include = ["pyproject.toml", "skillls/**/*.py"]
[tool.uv.sources] [tool.uv.sources]
tree-sitter-skill = { git = "ssh://git@git.acereca.net/acereca/tree-sitter-skill.git" } tree-sitter-skill = { git = "ssh://git@git.acereca.net/acereca/tree-sitter-skill.git" }
+2 -5
View File
@@ -1,9 +1,8 @@
from dataclasses import dataclass from dataclasses import dataclass
from enum import Enum, auto from enum import Enum
from lsprotocol.types import Location, Position, Range from lsprotocol.types import Position, Range
from skillls.types import URI
class SyntaxError(Exception): class SyntaxError(Exception):
@@ -28,7 +27,6 @@ def _check_for_matching_parens(content: str) -> list[Exception]:
line = 0 line = 0
col = 0 col = 0
last_open: Position = Position(0, 0) last_open: Position = Position(0, 0)
last_close: Position = Position(0, 0)
for char in content: for char in content:
match char: match char:
case "(": case "(":
@@ -45,7 +43,6 @@ def _check_for_matching_parens(content: str) -> list[Exception]:
) )
) )
opened = 0 opened = 0
last_close = Position(line, col)
case "\n": case "\n":
line += 1 line += 1
col = -1 col = -1
+1 -1
View File
@@ -9,7 +9,7 @@ from re import MULTILINE, compile as recompile, finditer
from pygls.workspace import TextDocument from pygls.workspace import TextDocument
from skillls.checker import check_content_for_errors from skillls.checker import check_content_for_errors
from skillls.types import URI, Node, NodeKind from skillls.types import Node, NodeKind
logger = getLogger(__name__) logger = getLogger(__name__)
+1 -1
View File
@@ -1,5 +1,5 @@
from dataclasses import dataclass, field from dataclasses import dataclass, field
from enum import Enum, auto from enum import Enum
from lsprotocol.types import DocumentSymbol, Range, SymbolKind from lsprotocol.types import DocumentSymbol, Range, SymbolKind
URI = str URI = str
Generated
+12 -12
View File
@@ -344,7 +344,7 @@ dependencies = [
{ name = "tree-sitter-skill" }, { name = "tree-sitter-skill" },
] ]
[package.optional-dependencies] [package.dev-dependencies]
dev = [ dev = [
{ name = "black" }, { name = "black" },
{ name = "mypy" }, { name = "mypy" },
@@ -355,18 +355,21 @@ dev = [
[package.metadata] [package.metadata]
requires-dist = [ requires-dist = [
{ name = "black", marker = "extra == 'dev'" },
{ name = "mypy", marker = "extra == 'dev'" },
{ name = "parsimonious", specifier = "~=0.10.0" }, { name = "parsimonious", specifier = "~=0.10.0" },
{ name = "pygls", specifier = "~=2.0" }, { name = "pygls", specifier = "~=2.0" },
{ name = "pytest", marker = "extra == 'dev'" },
{ name = "rich" }, { name = "rich" },
{ name = "ruff", marker = "extra == 'dev'" },
{ name = "tree-sitter", specifier = ">=0.24.0" }, { name = "tree-sitter", specifier = ">=0.24.0" },
{ name = "tree-sitter-skill", directory = "../tree-sitter-skill" }, { name = "tree-sitter-skill", git = "ssh://git@git.acereca.net/acereca/tree-sitter-skill.git" },
{ name = "types-parsimonious", marker = "extra == 'dev'" }, ]
[package.metadata.requires-dev]
dev = [
{ name = "black" },
{ name = "mypy" },
{ name = "pytest" },
{ name = "ruff" },
{ name = "types-parsimonious" },
] ]
provides-extras = ["dev"]
[[package]] [[package]]
name = "tree-sitter" name = "tree-sitter"
@@ -400,14 +403,11 @@ wheels = [
[[package]] [[package]]
name = "tree-sitter-skill" name = "tree-sitter-skill"
version = "0.1.4" version = "0.1.4"
source = { directory = "../tree-sitter-skill" } source = { git = "ssh://git@git.acereca.net/acereca/tree-sitter-skill.git#854d43328ede7077b1944ef4095c2c8f519369bb" }
dependencies = [ dependencies = [
{ name = "tree-sitter" }, { name = "tree-sitter" },
] ]
[package.metadata]
requires-dist = [{ name = "tree-sitter", specifier = "~=0.24" }]
[[package]] [[package]]
name = "types-parsimonious" name = "types-parsimonious"
version = "0.10.0.20240331" version = "0.10.0.20240331"