Skip to content

Commit 7f05647

Browse files
committed
Fixing issue #90 - XOR SYMBOL
1 parent cee4439 commit 7f05647

File tree

4 files changed

+15
-41
lines changed

4 files changed

+15
-41
lines changed

TypeScript.YAML-tmLanguage

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,14 @@ repository:
4545

4646
type-declaration:
4747
name: meta.type.declaration.ts
48-
begin: \b(type)\b\s+([a-zA-Z_$][\w$]*)\s*
48+
begin: \b(type)\b\s+([a-zA-Z_$][\w$]*)\s*=\s*
4949
beginCaptures:
5050
'1': { name: keyword.other.ts }
5151
'2': { name: storage.type.ts }
52-
end: (?=[,);>]|var|type|function|class|interface)
52+
end: (?=$|[,);>]|var|type|function|class|interface)
5353
patterns:
54-
- include: '#type-parameters'
55-
- name: keyword.operator.ts
56-
match: '=\s*'
5754
- include: '#type'
58-
55+
5956
enum-declaration:
6057
name: meta.enum.declaration.ts
6158
match: (?:\b(const)\s+)?\b(enum)\s+([a-zA-Z_$][\w$]*)

TypeScript.tmLanguage

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1486,7 +1486,7 @@
14861486
<key>type-declaration</key>
14871487
<dict>
14881488
<key>begin</key>
1489-
<string>\b(type)\b\s+([a-zA-Z_$][\w$]*)\s*</string>
1489+
<string>\b(type)\b\s+([a-zA-Z_$][\w$]*)\s*=\s*</string>
14901490
<key>beginCaptures</key>
14911491
<dict>
14921492
<key>1</key>
@@ -1501,21 +1501,11 @@
15011501
</dict>
15021502
</dict>
15031503
<key>end</key>
1504-
<string>(?=[,);&gt;]|var|type|function|class|interface)</string>
1504+
<string>(?=$|[,);&gt;]|var|type|function|class|interface)</string>
15051505
<key>name</key>
15061506
<string>meta.type.declaration.ts</string>
15071507
<key>patterns</key>
15081508
<array>
1509-
<dict>
1510-
<key>include</key>
1511-
<string>#type-parameters</string>
1512-
</dict>
1513-
<dict>
1514-
<key>match</key>
1515-
<string>=\s*</string>
1516-
<key>name</key>
1517-
<string>keyword.operator.ts</string>
1518-
</dict>
15191509
<dict>
15201510
<key>include</key>
15211511
<string>#type</string>

TypeScriptReact.YAML-tmLanguage

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,13 @@ repository:
4646
- include: '#enum-declaration'
4747

4848
type-declaration:
49-
name: meta.type.declaration.ts
50-
begin: \b(type)\b\s+([a-zA-Z_$][\w$]*)\s*
49+
name: meta.type.declaration.tsx
50+
begin: \b(type)\b\s+([a-zA-Z_$][\w$]*)\s*=\s*
5151
beginCaptures:
52-
'1': { name: keyword.other.ts }
53-
'2': { name: storage.type.ts }
54-
end: (?=[,);>]|var|type|function|class|interface)
52+
'1': { name: keyword.other.tsx }
53+
'2': { name: storage.type.tsx }
54+
end: (?=$|[,);>]|var|type|function|class|interface)
5555
patterns:
56-
- include: '#type-parameters'
57-
- name: keyword.operator.ts
58-
match: '=\s*'
5956
- include: '#type'
6057

6158
enum-declaration:

TypeScriptReact.tmLanguage

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1852,36 +1852,26 @@
18521852
<key>type-declaration</key>
18531853
<dict>
18541854
<key>begin</key>
1855-
<string>\b(type)\b\s+([a-zA-Z_$][\w$]*)\s*</string>
1855+
<string>\b(type)\b\s+([a-zA-Z_$][\w$]*)\s*=\s*</string>
18561856
<key>beginCaptures</key>
18571857
<dict>
18581858
<key>1</key>
18591859
<dict>
18601860
<key>name</key>
1861-
<string>keyword.other.ts</string>
1861+
<string>keyword.other.tsx</string>
18621862
</dict>
18631863
<key>2</key>
18641864
<dict>
18651865
<key>name</key>
1866-
<string>storage.type.ts</string>
1866+
<string>storage.type.tsx</string>
18671867
</dict>
18681868
</dict>
18691869
<key>end</key>
1870-
<string>(?=[,);&gt;]|var|type|function|class|interface)</string>
1870+
<string>(?=$|[,);&gt;]|var|type|function|class|interface)</string>
18711871
<key>name</key>
1872-
<string>meta.type.declaration.ts</string>
1872+
<string>meta.type.declaration.tsx</string>
18731873
<key>patterns</key>
18741874
<array>
1875-
<dict>
1876-
<key>include</key>
1877-
<string>#type-parameters</string>
1878-
</dict>
1879-
<dict>
1880-
<key>match</key>
1881-
<string>=\s*</string>
1882-
<key>name</key>
1883-
<string>keyword.operator.ts</string>
1884-
</dict>
18851875
<dict>
18861876
<key>include</key>
18871877
<string>#type</string>

0 commit comments

Comments
 (0)