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

Commit

Permalink
Merge pull request #21 from caleb531/string-fix
Browse files Browse the repository at this point in the history 
Allow for more than one key/value pair per line
  • Loading branch information
Winston Liu authored Mar 25, 2019
2 parents 28ce891 + 52b54b9 commit 000efcd
Show file tree
Hide file tree
Showing 2 changed files with 210 additions and 129 deletions.
243 changes: 161 additions & 82 deletions grammars/toml.cson
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@
'fileTypes': ['toml']
'patterns': [
{
'match': '(#).*$'
'name': 'comment.line.number-sign.toml'
'captures':
'1': 'name': 'punctuation.definition.comment.toml'
'include': '#comment'
}
{
'match': '(?:^\\s*)((\\[\\[)[^\\]]+(\\]\\]))'
Expand All @@ -23,107 +20,189 @@
'3': 'name': 'punctuation.definition.table.end.toml'
}
{
'match': '([A-Za-z0-9_-]+)\\s*(=)' # IMPORTANT: Do not replace with [\\w-]. \\w includes more than just a-z.
'captures':
'1': 'name': 'variable.other.key.toml'
'2': 'name': 'keyword.operator.assignment.toml'
'begin': '([A-Za-z0-9_-]+)\\s*(=)\\s*' # IMPORTANT: Do not replace with [\\w-]. \\w includes more than just a-z.
'beginCaptures':
'1':
'name': 'variable.other.key.toml'
'2':
'name': 'keyword.operator.assignment.toml'
'end': '(?!\\G)'
'patterns': [
{
'include': '#values'
}
]
}
{
'match': '((")(.*)("))\\s*(=)' # This one is .* because " can be escaped
'captures':
'1': 'name': 'string.quoted.double.toml'
'2': 'name': 'punctuation.definition.string.begin.toml'
'begin': '((")(.*?)("))\\s*(=)\\s*' # This one is .* because " can be escaped
'beginCaptures':
'1':
'name': 'string.quoted.double.toml'
'2':
'name': 'punctuation.definition.string.begin.toml'
'3':
'name': 'variable.other.key.toml'
'patterns': [
{
'include': '#string-escapes'
}
]
'4': 'name': 'punctuation.definition.string.end.toml'
'5': 'name': 'keyword.operator.assignment.toml'
}
{
'match': "((')([^']*)('))\\s*(=)"
'captures':
'1': 'name': 'string.quoted.single.toml'
'2': 'name': 'punctuation.definition.string.begin.toml'
'3': 'name': 'variable.other.key.toml'
'4': 'name': 'punctuation.definition.string.end.toml'
'5': 'name': 'keyword.operator.assignment.toml'
}
{
'begin': '"""'
'beginCaptures':
'0': 'name': 'punctuation.definition.string.begin.toml'
'end': '"""'
'endCaptures':
'0': 'name': 'punctuation.definition.string.end.toml'
'name': 'string.quoted.double.block.toml'
'4':
'name': 'punctuation.definition.string.end.toml'
'5':
'name': 'keyword.operator.assignment.toml'
'end': '(?!\\G)'
'patterns': [
{
'include': '#string-escapes'
}
{
'match': '\\\\$'
'name': 'constant.character.escape.toml'
'include': '#values'
}
]
}
{
'begin': "'''"
'begin': "((')([^']*)('))\\s*(=)\\s*"
'beginCaptures':
'0': 'name': 'punctuation.definition.string.begin.toml'
'end': "'''"
'endCaptures':
'0': 'name': 'punctuation.definition.string.end.toml'
'name': 'string.quoted.single.block.toml'
}
{
'begin': '"'
'beginCaptures':
'0': 'name': 'punctuation.definition.string.begin.toml'
'end': '"'
'endCaptures':
'0': 'name': 'punctuation.definition.string.end.toml'
'name': 'string.quoted.double.toml'
'1':
'name': 'string.quoted.single.toml'
'2':
'name': 'punctuation.definition.string.begin.toml'
'3':
'name': 'variable.other.key.toml'
'4':
'name': 'punctuation.definition.string.end.toml'
'5':
'name': 'keyword.operator.assignment.toml'
'end': '(?!\\G)'
'patterns': [
{
'include': '#string-escapes'
'include': '#values'
}
]
}
{
'begin': "'"
'beginCaptures':
'0': 'name': 'punctuation.definition.string.begin.toml'
'end': "'"
'endCaptures':
'0': 'name': 'punctuation.definition.string.end.toml'
'name': 'string.quoted.single.toml'
}
{
'match': 'true'
'name': 'constant.language.boolean.true.toml'
}
{
'match': 'false'
'name': 'constant.language.boolean.false.toml'
}
{
'match': '\\d{4}-\\d{2}-\\d{2}(?:(T)\\d{2}:\\d{2}:\\d{2}(?:\\.\\d+)?(?:(Z)|([+-])\\d{2}:\\d{2})?)?'
'name': 'constant.numeric.date.toml'
'captures':
'1': 'name': 'keyword.other.time.toml'
'2': 'name': 'keyword.other.offset.toml'
'3': 'name': 'keyword.other.offset.toml'
}
{
'match': '[+-]?(0|[1-9]\\d*)(_\\d+)*((\\.\\d+)(_\\d+)*)?([eE][+-]?\\d+(_\\d+)*)?'
'name': 'constant.numeric.toml'
}
]
'repository':
'comment':
'patterns': [
{
'match': '(#).*$'
'name': 'comment.line.number-sign.toml'
'captures':
'1': 'name': 'punctuation.definition.comment.toml'
}
]
'string-escapes':
'match': '\\\\[btnfr"\\\\]|\\\\u[A-Fa-f0-9]{4}|\\\\U[A-Fa-f0-9]{8}'
'name': 'constant.character.escape.toml'
'values':
'patterns': [
{
'begin': '\\['
'beginCaptures':
'0':
'name': 'punctuation.definition.array.begin.toml'
'end': '\\]'
'endCaptures':
'0':
'name': 'punctuation.definition.array.end.toml'
'patterns': [
{
'include': '#comment'
}
{
'match': ','
'name': 'punctuation.definition.separator.comma.toml'
}
{
'include': '#values'
}
]
}
{
'begin': '{'
'beginCaptures':
'0':
'name': 'punctuation.definition.table.inline.begin.toml'
'end': '}'
'endCaptures':
'0':
'name': 'punctuation.definition.table.inline.end.toml'
'patterns': [
{
'match': ','
'name': 'punctuation.definition.separator.comma.toml'
}
{
'include': '$self'
}
]
}
{
'begin': '"""'
'beginCaptures':
'0': 'name': 'punctuation.definition.string.begin.toml'
'end': '"""'
'endCaptures':
'0': 'name': 'punctuation.definition.string.end.toml'
'name': 'string.quoted.double.block.toml'
'patterns': [
{
'include': '#string-escapes'
}
{
'match': '\\\\$'
'name': 'constant.character.escape.toml'
}
]
}
{
'begin': "'''"
'beginCaptures':
'0': 'name': 'punctuation.definition.string.begin.toml'
'end': "'''"
'endCaptures':
'0': 'name': 'punctuation.definition.string.end.toml'
'name': 'string.quoted.single.block.toml'
}
{
'begin': '"'
'beginCaptures':
'0': 'name': 'punctuation.definition.string.begin.toml'
'end': '"'
'endCaptures':
'0': 'name': 'punctuation.definition.string.end.toml'
'name': 'string.quoted.double.toml'
'patterns': [
{
'include': '#string-escapes'
}
]
}
{
'begin': "'"
'beginCaptures':
'0': 'name': 'punctuation.definition.string.begin.toml'
'end': "'"
'endCaptures':
'0': 'name': 'punctuation.definition.string.end.toml'
'name': 'string.quoted.single.toml'
}
{
'match': 'true'
'name': 'constant.language.boolean.true.toml'
}
{
'match': 'false'
'name': 'constant.language.boolean.false.toml'
}
{
'match': '\\d{4}-\\d{2}-\\d{2}(?:(T)\\d{2}:\\d{2}:\\d{2}(?:\\.\\d+)?(?:(Z)|([+-])\\d{2}:\\d{2})?)?'
'name': 'constant.numeric.date.toml'
'captures':
'1': 'name': 'keyword.other.time.toml'
'2': 'name': 'keyword.other.offset.toml'
'3': 'name': 'keyword.other.offset.toml'
}
{
'match': '[+-]?(0|[1-9]\\d*)(_\\d+)*((\\.\\d+)(_\\d+)*)?([eE][+-]?\\d+(_\\d+)*)?'
'name': 'constant.numeric.toml'
}
]
Loading

0 comments on commit 000efcd

Please sign in to comment.