Merge pull request #635 from prefiks/master

basarat · basarat · commit 1424dda02fe6 · 2015-10-04T15:41:19.000+11:00
Fix problem with syntax highlihtingting
diff --git a/grammars/typescript.cson b/grammars/typescript.cson
@@ -180,7 +180,7 @@
                 'name': 'keyword.operator.js'
             'patterns': [
               {
-                'include': '$self'
+                'include': '$base'
               }
             ]
           }
@@ -327,14 +327,14 @@
           '1':
             'name': 'meta.delimiter.semicolon.js'
         'patterns': [
-          'include': '$self'
+          'include': '$base'
         ]
       }
       {
         'include': '#curlybracerecursion'
       }
       {
-        'include': '$self'
+        'include': '$base'
       }
       {
         'match': ';'
@@ -515,7 +515,7 @@
             'include': '#comma'
         'patterns': [
           {
-            'include': '$self'
+            'include': '$base'
           }
         ]
       }
@@ -632,7 +632,7 @@
         'name': 'keyword.operator.js'
     'patterns': [
       {
-        'include': '$self'
+        'include': '$base'
       }
     ]
   }
@@ -649,7 +649,7 @@
         'name': 'meta.brace.square.js'
     'patterns': [
       {
-        'include': '$self'
+        'include': '$base'
       }
     ]
   }
@@ -662,7 +662,7 @@
         'name': 'meta.brace.round.js'
     'patterns': [
       {
-        'include': '$self'
+        'include': '$base'
       }
     ]
   }
@@ -723,12 +723,12 @@
         'name': 'meta.brace.curly.js'
     'patterns': [
       {
-        'include': '$self'
+        'include': '$base'
       }
     ]
 
   'type':
-    'begin': '(?=)'
+    'begin': '(?=[\\(\\{\\p{L}\\p{Nl}$_])'
     'end': '(?<!\\*\\/)(?<!\\|)(?<!\\s)(?<!\\.)(?!\\G)(?!\\.)(?!\\s*\\|)'
     'patterns': [
       {
@@ -776,7 +776,7 @@
     ]
 
   'typeinheritedfrom':
-    'begin': '(?=)'
+    'begin': '(?=[\\(\\{\\p{L}\\p{Nl}$_])'
     'end': '(?<!\\*\\/)(?<!\\|)(?<!\\.)(?!\\G)(?!\\.)(?!\\|)'
     'patterns': [
       {
@@ -1047,7 +1047,7 @@
         'name': 'punctuation.definition.parameters.end.js'
     'patterns': [
       {
-        'include': '$self'
+        'include': '$base'
       }
     ]
 

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@`
`180`	`180`	`'name': 'keyword.operator.js'`
`181`	`181`	`'patterns': [`
`182`	`182`	`{`
`183`		`- 'include': '$self'`
	`183`	`+ 'include': '$base'`
`184`	`184`	`}`
`185`	`185`	`]`
`186`	`186`	`}`
`@@ -327,14 +327,14 @@`
`327`	`327`	`'1':`
`328`	`328`	`'name': 'meta.delimiter.semicolon.js'`
`329`	`329`	`'patterns': [`
`330`		`- 'include': '$self'`
	`330`	`+ 'include': '$base'`
`331`	`331`	`]`
`332`	`332`	`}`
`333`	`333`	`{`
`334`	`334`	`'include': '#curlybracerecursion'`
`335`	`335`	`}`
`336`	`336`	`{`
`337`		`- 'include': '$self'`
	`337`	`+ 'include': '$base'`
`338`	`338`	`}`
`339`	`339`	`{`
`340`	`340`	`'match': ';'`
`@@ -515,7 +515,7 @@`
`515`	`515`	`'include': '#comma'`
`516`	`516`	`'patterns': [`
`517`	`517`	`{`
`518`		`- 'include': '$self'`
	`518`	`+ 'include': '$base'`
`519`	`519`	`}`
`520`	`520`	`]`
`521`	`521`	`}`
`@@ -632,7 +632,7 @@`
`632`	`632`	`'name': 'keyword.operator.js'`
`633`	`633`	`'patterns': [`
`634`	`634`	`{`
`635`		`- 'include': '$self'`
	`635`	`+ 'include': '$base'`
`636`	`636`	`}`
`637`	`637`	`]`
`638`	`638`	`}`
`@@ -649,7 +649,7 @@`
`649`	`649`	`'name': 'meta.brace.square.js'`
`650`	`650`	`'patterns': [`
`651`	`651`	`{`
`652`		`- 'include': '$self'`
	`652`	`+ 'include': '$base'`
`653`	`653`	`}`
`654`	`654`	`]`
`655`	`655`	`}`
`@@ -662,7 +662,7 @@`
`662`	`662`	`'name': 'meta.brace.round.js'`
`663`	`663`	`'patterns': [`
`664`	`664`	`{`
`665`		`- 'include': '$self'`
	`665`	`+ 'include': '$base'`
`666`	`666`	`}`
`667`	`667`	`]`
`668`	`668`	`}`
`@@ -723,12 +723,12 @@`
`723`	`723`	`'name': 'meta.brace.curly.js'`
`724`	`724`	`'patterns': [`
`725`	`725`	`{`
`726`		`- 'include': '$self'`
	`726`	`+ 'include': '$base'`
`727`	`727`	`}`
`728`	`728`	`]`
`729`	`729`
`730`	`730`	`'type':`
`731`		`- 'begin': '(?=)'`
	`731`	`+ 'begin': '(?=[\\(\\{\\p{L}\\p{Nl}$_])'`
`732`	`732`	`'end': '(?<!\\\\/)(?<!\\\|)(?<!\\s)(?<!\\.)(?!\\G)(?!\\.)(?!\\s\\\|)'`
`733`	`733`	`'patterns': [`
`734`	`734`	`{`
`@@ -776,7 +776,7 @@`
`776`	`776`	`]`
`777`	`777`
`778`	`778`	`'typeinheritedfrom':`
`779`		`- 'begin': '(?=)'`
	`779`	`+ 'begin': '(?=[\\(\\{\\p{L}\\p{Nl}$_])'`
`780`	`780`	`'end': '(?<!\\*\\/)(?<!\\\|)(?<!\\.)(?!\\G)(?!\\.)(?!\\\|)'`
`781`	`781`	`'patterns': [`
`782`	`782`	`{`
`@@ -1047,7 +1047,7 @@`
`1047`	`1047`	`'name': 'punctuation.definition.parameters.end.js'`
`1048`	`1048`	`'patterns': [`
`1049`	`1049`	`{`
`1050`		`- 'include': '$self'`
	`1050`	`+ 'include': '$base'`
`1051`	`1051`	`}`
`1052`	`1052`	`]`
`1053`	`1053`