aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorStephan Seitz <stephan.seitz@fau.de>2022-01-22 19:10:34 +0100
committerStephan Seitz <stephan.seitz@fau.de>2022-02-05 18:54:55 +0100
commitb06961a519c7494d0d0509a9eadd6bbf72b9bbf5 (patch)
treecd5c95e9b2ea4fd2231272a925dd938f7604f031 /tests
parentindents(c): add zero_indent for #if (diff)
downloadnvim-treesitter-b06961a519c7494d0d0509a9eadd6bbf72b9bbf5.tar
nvim-treesitter-b06961a519c7494d0d0509a9eadd6bbf72b9bbf5.tar.gz
nvim-treesitter-b06961a519c7494d0d0509a9eadd6bbf72b9bbf5.tar.bz2
nvim-treesitter-b06961a519c7494d0d0509a9eadd6bbf72b9bbf5.tar.lz
nvim-treesitter-b06961a519c7494d0d0509a9eadd6bbf72b9bbf5.tar.xz
nvim-treesitter-b06961a519c7494d0d0509a9eadd6bbf72b9bbf5.tar.zst
nvim-treesitter-b06961a519c7494d0d0509a9eadd6bbf72b9bbf5.zip
fix(indents): re-parse before each indent
Diffstat (limited to 'tests')
-rw-r--r--tests/indent/c_spec.lua2
-rw-r--r--tests/indent/cpp_spec.lua4
-rw-r--r--tests/indent/lua/comment.lua6
-rw-r--r--tests/indent/lua_spec.lua4
-rw-r--r--tests/indent/python_spec.lua5
5 files changed, 14 insertions, 7 deletions
diff --git a/tests/indent/c_spec.lua b/tests/indent/c_spec.lua
index 40d393ca8..2c19ba774 100644
--- a/tests/indent/c_spec.lua
+++ b/tests/indent/c_spec.lua
@@ -27,7 +27,7 @@ describe("indent C:", function()
runner:new_line("cond.c", { on_line = 9, text = "x++;", indent = 4 })
runner:new_line("expr.c", { on_line = 10, text = "2 *", indent = 8 })
runner:new_line("func.c", { on_line = 17, text = "int z,", indent = 4 })
- runner:new_line("label.c", { on_line = 3, text = "normal:", indent = 0 }, "expected failure", XFAIL)
+ runner:new_line("label.c", { on_line = 3, text = "normal:", indent = 0 })
runner:new_line("loop.c", { on_line = 3, text = "x++;", indent = 8 })
runner:new_line("preproc_cond.c", { on_line = 5, text = "x++;", indent = 4 })
runner:new_line("preproc_func.c", { on_line = 3, text = "x++; \\", indent = 8 }, "expected failure", XFAIL)
diff --git a/tests/indent/cpp_spec.lua b/tests/indent/cpp_spec.lua
index b3f394375..7ac69e2a6 100644
--- a/tests/indent/cpp_spec.lua
+++ b/tests/indent/cpp_spec.lua
@@ -22,7 +22,7 @@ describe("indent C++:", function()
end)
describe("new line:", function()
- run:new_line("cpp/access.cpp", { on_line = 3, text = "protected:", indent = 0 }, "expected failure", XFAIL)
+ run:new_line("cpp/access.cpp", { on_line = 3, text = "protected:", indent = 0 })
run:new_line("cpp/class.cpp", { on_line = 2, text = "using T = int;", indent = 4 })
run:new_line("cpp/stream.cpp", { on_line = 5, text = "<< x + 3", indent = 8 })
@@ -34,7 +34,7 @@ describe("indent C++:", function()
run:new_line("c/cond.c", { on_line = 9, text = "x++;", indent = 4 })
run:new_line("c/expr.c", { on_line = 10, text = "2 *", indent = 8 })
run:new_line("c/func.c", { on_line = 17, text = "int z,", indent = 4 })
- run:new_line("c/label.c", { on_line = 3, text = "normal:", indent = 0 }, "expected failure", XFAIL)
+ run:new_line("c/label.c", { on_line = 3, text = "normal:", indent = 0 })
run:new_line("c/loop.c", { on_line = 3, text = "x++;", indent = 8 })
run:new_line("c/preproc_cond.c", { on_line = 5, text = "x++;", indent = 4 })
run:new_line("c/preproc_func.c", { on_line = 3, text = "x++; \\", indent = 8 }, "expected failure", XFAIL)
diff --git a/tests/indent/lua/comment.lua b/tests/indent/lua/comment.lua
index 9f3624e1e..36ed01530 100644
--- a/tests/indent/lua/comment.lua
+++ b/tests/indent/lua/comment.lua
@@ -5,3 +5,9 @@
another
comment
--]]
+
+ --[[
+ another
+ comment
+ a bit more indented
+ --]]
diff --git a/tests/indent/lua_spec.lua b/tests/indent/lua_spec.lua
index 2577e4837..17584a9ee 100644
--- a/tests/indent/lua_spec.lua
+++ b/tests/indent/lua_spec.lua
@@ -1,5 +1,5 @@
local Runner = require("tests.indent.common").Runner
-local XFAIL = require("tests.indent.common").XFAIL
+--local XFAIL = require("tests.indent.common").XFAIL
local run = Runner:new(it, "tests/indent/lua", {
tabstop = 2,
@@ -19,7 +19,7 @@ describe("indent Lua:", function()
describe("new line:", function()
run:new_line("comment.lua", { on_line = 1, text = "line", indent = "-- " })
- run:new_line("comment.lua", { on_line = 5, text = "multiline", indent = " " }, "expected failure", XFAIL)
+ run:new_line("comment.lua", { on_line = 5, text = "multiline", indent = " " })
run:new_line("func.lua", { on_line = 1, text = "x = x + 1", indent = 2 })
run:new_line("func.lua", { on_line = 2, text = "y = y + 1", indent = 4 })
run:new_line("func.lua", { on_line = 4, text = "y = y + 1", indent = 2 })
diff --git a/tests/indent/python_spec.lua b/tests/indent/python_spec.lua
index c9fcaf013..da8a97b67 100644
--- a/tests/indent/python_spec.lua
+++ b/tests/indent/python_spec.lua
@@ -1,4 +1,5 @@
local Runner = require("tests.indent.common").Runner
+local XFAIL = require("tests.indent.common").XFAIL
local run = Runner:new(it, "tests/indent/python", {
tabstop = 4,
@@ -28,8 +29,8 @@ describe("indent Python:", function()
run:new_line("control_flow.py", { on_line = 22, text = "x = 4", indent = 4 })
run:new_line("hanging_indent.py", { on_line = 1, text = "arg0,", indent = 8 })
run:new_line("hanging_indent.py", { on_line = 5, text = "0,", indent = 4 })
- run:new_line("join_lines.py", { on_line = 1, text = "+ 1 \\", indent = 4 })
- run:new_line("join_lines.py", { on_line = 4, text = "+ 1 \\", indent = 4 })
+ run:new_line("join_lines.py", { on_line = 1, text = "+ 1 \\", indent = 4 }, "expected failure", XFAIL)
+ run:new_line("join_lines.py", { on_line = 4, text = "+ 1 \\", indent = 4 }, "expected failure", XFAIL)
run:new_line("join_lines.py", { on_line = 7, text = "+ 1 \\", indent = 4 })
run:new_line("nested_collections.py", { on_line = 5, text = "0,", indent = 12 })
run:new_line("nested_collections.py", { on_line = 6, text = ",0", indent = 12 })