diff --git a/Matlab.tmbundle/Syntaxes/MATLAB.tmLanguage b/Matlab.tmbundle/Syntaxes/MATLAB.tmLanguage index b6b7e0d..e08f373 100644 --- a/Matlab.tmbundle/Syntaxes/MATLAB.tmLanguage +++ b/Matlab.tmbundle/Syntaxes/MATLAB.tmLanguage @@ -1844,7 +1844,7 @@ name meta.function-call.parens.matlab begin - ([a-zA-Z][a-zA-Z0-9_]*)\s*(\() + (?<!\.)\b([a-zA-Z][a-zA-Z0-9_]*)\s*(\() end (\)|(?<!\.{3}.*)\n) beginCaptures @@ -3045,15 +3045,6 @@ - property - - comment - Class property or enumeration member access - name - variable.other.property.matlab - match - (?<=\.)[a-zA-Z][a-zA-Z0-9_]*(?![a-zA-Z0-9_]|(?:\(|\{|\.\()) - readwrite_variable comment diff --git a/test/snap/Account.m.snap b/test/snap/Account.m.snap index 629e60b..e6e002d 100644 --- a/test/snap/Account.m.snap +++ b/test/snap/Account.m.snap @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/test/snap/CircleArea.m.snap b/test/snap/CircleArea.m.snap index 16cc5c9..e80ed89 100644 --- a/test/snap/CircleArea.m.snap +++ b/test/snap/CircleArea.m.snap @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/test/snap/PropertyValidation.m.snap b/test/snap/PropertyValidation.m.snap index 5f0b555..bdd338f 100644 --- a/test/snap/PropertyValidation.m.snap +++ b/test/snap/PropertyValidation.m.snap @@ -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 diff --git a/test/snap/argumentValidation.m.snap b/test/snap/argumentValidation.m.snap index 964094c..5ab3f84 100644 --- a/test/snap/argumentValidation.m.snap +++ b/test/snap/argumentValidation.m.snap @@ -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 diff --git a/test/t08PropertyValidation.m b/test/t08PropertyValidation.m index 1d1937f..7b493d9 100644 --- a/test/t08PropertyValidation.m +++ b/test/t08PropertyValidation.m @@ -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 diff --git a/test/t61ReadWriteOperations.m b/test/t61ReadWriteOperations.m index 8c8543d..cd89fd2 100644 --- a/test/t61ReadWriteOperations.m +++ b/test/t61ReadWriteOperations.m @@ -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