Merge pull request #29 from petems/fix_resources_with_variable_names

Fixes resources with variable name
atom · Mar 12, 2016 · 6879ea1 · 6879ea1
2 parents 3785bd3 + 52b9b43
commit 6879ea1
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/grammars/puppet.cson b/grammars/puppet.cson
@@ -122,6 +122,15 @@
     'match': '^\\s*(\\w+)\\s*{\\s*([\'"].+[\'"]):'
     'name': 'meta.definition.resource.puppet'
   }
+  {
+    'match': '^\\s*(\\w+)\\s*{\\s*(\\$[a-zA-Z_]+)\\s*:'
+    'captures':
+      '1':
+        'name': 'storage.type.puppet'
+      '2':
+        'name': 'entity.name.section.puppet'
+    'name': 'meta.definition.resource.puppet'
+  }
   {
     'match': '\\b(case|if|else|elsif)(?!::)\\b'
     'name': 'keyword.control.puppet'

diff --git a/spec/puppet-spec.coffee b/spec/puppet-spec.coffee
@@ -37,3 +37,13 @@ describe "Puppet grammar", ->
     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']
+
+    it "tokenizes resource type and string title", ->
+      {tokens} = grammar.tokenizeLine("package {'foo':}")
+      expect(tokens[0]).toEqual value: 'package', scopes: ['source.puppet', 'meta.definition.resource.puppet', 'storage.type.puppet']
+      expect(tokens[2]).toEqual value: "'foo'", scopes: ['source.puppet', 'meta.definition.resource.puppet', 'entity.name.section.puppet']
+
+    it "tokenizes resource type and variable title", ->
+      {tokens} = grammar.tokenizeLine("package {$foo:}")
+      expect(tokens[0]).toEqual value: 'package', scopes: ['source.puppet', 'meta.definition.resource.puppet', 'storage.type.puppet']
+      expect(tokens[2]).toEqual value: '$foo', scopes: ['source.puppet', 'meta.definition.resource.puppet', 'entity.name.section.puppet']