From 6538ac5e78d5b4e2433b37c24a0dfde2c7f2bcbf Mon Sep 17 00:00:00 2001 From: deathaxe Date: Mon, 14 Mar 2022 17:36:15 +0100 Subject: [PATCH] [JSON] Rename mapping separator scopes (#3270) Applies #3228 --- JSON/JSON.sublime-syntax | 4 ++-- JSON/syntax_test_json.json | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/JSON/JSON.sublime-syntax b/JSON/JSON.sublime-syntax index 2ff4218e34..9d1aa3aa28 100644 --- a/JSON/JSON.sublime-syntax +++ b/JSON/JSON.sublime-syntax @@ -116,7 +116,7 @@ contexts: - meta_include_prototype: false - include: inside-string - match: ':' - scope: punctuation.separator.mapping.key-value.json + scope: punctuation.separator.key-value.json push: - match: ',|\s?(?=\})' scope: invalid.illegal.expected-mapping-value.json @@ -129,7 +129,7 @@ contexts: - match: '' set: - match: ',' - scope: punctuation.separator.mapping.pair.json + scope: punctuation.separator.sequence.json pop: 1 - match: \s*(?=\}) pop: 1 diff --git a/JSON/syntax_test_json.json b/JSON/syntax_test_json.json index 7771800771..ae0760eb3f 100644 --- a/JSON/syntax_test_json.json +++ b/JSON/syntax_test_json.json @@ -23,11 +23,11 @@ // ^^ meta.mapping.value.json meta.mapping.json , , -// <- punctuation.separator.mapping.pair.json +// <- punctuation.separator.sequence.json //^ invalid.illegal.expected-mapping-key.json "sep": {}, -// ^ punctuation.separator.mapping.key-value.json +// ^ punctuation.separator.key-value.json "array": [ /**/ ], // ^^^^^^^^ meta.mapping.value.json meta.sequence.json @@ -54,14 +54,14 @@ // ^ - invalid // ^^^^^^^^^^ comment.line.double-slash.js , -// ^ punctuation.separator.mapping.pair.json +// ^ punctuation.separator.sequence.json "foo": "bar" /* comment */ // ^ - invalid // ^^^^^^^^^^^^^ comment.block.json }, //^ punctuation.section.mapping.end.json -// ^ punctuation.separator.mapping.pair.json +// ^ punctuation.separator.sequence.json "string": "string", // ^ punctuation.definition.string.begin.json @@ -80,7 +80,7 @@ "E": 20e10, // ^^^^^ meta.number.float.decimal.json constant.numeric.value.json //^^^ meta.mapping.key.json string.quoted.double.json -// ^ punctuation.separator.mapping.key-value.json - meta.mapping.key +// ^ punctuation.separator.key-value.json - meta.mapping.key "escape": "\n", // ^^ constant.character.escape.json @@ -97,7 +97,7 @@ /**/: "test", // ^ meta.mapping.json comment.block.json -// ^ punctuation.separator.mapping.key-value.json - comment +// ^ punctuation.separator.key-value.json - comment // ^^^^^^ meta.mapping.value.json string.quoted.double.json "array2":