From 0aab16357c7411573d8b2809899fba2093ef027c Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Fri, 24 Mar 2017 14:10:52 -0400 Subject: [PATCH] Rearranges context menu commands --- package.json | 100 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 60 insertions(+), 40 deletions(-) diff --git a/package.json b/package.json index c2befcc..180e54c 100644 --- a/package.json +++ b/package.json @@ -593,25 +593,25 @@ } ], "explorer/context": [ - { - "command": "gitlens.showQuickFileHistory", - "when": "gitlens:enabled", - "group": "gitlens@1" - }, - { - "command": "gitlens.openFileInRemote", - "when": "gitlens:enabled && gitlens:hasRemotes", - "group": "gitlens@2" - }, { "command": "gitlens.diffWithPrevious", "when": "gitlens:enabled && config.gitlens.menus.diff.enabled", - "group": "gitlens_diff" + "group": "1_gitlens@1" }, { "command": "gitlens.diffWithWorking", "when": "gitlens:enabled && config.gitlens.menus.diff.enabled", - "group": "gitlens_diff" + "group": "1_gitlens@2" + }, + { + "command": "gitlens.showQuickFileHistory", + "when": "gitlens:enabled", + "group": "1_gitlens_1@1" + }, + { + "command": "gitlens.openFileInRemote", + "when": "gitlens:enabled && gitlens:hasRemotes", + "group": "1_gitlens_1@2" } ], "editor/title": [ @@ -620,42 +620,57 @@ "when": "gitlens:enabled && gitlens:isBlameable", "group": "navigation@100" }, - { - "command": "gitlens.showQuickFileHistory", - "when": "editorFocus && gitlens:enabled", - "group": "gitlens" - }, - { - "command": "gitlens.showQuickRepoHistory", - "when": "!editorFocus && gitlens:enabled", - "group": "gitlens" - }, - { - "command": "gitlens.showQuickRepoStatus", - "when": "gitlens:enabled", - "group": "gitlens" - }, { "command": "gitlens.diffWithPrevious", "when": "editorTextFocus && gitlens:enabled && config.gitlens.menus.diff.enabled", - "group": "gitlens_diff" + "group": "2_gitlens" }, { "command": "gitlens.diffWithWorking", "when": "editorTextFocus && gitlens:enabled && config.gitlens.menus.diff.enabled", - "group": "gitlens_diff" + "group": "2_gitlens" + }, + { + "command": "gitlens.showQuickFileHistory", + "when": "editorFocus && gitlens:enabled", + "group": "2_gitlens_1" + }, + { + "command": "gitlens.showQuickRepoHistory", + "when": "!editorFocus && gitlens:enabled", + "group": "2_gitlens_1" + }, + { + "command": "gitlens.showQuickRepoStatus", + "when": "gitlens:enabled", + "group": "2_gitlens_1" } ], "editor/title/context": [ { - "command": "gitlens.toggleBlame", - "when": "gitlens:enabled && gitlens:isBlameable", - "group": "gitlens@1" + "command": "gitlens.diffWithPrevious", + "when": "gitlens:enabled && config.gitlens.menus.diff.enabled", + "group": "1_gitlens@1" + }, + { + "command": "gitlens.diffWithWorking", + "when": "gitlens:enabled && config.gitlens.menus.diff.enabled", + "group": "1_gitlens@2" }, { "command": "gitlens.showQuickFileHistory", "when": "gitlens:enabled", - "group": "gitlens@2" + "group": "1_gitlens_1@1" + }, + { + "command": "gitlens.toggleBlame", + "when": "gitlens:enabled && gitlens:isBlameable", + "group": "1_gitlens_1@2" + }, + { + "command": "gitlens.openFileInRemote", + "when": "gitlens:enabled && gitlens:hasRemotes", + "group": "1_gitlens_1@3" } ], "editor/context": [ @@ -677,23 +692,28 @@ { "command": "gitlens.diffWithPrevious", "when": "editorTextFocus && gitlens:enabled && config.gitlens.menus.diff.enabled", - "group": "1_gitlens-file@1" + "group": "1_gitlens_1@1" }, { "command": "gitlens.diffWithWorking", "when": "editorTextFocus && gitlens:enabled && config.gitlens.menus.diff.enabled", - "group": "1_gitlens-file@2" - }, - { - "command": "gitlens.toggleBlame", - "when": "editorTextFocus && gitlens:enabled && gitlens:isBlameable", - "group": "2_gitlens@1" + "group": "1_gitlens_1@2" }, { "command": "gitlens.showQuickFileHistory", "when": "gitlens:enabled", + "group": "2_gitlens@1" + }, + { + "command": "gitlens.toggleBlame", + "when": "editorTextFocus && gitlens:enabled && gitlens:isBlameable", "group": "2_gitlens@2" }, + { + "command": "gitlens.openFileInRemote", + "when": "editorTextFocus && gitlens:enabled && gitlens:hasRemotes", + "group": "2_gitlens@3" + }, { "command": "gitlens.copyShaToClipboard", "when": "editorTextFocus && gitlens:enabled && gitlens:isBlameable",