Skip to content

Commit 467e6ff

Browse files
committed
fix anonymous functions as arguments
1 parent ba83c5e commit 467e6ff

File tree

5 files changed

+28
-5
lines changed

5 files changed

+28
-5
lines changed

Matlab.tmbundle/Syntaxes/MATLAB.tmLanguage

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@
227227
<key>begin</key>
228228
<string>(?&lt;=\))[^\S\n]*(\()?</string>
229229
<key>end</key>
230-
<string>(\))?[^\S\n]*(?=;|(?&lt;!(?:\.{3}.*))\n|%)</string>
230+
<string>(\))?[^\S\n]*(?=;|,|(?&lt;!(?:\.{3}.*))\n|%)</string>
231231
<key>beginCaptures</key>
232232
<dict>
233233
<key>1</key>
@@ -262,7 +262,7 @@
262262
</dict>
263263
</array>
264264
<key>end</key>
265-
<string>(?=;|(?&lt;!(?:\.{3}.*))\n|%)</string>
265+
<string>(?=;|,|(?&lt;!(?:\.{3}.*))\n|%)</string>
266266
</dict>
267267
<key>blocks</key>
268268
<dict>

test/t54LineContinuationInAnonymousFunctions.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
% SYNTAX TEST "source.matlab" "Imports: https://github.com/mathworks/MATLAB-Language-grammar/pull/52"
1+
% SYNTAX TEST "source.matlab" "LineContinationInAnonymousFunctions: https://github.com/mathworks/MATLAB-Language-grammar/pull/52"
22

33

44
@(x, y) x.^2+y;

test/t57Operators.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
% SYNTAX TEST "source.matlab" "Imports: https://github.com/mathworks/MATLAB-Language-grammar/pull/57"
1+
% SYNTAX TEST "source.matlab" "Operators: https://github.com/mathworks/MATLAB-Language-grammar/pull/57"
22

33
%% Assignment and metadata query
44

test/t61ReadWriteOperations.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
% SYNTAX TEST "source.matlab" "Imports: https://github.com/mathworks/MATLAB-Language-grammar/pull/51"
1+
% SYNTAX TEST "source.matlab" "ReadWriteOperations: https://github.com/mathworks/MATLAB-Language-grammar/pull/51"
22

33
variable
44
% <------- variable.other.readwrite.matlab
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
% SYNTAX TEST "source.matlab" "AnonymousFunctionArgument: https://github.com/mathworks/MATLAB-Language-grammar/pull/51"
2+
3+
q = integral(@(x) x.^2, 0, 1);
4+
% ^^^^^^^^^ meta.function.anonymous.matlab
5+
% ^ - meta.function.anonymous.matlab
6+
7+
8+
if ~isempty(lstr)
9+
p.DataTipTemplate.DataTipRows(end+1) = ...
10+
dataTipTextRow('cBin', arrayfun(@(x) lstr, binsX, 'UniformOutput', false));
11+
% ^^^^^^^^^ meta.function.anonymous.matlab
12+
% ^ - meta.function.anonymous.matlab
13+
end
14+
% <-- meta.if.matlab keyword.control.end.if.matlab
15+
16+
17+
if ~isempty(lstr)
18+
p.DataTipTemplate.DataTipRows(end+1) = ...
19+
dataTipTextRow('cBin', arrayfun(@(x) lstr, binsX, 'UniformOutput', false));
20+
% ^^^^^^^^^ meta.function.anonymous.matlab
21+
% ^ - meta.function.anonymous.matlab
22+
end
23+
% <-- meta.if.matlab keyword.control.end.if.matlab

0 commit comments

Comments
 (0)