Skip to content
This repository has been archived by the owner on Dec 15, 2022. It is now read-only.

Update puppet grammar #25

Open
wants to merge 30 commits into
base: master
Choose a base branch
from
Open

Update puppet grammar #25

Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
4c14244
Recognize full resource syntaxes
ccaum Feb 16, 2016
41f07fd
Add conditionals to repository
ccaum Feb 16, 2016
35ec1f9
Rename variable repo item to variables
ccaum Feb 16, 2016
1c74618
Add numbers as repository item
ccaum Feb 16, 2016
1d7da0a
Improve function identification
ccaum Feb 16, 2016
a9f7440
Support new application puppet definition type
ccaum Feb 16, 2016
946d88d
Better identify constants
ccaum Feb 17, 2016
28f8161
Don't match ending '{' for class definitiions
ccaum Feb 17, 2016
9df8e8b
Move definition parameter matching to repository
ccaum Feb 17, 2016
b16aa7d
Match assignment operations anywhere in Puppet code
ccaum Feb 17, 2016
740c99b
Identify resource titles in a type block
ccaum Feb 18, 2016
41f12dd
Properly tokenize resource parameters
ccaum Feb 18, 2016
9961831
Properly parse class definitions
ccaum Feb 18, 2016
0a0b64b
Add tests for application definitions
ccaum Feb 18, 2016
8ea2501
Support defined types the same as classes
ccaum Feb 18, 2016
1479153
Do not tokenize resource titles
ccaum Feb 18, 2016
3b9b4da
Test resource reference tokenization
ccaum Feb 18, 2016
bea13b8
Add tests for functions
ccaum Feb 18, 2016
3f10a45
Support numbers and hashes anywhere in the Puppet code
ccaum Feb 18, 2016
d11a95f
Ensure defined types are tokenized properly
ccaum Feb 18, 2016
29f56a8
Improve function testing
ccaum Feb 18, 2016
8cfa4c5
Support number tokenization anywhere in Puppet code
ccaum Feb 18, 2016
ebbbc22
Support line comments in resource declarations
ccaum Feb 18, 2016
29c534a
Fix syntax ordering and captures
ccaum Feb 22, 2016
96d96f3
Scope function begin and end parentheses
ccaum Feb 22, 2016
4a06bad
Use repository naming conventions
ccaum Feb 22, 2016
9eb735f
Fix function parameter matching
ccaum Feb 22, 2016
b2bab8d
Use proper scoping conventions for numbers and classes
ccaum Feb 23, 2016
fb01c5f
Fix tests for number and class scoping changes
ccaum Feb 23, 2016
3bf1972
Support case statements
ccaum Feb 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
236 changes: 142 additions & 94 deletions grammars/puppet.cson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,99 +12,85 @@
{
'include': '#constants'
}
{
'include': '#numbers'
}
{
'include': '#hash'
}
{
'begin': '^\\s*/\\*'
'end': '\\*/'
'name': 'comment.block.puppet'
}
{
'begin': '^\\s*(node|class)\\s+((?:[-_A-Za-z0-9"\'.]+::)*[-_A-Za-z0-9"\'.]+)\\s*'
'captures':
'begin': '^\\s*(node|define|class|application)\\s+((?:[-_A-Za-z0-9"\'.]+::)*[-_A-Za-z0-9"\'.]+)\\s*'
'beginCaptures':
'1':
'name': 'storage.type.puppet'
'2':
'name': 'entity.name.type.class.puppet'
'end': '(?={)'
'endCaptures':
'0':
'name': 'punctuation.definition.class.begin.puppet'
'end': '{'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you move this end above the endCaptures?

'name': 'meta.definition.class.puppet'
'patterns': [
{
'begin': '\\b(inherits)\\b\\s+'
'captures':
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should also be beginCaptures

'1':
'name': 'storage.modifier.puppet'
'end': '(?={)'
'end': '{'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we give a capture to this?

'name': 'meta.definition.class.inherits.puppet'
'patterns': [
{
'match': '\\b((?:[-_A-Za-z0-9".]+::)*[-_A-Za-z0-9".]+)\\b'
'name': 'support.type.puppet'
'name': 'entity.name.type.class.puppet'
}
]
}
{
'captures':
'1':
'name': 'variable.other.puppet'
'2':
'name': 'punctuation.definition.variable.puppet'
'match': '((\\$+)[a-zA-Z_][a-zA-Z0-9_]*)\\s*(?=,|\\))'
'name': 'meta.function.argument.no-default.puppet'
}
{
'begin': '((\\$+)[a-zA-Z_][a-zA-Z0-9_]*)(?:\\s*(=)\\s*)\\s*'
'captures':
'1':
'name': 'variable.other.puppet'
'2':
'name': 'punctuation.definition.variable.puppet'
'3':
'name': 'keyword.operator.assignment.puppet'
'end': '(?=,|\\))'
'name': 'meta.function.argument.default.puppet'
'patterns': [
{
'include': '#parameter-default-types'
}
]
'include': '#defineparameters'
}
]
}
{
'begin': '^\\s*(define)\\s+([a-zA-Z0-9_:]+)\\s*(\\()'
'beginCaptures':
'1':
'name': 'storage.type.function.puppet'
'2':
'name': 'entity.name.function.puppet'
'3':
'name': 'punctuation.definition.parameters.begin.puppet'
'contentName': 'meta.function.arguments.puppet'
'end': '\\)'
'endCaptures':
'1':
'name': 'punctuation.definition.parameters.end.puppet'
'name': 'meta.function.puppet'
'name': 'storage.type.puppet'
'begin': '((?:[-_A-Za-z0-9".]+::)*[-_A-Za-z0-9".]+)\\s*{'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

begin should go before beginCaptures

'name': 'meta.definition.resource.puppet'
'end': '}'
'patterns': [
{
'captures':
'1':
'name': 'variable.other.puppet'
'2':
'name': 'punctuation.definition.variable.puppet'
'match': '((\\$+)[a-zA-Z_][a-zA-Z0-9_]*)\\s*(?=,|\\))'
'name': 'meta.function.argument.no-default.puppet'
'name': 'punctuation.classtitle.puppet'
'match': '(:)'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

match should go before captures
Also, since all this is matching is a single colon, you can change it to a zero capture.

'name': 'meta.title.puppet'
}
{
'begin': '((\\$+)[a-zA-Z_][a-zA-Z0-9_]*)(?:\\s*(=)\\s*)\\s*'
'captures':
'include': '#line_comment'
}
{
'include': '#strings'
}
{
'include': '#variables'
}
{
'include': '#metaparameters'
}
{
'beginCaptures':
'1':
'name': 'variable.other.puppet'
'name': 'name.parameter.resource.puppet'
'2':
'name': 'punctuation.definition.variable.puppet'
'3':
'name': 'keyword.operator.assignment.puppet'
'end': '(?=,|\\))'
'name': 'meta.function.argument.default.puppet'
'name': 'punctuation.separator.key-value.puppet'
'begin': '(\\w+)\\s*(=>)'
'name': 'meta.parameter.resource.puppet'
'end': ',|\\n|;'
'patterns': [
{
'include': '#parameter-default-types'
Expand All @@ -114,17 +100,7 @@
]
}
{
'captures':
'1':
'name': 'storage.type.puppet'
'2':
'name': 'entity.name.section.puppet'
'match': '^\\s*(\\w+)\\s*{\\s*([\'"].+[\'"]):'
'name': 'meta.definition.resource.puppet'
}
{
'match': '\\b(case|if|else|elsif)(?!::)\\b'
'name': 'keyword.control.puppet'
'include': '#conditionals'
}
{
'include': '#strings'
Expand All @@ -134,7 +110,7 @@
'name': 'entity.name.section.puppet'
}
{
'include': '#variable'
'include': '#variables'
}
{
'begin': '(?i)\\b(import|include)\\b\\s*'
Expand All @@ -144,29 +120,31 @@
'end': '(?=\\s|$)'
'name': 'meta.include.puppet'
}
{
'match': '\\b\\w+\\s*(?==>)\\s*'
'name': 'constant.other.key.puppet'
}
{
'match': '(?<={)\\s*\\w+\\s*(?=})'
'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'
'name': 'support.function.puppet'
'include': '#assignments'
}
{
'match': '=>'
'name': 'punctuation.separator.key-value.puppet'
'include': '#functions'
}
]
'repository':
'constants':
'functions':
'beginCaptures':
'0':
'name': 'support.function.puppet'
'endCaptures':
'0':
'name': 'support.function.puppet'
'begin': '(?:^|\\s|\\W)(\\w+)\\s*\\('
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you scope the parentheses here?

'end': '\\)'
'name': 'meta.function.puppet'
'patterns': [
{
'match': '(?i)\\b(absent|directory|false|file|present|running|stopped|true)\\b'
'name': 'constant.language.puppet'
'include': '#parameter-default-types'
}
]
'double-quoted-string':
Expand All @@ -184,7 +162,7 @@
'include': '#escaped_char'
}
{
'include': '#variable'
'include': '#variables'
}
]
'escaped_char':
Expand Down Expand Up @@ -234,7 +212,7 @@
'include': '#escaped_char'
}
{
'include': '#variable'
'include': '#variables'
}
{
'include': '#nested_braces_interpolated'
Expand Down Expand Up @@ -265,7 +243,7 @@
'include': '#escaped_char'
}
{
'include': '#variable'
'include': '#variables'
}
{
'include': '#nested_brackets_interpolated'
Expand Down Expand Up @@ -296,7 +274,7 @@
'include': '#escaped_char'
}
{
'include': '#variable'
'include': '#variables'
}
{
'include': '#nested_parens_interpolated'
Expand All @@ -320,14 +298,7 @@
'include': '#array'
}
{
'begin': '([a-zA-Z_][a-zA-Z0-9_]*)(\\()'
'end': '(\\))'
'name': 'meta.function.puppet'
'patterns': [
{
'include': '#parameter-default-types'
}
]
'include': "#functions"
}
{
'include': '#constants'
Expand All @@ -352,19 +323,22 @@
}
'hash':
{
'begin': '\\{'
'begin': '{'
'beginCaptures':
'0':
'name': 'punctuation.definition.hash.begin.puppet'
'end': '\\}'
'end': '}'
'endCaptures':
'0':
'name': 'punctuation.definition.hash.end.puppet'
'name': 'meta.hash.puppet'
'patterns': [
{
'match': '\\b\\w+\\s*(?==>)\\s*'
'name': 'constant.other.key.puppet'
'captures':
'0':
'name': 'punctuation.separator.key-value.puppet'
'match': '=>'
'name': 'meta.punctuation.hash.puppet'
}
{
'include': '#parameter-default-types'
Expand Down Expand Up @@ -395,7 +369,7 @@
'include': '#single-quoted-string'
}
]
'variable':
'variables':
'patterns': [
{
'captures':
Expand All @@ -414,3 +388,77 @@
'name': 'variable.other.readwrite.global.puppet'
}
]
'constants':
'beginCaptures':
'0':
'name': 'constant.support.puppet'
'begin': '((?:[-_A-Za-z0-9"\'.]+::)*[-_A-Za-z0-9"\'.]+)\\['
'endCaptures':
'0':
'name': 'constant.support.puppet'
'end': '\\]'
'patterns': [
{
'include': '#strings'
}
{
'include': '#variables'
}
]

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Extra newline here

'conditionals':
'patterns': [
{
'include': '#comparisons'
}
{
'include': '#cases'
}
]
'comparisons':
'beginCaptures':
'2':
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be 1

'name': 'keyword.control.puppet'
'begin': '(^|\\s)\\s*(if|else|unless|elsif)\\s+'
'end': '{'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should have a scope

'patterns': [
{
'include': '#parameter-default-types'
}
{
'include': '#comparisonoperators'
}
{
'include': '#negationoperators'
}
]
'comparisonoperators':
'match': '(?:\\s|^)(={2}|!=|>|<|>=|<=|=~|!~|in)(?:\\s|^)'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think == is cleaner than ={2} here. In addition, >= and <= have to be before > and <. And the ending ^ doesn't make sense...how can you begin the line after matching some characters?

'name': 'keyword.control.puppet'
'negationoperators':
'captures':
'1':
'name': 'negation.keyword.control.puppet'
'match': '(?:\\s|^)(not|!)(?:\\s|^)'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

match above captures (same with the numbers match below this one), and same question regarding the ending ^ capture.

'name': 'meta.keyword.control.puppet'
'numbers':
'captures':
'1':
'name': 'number.constant.puppet'
'match': '(?:(?:\\D&\\W)|\\s|^|\\[|\\{|,|;|\\()(\\d+([.]\\d+)?)(?!\\w)'
'name': 'meta.control.puppet'
'defineparameters':
'beginCaptures':
'0':
'name': 'punctuation.definition.classparameter.begin.puppet'
'begin': '\\('
'endCaptures':
'0':
'name': 'punctuation.definition.classparameter.end.puppet'
'end': '\\)'
'name': 'meta.classparameter.language.puppet'
'patterns': [
{
'include': '#parameter-default-types'
}
]
Loading