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

indents(c): Refactor indent queries

Browse source
This commit is contained in:
Pham Huy Hoang 2023-01-10 14:04:27 +09:00 • committed by Stephan Seitz
parent 5ac2c92060
commit 2f5deed456
6 changed files with 179 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

60
tests/indent/c/if_else.c Normal file
View file

@ -0,0 +1,60 @@
int foo(int x){
if (x > 10)
return 10;
if (x > 10)
return 10;
else
return 10;
if (x > 20)
return 20;
else if (x > 15)
return 15;
else
return 10;
}
int bar(int x){
if (x > 20)
return 10;
else {
return 10;
}
if (x > 20)
return 10;
else if (x > 10) {
return 10;
}
}
int baz(int x){
if (x > 20)
return x;
else if(x > 10) {
if(x > 10) {
if(x > 10)
return 10;
if(x > 5) {
return 5;
}
}
}
if (x > 20)
if (x > 19)
if(x > 18)
return x;
if (x > 20)
return x;
else if (x > 19) {
if (x > 18)
return x;
else
x++;
}
else
return x;
}

7
tests/indent/c/issue-4079.c Normal file
View file

@ -0,0 +1,7 @@
int main(){
for(;;)
}
int foo(){
while(1)
}

6
tests/indent/c/issue-4117.c Normal file
View file

@ -0,0 +1,6 @@
int main(){
if(1){
}
else {
}
}

1
tests/indent/c/no_braces.c
View file

@ -10,3 +10,4 @@ int foo(int x) {
for (int i = 0; i < 3; ++i)
x--;
}

32
tests/indent/c_spec.lua
View file

@ -38,9 +38,35 @@ describe("indent C:", function()
runner:new_line("ternary.c", { on_line = 4, text = ": (x == 0) : 0", indent = 8 })
runner:new_line("issue-1568.c", { on_line = 4, text = "x++;", indent = 8 })
runner:new_line("issue-2086.c", { on_line = 3, text = "}", indent = 0 })
runner:new_line("issue-4079.c", { on_line = 2, text = "return;", indent = 8 })
runner:new_line("issue-4079.c", { on_line = 2, text = "{", indent = 4 })
runner:new_line("issue-4079.c", { on_line = 6, text = "{", indent = 4 })
-- the line after inserted one will be left with wrong indent but we only care about the inserted one
runner:new_line("no_braces.c", { on_line = 4, text = "x++;", indent = 8 })
runner:new_line("no_braces.c", { on_line = 7, text = "x++;", indent = 8 })
runner:new_line("no_braces.c", { on_line = 10, text = "x++;", indent = 8 })
for _, line in ipairs { 2, 4, 7, 10 } do
runner:new_line("no_braces.c", { on_line = line, text = "x++;", indent = 8 })
end
for _, line in ipairs { 2, 5, 7, 10, 12, 14, 20, 22, 25, 27, 28, 33 } do
runner:new_line("if_else.c", { on_line = line, text = "x++;", indent = 8 })
end
for _, line in ipairs { 3, 6, 8, 13, 15, 20, 23 } do
runner:new_line("if_else.c", { on_line = line, text = "else", indent = 4 })
end
for _, info in ipairs {
{ 36, 12 },
{ 37, 16 },
{ 38, 12 },
{ 39, 16 },
{ 41, 12 },
{ 42, 8 },
{ 45, 8 },
{ 46, 12 },
{ 47, 16 },
{ 48, 4 },
{ 52, 8 },
{ 53, 12 },
{ 54, 12 },
} do
runner:new_line("if_else.c", { on_line = info[1], text = "x++;", indent = info[2] })
end
end)
end)