branch: externals/matlab-mode
commit 67552aec28fbf9ce58051d6fca392f3a2d3a454d
Author: John Ciolfi <john.ciolfi...@gmail.com>
Commit: John Ciolfi <john.ciolfi...@gmail.com>
matlab-ts-mode: updated to matlab ts abi/14 commit 5ad9933
---
.../font_lock_continuation_issue84.skip.txt | 1 -
.../font_lock_continuation_issue84_expected.txt | 7 ++
.../indent_old_indents.skip.txt | 1 -
.../indent_old_indents_for_typing.skip.txt | 2 -
.../indent_xr_statement_body_expected.org | 119 ++++++++++++---------
.../parser_cell_expected.txt | 2 +-
.../parser_simple_expected.txt | 2 +-
.../parser_simple_with_error_expected.txt | 2 +-
.../parser_variable_ids_expected.txt | 2 +-
.../thing_sentance_expected.org | 8 +-
10 files changed, 82 insertions(+), 64 deletions(-)
diff --git
a/tests/test-matlab-ts-mode-font-lock-files/font_lock_continuation_issue84.skip.txt
b/tests/test-matlab-ts-mode-font-lock-files/font_lock_continuation_issue84.skip.txt
deleted file mode 100644
index c2faf24170..0000000000
---
a/tests/test-matlab-ts-mode-font-lock-files/font_lock_continuation_issue84.skip.txt
+++ /dev/null
@@ -1 +0,0 @@
-See: https://github.com/acristoffers/tree-sitter-matlab/issues/84
diff --git
a/tests/test-matlab-ts-mode-font-lock-files/font_lock_continuation_issue84_expected.txt
b/tests/test-matlab-ts-mode-font-lock-files/font_lock_continuation_issue84_expected.txt
new file mode 100644
index 0000000000..24a5091133
--- /dev/null
+++
b/tests/test-matlab-ts-mode-font-lock-files/font_lock_continuation_issue84_expected.txt
@@ -0,0 +1,7 @@
+c ccc ccccccccc ccc
+
+c cccc cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
+vvvccc
+ o nD
+VVVccc
+ o nD
diff --git a/tests/test-matlab-ts-mode-indent-files/indent_old_indents.skip.txt
b/tests/test-matlab-ts-mode-indent-files/indent_old_indents.skip.txt
deleted file mode 100644
index 0e03eef279..0000000000
--- a/tests/test-matlab-ts-mode-indent-files/indent_old_indents.skip.txt
+++ /dev/null
@@ -1 +0,0 @@
-See https://github.com/acristoffers/tree-sitter-matlab/issues/84
diff --git
a/tests/test-matlab-ts-mode-indent-files/indent_old_indents_for_typing.skip.txt
b/tests/test-matlab-ts-mode-indent-files/indent_old_indents_for_typing.skip.txt
deleted file mode 100644
index f3a969526e..0000000000
---
a/tests/test-matlab-ts-mode-indent-files/indent_old_indents_for_typing.skip.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-See https://github.com/acristoffers/tree-sitter-matlab/issues/84
-Look at the block node issue in the comments section of the github issue.
diff --git
a/tests/test-matlab-ts-mode-indent-xr-files/indent_xr_statement_body_expected.org
b/tests/test-matlab-ts-mode-indent-xr-files/indent_xr_statement_body_expected.org
index 1127ca5c22..4fc1f580d1 100644
---
a/tests/test-matlab-ts-mode-indent-xr-files/indent_xr_statement_body_expected.org
+++
b/tests/test-matlab-ts-mode-indent-xr-files/indent_xr_statement_body_expected.org
@@ -432,28 +432,43 @@
- Invoking : "C-i" = indent-for-tab-command
Start point : 837
- No point movement
- No buffer modifications
+ Moved to point: 833
+ : 30:18: %c
+ : ^
+ Buffer modified:
+ #+begin_src diff
+--- start_contents
++++ end_contents
+@@ -27,7 +27,7 @@
+
+ % Case7: (t-utils-xr "C-n" "C-e" "C-m" (insert "%c") "C-i")
+ spmd
+- %c
++ %c
+ end
+
+ % Case8: (t-utils-xr "C-n" "C-e" "C-m" (insert "%c") "C-i")
+ #+end_src diff
* Executing commands from indent_xr_statement_body.m:33:25:
Case8: (t-utils-xr "C-n" "C-e" "C-m" (insert "%c") "C-i")
- Invoking : "C-n" = next-line
- Start point : 934
- Moved to point: 960
+ Start point : 930
+ Moved to point: 956
: 34:25: elseif a == 2
: ^
No buffer modifications
- Invoking : "C-e" = move-end-of-line
- Start point : 960
+ Start point : 956
No point movement
No buffer modifications
- Invoking : "C-m" = newline
- Start point : 960
- Moved to point: 977
+ Start point : 956
+ Moved to point: 973
: 35:16:
: ^
Buffer modified:
@@ -471,8 +486,8 @@
#+end_src diff
- Invoking : (insert "%c")
- Start point : 977
- Moved to point: 979
+ Start point : 973
+ Moved to point: 975
: 35:18: %c
: ^
Buffer modified:
@@ -491,7 +506,7 @@
#+end_src diff
- Invoking : "C-i" = indent-for-tab-command
- Start point : 979
+ Start point : 975
No point movement
No buffer modifications
@@ -500,20 +515,20 @@
Case9: (t-utils-xr "C-n" "C-e" "C-m" (insert "%c") "C-i")
- Invoking : "C-n" = next-line
- Start point : 1056
- Moved to point: 1073
+ Start point : 1052
+ Moved to point: 1069
: 38:16: else
: ^
No buffer modifications
- Invoking : "C-e" = move-end-of-line
- Start point : 1073
+ Start point : 1069
No point movement
No buffer modifications
- Invoking : "C-m" = newline
- Start point : 1073
- Moved to point: 1090
+ Start point : 1069
+ Moved to point: 1086
: 39:16:
: ^
Buffer modified:
@@ -531,8 +546,8 @@
#+end_src diff
- Invoking : (insert "%c")
- Start point : 1090
- Moved to point: 1092
+ Start point : 1086
+ Moved to point: 1088
: 39:18: %c
: ^
Buffer modified:
@@ -551,7 +566,7 @@
#+end_src diff
- Invoking : "C-i" = indent-for-tab-command
- Start point : 1092
+ Start point : 1088
No point movement
No buffer modifications
@@ -560,20 +575,20 @@
Case10: (t-utils-xr "C-n" "C-e" "C-m" (insert "%c") "C-i")
- Invoking : "C-n" = next-line
- Start point : 1199
- Moved to point: 1219
+ Start point : 1195
+ Moved to point: 1215
: 44:19: while a
: ^
No buffer modifications
- Invoking : "C-e" = move-end-of-line
- Start point : 1219
+ Start point : 1215
No point movement
No buffer modifications
- Invoking : "C-m" = newline
- Start point : 1219
- Moved to point: 1236
+ Start point : 1215
+ Moved to point: 1232
: 45:16:
: ^
Buffer modified:
@@ -591,8 +606,8 @@
#+end_src diff
- Invoking : (insert "%c")
- Start point : 1236
- Moved to point: 1238
+ Start point : 1232
+ Moved to point: 1234
: 45:18: %c
: ^
Buffer modified:
@@ -611,7 +626,7 @@
#+end_src diff
- Invoking : "C-i" = indent-for-tab-command
- Start point : 1238
+ Start point : 1234
No point movement
No buffer modifications
@@ -620,20 +635,20 @@
Case11: (t-utils-xr "C-n" "C-e" "C-m" (insert "%c") "C-i")
- Invoking : "C-n" = next-line
- Start point : 1328
- Moved to point: 1356
+ Start point : 1324
+ Moved to point: 1352
: 49:27: for fIdx = 1:10
: ^
No buffer modifications
- Invoking : "C-e" = move-end-of-line
- Start point : 1356
+ Start point : 1352
No point movement
No buffer modifications
- Invoking : "C-m" = newline
- Start point : 1356
- Moved to point: 1373
+ Start point : 1352
+ Moved to point: 1369
: 50:16:
: ^
Buffer modified:
@@ -651,8 +666,8 @@
#+end_src diff
- Invoking : (insert "%c")
- Start point : 1373
- Moved to point: 1375
+ Start point : 1369
+ Moved to point: 1371
: 50:18: %c
: ^
Buffer modified:
@@ -671,7 +686,7 @@
#+end_src diff
- Invoking : "C-i" = indent-for-tab-command
- Start point : 1375
+ Start point : 1371
No point movement
No buffer modifications
@@ -680,20 +695,20 @@
Case12: (t-utils-xr "C-n" "C-e" "C-m" (insert "%c") "C-i")
- Invoking : "C-n" = next-line
- Start point : 1477
- Moved to point: 1488
+ Start point : 1473
+ Moved to point: 1484
: 56:10: events
: ^
No buffer modifications
- Invoking : "C-e" = move-end-of-line
- Start point : 1488
+ Start point : 1484
No point movement
No buffer modifications
- Invoking : "C-m" = newline
- Start point : 1488
- Moved to point: 1497
+ Start point : 1484
+ Moved to point: 1493
: 57:8:
: ^
Buffer modified:
@@ -711,8 +726,8 @@
#+end_src diff
- Invoking : (insert "%c")
- Start point : 1497
- Moved to point: 1499
+ Start point : 1493
+ Moved to point: 1495
: 57:10: %c
: ^
Buffer modified:
@@ -731,7 +746,7 @@
#+end_src diff
- Invoking : "C-i" = indent-for-tab-command
- Start point : 1499
+ Start point : 1495
No point movement
No buffer modifications
@@ -740,20 +755,20 @@
Case13: (t-utils-xr "C-n" "C-e" "C-m" (insert "%c") "C-i")
- Invoking : "C-n" = next-line
- Start point : 1573
- Moved to point: 1589
+ Start point : 1569
+ Moved to point: 1585
: 61:15: enumeration
: ^
No buffer modifications
- Invoking : "C-e" = move-end-of-line
- Start point : 1589
+ Start point : 1585
No point movement
No buffer modifications
- Invoking : "C-m" = newline
- Start point : 1589
- Moved to point: 1598
+ Start point : 1585
+ Moved to point: 1594
: 62:8:
: ^
Buffer modified:
@@ -771,8 +786,8 @@
#+end_src diff
- Invoking : (insert "%c")
- Start point : 1598
- Moved to point: 1600
+ Start point : 1594
+ Moved to point: 1596
: 62:10: %c
: ^
Buffer modified:
@@ -791,7 +806,7 @@
#+end_src diff
- Invoking : "C-i" = indent-for-tab-command
- Start point : 1600
+ Start point : 1596
No point movement
No buffer modifications
@@ -800,7 +815,7 @@
Case14: (t-utils-xr (re-search-backward "^classdef") (print
(buffer-substring-no-properties (point) (point-max))))
- Invoking : (re-search-backward "^classdef")
- Start point : 1742
+ Start point : 1738
Moved to point: 82
: 4:0: classdef indent_xr_statement_body < handle
: ^
@@ -837,7 +852,7 @@ classdef indent_xr_statement_body < handle
% Case7: (t-utils-xr \"C-n\" \"C-e\" \"C-m\" (insert \"%c\")
\"C-i\")
spmd
- %c
+ %c
end
% Case8: (t-utils-xr \"C-n\" \"C-e\" \"C-m\" (insert \"%c\")
\"C-i\")
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 2f72e5247e..d905e13671 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,5 +1,5 @@
# tree-sitter parse tree annotated with [NODE-START,NODE-END]{NODE-TEXT}
-(source_file (comment[1,20]{% -*- matlab-ts -*-}) \n
+(source_file (comment[1,20]{% -*- matlab-ts -*-})
(assignment left: (identifier[22,23]{a}) =
right:
(cell {
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 dfafedb61c..58734b41ce 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,5 @@
# tree-sitter parse tree annotated with [NODE-START,NODE-END]{NODE-TEXT}
-(source_file (comment[1,20]{% -*- matlab-ts -*-}) \n
+(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 8847f9e8e3..92ea393be2 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,5 @@
# tree-sitter parse tree annotated with [NODE-START,NODE-END]{NODE-TEXT}
-(source_file (comment[1,20]{% -*- matlab-ts -*-}) \n
+(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 d2df0d049d..1b0e9a5381 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,5 +1,5 @@
# tree-sitter parse tree annotated with [NODE-START,NODE-END]{NODE-TEXT}
-(source_file (comment[1,20]{% -*- matlab-ts -*-}) \n
+(source_file (comment[1,20]{% -*- matlab-ts -*-})
(function_definition function
(function_output (identifier[31,35]{out1}) =)
name: (identifier[38,57]{parser_variable_ids})
diff --git
a/tests/test-matlab-ts-mode-thing-settings-files/thing_sentance_expected.org
b/tests/test-matlab-ts-mode-thing-settings-files/thing_sentance_expected.org
index ae92ed02b2..caea72cfa6 100644
--- a/tests/test-matlab-ts-mode-thing-settings-files/thing_sentance_expected.org
+++ b/tests/test-matlab-ts-mode-thing-settings-files/thing_sentance_expected.org
@@ -6,13 +6,13 @@
- Invoking : "M-e" = forward-sentence
Start point : 55
- Moved to point: 1709
- : 102:3: end
- : ^
+ Moved to point: 79
+ : 4:23: classdef thing_sentance
+ : ^
No buffer modifications
- Invoking : "M-a" = backward-sentence
- Start point : 1709
+ Start point : 79
Moved to point: 56
: 4:0: classdef thing_sentance
: ^
