Merge pull request #798 from jbarket/master

basarat · basarat · commit c617bf4b6fd2 · 2016-01-02T21:50:14.000+11:00
Angular2 Decorator Template Highlighting
diff --git a/grammars/typescript.cson b/grammars/typescript.cson
@@ -8,12 +8,10 @@
 'name': 'TypeScript'
 
 'patterns': [
-
   ####
   # Rules that no one should change
   # These are used by code to provide fancy completions
   ####
-
   {
       'comment': 'Match debugger statement'
       'match': '\\s*(debugger)[\\s;]+'
@@ -917,7 +915,7 @@
       }
     ]
 
-   'functionargumentreturntype':
+  'functionargumentreturntype':
     'begin': '(?=\\()'
     'end': '(?<!\\))(?!\\G)'
     'patterns': [
@@ -1047,7 +1045,7 @@
         'name': 'punctuation.definition.parameters.end.js'
     'patterns': [
       {
-        'include': '$base'
+        'include': '#angulartemplate'
       }
     ]
 
@@ -1380,5 +1378,12 @@
     ]
 
   'comma':
-      'match': ','
-      'name': 'meta.delimiter.object.comma.js'
+    'match': ','
+    'name': 'meta.delimiter.object.comma.js'
+
+  'angulartemplate':
+    'begin': '\\b(template:\\s*`)'
+    'end': '(`)'
+    'patterns': [
+      { 'include': 'text.html.basic' }
+    ]

Original file line number	Diff line number	Diff line change
`@@ -8,12 +8,10 @@`
`8`	`8`	`'name': 'TypeScript'`
`9`	`9`
`10`	`10`	`'patterns': [`
`11`		`-`
`12`	`11`	`####`
`13`	`12`	`# Rules that no one should change`
`14`	`13`	`# These are used by code to provide fancy completions`
`15`	`14`	`####`
`16`		`-`
`17`	`15`	`{`
`18`	`16`	`'comment': 'Match debugger statement'`
`19`	`17`	`'match': '\\s*(debugger)[\\s;]+'`
`@@ -917,7 +915,7 @@`
`917`	`915`	`}`
`918`	`916`	`]`
`919`	`917`
`920`		`- 'functionargumentreturntype':`
	`918`	`+ 'functionargumentreturntype':`
`921`	`919`	`'begin': '(?=\\()'`
`922`	`920`	`'end': '(?<!\\))(?!\\G)'`
`923`	`921`	`'patterns': [`
`@@ -1047,7 +1045,7 @@`
`1047`	`1045`	`'name': 'punctuation.definition.parameters.end.js'`
`1048`	`1046`	`'patterns': [`
`1049`	`1047`	`{`
`1050`		`- 'include': '$base'`
	`1048`	`+ 'include': '#angulartemplate'`
`1051`	`1049`	`}`
`1052`	`1050`	`]`
`1053`	`1051`
`@@ -1380,5 +1378,12 @@`
`1380`	`1378`	`]`
`1381`	`1379`
`1382`	`1380`	`'comma':`
`1383`		`- 'match': ','`
`1384`		`- 'name': 'meta.delimiter.object.comma.js'`
	`1381`	`+ 'match': ','`
	`1382`	`+ 'name': 'meta.delimiter.object.comma.js'`
	`1383`	`+`
	`1384`	`+ 'angulartemplate':`
	`1385`	+ 'begin': '\\b(template:\\s*`)'
	`1386`	+ 'end': '(`)'
	`1387`	`+ 'patterns': [`
	`1388`	`+ { 'include': 'text.html.basic' }`
	`1389`	`+ ]`