From 6919ac06e191ee958b6dd06350fc46b87dd74b0b Mon Sep 17 00:00:00 2001 From: deathaxe Date: Mon, 14 Mar 2022 17:36:58 +0100 Subject: [PATCH] [Git Formats] Rename mapping separator scopes (#3273) Applies #3228 --- Git Formats/Git Attributes.sublime-syntax | 12 ++++---- Git Formats/Git Commit.sublime-syntax | 18 ++++++------ Git Formats/Git Common.sublime-syntax | 2 +- Git Formats/Git Link.sublime-syntax | 2 +- Git Formats/Git Log.sublime-syntax | 2 +- Git Formats/Git Rebase.sublime-syntax | 2 +- Git Formats/tests/syntax_test_git_attributes | 30 ++++++++++---------- Git Formats/tests/syntax_test_git_commit | 28 +++++++++--------- Git Formats/tests/syntax_test_git_link | 4 +-- Git Formats/tests/syntax_test_git_log | 8 +++--- Git Formats/tests/syntax_test_git_rebase | 20 ++++++------- 11 files changed, 64 insertions(+), 64 deletions(-) diff --git a/Git Formats/Git Attributes.sublime-syntax b/Git Formats/Git Attributes.sublime-syntax index ab34d05d64..7e252b29ff 100644 --- a/Git Formats/Git Attributes.sublime-syntax +++ b/Git Formats/Git Attributes.sublime-syntax @@ -156,10 +156,10 @@ contexts: attribute-maybe-value-list: - meta_content_scope: meta.mapping.git.attributes - match: =(?=\S) - scope: meta.mapping.git.attributes punctuation.separator.mapping.key-value.git.attributes + scope: meta.mapping.git.attributes punctuation.separator.key-value.git.attributes set: [attribute-value-list, attribute-value-content] - match: = - scope: meta.mapping.git.attributes punctuation.separator.mapping.key-value.git.attributes + scope: meta.mapping.git.attributes punctuation.separator.key-value.git.attributes set: attribute-value-expected - include: attribute-separator - include: immediately-pop @@ -168,10 +168,10 @@ contexts: - meta_content_scope: meta.mapping.value.git.attributes - include: attribute-separator - match: ',(?=\S)' - scope: punctuation.separator.mapping.values.git.attributes + scope: punctuation.separator.sequence.git.attributes push: attribute-value-content - match: ',' - scope: meta.mapping.git.attributes punctuation.separator.mapping.values.git.attributes + scope: meta.mapping.git.attributes punctuation.separator.sequence.git.attributes set: attribute-value-expected - match: \S scope: invalid.illegal.value.git.attributes @@ -192,14 +192,14 @@ contexts: # Attributes are separated by whitespace # One whitespace after each attribute/value is captured as separator - match: \s - scope: meta.mapping.expect-value.git.attributes punctuation.separator.mapping.pair.git.attributes + scope: meta.mapping.expect-value.git.attributes punctuation.separator.sequence.git.attributes pop: 1 attribute-separator: # Attributes are separated by whitespace # One whitespace after each attribute/value is captured as separator - match: \s - scope: meta.mapping.git.attributes punctuation.separator.mapping.pair.git.attributes + scope: meta.mapping.git.attributes punctuation.separator.sequence.git.attributes pop: 1 ##[ PROTOTYPES ]####################################################### diff --git a/Git Formats/Git Commit.sublime-syntax b/Git Formats/Git Commit.sublime-syntax index 5dd826f5c0..7e5517dd2a 100644 --- a/Git Formats/Git Commit.sublime-syntax +++ b/Git Formats/Git Commit.sublime-syntax @@ -82,7 +82,7 @@ contexts: - match: ^\s*(Signed-off-by)\s*(:) captures: 1: keyword.other.signed-off-by.git.commit - 2: punctuation.separator.mapping.pair.git.commit + 2: punctuation.separator.key-value.git.commit ##[ COMMENTS ]######################################################### @@ -112,40 +112,40 @@ contexts: scope: meta.change-list.git.commit captures: 1: keyword.other.change-list.git.commit - 2: punctuation.separator.mapping.pair.change-list.git.commit + 2: punctuation.separator.key-value.change-list.git.commit 3: string.unquoted.git.commit markup.inserted.file.git.commit - match: \b({{copied}}|{{renamed}})\s*(:)\s*((.+)\s+(->)\s+(.+)) scope: meta.change-list.git.commit captures: 1: keyword.other.change-list.git.commit - 2: punctuation.separator.mapping.pair.change-list.git.commit + 2: punctuation.separator.key-value.change-list.git.commit 3: string.unquoted.git.commit 4: markup.changed.file.name.git.commit - 5: punctuation.separator.mapping.pair.path.git.commit + 5: punctuation.separator.key-value.path.git.commit 6: markup.changed.file.name.git.commit - match: \b({{typechange}})\s*(:)\s*(.*) scope: meta.change-list.git.commit captures: 1: keyword.other.change-list.git.commit - 2: punctuation.separator.mapping.pair.change-list.git.commit + 2: punctuation.separator.key-value.change-list.git.commit 3: string.unquoted.git.commit markup.changed.file.name.git.commit - match: \b({{modified}}|{{both_modified}})\s*(:)\s*(.*) scope: meta.change-list.git.commit captures: 1: keyword.other.change-list.git.commit - 2: punctuation.separator.mapping.pair.change-list.git.commit + 2: punctuation.separator.key-value.change-list.git.commit 3: string.unquoted.git.commit markup.changed.file.content.git.commit - match: \b({{deleted}}|{{deleted_by_them}}|{{deleted_by_us}}|{{both_deleted}})\s*(:)\s*(.*) scope: meta.change-list.git.commit captures: 1: keyword.other.change-list.git.commit - 2: punctuation.separator.mapping.pair.change-list.git.commit + 2: punctuation.separator.key-value.change-list.git.commit 3: string.unquoted.git.commit markup.deleted.file.git.commit - match: \b({{unknown}}|{{unmerged}})\s*(:)\s*(.*) scope: meta.change-list.git.commit captures: 1: keyword.other.change-list.git.commit - 2: punctuation.separator.mapping.pair.change-list.git.commit + 2: punctuation.separator.key-value.change-list.git.commit 3: string.unquoted.git.commit markup.ignored.file.git.commit commands-line: @@ -162,7 +162,7 @@ contexts: - match: \b({{date}})\s*(:)\s*(.*) captures: 1: markup.heading.git.commit - 2: punctuation.separator.mapping.pair.date.git.commit + 2: punctuation.separator.key-value.date.git.commit 3: constant.language.timestamp.git.commit heading: diff --git a/Git Formats/Git Common.sublime-syntax b/Git Formats/Git Common.sublime-syntax index 9edec3e57b..08b2d4198f 100644 --- a/Git Formats/Git Common.sublime-syntax +++ b/Git Formats/Git Common.sublime-syntax @@ -90,7 +90,7 @@ contexts: scope: meta.reference.issue.git captures: 1: keyword.other.resolved-issue.git - 2: punctuation.separator.mapping.pair.resolved-issue.git + 2: punctuation.separator.key-value.resolved-issue.git 3: constant.other.reference.issue.git 4: punctuation.separator.reference.issue.git # (inside repository_ref) 5: punctuation.definition.reference.issue.git diff --git a/Git Formats/Git Link.sublime-syntax b/Git Formats/Git Link.sublime-syntax index 990afd4d85..0622dec0b2 100644 --- a/Git Formats/Git Link.sublime-syntax +++ b/Git Formats/Git Link.sublime-syntax @@ -34,7 +34,7 @@ contexts: separator: - meta_scope: meta.mapping.git.link - match: ':' - scope: punctuation.separator.mapping.key-value.git.link + scope: punctuation.separator.key-value.git.link set: [mapping-value-meta, expect-path] - match: \n pop: 1 diff --git a/Git Formats/Git Log.sublime-syntax b/Git Formats/Git Log.sublime-syntax index 7668d865df..0eced97d25 100644 --- a/Git Formats/Git Log.sublime-syntax +++ b/Git Formats/Git Log.sublime-syntax @@ -61,7 +61,7 @@ contexts: - match: ^(\w+)\s*(:)\s* captures: 1: keyword.other.header.git.log - 2: punctuation.separator.mapping.pair.git.log + 2: punctuation.separator.key-value.git.log push: - meta_scope: meta.header.git.commit markup.raw.block.git.log - meta_content_scope: string.unquoted.log diff --git a/Git Formats/Git Rebase.sublime-syntax b/Git Formats/Git Rebase.sublime-syntax index 199a088b24..2efa706b65 100644 --- a/Git Formats/Git Rebase.sublime-syntax +++ b/Git Formats/Git Rebase.sublime-syntax @@ -181,7 +181,7 @@ contexts: help-cmd-descriptions: - match: (=)\s*(\S.+) captures: - 1: punctuation.separator.mapping.pair.git.rebase + 1: punctuation.separator.key-value.git.rebase 2: string.unquoted.git.rebase help-cmd-parameters: diff --git a/Git Formats/tests/syntax_test_git_attributes b/Git Formats/tests/syntax_test_git_attributes index 32be9a8947..87d876ec60 100644 --- a/Git Formats/tests/syntax_test_git_attributes +++ b/Git Formats/tests/syntax_test_git_attributes @@ -13,7 +13,7 @@ # ^ keyword.operator.logical.git.attributes # ^^^^^ variable.language.attribute.git.attributes # ^^^^^^ variable.language.attribute.git.attributes -# ^ punctuation.separator.mapping.key-value.git.attributes +# ^ punctuation.separator.key-value.git.attributes # ^^^^ string.unquoted.git.attributes [macro\tws]attr # <- meta.brackets.git.attributes punctuation.definition.brackets.begin.git.attributes @@ -64,13 +64,13 @@ # ^ punctuation.definition.string.end.git.attributes - entity.name.pattern.git # ^^^^^^ meta.attributes-list.git.attributes # ^^^^ variable.language.attribute.git.attributes -# ^ punctuation.separator.mapping.key-value.git.attributes +# ^ punctuation.separator.key-value.git.attributes # ^ punctuation.definition.string.begin.git.attributes # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ string.quoted.double.git.attributes # ^^^^^^^^^^ constant.character.escape.git.attributes # ^ punctuation.definition.string.end.git.attributes # ^^^^^ variable.language.attribute.git.attributes -# ^ punctuation.separator.mapping.key-value.git.attributes +# ^ punctuation.separator.key-value.git.attributes # ^^^^^^^^ string.quoted.double.git.attributes # ^^^^^^^^^ invalid.illegal.value.git.attributes @@ -92,9 +92,9 @@ # ^^^^^^^^^^^^^^^ meta.attributes-list.git.attributes # ^^^^^^^^^^^^^^^ meta.attribute # ^^^^^^^^ meta.mapping.key.git.attributes variable.language.attribute.git.attributes -# ^ punctuation.separator.mapping.key-value.git.attributes +# ^ punctuation.separator.key-value.git.attributes # ^^^^^ meta.mapping.value.git.attributes string.unquoted.git.attributes -# ^ meta.attribute meta.mapping.git.attributes punctuation.separator.mapping.pair.git.attributes +# ^ meta.attribute meta.mapping.git.attributes punctuation.separator.sequence.git.attributes # set binary content /path/*.pb?proj binary -text !indent eol=crlf attr=val1,-val2,!val3 !attr2 # no-comment @@ -116,15 +116,15 @@ # ^^^^^^ variable.language.attribute.git.attributes # ^ - variable.language.attribute - keyword.operator.logical # ^^^ variable.language.attribute.git.attributes -# ^ punctuation.separator.mapping.key-value.git.attributes +# ^ punctuation.separator.key-value.git.attributes # ^^^^ string.unquoted.git.attributes # ^ - variable.language.attribute - keyword.operator.logical # ^^^^ variable.language.attribute.git.attributes -# ^ punctuation.separator.mapping.key-value.git.attributes +# ^ punctuation.separator.key-value.git.attributes # ^^^^ string.unquoted.git.attributes -# ^ punctuation.separator.mapping.values.git.attributes +# ^ punctuation.separator.sequence.git.attributes # ^^^^^ string.unquoted.git.attributes -# ^ punctuation.separator.mapping.values.git.attributes +# ^ punctuation.separator.sequence.git.attributes # ^^^^^ string.unquoted.git.attributes # ^ - variable.language.attribute - keyword.operator.logical # ^ keyword.operator.logical.git.attributes @@ -177,7 +177,7 @@ pattern attr= # ^ meta.mapping.git - meta.mapping.key.git - meta.mapping.value.git # ^^^^ meta.mapping.key.git - meta.mapping.git - meta.mapping.value.git # ^ meta.mapping.git - meta.mapping.key.git - meta.mapping.value.git - meta.mapping.expect-value.git -# ^ punctuation.separator.mapping.key-value.git +# ^ punctuation.separator.key-value.git # ^ meta.mapping.expect-value.git - meta.mapping.key.git - meta.mapping.git # TEST: `meta.mapping.expect-value` at end of line @@ -188,21 +188,21 @@ pattern attr= no_value attr=value, eol=lf, # ^ meta.mapping.git - meta.mapping.key.git - meta.mapping.value.git # ^^^^ meta.mapping.key.git - meta.mapping.git - meta.mapping.value.git # ^ meta.mapping.git - meta.mapping.key.git - meta.mapping.value.git - meta.mapping.expect-value.git -# ^ punctuation.separator.mapping.key-value.git +# ^ punctuation.separator.key-value.git # ^ meta.mapping.expect-value.git - meta.mapping.key.git - meta.mapping.git # ^^^^^^^^ meta.attribute.other.git meta.mapping.key.git variable.language.attribute.git - meta.mapping.expect-value.git # ^ meta.mapping.git - meta.mapping.key.git - meta.mapping.value.git # ^^^^ meta.mapping.key.git - meta.mapping.git - meta.mapping.value.git # ^ meta.mapping.git - meta.mapping.key.git - meta.mapping.value.git - meta.mapping.expect-value.git -# ^ punctuation.separator.mapping.key-value.git +# ^ punctuation.separator.key-value.git # ^^^^^ string.unquoted.git.attributes # ^^^^^ meta.mapping.value.git - meta.mapping.key.git - meta.mapping.git - meta.mapping.expect-value.git -# ^ meta.mapping.git.attributes punctuation.separator.mapping.values.git.attributes +# ^ meta.mapping.git.attributes punctuation.separator.sequence.git.attributes # ^ meta.mapping.expect-value.git - meta.mapping.key.git - meta.mapping.git # ^^^ meta.mapping.key.git - meta.mapping.git - meta.mapping.value.git # ^ meta.mapping.git - meta.mapping.key.git - meta.mapping.value.git - meta.mapping.expect-value.git -# ^ punctuation.separator.mapping.key-value.git +# ^ punctuation.separator.key-value.git # ^^ string.unquoted.git.attributes # ^^ meta.mapping.value.git - meta.mapping.key.git - meta.mapping.git - meta.mapping.expect-value.git -# ^ meta.mapping.git.attributes punctuation.separator.mapping.values.git.attributes +# ^ meta.mapping.git.attributes punctuation.separator.sequence.git.attributes # ^ meta.mapping.expect-value.git - meta.mapping.key.git - meta.mapping.git diff --git a/Git Formats/tests/syntax_test_git_commit b/Git Formats/tests/syntax_test_git_commit index 9220c9aa40..0668e6d767 100644 --- a/Git Formats/tests/syntax_test_git_commit +++ b/Git Formats/tests/syntax_test_git_commit @@ -105,7 +105,7 @@ Fix: #203 #^^^^^^^^ meta.message.git.commit #^^^^^^^^ meta.reference.issue.git #^^ keyword.other.resolved-issue.git -# ^ punctuation.separator.mapping.pair.resolved-issue.git +# ^ punctuation.separator.key-value.resolved-issue.git # ^ punctuation.definition.reference.issue.git # ^^^^ constant.other.reference.issue.git # @@ -134,7 +134,7 @@ This commit applies all changes required to satisfy the JSON format unittest. #^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.message.git.commit # ^^^^^^^^^^^^^^^^^^^^^^ meta.reference.email.git # ^^^^^^^^^^^^^ keyword.other.signed-off-by.git.commit -# ^ punctuation.separator.mapping.pair.git.commit +# ^ punctuation.separator.key-value.git.commit # ^ punctuation.definition.reference.email.begin.git # ^^^^^^^^^^^^^^^^^^^^ entity.name.reference.email.git # ^ - punctuation.separator.email.git @@ -204,23 +204,23 @@ This commit applies all changes required to satisfy the JSON format unittest. #^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ comment.line.git.commit # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.change-list.git.commit # ^^^^^^^^ keyword.other.change-list.git.commit -# ^ punctuation.separator.mapping.pair.change-list.git.commit +# ^ punctuation.separator.key-value.change-list.git.commit # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ string.unquoted.git.commit markup.inserted.file.git.commit # modified: gitconfig/Snippets/section.sublime-snippet #^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ comment.line.git.commit # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.change-list.git.commit # ^^^^^^^^ keyword.other.change-list.git.commit -# ^ punctuation.separator.mapping.pair.change-list.git.commit +# ^ punctuation.separator.key-value.change-list.git.commit # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ string.unquoted.git.commit markup.changed.file.content.git.commit # renamed: gitconfig/old_name -> gitconfig/new_name #^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ comment.line.git.commit # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.change-list.git.commit -# ^^ punctuation.separator.mapping.pair.path.git.commit +# ^^ punctuation.separator.key-value.path.git.commit # deleted: gitconfig/Symbol List.tmPreferences #^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ comment.line.git.commit # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.change-list.git.commit # ^^^^^^^ keyword.other.change-list.git.commit -# ^ punctuation.separator.mapping.pair.change-list.git.commit +# ^ punctuation.separator.key-value.change-list.git.commit # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ string.unquoted.git.commit markup.deleted.file.git.commit # zum Commit vorgemerkte Änderungen: # <- comment.line.git.commit punctuation.definition.comment.git.commit @@ -230,23 +230,23 @@ This commit applies all changes required to satisfy the JSON format unittest. #^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ comment.line.git.commit # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.change-list.git.commit # ^^^^^^^^^^ keyword.other.change-list.git.commit -# ^ punctuation.separator.mapping.pair.change-list.git.commit +# ^ punctuation.separator.key-value.change-list.git.commit # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ string.unquoted.git.commit markup.inserted.file.git.commit # geändert: gitconfig/Snippets/section.sublime-snippet #^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ comment.line.git.commit # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.change-list.git.commit # ^^^^^^^^ keyword.other.change-list.git.commit -# ^ punctuation.separator.mapping.pair.change-list.git.commit +# ^ punctuation.separator.key-value.change-list.git.commit # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ string.unquoted.git.commit markup.changed.file.content.git.commit # renommé: gitconfig/old_name -> gitconfig/new_name #^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ comment.line.git.commit # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.change-list.git.commit -# ^^ punctuation.separator.mapping.pair.path.git.commit +# ^^ punctuation.separator.key-value.path.git.commit # gelöscht: gitconfig/Symbol List.tmPreferences #^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ comment.line.git.commit # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.change-list.git.commit # ^^^^^^^^ keyword.other.change-list.git.commit -# ^ punctuation.separator.mapping.pair.change-list.git.commit +# ^ punctuation.separator.key-value.change-list.git.commit # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ string.unquoted.git.commit markup.deleted.file.git.commit # 要提交的变更: # <- comment.line.git.commit punctuation.definition.comment.git.commit @@ -256,23 +256,23 @@ This commit applies all changes required to satisfy the JSON format unittest. #^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ comment.line.git.commit # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.change-list.git.commit # ^^^ keyword.other.change-list.git.commit -# ^ punctuation.separator.mapping.pair.change-list.git.commit +# ^ punctuation.separator.key-value.change-list.git.commit # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ string.unquoted.git.commit markup.inserted.file.git.commit # 修改: gitconfig/Snippets/section.sublime-snippet #^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ comment.line.git.commit # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.change-list.git.commit # ^^ keyword.other.change-list.git.commit -# ^ punctuation.separator.mapping.pair.change-list.git.commit +# ^ punctuation.separator.key-value.change-list.git.commit # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ string.unquoted.git.commit markup.changed.file.content.git.commit # 重命名: gitconfig/old_name -> gitconfig/new_name #^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ comment.line.git.commit # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.change-list.git.commit -# ^^ punctuation.separator.mapping.pair.path.git.commit +# ^^ punctuation.separator.key-value.path.git.commit # 删除: gitconfig/Symbol List.tmPreferences #^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ comment.line.git.commit # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.change-list.git.commit # ^^ keyword.other.change-list.git.commit -# ^ punctuation.separator.mapping.pair.change-list.git.commit +# ^ punctuation.separator.key-value.change-list.git.commit # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ string.unquoted.git.commit markup.deleted.file.git.commit # ------------------------ >8 ------------------------ # Do not touch the line above. diff --git a/Git Formats/tests/syntax_test_git_link b/Git Formats/tests/syntax_test_git_link index a442c22715..3c1b78c5bf 100644 --- a/Git Formats/tests/syntax_test_git_link +++ b/Git Formats/tests/syntax_test_git_link @@ -27,7 +27,7 @@ gitdir: ~/../sub..li~me/./packages/.git # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.mapping.value.git.link - meta.mapping.key.git.link # <- keyword.other.gitdir.git.link #^^^^^ keyword.other.gitdir.git.link -# ^ punctuation.separator.mapping.key-value.git.link +# ^ punctuation.separator.key-value.git.link # ^ - string.unquoted.git # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ string.unquoted.git # ^ - string.unquoted.git @@ -48,7 +48,7 @@ gitdir invalid : ../data/s?bl*me/packages/.git # <- keyword.other.gitdir.git.link #^^^^^ keyword.other.gitdir.git.link # ^^^^^^^ invalid.illegal.separator-expected.git.link -# ^ punctuation.separator.mapping.key-value.git.link +# ^ punctuation.separator.key-value.git.link # ^^ constant.language.path.parent.git # ^ punctuation.separator.path.git # ^ punctuation.separator.path.git diff --git a/Git Formats/tests/syntax_test_git_log b/Git Formats/tests/syntax_test_git_log index 2e2a9d5793..ae94ce540c 100644 --- a/Git Formats/tests/syntax_test_git_log +++ b/Git Formats/tests/syntax_test_git_log @@ -9,7 +9,7 @@ Author: username #^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.header.git.commit markup.raw.block.git.log #^^^^^^^ - string.unquoted.log #^^^^^ keyword.other.header.git.log -# ^ punctuation.separator.mapping.pair.git.log - keyword.other.header.git.log +# ^ punctuation.separator.key-value.git.log - keyword.other.header.git.log # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ string.unquoted.log # ^ punctuation.definition.reference.email.begin.git # ^^^^^^^^^^^^^^^^^^^^^^^^^ meta.reference.email.git @@ -22,7 +22,7 @@ Date: Thu Sep 21 22:53:04 2017 +0200 #^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.header.git.commit markup.raw.block.git.log #^^^^^^^ - string.unquoted.log #^^^ keyword.other.header.git.log -# ^ punctuation.separator.mapping.pair.git.log - keyword.other.header.git.log +# ^ punctuation.separator.key-value.git.log - keyword.other.header.git.log # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ string.unquoted.log # <- text.git.log - meta.header.git.commit - markup.raw.block.git.log - keyword.other.header.git.log @@ -59,7 +59,7 @@ Author: username #^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.header.git.commit markup.raw.block.git.log #^^^^^^^ - string.unquoted.log #^^^^^ keyword.other.header.git.log -# ^ punctuation.separator.mapping.pair.git.log - keyword.other.header.git.log +# ^ punctuation.separator.key-value.git.log - keyword.other.header.git.log # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ string.unquoted.log # ^ punctuation.definition.reference.email.begin.git # ^^^^^^^^^^^^^^^^^^^^^^^^^ meta.reference.email.git @@ -72,7 +72,7 @@ Date: Thu Sep 21 22:53:04 2017 +0200 #^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.header.git.commit markup.raw.block.git.log #^^^^^^^ - string.unquoted.log #^^^ keyword.other.header.git.log -# ^ punctuation.separator.mapping.pair.git.log - keyword.other.header.git.log +# ^ punctuation.separator.key-value.git.log - keyword.other.header.git.log # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ string.unquoted.log commit 344d003a330e244cc507d17c2f224bb295013511 (HEAD -> git_show, sublimehq/master, master) diff --git a/Git Formats/tests/syntax_test_git_rebase b/Git Formats/tests/syntax_test_git_rebase index 993ab13ab5..36b8d8d229 100644 --- a/Git Formats/tests/syntax_test_git_rebase +++ b/Git Formats/tests/syntax_test_git_rebase @@ -185,7 +185,7 @@ merge -C c7cba2e feature/branch-name # Merge branch 'alicja/loyalty' # ^ punctuation.separator.sequence # ^^^^ keyword.operator.commit.pick # ^^^^^^^^^^^^^ - keyword.operator -# ^ punctuation.separator.mapping.pair +# ^ punctuation.separator.key-value # ^^^^^^^^^^ - string.unquoted # ^^^^^^^^^^ string.unquoted # @@ -198,7 +198,7 @@ merge -C c7cba2e feature/branch-name # Merge branch 'alicja/loyalty' # ^^^^^^^^ variable.parameter.git.rebase # ^ punctuation.definition.variable.begin.git.rebase # ^ punctuation.definition.variable.end.git.rebase -# ^ punctuation.separator.mapping.pair.git.rebase +# ^ punctuation.separator.key-value.git.rebase # ^^^^^^^^^^ string.unquoted.git.rebase # # r, reword = use commit, but edit the commit message @@ -216,7 +216,7 @@ merge -C c7cba2e feature/branch-name # Merge branch 'alicja/loyalty' # ^^^^^^^^ variable.parameter.git.rebase # ^ punctuation.definition.variable.begin.git.rebase # ^ punctuation.definition.variable.end.git.rebase -# ^ punctuation.separator.mapping.pair.git.rebase +# ^ punctuation.separator.key-value.git.rebase # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ string.unquoted.git.rebase # # e, edit = use commit, but stop for amending @@ -234,7 +234,7 @@ merge -C c7cba2e feature/branch-name # Merge branch 'alicja/loyalty' # ^^^^^^^^ variable.parameter.git.rebase # ^ punctuation.definition.variable.begin.git.rebase # ^ punctuation.definition.variable.end.git.rebase -# ^ punctuation.separator.mapping.pair.git.rebase +# ^ punctuation.separator.key-value.git.rebase # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ string.unquoted.git.rebase # # s, squash = use commit, but meld into previous commit @@ -252,7 +252,7 @@ merge -C c7cba2e feature/branch-name # Merge branch 'alicja/loyalty' # ^^^^^^^^ variable.parameter.git.rebase # ^ punctuation.definition.variable.begin.git.rebase # ^ punctuation.definition.variable.end.git.rebase -# ^ punctuation.separator.mapping.pair.git.rebase +# ^ punctuation.separator.key-value.git.rebase # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ string.unquoted.git.rebase # # f, fixup = like "squash", but discard this commit's log message @@ -289,7 +289,7 @@ merge -C c7cba2e feature/branch-name # Merge branch 'alicja/loyalty' # ^^^^^^^^^ variable.parameter.git.rebase # ^ punctuation.definition.variable.begin.git.rebase # ^ punctuation.definition.variable.end.git.rebase -# ^ punctuation.separator.mapping.pair.git.rebase +# ^ punctuation.separator.key-value.git.rebase # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ string.unquoted.git.rebase # # b, break = stop here (continue rebase later with 'git rebase --continue') @@ -298,7 +298,7 @@ merge -C c7cba2e feature/branch-name # Merge branch 'alicja/loyalty' # ^ keyword.operator.commit.break.git.rebase # ^ punctuation.separator.sequence.git.rebase # ^^^^^ keyword.operator.commit.break.git.rebase -# ^ punctuation.separator.mapping.pair.git.rebase +# ^ punctuation.separator.key-value.git.rebase # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ string.unquoted.git.rebase # # d, drop = remove commit @@ -316,7 +316,7 @@ merge -C c7cba2e feature/branch-name # Merge branch 'alicja/loyalty' # ^^^^^^^^ variable.parameter.git.rebase # ^ punctuation.definition.variable.begin.git.rebase # ^ punctuation.definition.variable.end.git.rebase -# ^ punctuation.separator.mapping.pair.git.rebase +# ^ punctuation.separator.key-value.git.rebase # ^^^^^^^^^^^^^ string.unquoted.git.rebase # # l, label