From e95eb0ebfe206790442e7c42692a91c6f81bad6a Mon Sep 17 00:00:00 2001 From: DeathAxe Date: Sun, 13 Mar 2022 11:59:55 +0100 Subject: [PATCH] [YAML] Rename mapping separator scopes Applies #3228 --- YAML/YAML.sublime-syntax | 2 +- YAML/tests/syntax_test_flow.yaml | 10 +++++----- YAML/tests/syntax_test_types.yaml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/YAML/YAML.sublime-syntax b/YAML/YAML.sublime-syntax index 1210e0e6ee..889f009798 100644 --- a/YAML/YAML.sublime-syntax +++ b/YAML/YAML.sublime-syntax @@ -625,7 +625,7 @@ contexts: scope: punctuation.definition.mapping.end.yaml pop: true - match: ',' - scope: punctuation.separator.mapping.yaml + scope: punctuation.separator.sequence.yaml - include: flow-pair - include: flow-node # for sets diff --git a/YAML/tests/syntax_test_flow.yaml b/YAML/tests/syntax_test_flow.yaml index ed5428e747..07990cdeb2 100644 --- a/YAML/tests/syntax_test_flow.yaml +++ b/YAML/tests/syntax_test_flow.yaml @@ -117,16 +117,16 @@ continuation" #^ meta.mapping.key.yaml string.unquoted.plain.in.yaml # ^ meta.mapping.yaml punctuation.separator.key-value.mapping.yaml # ^ meta.mapping.value string.unquoted.plain.in -entity.name.tag -# ^ meta.mapping.yaml punctuation.separator.mapping +# ^ meta.mapping.yaml punctuation.separator.sequence # ^^ meta.mapping.key.yaml string.unquoted.plain.in # ^ meta.mapping.yaml punctuation.separator.key-value.mapping # ^^ meta.mapping.value.yaml string.unquoted.plain.in -# ^ punctuation.separator.mapping +# ^ punctuation.separator.sequence # <- meta.mapping.yaml punctuation.definition.mapping.begin *alias, true : false } #^^^^^^^^^^^^^^^^^^^^^ meta.mapping - meta.mapping meta.mapping #^^^^^ variable.other.alias -# ^ punctuation.separator.mapping +# ^ punctuation.separator.sequence # ^^^^ meta.mapping.key.yaml constant.language.boolean.yaml - string # ^ punctuation.separator.key-value.mapping # ^^^^^ meta.mapping.value.yaml constant.language.boolean.yaml @@ -148,7 +148,7 @@ continuation" # ^^^^^^^^ meta.mapping.value.yaml # ^^^^^^^ string.quoted.double.yaml # ^^ meta.mapping.yaml -# ^ punctuation.separator.mapping.yaml +# ^ punctuation.separator.sequence.yaml # ^^^^^ meta.mapping.key.yaml string.quoted.single.yaml # ^ punctuation.separator.key-value.mapping.yaml # ^^^ meta.mapping.value.yaml @@ -158,7 +158,7 @@ continuation" {? !!str 'key' : !!str value, # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.mapping - meta.mapping meta.mapping # ^^^^^^^^^^^^ meta.mapping.value -# ^ punctuation.separator.mapping - meta.mapping.value +# ^ punctuation.separator.sequence - meta.mapping.value #^ punctuation.definition.key.begin.yaml #^^^^^^^^^^^^^^ meta.mapping.key.yaml # ^^^^^ storage diff --git a/YAML/tests/syntax_test_types.yaml b/YAML/tests/syntax_test_types.yaml index 7045ff907f..6bc699deeb 100644 --- a/YAML/tests/syntax_test_types.yaml +++ b/YAML/tests/syntax_test_types.yaml @@ -194,7 +194,7 @@ true: false #^^^^ constant.language.nan.yaml # ^ punctuation.separator.key-value.mapping.yaml # ^ meta.number.integer.decimal.yaml constant.numeric.value.yaml -# ^ punctuation.separator.mapping.yaml +# ^ punctuation.separator.sequence.yaml # ^ meta.number.integer.decimal.yaml constant.numeric.value.yaml # ^ punctuation.separator.key-value.mapping.yaml # ^^^^^^^^^^ constant.other.timestamp.yaml