Skip to content

Commit 3c562ec

Browse files
committed
Mark "object" type as keyword
1 parent dbac61e commit 3c562ec

File tree

5 files changed

+26
-3
lines changed

5 files changed

+26
-3
lines changed

TypeScript.YAML-tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -906,7 +906,7 @@ repository:
906906

907907
type-builtin-literals:
908908
name: support.type.builtin.ts
909-
match: (?<!\.|\$)\b(this|true|false|undefined|null)\b(?!\$)
909+
match: (?<!\.|\$)\b(this|true|false|undefined|null|object)\b(?!\$)
910910

911911
# Parenthesis can contain either types and function parameters
912912
# (number | string) or (param: number, param2: string)

TypeScript.tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2792,7 +2792,7 @@
27922792
<key>name</key>
27932793
<string>support.type.builtin.ts</string>
27942794
<key>match</key>
2795-
<string>(?&lt;!\.|\$)\b(this|true|false|undefined|null)\b(?!\$)</string>
2795+
<string>(?&lt;!\.|\$)\b(this|true|false|undefined|null|object)\b(?!\$)</string>
27962796
</dict>
27972797
<key>type-paren-or-function-parameters</key>
27982798
<dict>

TypeScriptReact.tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2796,7 +2796,7 @@
27962796
<key>name</key>
27972797
<string>support.type.builtin.tsx</string>
27982798
<key>match</key>
2799-
<string>(?&lt;!\.|\$)\b(this|true|false|undefined|null)\b(?!\$)</string>
2799+
<string>(?&lt;!\.|\$)\b(this|true|false|undefined|null|object)\b(?!\$)</string>
28002800
</dict>
28012801
<key>type-paren-or-function-parameters</key>
28022802
<dict>
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
original file
2+
-----------------------------------
3+
var a: object;
4+
-----------------------------------
5+
6+
Grammar: TypeScript.tmLanguage
7+
-----------------------------------
8+
>var a: object;
9+
^^^
10+
source.ts meta.var.expr.ts storage.type.ts
11+
^
12+
source.ts meta.var.expr.ts
13+
^
14+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
15+
^
16+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
17+
^
18+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts
19+
^^^^^^
20+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts support.type.builtin.ts
21+
^
22+
source.ts punctuation.terminator.statement.ts

tests/cases/objectType.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
var a: object;

0 commit comments

Comments
 (0)