Skip to content

Commit c584804

Browse files
committed
fix while statement
1 parent 082c21b commit c584804

File tree

3 files changed

+46
-7
lines changed

3 files changed

+46
-7
lines changed

Matlab.tmbundle/Syntaxes/MATLAB.tmLanguage

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -692,17 +692,16 @@
692692
<key>name</key>
693693
<string>meta.while.declaration.matlab</string>
694694
<key>begin</key>
695-
<string>\G</string>
695+
<string>\G(?!$)</string>
696696
<key>end</key>
697-
<string>(?&lt;!\.{3}.*)(?:(?=([,;])(?![^(]*\)))|$)</string>
698-
<key>endCaptures</key>
699-
<dict>
700-
<key>1</key>
697+
<string>(?&lt;!\.{3}.*)(?:(?=[,;](?![^(]*\)))|$)</string>
698+
<key>patterns</key>
699+
<array>
701700
<dict>
702701
<key>include</key>
703702
<string>$self</string>
704703
</dict>
705-
</dict>
704+
</array>
706705
</dict>
707706
<dict>
708707
<key>include</key>

test/snap/Account.m.snap

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,10 @@
278278
# ^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.while.matlab keyword.control.while.matlab
279279
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.while.matlab meta.while.declaration.matlab
280280
# ^^^^^^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.while.matlab meta.while.declaration.matlab variable.other.readwrite.matlab
281-
# ^^^^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.while.matlab meta.while.declaration.matlab
281+
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.while.matlab meta.while.declaration.matlab
282+
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.while.matlab meta.while.declaration.matlab keyword.operator.relational.matlab
283+
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.while.matlab meta.while.declaration.matlab
284+
# ^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.while.matlab meta.while.declaration.matlab constant.numeric.decimal.matlab
282285
> n = n + 1;
283286
#^^^^^^^^^^^^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.while.matlab
284287
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.while.matlab meta.assignment.variable.single.matlab variable.other.readwrite.matlab

test/t78EOLcommentsInBlocks.m

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
% SYNTAX TEST "source.matlab" "EOLcommentsInBlocks: https://github.com/mathworks/MATLAB-Language-grammar/pull/78"
2+
3+
4+
while test % test
5+
% <---- keyword.control.while.matlab
6+
% ^^^^ meta.while.declaration.matlab
7+
% ^^^^^^ comment.line.percentage.matlab
8+
% test
9+
end
10+
11+
while (test) % test
12+
% <---- keyword.control.while.matlab
13+
% ^^^^^^ meta.while.declaration.matlab
14+
% ^^^^^^ comment.line.percentage.matlab
15+
% test
16+
end
17+
18+
while test; % test
19+
% <---- keyword.control.while.matlab
20+
% ^^^^ meta.while.declaration.matlab
21+
% ^^^^^^ comment.line.percentage.matlab
22+
% test
23+
end
24+
25+
for i = 1:10 % test
26+
% <-- keyword.control.for.matlab
27+
% ^^^^^ meta.for.declaration.matlab
28+
% ^^^^^^ comment.line.percentage.matlab
29+
% test
30+
end
31+
32+
if i == 10 % test
33+
% <-- keyword.control.if.matlab
34+
% ^^^^^^^ meta.if.declaration.matlab
35+
% ^^^^^^ comment.line.percentage.matlab
36+
% test
37+
end

0 commit comments

Comments
 (0)