Merge pull request #48 from atom/wl-directives

Tokenize ---
atom · Jun 24, 2016 · 1f5bd16 · 1f5bd16
2 parents 9f55beb + 669b2df
commit 1f5bd16
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/grammars/yaml.cson b/grammars/yaml.cson
@@ -11,7 +11,7 @@
   'sublime-syntax'
   'Boxfile'
 ]
-'firstLineMatch': '^#cloud-config'
+'firstLineMatch': '^(#cloud-config|---)'
 'patterns': [
   {
     'include': '#erb'
@@ -20,6 +20,10 @@
     'match': '\\t+'
     'name': 'invalid.illegal.whitespace.yaml'
   }
+  {
+    'match': '^---'
+    'name': 'punctuation.definition.directives.end.yaml'
+  }
   {
     'begin': '^(\\s*)(?!-\\s*)(\\S+\\s*(:))\\s*(\\||>)'
     'beginCaptures':

diff --git a/spec/yaml-spec.coffee b/spec/yaml-spec.coffee
@@ -419,6 +419,14 @@ describe "YAML grammar", ->
       {tokens} = grammar.tokenizeLine "true: something"
       expect(tokens[0]).toEqual value: "true", scopes: ["source.yaml", "string.unquoted.yaml", "entity.name.tag.yaml"]
 
+  describe "directives", ->
+    it "tokenizes directives end markers", ->
+      {tokens} = grammar.tokenizeLine "---"
+      expect(tokens[0]).toEqual value: "---", scopes: ["source.yaml", "punctuation.definition.directives.end.yaml"]
+
+      {tokens} = grammar.tokenizeLine " ---"
+      expect(tokens[1]).not.toEqual value: "---", scopes: ["source.yaml", "punctuation.definition.directives.end.yaml"]
+
   describe "tabs", ->
     it "marks them as invalid", ->
       {tokens} = grammar.tokenizeLine "\t\ttabs:"