diff options
author | Keith Hall <kingkeith+github@gmail.com> | 2021-04-01 22:55:53 +0300 |
---|---|---|
committer | David Peter <sharkdp@users.noreply.github.com> | 2021-05-11 21:04:02 +0200 |
commit | 848ceb6f10b6d5f9fcfca5b3530220a5b2403f84 (patch) | |
tree | 90d3ad49344f515dbebd2e3a760dd327911c4c16 /assets | |
parent | 3559079de0081987741a1d6fb2ea9ee4b1a42e56 (diff) |
Remove variable.other from CSV highlighting
Diffstat (limited to 'assets')
-rw-r--r-- | assets/syntaxes/02_Extra/CSV.sublime-syntax | 12 | ||||
-rw-r--r-- | assets/syntaxes/02_Extra/syntax_test_csv.csv | 26 | ||||
-rw-r--r-- | assets/syntaxes/02_Extra/syntax_test_tsv.tsv | 26 |
3 files changed, 31 insertions, 33 deletions
diff --git a/assets/syntaxes/02_Extra/CSV.sublime-syntax b/assets/syntaxes/02_Extra/CSV.sublime-syntax index 10e5c7cc..cca7cd2c 100644 --- a/assets/syntaxes/02_Extra/CSV.sublime-syntax +++ b/assets/syntaxes/02_Extra/CSV.sublime-syntax @@ -17,8 +17,6 @@ contexts: - match: '' push: - field_or_record_separator - - field5 - - field_or_record_separator - field4 - field_or_record_separator - field3 @@ -70,15 +68,11 @@ contexts: field3: - match: '' set: - - meta_content_scope: meta.field-3.csv variable.other + - meta_content_scope: meta.field-3.csv constant.numeric - include: field_contents field4: - match: '' set: - - meta_content_scope: meta.field-4.csv constant.numeric - - include: field_contents - field5: - - match: '' - set: - - meta_content_scope: meta.field-5.csv keyword.operator + - meta_content_scope: meta.field-4.csv keyword.operator - include: field_contents + diff --git a/assets/syntaxes/02_Extra/syntax_test_csv.csv b/assets/syntaxes/02_Extra/syntax_test_csv.csv index 1d7ae9f9..c997b2bd 100644 --- a/assets/syntaxes/02_Extra/syntax_test_csv.csv +++ b/assets/syntaxes/02_Extra/syntax_test_csv.csv @@ -8,19 +8,21 @@ Forename,Surname,House No.,Street,City,Postcode # ^ punctuation.separator.sequence # ^^^^^^ meta.field-4 # ^ punctuation.separator.sequence -# ^^^^ meta.field-5 +# ^^^^ meta.field-1 # ^ punctuation.separator.sequence -# ^^^^^^^^ meta.field-1 -John,Doe,87,Citiville,TU43 6GH +# ^^^^^^^^ 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-5 +# ^^^^^^^^^^ 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 @@ -32,11 +34,11 @@ Jane,Doe,22,"""Fun"" Street","The City, County",FA90 1XA # ^^ constant.character.escape # ^^ constant.character.escape # ^ punctuation.separator.sequence -# ^ meta.field-5 string.quoted.double punctuation.definition.string.begin -# ^^^^^^^^^^^^^^^^^ meta.field-5 string.quoted.double -# ^ meta.field-5 string.quoted.double punctuation.definition.string.end +# ^ 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-1 +# ^^^^^^^^ meta.field-2 Fred,Bloggs,"19","Street #^^^ meta.field-1 # ^ punctuation.separator.sequence @@ -53,6 +55,6 @@ Lines",Citee,P0stc0d3 #^^^^^ meta.field-4 string.quoted.double # ^ meta.field-4 punctuation.definition.string.end # ^ punctuation.separator.sequence -# ^^^^^ meta.field-5 +# ^^^^^ meta.field-1 # ^ punctuation.separator.sequence -# ^^^^^^^^ meta.field-1 +# ^^^^^^^^ meta.field-2 diff --git a/assets/syntaxes/02_Extra/syntax_test_tsv.tsv b/assets/syntaxes/02_Extra/syntax_test_tsv.tsv index 6d005214..8c2645b8 100644 --- a/assets/syntaxes/02_Extra/syntax_test_tsv.tsv +++ b/assets/syntaxes/02_Extra/syntax_test_tsv.tsv @@ -8,19 +8,21 @@ Forename Surname House No. Street City Postcode # ^ punctuation.separator.sequence # ^^^^^^ meta.field-4 # ^ punctuation.separator.sequence -# ^^^^ meta.field-5 +# ^^^^ meta.field-1 # ^ punctuation.separator.sequence -# ^^^^^^^^ meta.field-1 -John Doe 87 Citiville TU43 6GH +# ^^^^^^^^ 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-5 +# ^^^^^^^^^^ 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 @@ -32,11 +34,11 @@ Jane Doe 22 """Fun"" Street" "The City County" FA90 1XA # ^^ constant.character.escape # ^^ constant.character.escape # ^ punctuation.separator.sequence -# ^ meta.field-5 string.quoted.double punctuation.definition.string.begin -# ^^^^^^^^^^^^^^^^^ meta.field-5 string.quoted.double -# ^ meta.field-5 string.quoted.double punctuation.definition.string.end +# ^ 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-1 +# ^^^^^^^^ meta.field-2 Fred Bloggs "19" "Street #^^^ meta.field-1 # ^ punctuation.separator.sequence @@ -53,6 +55,6 @@ Lines" Citee P0stc0d3 #^^^^^ meta.field-4 string.quoted.double # ^ meta.field-4 punctuation.definition.string.end # ^ punctuation.separator.sequence -# ^^^^^ meta.field-5 +# ^^^^^ meta.field-1 # ^ punctuation.separator.sequence -# ^^^^^^^^ meta.field-1 +# ^^^^^^^^ meta.field-2 |