branch: externals/matlab-mode
commit 84fdab059277c75aa71ec3a0ee760b3672942756
Author: John Ciolfi <[email protected]>
Commit: John Ciolfi <[email protected]>
ts-parser-tests: update format of the syntax tree baselines
---
tests/t-utils.el | 5 ++-
...binary_operator_continued_issue107_expected.txt | 51 +++++++++++-----------
.../parser_cell_expected.txt | 23 +++++-----
.../parser_simple_expected.txt | 9 ++--
.../parser_simple_with_error_expected.txt | 9 ++--
.../parser_variable_ids_expected.txt | 23 +++++-----
6 files changed, 63 insertions(+), 57 deletions(-)
diff --git a/tests/t-utils.el b/tests/t-utils.el
index 125435e0cd..38ce0d0e8d 100644
--- a/tests/t-utils.el
+++ b/tests/t-utils.el
@@ -2792,7 +2792,7 @@ Similar `treesit--explorer-draw-node' but designed for
test baselines."
(setq node-text (replace-regexp-in-string (car pair) (cdr
pair) node-text)))
(when (> (length node-text) 50)
(setq node-text (concat (substring node-text 0 50) "...")))
- (insert (format "[%d,%d]{%s}"
+ (insert (format "[%d,%d)@{%s}@"
(treesit-node-start node)
(treesit-node-end node)
node-text)))))
@@ -2826,7 +2826,8 @@ Similar `treesit--explorer-draw-node' but designed for
test baselines."
(let ((root (or (treesit-buffer-root-node)
(error "No tree-sitter root node"))))
(with-temp-buffer
- (insert "# tree-sitter parse tree annotated with
[NODE-START,NODE-END]{NODE-TEXT}\n")
+ (insert "# tree-sitter parse tree annotated with
[NODE_START,NODE_END)@{NODE_TEXT}@\n")
+ (insert "# where node is of length NODE-END - NODE_START\n")
(t-utils--syntax-tree-draw-node root)
(goto-char (point-max))
(insert "\n")
diff --git
a/tests/test-matlab-ts-mode-parser-files/parser_binary_operator_continued_issue107_expected.txt
b/tests/test-matlab-ts-mode-parser-files/parser_binary_operator_continued_issue107_expected.txt
index e187dcc304..542477887b 100644
---
a/tests/test-matlab-ts-mode-parser-files/parser_binary_operator_continued_issue107_expected.txt
+++
b/tests/test-matlab-ts-mode-parser-files/parser_binary_operator_continued_issue107_expected.txt
@@ -1,63 +1,64 @@
-# tree-sitter parse tree annotated with [NODE-START,NODE-END]{NODE-TEXT}
-(source_file (comment[1,20]{% -*- matlab-ts -*-}) (comment[22,89]{% See
https://github.com/acristoffers/tree-sitter-...})
- (assignment left: (identifier[91,93]{v1}) =
+# tree-sitter parse tree annotated with [NODE_START,NODE_END)@{NODE_TEXT}@
+# where node is of length NODE-END - NODE_START
+(source_file (comment[1,20)@{% -*- matlab-ts -*-}@) (comment[22,89)@{% See
https://github.com/acristoffers/tree-sitter-...}@)
+ (assignment left: (identifier[91,93)@{v1}@) =
right:
(cell {
(row
- (binary_operator left: (number[97,98]{1}) + right: (number[101,102]{2})))
+ (binary_operator left: (number[97,98)@{1}@) + right:
(number[101,102)@{2}@)))
}))
;
- (assignment left: (identifier[106,108]{v2}) =
+ (assignment left: (identifier[106,108)@{v2}@) =
right:
- (cell { (line_continuation[113,117]{...\n})
+ (cell { (line_continuation[113,117)@{...\n}@)
(row
- (binary_operator left: (number[124,125]{1})
(line_continuation[126,137]{...\n }) +
(line_continuation[139,143]{...\n}) right: (number[150,151]{2})))
+ (binary_operator left: (number[124,125)@{1}@)
(line_continuation[126,137)@{...\n }@) +
(line_continuation[139,143)@{...\n}@) right: (number[150,151)@{2}@)))
}))
;
- (function_call name: (identifier[161,167]{assert}) (
+ (function_call name: (identifier[161,167)@{assert}@) (
(arguments
argument:
- (function_call name: (identifier[168,175]{isequal}) (
- (arguments argument: (identifier[176,178]{v1}) ,
(identifier[180,182]{v2}))
+ (function_call name: (identifier[168,175)@{isequal}@) (
+ (arguments argument: (identifier[176,178)@{v1}@) ,
(identifier[180,182)@{v2}@))
)))
))
\n
- (assignment left: (identifier[186,188]{v3}) =
+ (assignment left: (identifier[186,188)@{v3}@) =
right:
(matrix [
(row
- (binary_operator left: (number[192,193]{1}) + right:
(number[196,197]{2})))
+ (binary_operator left: (number[192,193)@{1}@) + right:
(number[196,197)@{2}@)))
]))
;
- (assignment left: (identifier[201,203]{v4}) =
+ (assignment left: (identifier[201,203)@{v4}@) =
right:
- (matrix [ (line_continuation[208,212]{...\n})
+ (matrix [ (line_continuation[208,212)@{...\n}@)
(row
- (binary_operator left: (number[219,220]{1})
(line_continuation[221,232]{...\n }) +
(line_continuation[234,238]{...\n}) right: (number[245,246]{2})))
+ (binary_operator left: (number[219,220)@{1}@)
(line_continuation[221,232)@{...\n }@) +
(line_continuation[234,238)@{...\n}@) right: (number[245,246)@{2}@)))
]))
;
- (function_call name: (identifier[256,262]{assert}) (
+ (function_call name: (identifier[256,262)@{assert}@) (
(arguments
argument:
- (function_call name: (identifier[263,270]{isequal}) (
- (arguments argument: (identifier[271,273]{v3}) ,
(identifier[275,277]{v4}))
+ (function_call name: (identifier[263,270)@{isequal}@) (
+ (arguments argument: (identifier[271,273)@{v3}@) ,
(identifier[275,277)@{v4}@))
)))
))
\n
- (assignment left: (identifier[281,283]{v5}) =
- right: (binary_operator left: (number[286,287]{1}) + right:
(number[290,291]{2})))
+ (assignment left: (identifier[281,283)@{v5}@) =
+ right: (binary_operator left: (number[286,287)@{1}@) + right:
(number[290,291)@{2}@)))
;
- (assignment left: (identifier[294,296]{v6}) =
+ (assignment left: (identifier[294,296)@{v6}@) =
right:
(parenthesis (
- (binary_operator left: (number[300,301]{1})
(line_continuation[302,306]{...\n}) + (line_continuation[314,318]{...\n})
right: (number[324,325]{2}))
+ (binary_operator left: (number[300,301)@{1}@)
(line_continuation[302,306)@{...\n}@) + (line_continuation[314,318)@{...\n}@)
right: (number[324,325)@{2}@))
)))
;
- (function_call name: (identifier[329,335]{assert}) (
+ (function_call name: (identifier[329,335)@{assert}@) (
(arguments
argument:
- (function_call name: (identifier[336,343]{isequal}) (
- (arguments argument: (identifier[344,346]{v5}) ,
(identifier[348,350]{v6}))
+ (function_call name: (identifier[336,343)@{isequal}@) (
+ (arguments argument: (identifier[344,346)@{v5}@) ,
(identifier[348,350)@{v6}@))
)))
))
\n)
diff --git a/tests/test-matlab-ts-mode-parser-files/parser_cell_expected.txt
b/tests/test-matlab-ts-mode-parser-files/parser_cell_expected.txt
index bd3f6ae470..31e67dac75 100644
--- a/tests/test-matlab-ts-mode-parser-files/parser_cell_expected.txt
+++ b/tests/test-matlab-ts-mode-parser-files/parser_cell_expected.txt
@@ -1,22 +1,23 @@
-# tree-sitter parse tree annotated with [NODE-START,NODE-END]{NODE-TEXT}
-(source_file (comment[1,20]{% -*- matlab-ts -*-})
- (assignment left: (identifier[22,23]{a}) =
+# tree-sitter parse tree annotated with [NODE_START,NODE_END)@{NODE_TEXT}@
+# where node is of length NODE-END - NODE_START
+(source_file (comment[1,20)@{% -*- matlab-ts -*-}@)
+ (assignment left: (identifier[22,23)@{a}@) =
right:
(cell {
(row
(cell {
- (row (number[28,29]{1}) , (number[31,32]{2}))
+ (row (number[28,29)@{1}@) , (number[31,32)@{2}@))
}))
;
(row
(cell {
- (row (number[41,42]{3}) , (number[44,45]{4}))
+ (row (number[41,42)@{3}@) , (number[44,45)@{4}@))
}))
- ; (comment[53,64]{% comment 1})
+ ; (comment[53,64)@{% comment 1}@)
(row
- (range (number[70,71]{1}) : (number[72,74]{10})))
- (comment[80,91]{% comment 2}) }))
+ (range (number[70,71)@{1}@) : (number[72,74)@{10}@)))
+ (comment[80,91)@{% comment 2}@) }))
;
- (assignment left: (identifier[100,101]{b}) =
- right: (string " (string_content[105,117]{not a \{cell\}}) "))
- ; (comment[121,132]{%\{\n foo\n%\}}) \n)
+ (assignment left: (identifier[100,101)@{b}@) =
+ right: (string " (string_content[105,117)@{not a \{cell\}}@) "))
+ ; (comment[121,132)@{%\{\n foo\n%\}}@) \n)
diff --git a/tests/test-matlab-ts-mode-parser-files/parser_simple_expected.txt
b/tests/test-matlab-ts-mode-parser-files/parser_simple_expected.txt
index 58734b41ce..b311380e23 100644
--- a/tests/test-matlab-ts-mode-parser-files/parser_simple_expected.txt
+++ b/tests/test-matlab-ts-mode-parser-files/parser_simple_expected.txt
@@ -1,5 +1,6 @@
-# tree-sitter parse tree annotated with [NODE-START,NODE-END]{NODE-TEXT}
-(source_file (comment[1,20]{% -*- matlab-ts -*-})
- (assignment left: (identifier[22,23]{a}) =
- right: (binary_operator left: (number[26,27]{1}) + right:
(number[30,31]{2})))
+# tree-sitter parse tree annotated with [NODE_START,NODE_END)@{NODE_TEXT}@
+# where node is of length NODE-END - NODE_START
+(source_file (comment[1,20)@{% -*- matlab-ts -*-}@)
+ (assignment left: (identifier[22,23)@{a}@) =
+ right: (binary_operator left: (number[26,27)@{1}@) + right:
(number[30,31)@{2}@)))
; \n)
diff --git
a/tests/test-matlab-ts-mode-parser-files/parser_simple_with_error_expected.txt
b/tests/test-matlab-ts-mode-parser-files/parser_simple_with_error_expected.txt
index 92ea393be2..17cd6c0858 100644
---
a/tests/test-matlab-ts-mode-parser-files/parser_simple_with_error_expected.txt
+++
b/tests/test-matlab-ts-mode-parser-files/parser_simple_with_error_expected.txt
@@ -1,5 +1,6 @@
-# tree-sitter parse tree annotated with [NODE-START,NODE-END]{NODE-TEXT}
-(source_file (comment[1,20]{% -*- matlab-ts -*-})
- (ERROR (identifier[22,23]{a}) =
- (binary_operator left: (number[26,27]{1}) + right: (number[30,31]{2}))
+# tree-sitter parse tree annotated with [NODE_START,NODE_END)@{NODE_TEXT}@
+# where node is of length NODE-END - NODE_START
+(source_file (comment[1,20)@{% -*- matlab-ts -*-}@)
+ (ERROR (identifier[22,23)@{a}@) =
+ (binary_operator left: (number[26,27)@{1}@) + right: (number[30,31)@{2}@))
+))
diff --git
a/tests/test-matlab-ts-mode-parser-files/parser_variable_ids_expected.txt
b/tests/test-matlab-ts-mode-parser-files/parser_variable_ids_expected.txt
index 72857512db..3c07a7f5de 100644
--- a/tests/test-matlab-ts-mode-parser-files/parser_variable_ids_expected.txt
+++ b/tests/test-matlab-ts-mode-parser-files/parser_variable_ids_expected.txt
@@ -1,22 +1,23 @@
-# tree-sitter parse tree annotated with [NODE-START,NODE-END]{NODE-TEXT}
-(source_file (comment[1,20]{% -*- matlab-ts -*-})
+# tree-sitter parse tree annotated with [NODE_START,NODE_END)@{NODE_TEXT}@
+# where node is of length NODE-END - NODE_START
+(source_file (comment[1,20)@{% -*- matlab-ts -*-}@)
(function_definition function
- (function_output (identifier[31,35]{out1}) =)
- name: (identifier[38,57]{parser_variable_ids})
- (function_arguments ( arguments: (identifier[58,61]{in1}) ))
+ (function_output (identifier[31,35)@{out1}@) =)
+ name: (identifier[38,57)@{parser_variable_ids}@)
+ (function_arguments ( arguments: (identifier[58,61)@{in1}@) ))
\n
(block
- (assignment left: (identifier[68,72]{out1}) =
+ (assignment left: (identifier[68,72)@{out1}@) =
right:
(binary_operator
- left: (binary_operator left: (identifier[75,78]{in1}) * right:
(number[81,82]{2}))
+ left: (binary_operator left: (identifier[75,78)@{in1}@) * right:
(number[81,82)@{2}@))
+
- right: (field_expression object: (identifier[85,88]{foo}) . field:
(identifier[89,93]{out1}))))
+ right: (field_expression object: (identifier[85,88)@{foo}@) . field:
(identifier[89,93)@{out1}@))))
;
- (assignment left: (identifier[99,103]{out1}) =
+ (assignment left: (identifier[99,103)@{out1}@) =
right:
- (binary_operator left: (identifier[106,110]{out1}) +
- right: (binary_operator left: (number[113,114]{2}) * right:
(identifier[117,121]{out1}))))
+ (binary_operator left: (identifier[106,110)@{out1}@) +
+ right: (binary_operator left: (number[113,114)@{2}@) * right:
(identifier[117,121)@{out1}@))))
; \n)
end)
\n)
