Skip to content

Commit fd473eb

Browse files
dklilleydklilley
authored
Merge pull request #103 from Gustaf-C/remove_misleading_highlighting
Suggestion: Remove highlighting for properties/methods/struct field accesses
2 parents 264823e + e9c0730 commit fd473eb

7 files changed

Lines changed: 22 additions & 35 deletions

File tree

‎Matlab.tmbundle/Syntaxes/MATLAB.tmLanguage‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1844,7 +1844,7 @@
18441844
<key>name</key>
18451845
<string>meta.function-call.parens.matlab</string>
18461846
<key>begin</key>
1847-
<string>([a-zA-Z][a-zA-Z0-9_]*)\s*(\()</string>
1847+
<string>(?&lt;!\.)\b([a-zA-Z][a-zA-Z0-9_]*)\s*(\()</string>
18481848
<key>end</key>
18491849
<string>(\)|(?&lt;!\.{3}.*)\n)</string>
18501850
<key>beginCaptures</key>
@@ -3045,15 +3045,6 @@
30453045
</dict>
30463046
</dict>
30473047
</dict>
3048-
<key>property</key>
3049-
<dict>
3050-
<key>comment</key>
3051-
<string>Class property or enumeration member access</string>
3052-
<key>name</key>
3053-
<string>variable.other.property.matlab</string>
3054-
<key>match</key>
3055-
<string>(?&lt;=\.)[a-zA-Z][a-zA-Z0-9_]*(?![a-zA-Z0-9_]|(?:\(|\{|\.\())</string>
3056-
</dict>
30573048
<key>readwrite_variable</key>
30583049
<dict>
30593050
<key>comment</key>

‎test/snap/Account.m.snap‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
#^^^^^^^^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab
5757
# ^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.assignment.variable.single.matlab variable.other.readwrite.matlab
5858
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.assignment.variable.single.matlab punctuation.accessor.dot.matlab
59-
# ^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.assignment.variable.single.matlab variable.other.property.matlab
59+
# ^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.assignment.variable.single.matlab
6060
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab
6161
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab keyword.operator.assignment.matlab
6262
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab
@@ -98,7 +98,7 @@
9898
#^^^^^^^^^^^^^^^^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.if.matlab meta.if.matlab
9999
# ^^^ 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
100100
# ^ 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
101-
# ^^^^^ 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
101+
# ^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.if.matlab meta.if.matlab meta.assignment.variable.single.matlab
102102
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.if.matlab meta.if.matlab
103103
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.if.matlab meta.if.matlab keyword.operator.assignment.matlab
104104
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.if.matlab meta.if.matlab
@@ -147,7 +147,7 @@
147147
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.function-call.parens.matlab punctuation.section.brackets.begin.matlab
148148
# ^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.function-call.parens.matlab meta.brackets.matlab variable.other.readwrite.matlab
149149
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.function-call.parens.matlab meta.brackets.matlab punctuation.accessor.dot.matlab
150-
# ^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.function-call.parens.matlab meta.brackets.matlab variable.other.property.matlab
150+
# ^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.function-call.parens.matlab meta.brackets.matlab
151151
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.function-call.parens.matlab punctuation.section.brackets.end.matlab
152152
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.function-call.parens.matlab punctuation.separator.comma.matlab
153153
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.function-call.parens.matlab constant.numeric.decimal.matlab
@@ -246,12 +246,12 @@
246246
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab punctuation.section.brackets.begin.matlab
247247
# ^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.brackets.matlab variable.other.readwrite.matlab
248248
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.brackets.matlab punctuation.accessor.dot.matlab
249-
# ^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.brackets.matlab meta.function-call.parens.matlab entity.name.function.matlab
250-
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.brackets.matlab meta.function-call.parens.matlab punctuation.section.parens.begin.matlab
251-
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.brackets.matlab meta.function-call.parens.matlab
252-
# ^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.brackets.matlab meta.function-call.parens.matlab keyword.operator.word.matlab
253-
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.brackets.matlab meta.function-call.parens.matlab
254-
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.brackets.matlab meta.function-call.parens.matlab punctuation.section.parens.end.matlab
249+
# ^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.brackets.matlab
250+
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.brackets.matlab punctuation.section.parens.begin.matlab
251+
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.brackets.matlab meta.parens.matlab
252+
# ^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.brackets.matlab meta.parens.matlab keyword.operator.word.matlab
253+
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.brackets.matlab meta.parens.matlab
254+
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.brackets.matlab punctuation.section.parens.end.matlab
255255
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.brackets.matlab
256256
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab punctuation.section.brackets.end.matlab
257257
# ^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab

‎test/snap/CircleArea.m.snap‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
#^^^^^^^^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.if.matlab
7676
# ^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.if.matlab meta.assignment.variable.single.matlab variable.other.readwrite.matlab
7777
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.if.matlab meta.assignment.variable.single.matlab punctuation.accessor.dot.matlab
78-
# ^^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.if.matlab meta.assignment.variable.single.matlab variable.other.property.matlab
78+
# ^^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.if.matlab meta.assignment.variable.single.matlab
7979
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.if.matlab
8080
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.if.matlab keyword.operator.assignment.matlab
8181
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.if.matlab
@@ -107,11 +107,11 @@
107107
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab
108108
# ^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab variable.other.readwrite.matlab
109109
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab punctuation.accessor.dot.matlab
110-
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab variable.other.property.matlab
110+
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab
111111
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab keyword.operator.arithmetic.matlab
112112
# ^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab variable.other.readwrite.matlab
113113
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab punctuation.accessor.dot.matlab
114-
# ^^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab variable.other.property.matlab
114+
# ^^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab
115115
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab keyword.operator.arithmetic.matlab
116116
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab constant.numeric.decimal.matlab
117117
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab punctuation.terminator.semicolon.matlab
@@ -156,7 +156,7 @@
156156
#^^^^^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab
157157
# ^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.assignment.variable.single.matlab variable.other.readwrite.matlab
158158
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.assignment.variable.single.matlab punctuation.accessor.dot.matlab
159-
# ^^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.assignment.variable.single.matlab variable.other.property.matlab
159+
# ^^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.assignment.variable.single.matlab
160160
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab
161161
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab keyword.operator.assignment.matlab
162162
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab
@@ -181,7 +181,7 @@
181181
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab
182182
# ^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab variable.other.readwrite.matlab
183183
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab punctuation.accessor.dot.matlab
184-
# ^^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab variable.other.property.matlab
184+
# ^^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab
185185
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab punctuation.terminator.semicolon.matlab
186186
> d = r*2;
187187
#^^^^^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab
@@ -304,7 +304,7 @@
304304
# ^ 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
305305
# ^^^ 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
306306
# ^ 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
307-
# ^^^^ 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
307+
# ^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.function-call.parens.matlab meta.brackets.matlab meta.function-call.parens.matlab
308308
# ^ 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
309309
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab meta.function-call.parens.matlab punctuation.section.brackets.end.matlab
310310
# ^ 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 @@
337337
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab
338338
# ^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab variable.other.readwrite.matlab
339339
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab punctuation.accessor.dot.matlab
340-
# ^^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab variable.other.property.matlab
340+
# ^^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab
341341
# ^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab punctuation.terminator.semicolon.matlab
342342
> disp(['Circle with radius: ',num2str(rad)])
343343
#^^^^^^^^^ source.matlab meta.class.matlab meta.methods.matlab meta.function.matlab

‎test/snap/PropertyValidation.m.snap‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,10 @@
101101
# ^ source.matlab meta.class.matlab meta.properties.matlab meta.assignment.definition.property.matlab
102102
# ^^^^ source.matlab meta.class.matlab meta.properties.matlab meta.assignment.definition.property.matlab variable.other.readwrite.matlab
103103
# ^ source.matlab meta.class.matlab meta.properties.matlab meta.assignment.definition.property.matlab punctuation.accessor.dot.matlab
104-
# ^^^^ source.matlab meta.class.matlab meta.properties.matlab meta.assignment.definition.property.matlab meta.function-call.parens.matlab entity.name.function.matlab
105-
# ^ source.matlab meta.class.matlab meta.properties.matlab meta.assignment.definition.property.matlab meta.function-call.parens.matlab punctuation.section.parens.begin.matlab
106-
# ^ source.matlab meta.class.matlab meta.properties.matlab meta.assignment.definition.property.matlab meta.function-call.parens.matlab constant.numeric.decimal.matlab
107-
# ^ source.matlab meta.class.matlab meta.properties.matlab meta.assignment.definition.property.matlab meta.function-call.parens.matlab punctuation.section.parens.end.matlab
104+
# ^^^^ source.matlab meta.class.matlab meta.properties.matlab meta.assignment.definition.property.matlab
105+
# ^ source.matlab meta.class.matlab meta.properties.matlab meta.assignment.definition.property.matlab punctuation.section.parens.begin.matlab
106+
# ^ source.matlab meta.class.matlab meta.properties.matlab meta.assignment.definition.property.matlab meta.parens.matlab constant.numeric.decimal.matlab
107+
# ^ source.matlab meta.class.matlab meta.properties.matlab meta.assignment.definition.property.matlab punctuation.section.parens.end.matlab
108108
> PropSizeInit (1,2) = 'char'
109109
#^^^^^^^^ source.matlab meta.class.matlab meta.properties.matlab meta.assignment.definition.property.matlab
110110
# ^^^^^^^^^^^^ source.matlab meta.class.matlab meta.properties.matlab meta.assignment.definition.property.matlab variable.object.property.matlab

‎test/snap/argumentValidation.m.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@
187187
# ^ 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
188188
# ^^^^ 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
189189
# ^ 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
190-
# ^^^^^ 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
190+
# ^^^^^ source.matlab meta.function.matlab meta.arguments.matlab meta.assignment.definition.property.matlab meta.block.validation.matlab meta.function-call.parens.matlab
191191
# ^ 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
192192
# ^^ source.matlab meta.function.matlab meta.arguments.matlab meta.assignment.definition.property.matlab meta.block.validation.matlab
193193
# ^^^ 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

‎test/t08PropertyValidation.m‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@
4444
% ^ punctuation.definition.string.end.matlab
4545
PropTypeInit some.type = some.type(1)
4646
% ^^^^^^^^^ storage.type.matlab
47-
% ^^^^^^^ meta.function-call.parens.matlab
48-
% ^^^^ entity.name.function.matlab
4947
% ^ punctuation.section.parens.begin.matlab
5048
% ^ constant.numeric.decimal.matlab
5149
% ^ punctuation.section.parens.end.matlab

‎test/t61ReadWriteOperations.m‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@
66
classInstance.property
77
% <------------ variable.other.readwrite.matlab
88
% ^ punctuation.accessor.dot.matlab
9-
% ^^^^^^^^ variable.other.property.matlab
109

1110
classInstance.method()
1211
% <------------ variable.other.readwrite.matlab
1312
% ^ punctuation.accessor.dot.matlab
14-
% ^^^^^^ entity.name.function.matlab
1513
% ^ punctuation.section.parens.begin.matlab
1614
% ^ punctuation.section.parens.end.matlab

0 commit comments

Comments
 (0)