Support builtin type literals like this,true,false,null,undefined

sheetalkamat · sheetalkamat · commit bbaffdca503a · 2016-09-13T10:07:11.000-07:00
diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage
@@ -719,6 +719,7 @@ repository:
     - include: '#comment'
     - include: '#string'
     - include: '#type-primitive'
+    - include: '#type-builtin-literals'
     - include: '#type-parameters'
     - include: '#type-tuple'
     - include: '#type-object'
@@ -747,6 +748,10 @@ repository:
     name: support.type.primitive.ts
     match: '(?<!\.|\$)\b(string|number|boolean|symbol|any|void|never)\b(?!\$)'
 
+  type-builtin-literals:
+    name: support.type.builtin.ts
+    match: '(?<!\.|\$)\b(this|true|false|undefined|null)\b(?!\$)'
+
   # Parenthesis can contain either types and function parameters
   # (number | string) or (param: number, param2: string)
   # and it can be nested, for example
diff --git a/TypeScript.tmLanguage b/TypeScript.tmLanguage
@@ -3444,6 +3444,10 @@
 					<key>include</key>
 					<string>#type-primitive</string>
 				</dict>
+				<dict>
+					<key>include</key>
+					<string>#type-builtin-literals</string>
+				</dict>
 				<dict>
 					<key>include</key>
 					<string>#type-parameters</string>
@@ -3498,6 +3502,13 @@
 				</dict>
 			</array>
 		</dict>
+		<key>type-builtin-literals</key>
+		<dict>
+			<key>match</key>
+			<string>(?&lt;!\.|\$)\b(this|true|false|undefined|null)\b(?!\$)</string>
+			<key>name</key>
+			<string>support.type.builtin.ts</string>
+		</dict>
 		<key>type-declaration</key>
 		<dict>
 			<key>begin</key>
diff --git a/TypeScriptReact.YAML-tmLanguage b/TypeScriptReact.YAML-tmLanguage
@@ -723,6 +723,7 @@ repository:
     - include: '#comment'
     - include: '#string'
     - include: '#type-primitive'
+    - include: '#type-builtin-literals'
     - include: '#type-parameters'
     - include: '#type-tuple'
     - include: '#type-object'
@@ -751,6 +752,10 @@ repository:
     name: support.type.primitive.tsx
     match: '(?<!\.|\$)\b(string|number|boolean|symbol|any|void|never)\b(?!\$)'
 
+  type-builtin-literals:
+    name: support.type.builtin.tsx
+    match: '(?<!\.|\$)\b(this|true|false|undefined|null)\b(?!\$)'
+
   # Parenthesis can contain either types and function parameters
   # (number | string) or (param: number, param2: string)
   # and it can be nested, for example
diff --git a/TypeScriptReact.tmLanguage b/TypeScriptReact.tmLanguage
@@ -3834,6 +3834,10 @@
 					<key>include</key>
 					<string>#type-primitive</string>
 				</dict>
+				<dict>
+					<key>include</key>
+					<string>#type-builtin-literals</string>
+				</dict>
 				<dict>
 					<key>include</key>
 					<string>#type-parameters</string>
@@ -3888,6 +3892,13 @@
 				</dict>
 			</array>
 		</dict>
+		<key>type-builtin-literals</key>
+		<dict>
+			<key>match</key>
+			<string>(?&lt;!\.|\$)\b(this|true|false|undefined|null)\b(?!\$)</string>
+			<key>name</key>
+			<string>support.type.builtin.tsx</string>
+		</dict>
 		<key>type-declaration</key>
 		<dict>
 			<key>begin</key>
