diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage index 9638a98d..8053ed6c 100644 --- a/TypeScript.YAML-tmLanguage +++ b/TypeScript.YAML-tmLanguage @@ -307,7 +307,7 @@ repository: type-annotation: name: meta.type.annotation.ts begin: ":" - end: (?=$|[,);\}\]]|//)|(?==[^>])|(?<=[\}>\]\)]|[a-zA-Z_$])\s*(?=\{) + end: (?=$|[,);\}\]]|//)|(?==[^>])|(?<=[\}>\]\)]|[a-zA-Z0-9_$])\s*(?=\{) patterns: - include: '#expression-operator' - include: '#type' diff --git a/TypeScript.tmLanguage b/TypeScript.tmLanguage index e9deddf1..1461e660 100644 --- a/TypeScript.tmLanguage +++ b/TypeScript.tmLanguage @@ -1604,7 +1604,7 @@ begin : end - (?=$|[,);\}\]]|//)|(?==[^>])|(?<=[\}>\]\)]|[a-zA-Z_$])\s*(?=\{) + (?=$|[,);\}\]]|//)|(?==[^>])|(?<=[\}>\]\)]|[a-zA-Z0-9_$])\s*(?=\{) name meta.type.annotation.ts patterns diff --git a/TypeScriptReact.YAML-tmLanguage b/TypeScriptReact.YAML-tmLanguage index 4da737f8..a0aa4a4b 100644 --- a/TypeScriptReact.YAML-tmLanguage +++ b/TypeScriptReact.YAML-tmLanguage @@ -309,7 +309,7 @@ repository: type-annotation: name: meta.type.annotation.tsx begin: ":" - end: (?=$|[,);\}\]]|//)|(?==[^>])|(?<=[\}>\]\)]|[a-zA-Z_$])\s*(?=\{) + end: (?=$|[,);\}\]]|//)|(?==[^>])|(?<=[\}>\]\)]|[a-zA-Z0-9_$])\s*(?=\{) patterns: - include: '#expression-operator' - include: '#type' diff --git a/TypeScriptReact.tmLanguage b/TypeScriptReact.tmLanguage index 6f211d65..5e2f7f7f 100644 --- a/TypeScriptReact.tmLanguage +++ b/TypeScriptReact.tmLanguage @@ -1970,7 +1970,7 @@ begin : end - (?=$|[,);\}\]]|//)|(?==[^>])|(?<=[\}>\]\)]|[a-zA-Z_$])\s*(?=\{) + (?=$|[,);\}\]]|//)|(?==[^>])|(?<=[\}>\]\)]|[a-zA-Z0-9_$])\s*(?=\{) name meta.type.annotation.tsx patterns diff --git a/tests/baselines/FunctionMethodReturnTypes.txt b/tests/baselines/FunctionMethodReturnTypes.txt index 6b35d12b..7bfacc74 100644 --- a/tests/baselines/FunctionMethodReturnTypes.txt +++ b/tests/baselines/FunctionMethodReturnTypes.txt @@ -75,4 +75,9 @@ [29, 59]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts [30, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts [30, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts -[30, 69]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts \ No newline at end of file +[30, 69]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts +[31, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts +[31, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts +[31, 55]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts +[31, 62]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.numeric.ts +[31, 66]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts \ No newline at end of file diff --git a/tests/cases/FunctionMethodReturnTypes.ts b/tests/cases/FunctionMethodReturnTypes.ts index 4f9388e6..d46d3857 100644 --- a/tests/cases/FunctionMethodReturnTypes.ts +++ b/tests/cases/FunctionMethodReturnTypes.ts @@ -28,4 +28,7 @@ class TestClass { ^^public ^^testMethodReturnType11(): number | string { ^^return 1 } ^^public ^^testMethodReturnType12(): number | string [] { ^^return } ^^public ^^testMethodReturnType13(): [number, number] | string [] { ^^return [""] } -} \ No newline at end of file + ^^public ^^testMethodReturnType14(): EndsWithDigit1 { ^^return ^^123 ^^} +} + +type EndsWithDigit1 = number;