diff options
| -rw-r--r-- | queries/lua/indents.scm | 7 | ||||
| -rw-r--r-- | tests/indent/lua/func.lua | 2 | ||||
| -rw-r--r-- | tests/indent/lua_spec.lua | 1 |
3 files changed, 9 insertions, 1 deletions
diff --git a/queries/lua/indents.scm b/queries/lua/indents.scm index c05cc4e5f..a5f66ebcc 100644 --- a/queries/lua/indents.scm +++ b/queries/lua/indents.scm @@ -16,10 +16,12 @@ [ "end" - ")" "}" ] @indent.end +(")" @indent.end + (#not-has-parent? @indent.end parameters)) + (return_statement (expression_list (function_call))) @indent.dedent @@ -39,3 +41,6 @@ (comment) @indent.auto (string) @indent.auto + +(ERROR + "function") @indent.begin diff --git a/tests/indent/lua/func.lua b/tests/indent/lua/func.lua index 1f95ca97a..e2c3c037f 100644 --- a/tests/indent/lua/func.lua +++ b/tests/indent/lua/func.lua @@ -7,3 +7,5 @@ function foo(x) 1, 2) end + +function hi() diff --git a/tests/indent/lua_spec.lua b/tests/indent/lua_spec.lua index 3fd4d58a1..b54ec6512 100644 --- a/tests/indent/lua_spec.lua +++ b/tests/indent/lua_spec.lua @@ -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 = 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 = 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 = 2, text = "x", indent = 0 }) run:new_line("string.lua", { on_line = 3, text = "x", indent = 2 }) |