Merge pull request #29 from atom/wl-add-master-pattern

Add master pattern
atom · Sep 22, 2017 · c160010 · c160010
2 parents bffabcf + 71caf22
commit c160010
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/grammars/mustache.cson b/grammars/mustache.cson
@@ -13,6 +13,23 @@
 ]
 'injections':
   'L:text.html.mustache - (meta.tag.template.mustache | comment.block.mustache)':
+    'patterns': [
+      {
+        # This should be the only pattern here!
+        # Add everything else into #mustache below
+        'include': '#mustache'
+      }
+    ]
+'patterns': [
+  {
+    'include': 'text.html.basic'
+  }
+]
+'repository':
+  # The master pattern. All new patterns should be added here instead of in
+  # 'injections' to make including this language easier.
+  # See https://github.com/atom/language-mustache/issues/26
+  'mustache':
     'patterns': [
       {
         'include': '#comment'
@@ -30,12 +47,6 @@
         'include': '#template'
       }
     ]
-'patterns': [
-  {
-    'include': 'text.html.basic'
-  }
-]
-'repository':
   'comment':
     'begin': '{{!'
     'beginCaptures':

diff --git a/grammars/sql with mustaches.cson b/grammars/sql with mustaches.cson
@@ -4,7 +4,7 @@
 ]
 'patterns': [
   {
-    'include': 'text.html.mustache'
+    'include': 'text.html.mustache#mustache'
   }
   {
     'include': 'source.sql'