diff --git a/tests/baselines/Issue248.baseline.txt b/tests/baselines/Issue248.baseline.txt
@@ -111,7 +111,7 @@ class C6 {
                            ^
                            source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts new.expr.ts
                             ^^^^
-                            source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts new.expr.ts entity.name.type.ts
+                            source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts new.expr.ts support.type.builtin.ts
                                 ^
                                 source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.brace.round.ts
                                  ^^^
@@ -205,7 +205,7 @@ class C6 {
                            ^
                            source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts new.expr.ts
                             ^^^^
-                            source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts new.expr.ts entity.name.type.ts
+                            source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts new.expr.ts support.type.builtin.ts
                                 ^
                                 source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.brace.round.ts
                                  ^^^
@@ -299,7 +299,7 @@ class C6 {
                            ^
                            source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts new.expr.ts
                             ^^^^
-                            source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts new.expr.ts entity.name.type.ts
+                            source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts new.expr.ts support.type.builtin.ts
                                 ^
                                 source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.brace.round.ts
                                  ^^^
@@ -393,7 +393,7 @@ class C6 {
                            ^
                            source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts new.expr.ts
                             ^^^^
-                            source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts new.expr.ts entity.name.type.ts
+                            source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts new.expr.ts support.type.builtin.ts
                                 ^
                                 source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.brace.round.ts
                                  ^^^
@@ -487,7 +487,7 @@ class C6 {
                            ^
                            source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts new.expr.ts
                             ^^^^
-                            source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts new.expr.ts entity.name.type.ts
+                            source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts new.expr.ts support.type.builtin.ts
                                 ^
                                 source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.brace.round.ts
                                  ^^^
@@ -581,7 +581,7 @@ class C6 {
                            ^
                            source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts new.expr.ts
                             ^^^^
-                            source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts new.expr.ts entity.name.type.ts
+                            source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts new.expr.ts support.type.builtin.ts
                                 ^
                                 source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.brace.round.ts
                                  ^^^

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ class C6 {`
`111`	`111`	`^`
`112`	`112`	`source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts new.expr.ts`
`113`	`113`	`^^^^`
`114`		`- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts new.expr.ts entity.name.type.ts`
	`114`	`+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts new.expr.ts support.type.builtin.ts`
`115`	`115`	`^`
`116`	`116`	`source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.brace.round.ts`
`117`	`117`	`^^^`
`@@ -205,7 +205,7 @@ class C6 {`
`205`	`205`	`^`
`206`	`206`	`source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts new.expr.ts`
`207`	`207`	`^^^^`
`208`		`- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts new.expr.ts entity.name.type.ts`
	`208`	`+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts new.expr.ts support.type.builtin.ts`
`209`	`209`	`^`
`210`	`210`	`source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.brace.round.ts`
`211`	`211`	`^^^`
`@@ -299,7 +299,7 @@ class C6 {`
`299`	`299`	`^`
`300`	`300`	`source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts new.expr.ts`
`301`	`301`	`^^^^`
`302`		`- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts new.expr.ts entity.name.type.ts`
	`302`	`+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts new.expr.ts support.type.builtin.ts`
`303`	`303`	`^`
`304`	`304`	`source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.brace.round.ts`
`305`	`305`	`^^^`
`@@ -393,7 +393,7 @@ class C6 {`
`393`	`393`	`^`
`394`	`394`	`source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts new.expr.ts`
`395`	`395`	`^^^^`
`396`		`- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts new.expr.ts entity.name.type.ts`
	`396`	`+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts new.expr.ts support.type.builtin.ts`
`397`	`397`	`^`
`398`	`398`	`source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.brace.round.ts`
`399`	`399`	`^^^`
`@@ -487,7 +487,7 @@ class C6 {`
`487`	`487`	`^`
`488`	`488`	`source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts new.expr.ts`
`489`	`489`	`^^^^`
`490`		`- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts new.expr.ts entity.name.type.ts`
	`490`	`+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts new.expr.ts support.type.builtin.ts`
`491`	`491`	`^`
`492`	`492`	`source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.brace.round.ts`
`493`	`493`	`^^^`
`@@ -581,7 +581,7 @@ class C6 {`
`581`	`581`	`^`
`582`	`582`	`source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts new.expr.ts`
`583`	`583`	`^^^^`
`584`		`- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts new.expr.ts entity.name.type.ts`
	`584`	`+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts new.expr.ts support.type.builtin.ts`
`585`	`585`	`^`
`586`	`586`	`source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.brace.round.ts`
`587`	`587`	`^^^`