benbot/nvim-treesitter
1
0
Fork 0
mirror of https://github.com/nvim-treesitter/nvim-treesitter.git synced 2026-07-10 15:30:01 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(lua): indent functions before they are closed

Browse source 
Fixes #6786
This commit is contained in:
Riley Bruins 2024-07-05 10:17:41 -07:00 • committed by Christian Clason
parent f16a775830
commit 4836c1df65
3 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
queries/lua/indents.scm
View file

@ -16,10 +16,12 @@
[ [
"end" "end"
")"
"}" "}"
] @indent.end ] @indent.end
(")" @indent.end
(#not-has-parent? @indent.end parameters))
(return_statement (return_statement
(expression_list (expression_list
(function_call))) @indent.dedent (function_call))) @indent.dedent
@ -39,3 +41,6 @@
(comment) @indent.auto (comment) @indent.auto
(string) @indent.auto (string) @indent.auto
(ERROR
"function") @indent.begin

2
tests/indent/lua/func.lua
View file

@ -7,3 +7,5 @@ function foo(x)
1, 1,
2) 2)
end end
function hi()

1
tests/indent/lua_spec.lua
View file

@ -23,6 +23,7 @@ describe("indent Lua:", function()
run:new_line("func.lua", { on_line = 4, text = "y = y + 1", indent = 2 }) run:new_line("func.lua", { on_line = 4, text = "y = y + 1", indent = 2 })
run:new_line("func.lua", { on_line = 5, text = "3,", indent = 4 }) run:new_line("func.lua", { on_line = 5, text = "3,", indent = 4 })
run:new_line("func.lua", { on_line = 9, text = "x = x + 1", indent = 0 }) run:new_line("func.lua", { on_line = 9, text = "x = x + 1", indent = 0 })
run:new_line("func.lua", { on_line = 11, text = "x = x + 1", indent = 2 })
run:new_line("string.lua", { on_line = 1, text = "x", indent = 0 }) run:new_line("string.lua", { on_line = 1, text = "x", indent = 0 })
run:new_line("string.lua", { on_line = 2, text = "x", indent = 0 }) run:new_line("string.lua", { on_line = 2, text = "x", indent = 0 })
run:new_line("string.lua", { on_line = 3, text = "x", indent = 2 }) run:new_line("string.lua", { on_line = 3, text = "x", indent = 2 })