Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions Matlab.tmbundle/Syntaxes/MATLAB.tmLanguage
Original file line number Diff line number Diff line change
Expand Up @@ -1844,7 +1844,7 @@
<key>name</key>
<string>meta.function-call.parens.matlab</string>
<key>begin</key>
<string>([a-zA-Z][a-zA-Z0-9_]*)\s*(\()</string>
<string>(?&lt;!\.)\b([a-zA-Z][a-zA-Z0-9_]*)\s*(\()</string>
<key>end</key>
<string>(\)|(?&lt;!\.{3}.*)\n)</string>
<key>beginCaptures</key>
Expand Down Expand Up @@ -3045,15 +3045,6 @@
</dict>
</dict>
</dict>
<key>property</key>
<dict>
<key>comment</key>
<string>Class property or enumeration member access</string>
<key>name</key>
<string>variable.other.property.matlab</string>
<key>match</key>
<string>(?&lt;=\.)[a-zA-Z][a-zA-Z0-9_]*(?![a-zA-Z0-9_]|(?:\(|\{|\.\())</string>
</dict>
<key>readwrite_variable</key>
<dict>
<key>comment</key>
Expand Down
18 changes: 9 additions & 9 deletions test/snap/Account.m.snap
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
#^^^^^^^^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab
# ^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.assignment.variable.single.matlab variable.other.readwrite.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.assignment.variable.single.matlab punctuation.accessor.dot.matlab
# ^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.assignment.variable.single.matlab variable.other.property.matlab
# ^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.assignment.variable.single.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab keyword.operator.assignment.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab
Expand Down Expand Up @@ -98,7 +98,7 @@
#^^^^^^^^^^^^^^^^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.if.matlab meta.if.matlab
# ^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.if.matlab meta.if.matlab meta.assignment.variable.single.matlab variable.other.readwrite.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.if.matlab meta.if.matlab meta.assignment.variable.single.matlab punctuation.accessor.dot.matlab
# ^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.if.matlab meta.if.matlab meta.assignment.variable.single.matlab variable.other.property.matlab
# ^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.if.matlab meta.if.matlab meta.assignment.variable.single.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.if.matlab meta.if.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.if.matlab meta.if.matlab keyword.operator.assignment.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.if.matlab meta.if.matlab
Expand Down Expand Up @@ -147,7 +147,7 @@
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.function-call.parens.matlab punctuation.section.brackets.begin.matlab
# ^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.function-call.parens.matlab meta.brackets.matlab variable.other.readwrite.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.function-call.parens.matlab meta.brackets.matlab punctuation.accessor.dot.matlab
# ^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.function-call.parens.matlab meta.brackets.matlab variable.other.property.matlab
# ^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.function-call.parens.matlab meta.brackets.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.function-call.parens.matlab punctuation.section.brackets.end.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.function-call.parens.matlab punctuation.separator.comma.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.function-call.parens.matlab constant.numeric.decimal.matlab
Expand Down Expand Up @@ -246,12 +246,12 @@
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab punctuation.section.brackets.begin.matlab
# ^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.brackets.matlab variable.other.readwrite.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.brackets.matlab punctuation.accessor.dot.matlab
# ^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.brackets.matlab meta.function-call.parens.matlab entity.name.function.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.brackets.matlab meta.function-call.parens.matlab punctuation.section.parens.begin.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.brackets.matlab meta.function-call.parens.matlab
# ^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.brackets.matlab meta.function-call.parens.matlab keyword.operator.word.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.brackets.matlab meta.function-call.parens.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.brackets.matlab meta.function-call.parens.matlab punctuation.section.parens.end.matlab
# ^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.brackets.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.brackets.matlab punctuation.section.parens.begin.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.brackets.matlab meta.parens.matlab
# ^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.brackets.matlab meta.parens.matlab keyword.operator.word.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.brackets.matlab meta.parens.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.brackets.matlab punctuation.section.parens.end.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.brackets.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab punctuation.section.brackets.end.matlab
# ^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab
Expand Down
14 changes: 7 additions & 7 deletions test/snap/CircleArea.m.snap
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
#^^^^^^^^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.if.matlab
# ^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.if.matlab meta.assignment.variable.single.matlab variable.other.readwrite.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.if.matlab meta.assignment.variable.single.matlab punctuation.accessor.dot.matlab
# ^^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.if.matlab meta.assignment.variable.single.matlab variable.other.property.matlab
# ^^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.if.matlab meta.assignment.variable.single.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.if.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.if.matlab keyword.operator.assignment.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.if.matlab
Expand Down Expand Up @@ -107,11 +107,11 @@
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab
# ^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab variable.other.readwrite.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab punctuation.accessor.dot.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab variable.other.property.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab keyword.operator.arithmetic.matlab
# ^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab variable.other.readwrite.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab punctuation.accessor.dot.matlab
# ^^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab variable.other.property.matlab
# ^^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab keyword.operator.arithmetic.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab constant.numeric.decimal.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab punctuation.terminator.semicolon.matlab
Expand Down Expand Up @@ -156,7 +156,7 @@
#^^^^^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab
# ^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.assignment.variable.single.matlab variable.other.readwrite.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.assignment.variable.single.matlab punctuation.accessor.dot.matlab
# ^^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.assignment.variable.single.matlab variable.other.property.matlab
# ^^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.assignment.variable.single.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab keyword.operator.assignment.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab
Expand All @@ -181,7 +181,7 @@
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab
# ^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab variable.other.readwrite.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab punctuation.accessor.dot.matlab
# ^^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab variable.other.property.matlab
# ^^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab punctuation.terminator.semicolon.matlab
> d = r*2;
#^^^^^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab
Expand Down Expand Up @@ -304,7 +304,7 @@
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.function-call.parens.matlab meta.brackets.matlab meta.function-call.parens.matlab punctuation.section.parens.begin.matlab
# ^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.function-call.parens.matlab meta.brackets.matlab meta.function-call.parens.matlab variable.other.readwrite.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.function-call.parens.matlab meta.brackets.matlab meta.function-call.parens.matlab punctuation.accessor.dot.matlab
# ^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.function-call.parens.matlab meta.brackets.matlab meta.function-call.parens.matlab variable.other.property.matlab
# ^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.function-call.parens.matlab meta.brackets.matlab meta.function-call.parens.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.function-call.parens.matlab meta.brackets.matlab meta.function-call.parens.matlab punctuation.section.parens.end.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.function-call.parens.matlab punctuation.section.brackets.end.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.function-call.parens.matlab punctuation.section.parens.end.matlab
Expand Down Expand Up @@ -337,7 +337,7 @@
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab
# ^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab variable.other.readwrite.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab punctuation.accessor.dot.matlab
# ^^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab variable.other.property.matlab
# ^^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab punctuation.terminator.semicolon.matlab
> disp(['Circle with radius: ',num2str(rad)])
#^^^^^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab
Expand Down
8 changes: 4 additions & 4 deletions test/snap/PropertyValidation.m.snap
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,10 @@
# ^ source.matlab meta.class.matlab meta.properties.matlab meta.assignment.definition.property.matlab
# ^^^^ source.matlab meta.class.matlab meta.properties.matlab meta.assignment.definition.property.matlab variable.other.readwrite.matlab
# ^ source.matlab meta.class.matlab meta.properties.matlab meta.assignment.definition.property.matlab punctuation.accessor.dot.matlab
# ^^^^ source.matlab meta.class.matlab meta.properties.matlab meta.assignment.definition.property.matlab meta.function-call.parens.matlab entity.name.function.matlab
# ^ source.matlab meta.class.matlab meta.properties.matlab meta.assignment.definition.property.matlab meta.function-call.parens.matlab punctuation.section.parens.begin.matlab
# ^ source.matlab meta.class.matlab meta.properties.matlab meta.assignment.definition.property.matlab meta.function-call.parens.matlab constant.numeric.decimal.matlab
# ^ source.matlab meta.class.matlab meta.properties.matlab meta.assignment.definition.property.matlab meta.function-call.parens.matlab punctuation.section.parens.end.matlab
# ^^^^ source.matlab meta.class.matlab meta.properties.matlab meta.assignment.definition.property.matlab
# ^ source.matlab meta.class.matlab meta.properties.matlab meta.assignment.definition.property.matlab punctuation.section.parens.begin.matlab
# ^ source.matlab meta.class.matlab meta.properties.matlab meta.assignment.definition.property.matlab meta.parens.matlab constant.numeric.decimal.matlab
# ^ source.matlab meta.class.matlab meta.properties.matlab meta.assignment.definition.property.matlab punctuation.section.parens.end.matlab
> PropSizeInit (1,2) = 'char'
#^^^^^^^^ source.matlab meta.class.matlab meta.properties.matlab meta.assignment.definition.property.matlab
# ^^^^^^^^^^^^ source.matlab meta.class.matlab meta.properties.matlab meta.assignment.definition.property.matlab variable.object.property.matlab
Expand Down
2 changes: 1 addition & 1 deletion test/snap/argumentValidation.m.snap
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
# ^ source.matlab meta.function.matlab meta.arguments.matlab meta.assignment.definition.property.matlab meta.block.validation.matlab meta.function-call.parens.matlab punctuation.section.parens.begin.matlab
# ^^^^ source.matlab meta.function.matlab meta.arguments.matlab meta.assignment.definition.property.matlab meta.block.validation.matlab meta.function-call.parens.matlab variable.other.readwrite.matlab
# ^ source.matlab meta.function.matlab meta.arguments.matlab meta.assignment.definition.property.matlab meta.block.validation.matlab meta.function-call.parens.matlab punctuation.accessor.dot.matlab
# ^^^^^ source.matlab meta.function.matlab meta.arguments.matlab meta.assignment.definition.property.matlab meta.block.validation.matlab meta.function-call.parens.matlab variable.other.property.matlab
# ^^^^^ source.matlab meta.function.matlab meta.arguments.matlab meta.assignment.definition.property.matlab meta.block.validation.matlab meta.function-call.parens.matlab
# ^ source.matlab meta.function.matlab meta.arguments.matlab meta.assignment.definition.property.matlab meta.block.validation.matlab meta.function-call.parens.matlab punctuation.section.parens.end.matlab
# ^^ source.matlab meta.function.matlab meta.arguments.matlab meta.assignment.definition.property.matlab meta.block.validation.matlab
# ^^^ source.matlab meta.function.matlab meta.arguments.matlab meta.assignment.definition.property.matlab meta.block.validation.matlab meta.continuation.line.matlab punctuation.separator.continuation.line.matlab
Expand Down
2 changes: 0 additions & 2 deletions test/t08PropertyValidation.m
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@
% ^ punctuation.definition.string.end.matlab
PropTypeInit some.type = some.type(1)
% ^^^^^^^^^ storage.type.matlab
% ^^^^^^^ meta.function-call.parens.matlab
% ^^^^ entity.name.function.matlab
% ^ punctuation.section.parens.begin.matlab
% ^ constant.numeric.decimal.matlab
% ^ punctuation.section.parens.end.matlab
Expand Down
2 changes: 0 additions & 2 deletions test/t61ReadWriteOperations.m
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,9 @@
classInstance.property
% <------------ variable.other.readwrite.matlab
% ^ punctuation.accessor.dot.matlab
% ^^^^^^^^ variable.other.property.matlab

classInstance.method()
% <------------ variable.other.readwrite.matlab
% ^ punctuation.accessor.dot.matlab
% ^^^^^^ entity.name.function.matlab
% ^ punctuation.section.parens.begin.matlab
% ^ punctuation.section.parens.end.matlab
Loading