Merge pull request #30 from petems/move_contain_to_include_syntax

Changes contain to be part of the include syntax
atom · Mar 11, 2016 · 498e083 · 498e083
2 parents b3e8514 + 86ce372
commit 498e083
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/grammars/puppet.cson b/grammars/puppet.cson
@@ -137,7 +137,7 @@
     'include': '#variable'
   }
   {
-    'begin': '(?i)\\b(import|include)\\b\\s*'
+    'begin': '(?i)\\b(import|include|contain)\\b\\s*'
     'beginCaptures':
       '1':
         'name': 'keyword.control.import.include.puppet'
@@ -153,7 +153,7 @@
     'name': 'constant.other.bareword.puppet'
   }
   {
-    'match': '(?i)\\b(alert|contain|crit|debug|defined|emerg|err|escape|fail|failed|file|generate|gsub|include|info|notice|package|realize|search|tag|tagged|template|warning)\\b'
+    'match': '(?i)\\b(alert|crit|debug|defined|emerg|err|escape|fail|failed|file|generate|gsub|info|notice|package|realize|search|tag|tagged|template|warning)\\b'
     'name': 'support.function.puppet'
   }
   {

diff --git a/spec/puppet-spec.coffee b/spec/puppet-spec.coffee
@@ -29,3 +29,11 @@ describe "Puppet grammar", ->
     it "tokenizes double quoted node", ->
       {tokens} = grammar.tokenizeLine('node "hostname" {')
       expect(tokens[0]).toEqual value: 'node', scopes: ['source.puppet', 'meta.definition.class.puppet', 'storage.type.puppet']
+
+    it "tokenizes include as an include function", ->
+      {tokens} = grammar.tokenizeLine("contain foo")
+      expect(tokens[0]).toEqual value: 'contain', scopes: ['source.puppet', 'meta.include.puppet', 'keyword.control.import.include.puppet']
+
+    it "tokenizes contain as an include function", ->
+      {tokens} = grammar.tokenizeLine('include foo')
+      expect(tokens[0]).toEqual value: 'include', scopes: ['source.puppet', 'meta.include.puppet', 'keyword.control.import.include.puppet']