Skip to content

Commit c9b5bdf

Browse files
a couple of unit tests for the tree-sitter
1 parent 2dad2a7 commit c9b5bdf

File tree

6 files changed

+372
-14
lines changed

6 files changed

+372
-14
lines changed

.github/workflows/test.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ jobs:
2929
- name: Lint
3030
run: scripts/lint_teal.sh
3131

32+
- name: Test
33+
run: luarocks test
34+
3235
- name: Check for untracked or modified files
3336
run: |
3437
if [ -n "$(git status --porcelain)" ]; then

gen/teal_language_server/document.lua

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ local asserts = require("teal_language_server.asserts")
99
local tracing = require("teal_language_server.tracing")
1010

1111
local ltreesitter = require("ltreesitter")
12-
local teal_parser = ltreesitter.load("./teal.so", "teal")
12+
local teal_parser = ltreesitter.require("parser/teal", "teal")
1313

1414
local tl = require("tl")
1515

@@ -397,7 +397,7 @@ function Document:type_information_for_tokens(tokens, y, x)
397397
return nil
398398
end
399399

400-
function Document:_parser_token(y, x)
400+
function Document:_tree_sitter_token(y, x)
401401
local moved = self._tree_cursor:goto_first_child()
402402
local node = self._tree_cursor:current_node()
403403

@@ -487,21 +487,21 @@ function Document:_parser_token(y, x)
487487

488488
if y == start_point.row and y == end_point.row then
489489
if x >= start_point.column and x <= end_point.column then
490-
return self:_parser_token(y, x)
490+
return self:_tree_sitter_token(y, x)
491491
end
492492

493493
elseif y >= start_point.row and y <= end_point.row then
494-
return self:_parser_token(y, x)
494+
return self:_tree_sitter_token(y, x)
495495
end
496496

497497
moved = self._tree_cursor:goto_next_sibling()
498498
node = self._tree_cursor:current_node()
499499
end
500500
end
501501

502-
function Document:parser_token(y, x)
502+
function Document:tree_sitter_token(y, x)
503503
self._tree_cursor:reset(self._tree:root())
504-
return self:_parser_token(y, x)
504+
return self:_tree_sitter_token(y, x)
505505
end
506506

507507
class.setup(Document, "Document", {

gen/teal_language_server/misc_handlers.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ function MiscHandlers:_get_node_info(params, pos)
167167
end
168168

169169
tracing.warning(_module_name, "Received request for completion at position: {}", { pos })
170-
local node_info = doc:parser_token(pos.line, pos.character)
170+
local node_info = doc:tree_sitter_token(pos.line, pos.character)
171171
if node_info == nil then
172172
tracing.warning(_module_name, "Unable to retrieve node info from tree-sitter parser", {})
173173
return nil

0 commit comments

Comments
 (0)