Skip to content

Commit 1a663e2

Browse files
committed
Merge pull request #48 from blakeembrey/support-non-semicolons
Match EOL with various selectors
2 parents 05e623f + c85e83c commit 1a663e2

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

TypeScript.YAML-tmLanguage

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ patterns:
1111
repository:
1212
var-expr:
1313
name: meta.var.expr.ts
14-
begin: (?<!\()\s*\b(var|let|const(?!\s+enum))\s+([a-zA-Z_$][\w$]*)
14+
begin: (?<!\()\s*\b(var|let|const(?!\s+enum))\s+([a-zA-Z_$][\w$]*)
1515
beginCaptures:
1616
'1': { name: storage.type.ts }
1717
'2': { name: variable.ts }
@@ -25,7 +25,7 @@ repository:
2525
name: keyword.control.ts
2626
match: (?<!\.)\b(break|catch|continue|debugger|declare|do|else|finally|for|if|return|switch|throw|try|while|with|super|case|default)\b
2727

28-
switch-case:
28+
switch-case:
2929
name: case.expr.ts
3030
begin: '(?<!\.)\b(case|default)\b'
3131
beginCaptures:
@@ -48,7 +48,7 @@ repository:
4848
beginCaptures:
4949
'1': { name: keyword.other.ts }
5050
'2': { name: storage.type.ts }
51-
end: (?=[,);>]|var|type|function|class|interface)
51+
end: (?=$|[,);>]|var|type|function|class|interface)
5252
patterns:
5353
- include: '#type'
5454

@@ -143,7 +143,7 @@ repository:
143143
beginCaptures:
144144
'1': { name: variable.ts }
145145
'2': { name: keyword.operator.ts }
146-
end: '(?=\}|;|,)|(?<=\})'
146+
end: '(?=\}|;|,|$)|(?<=\})'
147147
patterns:
148148
- include: '#expression'
149149

@@ -158,7 +158,7 @@ repository:
158158
'5': { name: keyword.operator.ts }
159159
'6': { name: entity.name.function.ts }
160160
'7': { name: keyword.operator.ts }
161-
end: '(?=\}|;|,)|(?<=\})'
161+
end: '(?=\}|;|,|$)|(?<=\})'
162162
patterns:
163163
- include: '#comment'
164164
- include: '#type-parameters'
@@ -195,7 +195,7 @@ repository:
195195
match: ([a-zA-Z_$][\w$]*)(?=\:)
196196
captures:
197197
'1': { name: variable.parameter.ts}
198-
198+
199199
function-declaration:
200200
name: meta.function.ts
201201
begin: \b(?:(export)\s+)?(?:(async)\s+)?(function\b)(?:\s+([a-zA-Z_$][\w$]*))?\s*
@@ -315,11 +315,11 @@ repository:
315315
- include: '#comment'
316316
- include: '#type'
317317
- include: '#function-type-parameters'
318-
318+
319319
await-modifier:
320320
name: storage.modifier.ts
321321
match: 'await'
322-
322+
323323
type-operator:
324324
name: keyword.operator.type.ts
325325
match: '[.|]'
@@ -357,7 +357,7 @@ repository:
357357
beginCaptures:
358358
'1': { name: entity.name.type.ts }
359359
'2': { name: meta.brace.angle.ts }
360-
end: '(?=$)|(>)'
360+
end: '(?=$)|(>)'
361361
endCaptures:
362362
'2': { name: meta.brace.angle.ts }
363363
patterns:
@@ -372,7 +372,7 @@ repository:
372372
'1': { name: keyword.operator.ts }
373373
end: (?=$|[,);=])
374374
patterns:
375-
- include: '#expression'
375+
- include: '#expression'
376376

377377
expression:
378378
name: meta.expression.ts
@@ -398,7 +398,7 @@ repository:
398398
- include: '#function-call'
399399
- include: '#switch-case'
400400
- include: '#control-statement'
401-
401+
402402
for-in-simple:
403403
name: forin.expr.ts
404404
match: (?<=\()\s*\b(var|let|const)\s+([a-zA-Z_$][\w$]*)\s+(in|of)\b
@@ -587,7 +587,7 @@ repository:
587587
- include: '#expression'
588588

589589
numeric-literal:
590-
name: constant.numeric.ts
590+
name: constant.numeric.ts
591591
match: \b(?<=[^$])((0(x|X)[0-9a-fA-F]+)|([0-9]+(\.[0-9]+)?))\b
592592

593593
boolean-literal:
@@ -597,19 +597,19 @@ repository:
597597
null-literal:
598598
name: constant.language.null.ts
599599
match: \b(null)\b
600-
600+
601601
this-literal:
602602
name: constant.language.this.ts
603603
match: \b(this)\b
604-
604+
605605
undefined-literal:
606606
name: constant.language.ts
607607
match: \b(undefined)\b
608608

609609
access-modifier:
610610
name: storage.modifier.ts
611611
match: \b(public|protected|private)\b
612-
612+
613613
static-modifier:
614614
name: keyword.other.ts
615615
match: \b(static)\b

TypeScript.tmLanguage

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@
402402
</dict>
403403
</dict>
404404
<key>end</key>
405-
<string>(?=\}|;|,)|(?&lt;=\})</string>
405+
<string>(?=\}|;|,|$)|(?&lt;=\})</string>
406406
<key>name</key>
407407
<string>meta.field.declaration.ts</string>
408408
<key>patterns</key>
@@ -723,7 +723,7 @@
723723
</dict>
724724
</dict>
725725
<key>end</key>
726-
<string>(?=\}|;|,)|(?&lt;=\})</string>
726+
<string>(?=\}|;|,|$)|(?&lt;=\})</string>
727727
<key>name</key>
728728
<string>meta.method.declaration.ts</string>
729729
<key>patterns</key>
@@ -1418,7 +1418,7 @@
14181418
</dict>
14191419
</dict>
14201420
<key>end</key>
1421-
<string>(?=[,);&gt;]|var|type|function|class|interface)</string>
1421+
<string>(?=$|[,);&gt;]|var|type|function|class|interface)</string>
14221422
<key>name</key>
14231423
<string>meta.type.declaration.ts</string>
14241424
<key>patterns</key>

0 commit comments

Comments
 (0)