diff options
author | David Peter <sharkdp@users.noreply.github.com> | 2021-05-12 11:34:35 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-12 11:34:35 +0200 |
commit | 5db3c930576a8aa4705843dd512303059fc98771 (patch) | |
tree | 9057d2c5ea11263e4bedaa2b0053fe5ab95c69b6 /assets | |
parent | b3ab8439547b6204167cb05ac7360160b54a1568 (diff) | |
parent | b16cacc758fb60777072ff8f9b9ae8ba97e4f5ae (diff) |
Merge branch 'master' into syslog
Diffstat (limited to 'assets')
-rw-r--r-- | assets/patches/Monokai-Extended.tmTheme.patch | 2 | ||||
m--------- | assets/syntaxes/02_Extra/CSV | 0 | ||||
-rw-r--r-- | assets/syntaxes/02_Extra/CSV.sublime-syntax | 110 | ||||
m--------- | assets/syntaxes/02_Extra/Julia | 0 | ||||
m--------- | assets/syntaxes/02_Extra/SCSS_Sass | 0 | ||||
-rw-r--r-- | assets/syntaxes/02_Extra/syntax_test_csv.csv | 60 | ||||
-rw-r--r-- | assets/syntaxes/02_Extra/syntax_test_tsv.tsv | 60 |
7 files changed, 192 insertions, 40 deletions
diff --git a/assets/patches/Monokai-Extended.tmTheme.patch b/assets/patches/Monokai-Extended.tmTheme.patch index c237f53d..106b584d 100644 --- a/assets/patches/Monokai-Extended.tmTheme.patch +++ b/assets/patches/Monokai-Extended.tmTheme.patch @@ -7,7 +7,7 @@ index 9c2aa3e..180cbbf 100644 <string>JSON String</string> <key>scope</key> - <string>meta.structure.dictionary.json string.quoted.double.json</string> -+ <string>meta.mapping.key.json string.quoted.double.json</string> ++ <string>meta.mapping.key.json string.quoted.double.json, punctuation.separator.sequence.csv</string> <key>settings</key> <dict> <key>foreground</key> diff --git a/assets/syntaxes/02_Extra/CSV b/assets/syntaxes/02_Extra/CSV deleted file mode 160000 -Subproject 4786d037a761bc45e516f6b0624a839919ec6d0 diff --git a/assets/syntaxes/02_Extra/CSV.sublime-syntax b/assets/syntaxes/02_Extra/CSV.sublime-syntax index 1bbc5b97..cca7cd2c 100644 --- a/assets/syntaxes/02_Extra/CSV.sublime-syntax +++ b/assets/syntaxes/02_Extra/CSV.sublime-syntax @@ -1,46 +1,78 @@ %YAML 1.2 --- -# http://www.sublimetext.com/docs/3/syntax.html -name: Advanced CSV +# See http://www.sublimetext.com/docs/3/syntax.html +name: Comma Separated Values file_extensions: - csv - tsv -scope: text.advanced_csv +scope: text.csv +variables: + field_separator: (?:[,;\t]) + record_separator: (?:$\n?) contexts: - main: - - match: (\") - captures: - 1: string.quoted.double.advanced_csv - push: - - meta_scope: meta.quoted.advanced_csv - - match: (\") - captures: - 1: string.quoted.double.advanced_csv - pop: true - - include: main - - match: '(\[([+-]?\d*)(\:)?([+-]?\d*)(\,)?([+-]?\d*)(\:)?([+-]?\d*)\])?\s*([<>v^])?\s*(=)' - captures: - 1: keyword.operator.advanced_csv - 2: constant.numeric.formula.advanced_csv - 4: constant.numeric.formula.advanced_csv - 6: constant.numeric.formula.advanced_csv - 8: constant.numeric.formula.advanced_csv - 9: keyword.operator.advanced_csv - 10: keyword.operator.advanced_csv + prototype: + - match: (?={{record_separator}}) + pop: true + fields: + - match: '' push: - - meta_scope: meta.range.advanced_csv - - match: (?=(\")|$) - pop: true - - include: scope:source.python - - match: '(?<=^|,|\s|\")([0-9.eE+-]+)(?=$|,|\s|\")' - scope: meta.number.advanced_csv - captures: - 1: constant.numeric.advanced_csv - - match: '(?<=^|,|\s|\")([^, \t\"]+)(?=$|,|\s|\")' - scope: meta.nonnumber.advanced_csv - captures: - 1: storage.type.advanced_csv - - match: (\,) - scope: meta.delimiter.advanced_csv - captures: - 1: keyword.operator.advanced_csv + - field_or_record_separator + - field4 + - field_or_record_separator + - field3 + - field_or_record_separator + - field2 + - field_or_record_separator + - field1 + main: + - meta_include_prototype: false + - match: '^' + set: fields + + field_or_record_separator: + - meta_include_prototype: false + - match: '{{record_separator}}' + scope: punctuation.terminator.record.csv + pop: true + - match: '{{field_separator}}' + scope: punctuation.separator.sequence.csv + pop: true + + field_contents: + - match: '"' + scope: punctuation.definition.string.begin.csv + push: double_quoted_string + + - match: (?={{field_separator}}|{{record_separator}}) + pop: true + + double_quoted_string: + - meta_include_prototype: false + - meta_scope: string.quoted.double.csv + - match: '""' + scope: constant.character.escape.csv + - match: '"' + scope: punctuation.definition.string.end.csv + pop: true + + field1: + - match: '' + set: + - meta_content_scope: meta.field-1.csv support.type + - include: field_contents + field2: + - match: '' + set: + - meta_content_scope: meta.field-2.csv support.function + - include: field_contents + field3: + - match: '' + set: + - meta_content_scope: meta.field-3.csv constant.numeric + - include: field_contents + field4: + - match: '' + set: + - meta_content_scope: meta.field-4.csv keyword.operator + - include: field_contents + diff --git a/assets/syntaxes/02_Extra/Julia b/assets/syntaxes/02_Extra/Julia -Subproject 45a1b6fe6cc37a2b614ae199d85c702b8711e22 +Subproject cc13e7d4ef74a6556af09d8858d2cc6a47ef545 diff --git a/assets/syntaxes/02_Extra/SCSS_Sass b/assets/syntaxes/02_Extra/SCSS_Sass -Subproject 4868322030c3644d6b8cfff68c85849789d9bdb +Subproject 63819a1ab6b2075360933b2cfe41b416de0e3c2 diff --git a/assets/syntaxes/02_Extra/syntax_test_csv.csv b/assets/syntaxes/02_Extra/syntax_test_csv.csv new file mode 100644 index 00000000..c997b2bd --- /dev/null +++ b/assets/syntaxes/02_Extra/syntax_test_csv.csv @@ -0,0 +1,60 @@ +# SYNTAX TEST "CSV.sublime-syntax" +Forename,Surname,House No.,Street,City,Postcode +#^^^^^^^ meta.field-1 +# ^ punctuation.separator.sequence +# ^^^^^^^ meta.field-2 +# ^ punctuation.separator.sequence +# ^^^^^^^^^ meta.field-3 +# ^ punctuation.separator.sequence +# ^^^^^^ meta.field-4 +# ^ punctuation.separator.sequence +# ^^^^ meta.field-1 +# ^ punctuation.separator.sequence +# ^^^^^^^^ meta.field-2 +John,Doe,87,Logon Road,Citiville,TU43 6GH +#^^^ meta.field-1 +# ^ punctuation.separator.sequence +# ^^^ meta.field-2 +# ^ punctuation.separator.sequence +# ^^ meta.field-3 +# ^ punctuation.separator.sequence +# ^^^^^^^^^^ meta.field-4 +# ^ punctuation.separator.sequence +# ^^^^^^^^^ meta.field-1 +# ^ punctuation.separator.sequence +# ^^^^^^^^ meta.field-2 +Jane,Doe,22,"""Fun"" Street","The City, County",FA90 1XA +#^^^ meta.field-1 +# ^ punctuation.separator.sequence +# ^^^ meta.field-2 +# ^ punctuation.separator.sequence +# ^^ meta.field-3 +# ^ punctuation.separator.sequence +# ^^^^^^^^^^^^^^^^ meta.field-4 string.quoted.double +# ^^ constant.character.escape +# ^^ constant.character.escape +# ^ punctuation.separator.sequence +# ^ meta.field-1 string.quoted.double punctuation.definition.string.begin +# ^^^^^^^^^^^^^^^^^ meta.field-1 string.quoted.double +# ^ meta.field-1 string.quoted.double punctuation.definition.string.end +# ^ punctuation.separator.sequence +# ^^^^^^^^ meta.field-2 +Fred,Bloggs,"19","Street +#^^^ meta.field-1 +# ^ punctuation.separator.sequence +# ^^^^^^ meta.field-2 +# ^ punctuation.separator.sequence +# ^^^ meta.field-3 string.quoted.double +# ^ punctuation.separator.sequence +# ^ meta.field-4 punctuation.definition.string.begin +# ^^^^^^^^ meta.field-4 string.quoted.double +Spanning Multiple "" +#^^^^^^^^^^^^^^^^^^^^ meta.field-4 string.quoted.double +# ^^ constant.character.escape +Lines",Citee,P0stc0d3 +#^^^^^ meta.field-4 string.quoted.double +# ^ meta.field-4 punctuation.definition.string.end +# ^ punctuation.separator.sequence +# ^^^^^ meta.field-1 +# ^ punctuation.separator.sequence +# ^^^^^^^^ meta.field-2 diff --git a/assets/syntaxes/02_Extra/syntax_test_tsv.tsv b/assets/syntaxes/02_Extra/syntax_test_tsv.tsv new file mode 100644 index 00000000..8c2645b8 --- /dev/null +++ b/assets/syntaxes/02_Extra/syntax_test_tsv.tsv @@ -0,0 +1,60 @@ +# SYNTAX TEST "CSV.sublime-syntax" +Forename Surname House No. Street City Postcode +#^^^^^^^ meta.field-1 +# ^ punctuation.separator.sequence +# ^^^^^^^ meta.field-2 +# ^ punctuation.separator.sequence +# ^^^^^^^^^ meta.field-3 +# ^ punctuation.separator.sequence +# ^^^^^^ meta.field-4 +# ^ punctuation.separator.sequence +# ^^^^ meta.field-1 +# ^ punctuation.separator.sequence +# ^^^^^^^^ meta.field-2 +John Doe 87 Logon Road Citiville TU43 6GH +#^^^ meta.field-1 +# ^ punctuation.separator.sequence +# ^^^ meta.field-2 +# ^ punctuation.separator.sequence +# ^^ meta.field-3 +# ^ punctuation.separator.sequence +# ^^^^^^^^^^ meta.field-4 +# ^ punctuation.separator.sequence +# ^^^^^^^^^ meta.field-1 +# ^ punctuation.separator.sequence +# ^^^^^^^^ meta.field-2 +Jane Doe 22 """Fun"" Street" "The City County" FA90 1XA +#^^^ meta.field-1 +# ^ punctuation.separator.sequence +# ^^^ meta.field-2 +# ^ punctuation.separator.sequence +# ^^ meta.field-3 +# ^ punctuation.separator.sequence +# ^^^^^^^^^^^^^^^^ meta.field-4 string.quoted.double +# ^^ constant.character.escape +# ^^ constant.character.escape +# ^ punctuation.separator.sequence +# ^ meta.field-1 string.quoted.double punctuation.definition.string.begin +# ^^^^^^^^^^^^^^^^^ meta.field-1 string.quoted.double +# ^ meta.field-1 string.quoted.double punctuation.definition.string.end +# ^ punctuation.separator.sequence +# ^^^^^^^^ meta.field-2 +Fred Bloggs "19" "Street +#^^^ meta.field-1 +# ^ punctuation.separator.sequence +# ^^^^^^ meta.field-2 +# ^ punctuation.separator.sequence +# ^^^ meta.field-3 string.quoted.double +# ^ punctuation.separator.sequence +# ^ meta.field-4 punctuation.definition.string.begin +# ^^^^^^^^ meta.field-4 string.quoted.double +Spanning Multiple "" +#^^^^^^^^^^^^^^^^^^^^ meta.field-4 string.quoted.double +# ^^ constant.character.escape +Lines" Citee P0stc0d3 +#^^^^^ meta.field-4 string.quoted.double +# ^ meta.field-4 punctuation.definition.string.end +# ^ punctuation.separator.sequence +# ^^^^^ meta.field-1 +# ^ punctuation.separator.sequence +# ^^^^^^^^ meta.field-2 |