Merge pull request #635 from prefiks/master

Fix problem with syntax highlihtingting
TypeStrong · Oct 4, 2015 · 1424dda · 1424dda
2 parents f2165ca + 2af4971
commit 1424dda
Showing 1 changed file with 11 additions and 11 deletions.
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'
       }
     ]