diff options
| -rw-r--r-- | queries/t32/indents.scm | 22 | ||||
| -rw-r--r-- | tests/indent/t32/if_block.cmm | 6 | ||||
| -rw-r--r-- | tests/indent/t32_spec.lua | 39 |
3 files changed, 34 insertions, 33 deletions
diff --git a/queries/t32/indents.scm b/queries/t32/indents.scm index 64ee3f571..b30b916d2 100644 --- a/queries/t32/indents.scm +++ b/queries/t32/indents.scm @@ -1,28 +1,15 @@ -; Subroutines & scoping (block ")" @indent.branch .) @indent.begin +(if_block) @indent.begin -; Control flow statements -( - (if_block - condition: (_) - . (_) @_then) @indent.begin - (#not-has-type? @_then block) -) +(if_block + (block)) @indent.dedent (else_block) @indent.branch (else_block - (if_block) @indent.dedent) @indent.branch - -( - (else_block - (if_block - condition: (_) - . (_) @_then)) @indent.branch - (#not-has-type? @_then block) -) + (if_block) @indent.dedent) (while_block (command_expression)) @indent.auto @@ -30,5 +17,4 @@ (repeat_block (command_expression)) @indent.auto - (comment) @indent.auto diff --git a/tests/indent/t32/if_block.cmm b/tests/indent/t32/if_block.cmm index e85b5e714..4bda7c6e5 100644 --- a/tests/indent/t32/if_block.cmm +++ b/tests/indent/t32/if_block.cmm @@ -43,7 +43,7 @@ IF &f stop ELSE IF &h - ( - continue - ) + ( + continue + ) diff --git a/tests/indent/t32_spec.lua b/tests/indent/t32_spec.lua index b305cd61c..88d26612b 100644 --- a/tests/indent/t32_spec.lua +++ b/tests/indent/t32_spec.lua @@ -35,7 +35,22 @@ describe("indent t32:", function() ) end - runner:new_line("if_block.cmm", { on_line = 45, text = "&x=1.", indent = 2 }, "command in IF then") + -- Insertion of a command right before the existing block results in + -- incorrect syntax. The parse either detect an error or incorrectly + -- assumes "ELSE IF" is a command. + for ii, test in ipairs { + { 26, 2 }, + { 30, 2 }, + } do + runner:new_line( + "if_block.cmm", + { on_line = test[1], text = 'PRINT ""', indent = test[2] }, + "displace block in IF then[" .. ii .. "]", + XFAIL + ) + end + + runner:new_line("if_block.cmm", { on_line = 45, text = "&x=1.", indent = 6 }, "command in IF then", XFAIL) for ii, test in ipairs { { 16, 2 }, @@ -45,7 +60,7 @@ describe("indent t32:", function() } do runner:new_line( "if_block.cmm", - { on_line = test[1], text = "(\n", indent = test[2] }, + { on_line = test[1], text = "CONTinue\n", indent = test[2] }, "command in IF else[" .. ii .. "]" ) end @@ -68,8 +83,8 @@ describe("indent t32:", function() end for ii, test in ipairs { - { 1, 0, nil }, - { 4, 2, XFAIL }, + { 1, 0 }, + { 4, 2 }, } do runner:new_line( "repeat_block.cmm", @@ -81,9 +96,9 @@ describe("indent t32:", function() runner:new_line("repeat_block.cmm", { on_line = 3, text = "(\n", indent = 0 }, "block in RePeaT then") for ii, test in ipairs { - { 7, 2, XFAIL }, - { 18, 2, nil }, - { 24, 2, XFAIL }, + { 7, 2 }, + { 18, 2 }, + { 24, 2 }, } do runner:new_line( "repeat_block.cmm", @@ -95,11 +110,11 @@ describe("indent t32:", function() runner:new_line("subroutine_block.cmm", { on_line = 1, text = "(\n", indent = 0 }, "block after call label") for ii, test in ipairs { - { 2, 2, XFAIL }, - { 3, 2, nil }, - { 8, 2, XFAIL }, - { 12, 2, nil }, - { 19, 2, XFAIL }, + { 2, 2 }, + { 3, 2 }, + { 8, 2 }, + { 12, 2 }, + { 19, 2 }, } do runner:new_line( "subroutine_block.cmm", |