Skip to content

Commit aefa631

Browse files
anubmatanubmat
committed
Merge remote-tracking branch 'origin/master' into issue_124
2 parents 9360c25 + 522d0e0 commit aefa631

File tree

5 files changed

+31
-36
lines changed

5 files changed

+31
-36
lines changed

‎FindRefs.YAML-tmLanguage

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ patterns:
99
- include: '#footer'
1010
- include: '#reference'
1111
- include: '#line-with-match'
12-
12+
1313
repository:
1414
filename:
1515
match: ^([^ ].*:)$
@@ -39,7 +39,7 @@ repository:
3939
# is for single-line referenes into TypeScript files)
4040
var-expr:
4141
name: meta.var.expr.ts
42-
begin: (?<!\()\s*\b(var|let|const(?!\s+enum))\s+([a-zA-Z_$][\w$]*)
42+
begin: (?<!\()\s*\b(var|let|const(?!\s+enum))\s+([a-zA-Z_$][\w$]*)
4343
beginCaptures:
4444
'1': { name: storage.type.ts }
4545
'2': { name: variable.ts }
@@ -51,12 +51,12 @@ repository:
5151
name: keyword.control.ts
5252
match: \b(break|catch|continue|declare|do|else|finally|for|if|return|switch|throw|try|while)\b
5353

54-
switch-case:
54+
switch-case:
5555
name: case.expr.ts
5656
begin: '\b(case|default)\b'
5757
beginCaptures:
5858
'1': { name: keyword.control.ts }
59-
end: ':'
59+
end: ':'
6060
patterns:
6161
- include: '#expression'
6262

@@ -107,7 +107,7 @@ repository:
107107
match: (?:\b(extends|implements)\b|,)(?:\s+([a-zA-Z_$][.\w$]*))
108108
captures:
109109
'1': { name: storage.modifier.ts }
110-
'2': { name: storage.type.ts }
110+
'2': { name: storage.type.ts }
111111

112112
object-body:
113113
name: meta.object.body.ts
@@ -186,7 +186,7 @@ repository:
186186
match: ([a-zA-Z_$][\w$]*)(?=\:)
187187
captures:
188188
'1': { name: variable.parameter.ts}
189-
189+
190190
function-declaration:
191191
name: meta.function.ts
192192
begin: \b(function)\b(?:\s+([a-zA-Z_$][\w$]*))?\s*
@@ -295,7 +295,7 @@ repository:
295295
type-parameters:
296296
name: meta.type.parameters.ts
297297
begin: '<'
298-
end: '$|(?=var|type|function|class|interface)|>'
298+
end: '$|(?=var|type|function|class|interface)|>'
299299
patterns:
300300
- name: keyword.other.ts
301301
match: '\b(extends)\b'
@@ -308,7 +308,7 @@ repository:
308308
'1': { name: keyword.operator.ts }
309309
end: $|(?=[,);=])
310310
patterns:
311-
- include: '#expression'
311+
- include: '#expression'
312312

313313
expression:
314314
name: meta.expression.ts
@@ -347,14 +347,14 @@ repository:
347347
captures:
348348
'1': { name: storage.type.ts }
349349
'2': { name: storage.type.ts }
350-
350+
351351
new-expr:
352352
name: new.expr.ts
353353
match: '\b(new)\b\s*([a-zA-Z_$][.\w$]*)'
354354
captures:
355355
'1': { name: keyword.operator.ts }
356356
'2': { name: storage.type.ts }
357-
357+
358358
# TODO: object members with quoted or numric lhs
359359
object-member:
360360
name: meta.object.member.ts
@@ -373,15 +373,15 @@ repository:
373373

374374
relational-operator:
375375
name: keyword.operator.ts
376-
match: ===|==|=|!=|!==|<=|>=|<>|<|>
376+
match: ===|!==|==|!=|<=|>=|<>|=|<|>
377377

378378
assignment-operator:
379379
name: keyword.operator.ts
380-
match: <<=|>>=|>>>=|\*=|(?<!\()/=|%=|\+=|\-=|&=|\^=
380+
match: <<=|>>>=|>>=|\*=|(?<!\()/=|%=|\+=|\-=|&=|\^=
381381

382382
logic-operator:
383383
name: keyword.operator.ts
384-
match: \!|&|~|\||&&|\|\|
384+
match: \!|&&|&|~|\|\||\|
385385

386386
storage-keyword:
387387
name: storage.type.ts
@@ -503,7 +503,7 @@ repository:
503503
- include: '#expression'
504504

505505
numeric-literal:
506-
name: constant.numeric.ts
506+
name: constant.numeric.ts
507507
match: \b((0(x|X)[0-9a-fA-F]+)|([0-9]+(\.[0-9]+)?))\b
508508

509509
boolean-literal:
@@ -521,16 +521,11 @@ repository:
521521
access-modifier:
522522
name: storage.modifier.ts
523523
match: \b(public|protected|private)\b
524-
524+
525525
static-modifier:
526526
name: keyword.other.ts
527527
match: \b(static)\b
528528

529529
property-accessor:
530530
name: storage.type.property.ts
531531
match: \b(get|set)\b
532-
533-
534-
535-
536-

‎TypeScript.YAML-tmLanguage

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ repository:
164164
begin: '\b(?:(abstract)\s+)?\b(?:(public|private|protected)\s+)?\b(?:(async)\s+)?(?:(get|set)\s+)?(?:(new)|(?:\b(constructor)\b)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\<)'
165165
beginCaptures:
166166
'1': { name: storage.modifier.ts } # captures keyword (abstract)
167-
'2': { name: storage.modifier.ts } # captures keyword (public or private or protected)
167+
'2': { name: storage.modifier.ts } # captures keyword (public or private or protected)
168168
'3': { name: storage.modifier.ts } # captures keyword (async)
169169
'4': { name: storage.type.property.ts } # captures keyword (get|set)
170170
'5': { name: keyword.operator.ts } # captures keyword (new)
@@ -185,7 +185,7 @@ repository:
185185
match: '\b(?:(abstract)\s+)?\b(?:(public|private|protected)\s+)?\b(?:(async)\s+)?(?:(get|set)\s+)?(?:(new)|(?:\b(constructor)\b)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\<)'
186186
captures:
187187
'1': { name: storage.modifier.ts } # captures keyword (abstract)
188-
'2': { name: storage.modifier.ts } # captures keyword (public or private or protected)
188+
'2': { name: storage.modifier.ts } # captures keyword (public or private or protected)
189189
'3': { name: storage.modifier.ts } # captures keyword (async)
190190
'4': { name: storage.type.property.ts } # captures keyword (get|set)
191191
'5': { name: keyword.operator.ts } # captures keyword (new)
@@ -519,15 +519,15 @@ repository:
519519

520520
relational-operator:
521521
name: keyword.operator.comparison.ts
522-
match: ===|==|=|!=|!==|<=|>=|<>|<|>
522+
match: ===|!==|==|!=|<=|>=|<>|=|<|>
523523

524524
assignment-operator:
525525
name: keyword.operator.assignment.ts
526-
match: <<=|>>=|>>>=|\*=|(?<!\()/=|%=|\+=|\-=|&=|\^=
526+
match: <<=|>>>=|>>=|\*=|(?<!\()/=|%=|\+=|\-=|&=|\^=
527527

528528
logic-operator:
529529
name: keyword.operator.arithmetic.ts
530-
match: \!|&|~|\^|\||&&|\|\|
530+
match: \!|&&|&|~|\^|\|\||\|
531531

532532
storage-keyword:
533533
name: storage.type.ts

‎TypeScript.tmLanguage

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<key>assignment-operator</key>
6767
<dict>
6868
<key>match</key>
69-
<string>&lt;&lt;=|&gt;&gt;=|&gt;&gt;&gt;=|\*=|(?&lt;!\()/=|%=|\+=|\-=|&amp;=|\^=</string>
69+
<string>&lt;&lt;=|&gt;&gt;&gt;=|&gt;&gt;=|\*=|(?&lt;!\()/=|%=|\+=|\-=|&amp;=|\^=</string>
7070
<key>name</key>
7171
<string>keyword.operator.assignment.ts</string>
7272
</dict>
@@ -730,7 +730,7 @@
730730
<key>logic-operator</key>
731731
<dict>
732732
<key>match</key>
733-
<string>\!|&amp;|~|\^|\||&amp;&amp;|\|\|</string>
733+
<string>\!|&amp;&amp;|&amp;|~|\^|\|\||\|</string>
734734
<key>name</key>
735735
<string>keyword.operator.arithmetic.ts</string>
736736
</dict>
@@ -1247,7 +1247,7 @@
12471247
<key>relational-operator</key>
12481248
<dict>
12491249
<key>match</key>
1250-
<string>===|==|=|!=|!==|&lt;=|&gt;=|&lt;&gt;|&lt;|&gt;</string>
1250+
<string>===|!==|==|!=|&lt;=|&gt;=|&lt;&gt;|=|&lt;|&gt;</string>
12511251
<key>name</key>
12521252
<string>keyword.operator.comparison.ts</string>
12531253
</dict>

‎TypeScriptReact.YAML-tmLanguage

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ repository:
166166
begin: '\b(?:(abstract)\s+)?\b(?:(public|private|protected)\s+)?\b(?:(async)\s+)?(?:(get|set)\s+)?(?:(new)|(?:\b(constructor)\b)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\<)'
167167
beginCaptures:
168168
'1': { name: storage.modifier.tsx } # captures keyword (abstract)
169-
'2': { name: storage.modifier.tsx } # captures keyword (public or private or protected)
169+
'2': { name: storage.modifier.tsx } # captures keyword (public or private or protected)
170170
'3': { name: storage.modifier.tsx } # captures keyword (async)
171171
'4': { name: storage.type.property.tsx } # captures keyword (get|set)
172172
'5': { name: keyword.operator.tsx } # captures keyword (new)
@@ -187,7 +187,7 @@ repository:
187187
match: '\b(?:(abstract)\s+)?\b(?:(public|private|protected)\s+)?\b(?:(async)\s+)?(?:(get|set)\s+)?(?:(new)|(?:\b(constructor)\b)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\<)'
188188
captures:
189189
'1': { name: storage.modifier.tsx } # captures keyword (abstract)
190-
'2': { name: storage.modifier.tsx } # captures keyword (public or private or protected)
190+
'2': { name: storage.modifier.tsx } # captures keyword (public or private or protected)
191191
'3': { name: storage.modifier.tsx } # captures keyword (async)
192192
'4': { name: storage.type.property.tsx } # captures keyword (get|set)
193193
'5': { name: keyword.operator.tsx } # captures keyword (new)
@@ -508,15 +508,15 @@ repository:
508508
relational-operator:
509509

510510
name: keyword.operator.comparison.tsx
511-
match: ===|==|=|!=|!==|<=|>=|<>|<|>
511+
match: ===|!==|==|!=|<=|>=|<>|=|<|>
512512

513513
assignment-operator:
514514
name: keyword.operator.assignment.tsx
515-
match: <<=|>>=|>>>=|\*=|(?<!\()/=|%=|\+=|\-=|&=|\^=
515+
match: <<=|>>>=|>>=|\*=|(?<!\()/=|%=|\+=|\-=|&=|\^=
516516

517517
logic-operator:
518518
name: keyword.operator.arithmetic.tsx
519-
match: \!|&|~|\^|\||&&|\|\|
519+
match: \!|&&|&|~|\^|\|\||\|
520520

521521
storage-keyword:
522522
name: storage.type.tsx

‎TypeScriptReact.tmLanguage

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<key>assignment-operator</key>
6767
<dict>
6868
<key>match</key>
69-
<string>&lt;&lt;=|&gt;&gt;=|&gt;&gt;&gt;=|\*=|(?&lt;!\()/=|%=|\+=|\-=|&amp;=|\^=</string>
69+
<string>&lt;&lt;=|&gt;&gt;&gt;=|&gt;&gt;=|\*=|(?&lt;!\()/=|%=|\+=|\-=|&amp;=|\^=</string>
7070
<key>name</key>
7171
<string>keyword.operator.assignment.tsx</string>
7272
</dict>
@@ -1096,7 +1096,7 @@
10961096
<key>logic-operator</key>
10971097
<dict>
10981098
<key>match</key>
1099-
<string>\!|&amp;|~|\^|\||&amp;&amp;|\|\|</string>
1099+
<string>\!|&amp;&amp;|&amp;|~|\^|\|\||\|</string>
11001100
<key>name</key>
11011101
<string>keyword.operator.arithmetic.tsx</string>
11021102
</dict>
@@ -1613,7 +1613,7 @@
16131613
<key>relational-operator</key>
16141614
<dict>
16151615
<key>match</key>
1616-
<string>===|==|=|!=|!==|&lt;=|&gt;=|&lt;&gt;|&lt;|&gt;</string>
1616+
<string>===|!==|==|!=|&lt;=|&gt;=|&lt;&gt;|=|&lt;|&gt;</string>
16171617
<key>name</key>
16181618
<string>keyword.operator.comparison.tsx</string>
16191619
</dict>

0 commit comments

Comments
 (0)