Skip to content

Commit 7d36891

Browse files
committed
Allow method return types to end with a digit
1 parent a78f05a commit 7d36891

6 files changed

+12
-6
lines changed

TypeScript.YAML-tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ repository:
307307
type-annotation:
308308
name: meta.type.annotation.ts
309309
begin: ":"
310-
end: (?=$|[,);\}\]]|//)|(?==[^>])|(?<=[\}>\]\)]|[a-zA-Z_$])\s*(?=\{)
310+
end: (?=$|[,);\}\]]|//)|(?==[^>])|(?<=[\}>\]\)]|[a-zA-Z0-9_$])\s*(?=\{)
311311
patterns:
312312
- include: '#expression-operator'
313313
- include: '#type'

TypeScript.tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1604,7 +1604,7 @@
16041604
<key>begin</key>
16051605
<string>:</string>
16061606
<key>end</key>
1607-
<string>(?=$|[,);\}\]]|//)|(?==[^&gt;])|(?&lt;=[\}&gt;\]\)]|[a-zA-Z_$])\s*(?=\{)</string>
1607+
<string>(?=$|[,);\}\]]|//)|(?==[^&gt;])|(?&lt;=[\}&gt;\]\)]|[a-zA-Z0-9_$])\s*(?=\{)</string>
16081608
<key>name</key>
16091609
<string>meta.type.annotation.ts</string>
16101610
<key>patterns</key>

TypeScriptReact.YAML-tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ repository:
309309
type-annotation:
310310
name: meta.type.annotation.tsx
311311
begin: ":"
312-
end: (?=$|[,);\}\]]|//)|(?==[^>])|(?<=[\}>\]\)]|[a-zA-Z_$])\s*(?=\{)
312+
end: (?=$|[,);\}\]]|//)|(?==[^>])|(?<=[\}>\]\)]|[a-zA-Z0-9_$])\s*(?=\{)
313313
patterns:
314314
- include: '#expression-operator'
315315
- include: '#type'

TypeScriptReact.tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1970,7 +1970,7 @@
19701970
<key>begin</key>
19711971
<string>:</string>
19721972
<key>end</key>
1973-
<string>(?=$|[,);\}\]]|//)|(?==[^&gt;])|(?&lt;=[\}&gt;\]\)]|[a-zA-Z_$])\s*(?=\{)</string>
1973+
<string>(?=$|[,);\}\]]|//)|(?==[^&gt;])|(?&lt;=[\}&gt;\]\)]|[a-zA-Z0-9_$])\s*(?=\{)</string>
19741974
<key>name</key>
19751975
<string>meta.type.annotation.tsx</string>
19761976
<key>patterns</key>

tests/baselines/FunctionMethodReturnTypes.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,7 @@
7575
[29, 59]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts
7676
[30, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts
7777
[30, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts
78-
[30, 69]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts
78+
[30, 69]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts
79+
[31, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts
80+
[31, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts
81+
[31, 55]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts

tests/cases/FunctionMethodReturnTypes.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,7 @@ class TestClass {
2828
^^public ^^testMethodReturnType11(): number | string { ^^return 1 }
2929
^^public ^^testMethodReturnType12(): number | string [] { ^^return }
3030
^^public ^^testMethodReturnType13(): [number, number] | string [] { ^^return [""] }
31-
}
31+
^^public ^^testMethodReturnType14(): EndsWithDigit1 { ^^return 123 }
32+
}
33+
34+
type EndsWithDigit1 = number;

0 commit comments

Comments
 (0)