From b0ad5d10482bae23bc1b3c1796f2f4ee98b4ab08 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Sun, 18 Feb 2018 14:59:36 -0500 Subject: [PATCH] Consolidates commands using regex matching Renames view items for regex matching --- README.md | 2 +- package.json | 629 +++++----------------------------------------- src/views/explorerNode.ts | 24 +- 3 files changed, 70 insertions(+), 585 deletions(-) diff --git a/README.md b/README.md index fb28885..6cfc4da 100644 --- a/README.md +++ b/README.md @@ -135,7 +135,7 @@ The repository view provides a full Git repository explorer, which has the follo - A context menu provides a *Refresh* command - Tags expand to show its revision (commit) history - Context menus for each tag provide - - *Compare with Index (HEAD)*, *Compare with Working Tree*, *Compare with Selected*, *Select for Compare*, *Open Directory Compare with Working Tree*, *Delete Tag (via Terminal)*, and *Refresh* commands + - *Compare with Index (HEAD)*, *Compare with Working Tree*, *Compare with Selected*, *Select for Compare*, *Open Directory Compare with Working Tree*, *Delete Tag (via Terminal)*, *Create Branch (via Terminal)*, and *Refresh* commands - Revisions (commits) expand to show the set of files changed, complete with status indicators for adds, changes, renames, and deletes - See the *Revisions (commits) expand* section under **Branches** above for more details diff --git a/package.json b/package.json index 93621ab..b0a2a22 100644 --- a/package.json +++ b/package.json @@ -2350,436 +2350,131 @@ "group": "1_gitlens@1" }, { - "command": "gitlens.explorers.compareWithHead", - "when": "viewItem == gitlens:branch", - "group": "7_gitlens@1" - }, - { - "command": "gitlens.explorers.compareWithWorking", - "when": "viewItem == gitlens:branch", - "group": "7_gitlens@2" - }, - { - "command": "gitlens.explorers.compareWithSelected", - "when": "viewItem == gitlens:branch && gitlens:explorers:canCompare", - "group": "7_gitlens_@1" - }, - { - "command": "gitlens.explorers.compareSelectedAncestorWithWorking", - "when": "viewItem == gitlens:branch && gitlens:explorers:canCompare == branch", - "group": "7_gitlens_@2" - }, - { - "command": "gitlens.explorers.selectForCompare", - "when": "viewItem == gitlens:branch", - "group": "7_gitlens_@3" - }, - { - "command": "gitlens.explorers.openDirectoryDiffWithWorking", - "when": "viewItem == gitlens:branch", - "group": "7_gitlens_diff@1" - }, - { - "command": "gitlens.explorers.terminalCheckoutBranch", - "when": "viewItem == gitlens:branch", - "group": "8_gitlens@1" - }, - { - "command": "gitlens.explorers.terminalMergeBranch", - "when": "viewItem == gitlens:branch", - "group": "8_gitlens@2" - }, - { - "command": "gitlens.explorers.terminalRebaseBranch", - "when": "viewItem == gitlens:branch", - "group": "8_gitlens@3" - }, - { - "command": "gitlens.explorers.terminalSquashBranchIntoCommit", - "when": "viewItem == gitlens:branch", - "group": "8_gitlens@4" - }, - { - "command": "gitlens.explorers.terminalCreateBranch", - "when": "viewItem == gitlens:branch", - "group": "8_gitlens@5" - }, - { - "command": "gitlens.explorers.terminalDeleteBranch", - "when": "viewItem == gitlens:branch", - "group": "8_gitlens@6" - }, - { - "command": "gitlens.explorers.terminalCreateTag", - "when": "viewItem == gitlens:branch", - "group": "8_gitlens@7" - }, - { "command": "gitlens.openBranchInRemote", - "when": "viewItem == gitlens:branch:tracking", + "when": "viewItem =~ /gitlens:(branch\\b(.*?:tracking|:remote))/", "group": "1_gitlens@1" }, { "command": "gitlens.explorers.compareWithRemote", - "when": "viewItem == gitlens:branch:tracking", + "when": "viewItem =~ /gitlens:(branch\\b.*?:tracking)/", "group": "7_gitlens@1" }, { "command": "gitlens.explorers.compareWithHead", - "when": "viewItem == gitlens:branch:tracking", + "when": "viewItem =~ /gitlens:(branch|commit|stash|tag)\\b/", "group": "7_gitlens@2" }, { "command": "gitlens.explorers.compareWithWorking", - "when": "viewItem == gitlens:branch:tracking", + "when": "viewItem =~ /gitlens:(branch|commit|stash|tag)\\b/", "group": "7_gitlens@3" }, { "command": "gitlens.explorers.compareWithSelected", - "when": "viewItem == gitlens:branch:tracking && gitlens:explorers:canCompare", + "when": "viewItem =~ /gitlens:(branch|commit|stash|tag)\\b/ && gitlens:explorers:canCompare", "group": "7_gitlens_@1" }, { "command": "gitlens.explorers.compareSelectedAncestorWithWorking", - "when": "viewItem == gitlens:branch:tracking && gitlens:explorers:canCompare == branch", + "when": "viewItem =~ /gitlens:branch\\b/ && gitlens:explorers:canCompare == branch", "group": "7_gitlens_@2" }, { "command": "gitlens.explorers.selectForCompare", - "when": "viewItem == gitlens:branch:tracking", + "when": "viewItem =~ /gitlens:(branch|commit|stash|tag)\\b/", "group": "7_gitlens_@3" }, { "command": "gitlens.explorers.openDirectoryDiffWithWorking", - "when": "viewItem == gitlens:branch:tracking", + "when": "viewItem =~ /gitlens:(branch|tag)\\b/", "group": "7_gitlens_diff@1" }, { "command": "gitlens.explorers.terminalCheckoutBranch", - "when": "viewItem == gitlens:branch:tracking", - "group": "8_gitlens@1" - }, - { - "command": "gitlens.explorers.terminalMergeBranch", - "when": "viewItem == gitlens:branch:tracking", - "group": "8_gitlens@2" - }, - { - "command": "gitlens.explorers.terminalRebaseBranch", - "when": "viewItem == gitlens:branch:tracking", - "group": "8_gitlens@3" - }, - { - "command": "gitlens.explorers.terminalSquashBranchIntoCommit", - "when": "viewItem == gitlens:branch:tracking", - "group": "8_gitlens@4" - }, - { - "command": "gitlens.explorers.terminalCreateBranch", - "when": "viewItem == gitlens:branch:tracking", - "group": "8_gitlens@5" - }, - { - "command": "gitlens.explorers.terminalDeleteBranch", - "when": "viewItem == gitlens:branch:tracking", - "group": "8_gitlens@6" - }, - { - "command": "gitlens.explorers.terminalCreateTag", - "when": "viewItem == gitlens:branch:tracking", - "group": "8_gitlens@7" - }, - { - "command": "gitlens.explorers.compareWithHead", - "when": "viewItem == gitlens:current-branch", - "group": "7_gitlens@1" - }, - { - "command": "gitlens.explorers.compareWithWorking", - "when": "viewItem == gitlens:current-branch", - "group": "7_gitlens@2" - }, - { - "command": "gitlens.explorers.compareWithSelected", - "when": "viewItem == gitlens:current-branch && gitlens:explorers:canCompare", - "group": "7_gitlens_@1" - }, - { - "command": "gitlens.explorers.compareSelectedAncestorWithWorking", - "when": "viewItem == gitlens:current-branch && gitlens:explorers:canCompare == branch", - "group": "7_gitlens_@2" - }, - { - "command": "gitlens.explorers.selectForCompare", - "when": "viewItem == gitlens:current-branch", - "group": "7_gitlens_@3" - }, - { - "command": "gitlens.explorers.terminalCreateBranch", - "when": "viewItem == gitlens:current-branch", + "when": "viewItem =~ /gitlens:(branch\\b(?!:current))/", "group": "8_gitlens@1" }, { - "command": "gitlens.explorers.terminalCreateTag", - "when": "viewItem == gitlens:current-branch", - "group": "8_gitlens@2" - }, - { - "command": "gitlens.openBranchInRemote", - "when": "viewItem == gitlens:current-branch:tracking", - "group": "1_gitlens@1" - }, - { - "command": "gitlens.explorers.compareWithRemote", - "when": "viewItem == gitlens:current-branch:tracking", - "group": "7_gitlens@1" - }, - { - "command": "gitlens.explorers.compareWithHead", - "when": "viewItem == gitlens:current-branch:tracking", - "group": "7_gitlens@2" - }, - { - "command": "gitlens.explorers.compareWithWorking", - "when": "viewItem == gitlens:current-branch:tracking", - "group": "7_gitlens@3" - }, - { - "command": "gitlens.explorers.compareWithSelected", - "when": "viewItem == gitlens:current-branch:tracking && gitlens:explorers:canCompare", - "group": "7_gitlens_@1" - }, - { - "command": "gitlens.explorers.compareSelectedAncestorWithWorking", - "when": "viewItem == gitlens:current-branch:tracking && gitlens:explorers:canCompare == branch", - "group": "7_gitlens_@2" - }, - { - "command": "gitlens.explorers.selectForCompare", - "when": "viewItem == gitlens:current-branch:tracking", - "group": "7_gitlens_@3" - }, - { "command": "gitlens.explorers.terminalRebaseBranchToRemote", - "when": "viewItem == gitlens:current-branch:tracking", - "group": "8_gitlens@1" - }, - { - "command": "gitlens.explorers.terminalCreateBranch", - "when": "viewItem == gitlens:current-branch:tracking", - "group": "8_gitlens@2" - }, - { - "command": "gitlens.explorers.terminalCreateTag", - "when": "viewItem == gitlens:current-branch:tracking", - "group": "8_gitlens@3" - }, - { - "command": "gitlens.openBranchInRemote", - "when": "viewItem == gitlens:remote-branch", - "group": "1_gitlens@1" - }, - { - "command": "gitlens.explorers.compareWithHead", - "when": "viewItem == gitlens:remote-branch", - "group": "7_gitlens@1" - }, - { - "command": "gitlens.explorers.compareWithWorking", - "when": "viewItem == gitlens:remote-branch", - "group": "7_gitlens@2" - }, - { - "command": "gitlens.explorers.compareWithSelected", - "when": "viewItem == gitlens:remote-branch && gitlens:explorers:canCompare", - "group": "7_gitlens_@1" - }, - { - "command": "gitlens.explorers.compareSelectedAncestorWithWorking", - "when": "viewItem == gitlens:remote-branch && gitlens:explorers:canCompare == branch", - "group": "7_gitlens_@2" - }, - { - "command": "gitlens.explorers.selectForCompare", - "when": "viewItem == gitlens:remote-branch", - "group": "7_gitlens_@3" - }, - { - "command": "gitlens.explorers.openDirectoryDiffWithWorking", - "when": "viewItem == gitlens:remote-branch", - "group": "7_gitlens_diff@1" - }, - { - "command": "gitlens.explorers.terminalCheckoutBranch", - "when": "viewItem == gitlens:remote-branch", + "when": "viewItem =~ /gitlens:(branch:current:tracking|status:upstream)\\b/", "group": "8_gitlens@1" }, { "command": "gitlens.explorers.terminalMergeBranch", - "when": "viewItem == gitlens:remote-branch", + "when": "viewItem =~ /gitlens:(branch\\b(?!:current))/", "group": "8_gitlens@2" }, { "command": "gitlens.explorers.terminalRebaseBranch", - "when": "viewItem == gitlens:remote-branch", + "when": "viewItem =~ /gitlens:(branch\\b(?!:current))/", "group": "8_gitlens@3" }, { "command": "gitlens.explorers.terminalSquashBranchIntoCommit", - "when": "viewItem == gitlens:remote-branch", + "when": "viewItem =~ /gitlens:(branch\\b(?!:current))/", "group": "8_gitlens@4" }, { "command": "gitlens.explorers.terminalCreateBranch", - "when": "viewItem == gitlens:remote-branch", + "when": "viewItem =~ /gitlens:(branch|commit|status:upstream|tag)\\b/", "group": "8_gitlens@5" }, { "command": "gitlens.explorers.terminalDeleteBranch", - "when": "viewItem == gitlens:remote-branch", + "when": "viewItem =~ /gitlens:(branch\\b(?!:current))/", "group": "8_gitlens@6" }, { "command": "gitlens.explorers.terminalCreateTag", - "when": "viewItem == gitlens:remote-branch", + "when": "viewItem =~ /gitlens:(branch|commit|status:upstream)\\b/", "group": "8_gitlens@7" }, { "command": "gitlens.openCommitInRemote", - "when": "viewItem == gitlens:commit && gitlens:hasRemotes", + "when": "viewItem =~ /gitlens:commit\\b/ && gitlens:hasRemotes", "group": "1_gitlens@1" }, { "command": "gitlens.explorers.openChangedFileChanges", - "when": "viewItem == gitlens:commit", + "when": "viewItem =~ /gitlens:(commit|stash)\\b/", "group": "2_gitlens@1" }, { "command": "gitlens.explorers.openChangedFileChangesWithWorking", - "when": "viewItem == gitlens:commit", - "group": "2_gitlens@1" + "when": "viewItem =~ /gitlens:(commit|stash)\\b/", + "group": "2_gitlens@2" }, { "command": "gitlens.explorers.openChangedFiles", - "when": "viewItem == gitlens:commit", + "when": "viewItem =~ /gitlens:(commit|stash)\\b/", "group": "3_gitlens@1" }, { "command": "gitlens.explorers.openChangedFileRevisions", - "when": "viewItem == gitlens:commit", + "when": "viewItem =~ /gitlens:(commit|stash)\\b/", "group": "3_gitlens@2" }, { "command": "gitlens.copyShaToClipboard", - "when": "viewItem == gitlens:commit", + "when": "viewItem =~ /gitlens:commit\\b/", "group": "4_gitlens@1" }, { "command": "gitlens.copyMessageToClipboard", - "when": "viewItem == gitlens:commit", + "when": "viewItem =~ /gitlens:(commit|stash)\\b/", "group": "4_gitlens@2" }, { "command": "gitlens.showQuickCommitDetails", - "when": "viewItem == gitlens:commit", + "when": "viewItem =~ /gitlens:commit\\b/", "group": "5_gitlens@1" }, { - "command": "gitlens.explorers.compareWithHead", - "when": "viewItem == gitlens:commit", - "group": "7_gitlens@1" - }, - { - "command": "gitlens.explorers.compareWithWorking", - "when": "viewItem == gitlens:commit", - "group": "7_gitlens@2" - }, - { - "command": "gitlens.explorers.compareWithSelected", - "when": "viewItem == gitlens:commit && gitlens:explorers:canCompare", - "group": "7_gitlens_@1" - }, - { - "command": "gitlens.explorers.selectForCompare", - "when": "viewItem == gitlens:commit", - "group": "7_gitlens_@2" - }, - { "command": "gitlens.explorers.terminalCherryPickCommit", "when": "viewItem == gitlens:commit", "group": "8_gitlens@1" }, { - "command": "gitlens.explorers.terminalCreateBranch", - "when": "viewItem == gitlens:commit", - "group": "8_gitlens@2" - }, - { - "command": "gitlens.explorers.terminalCreateTag", - "when": "viewItem == gitlens:commit", - "group": "8_gitlens@3" - }, - { - "command": "gitlens.openCommitInRemote", - "when": "viewItem == gitlens:commit:current && gitlens:hasRemotes", - "group": "1_gitlens@1" - }, - { - "command": "gitlens.explorers.openChangedFileChanges", - "when": "viewItem == gitlens:commit:current", - "group": "2_gitlens@1" - }, - { - "command": "gitlens.explorers.openChangedFileChangesWithWorking", - "when": "viewItem == gitlens:commit:current", - "group": "2_gitlens@1" - }, - { - "command": "gitlens.explorers.openChangedFiles", - "when": "viewItem == gitlens:commit:current", - "group": "3_gitlens@1" - }, - { - "command": "gitlens.explorers.openChangedFileRevisions", - "when": "viewItem == gitlens:commit:current", - "group": "3_gitlens@2" - }, - { - "command": "gitlens.copyShaToClipboard", - "when": "viewItem == gitlens:commit:current", - "group": "4_gitlens@1" - }, - { - "command": "gitlens.copyMessageToClipboard", - "when": "viewItem == gitlens:commit:current", - "group": "4_gitlens@2" - }, - { - "command": "gitlens.showQuickCommitDetails", - "when": "viewItem == gitlens:commit:current", - "group": "5_gitlens@1" - }, - { - "command": "gitlens.explorers.compareWithHead", - "when": "viewItem == gitlens:commit:current", - "group": "7_gitlens@1" - }, - { - "command": "gitlens.explorers.compareWithWorking", - "when": "viewItem == gitlens:commit:current", - "group": "7_gitlens@2" - }, - { - "command": "gitlens.explorers.compareWithSelected", - "when": "viewItem == gitlens:commit:current && gitlens:explorers:canCompare", - "group": "7_gitlens_@1" - }, - { - "command": "gitlens.explorers.selectForCompare", - "when": "viewItem == gitlens:commit:current", - "group": "7_gitlens_@2" - }, - { "command": "gitlens.explorers.terminalRevertCommit", "when": "viewItem == gitlens:commit:current", "group": "8_gitlens@1" @@ -2795,79 +2490,69 @@ "group": "8_gitlens@3" }, { - "command": "gitlens.explorers.terminalCreateBranch", - "when": "viewItem == gitlens:commit:current", - "group": "8_gitlens@4" - }, - { - "command": "gitlens.explorers.terminalCreateTag", - "when": "viewItem == gitlens:commit:current", - "group": "8_gitlens@5" - }, - { "command": "gitlens.explorers.openFile", - "when": "viewItem == gitlens:commit-file", + "when": "viewItem =~ /gitlens:file\\b/", "group": "inline" }, { "command": "gitlens.explorers.openChanges", - "when": "viewItem == gitlens:commit-file", - "group": "1_gitlens@1" + "when": "viewItem =~ /gitlens:file\\b/", + "group": "2_gitlens@1" }, { "command": "gitlens.explorers.openChangesWithWorking", - "when": "viewItem == gitlens:commit-file", - "group": "1_gitlens@2" + "when": "viewItem =~ /gitlens:file\\b/", + "group": "2_gitlens@2" }, { "command": "gitlens.explorers.openFile", - "when": "viewItem == gitlens:commit-file", - "group": "2_gitlens@1" + "when": "viewItem =~ /gitlens:(file|history-file|status:file)\\b/", + "group": "3_gitlens@1" }, { "command": "gitlens.explorers.openFileRevision", - "when": "viewItem == gitlens:commit-file", - "group": "2_gitlens@2" + "when": "viewItem =~ /gitlens:file\\b/", + "group": "3_gitlens@2" }, { "command": "gitlens.openFileInRemote", - "when": "viewItem == gitlens:commit-file && gitlens:hasRemotes", - "group": "3_gitlens@1" + "when": "viewItem =~ /gitlens:file\\b/ && gitlens:hasRemotes", + "group": "4_gitlens@1" }, { "command": "gitlens.explorers.openFileRevisionInRemote", - "when": "viewItem == gitlens:commit-file && gitlens:hasRemotes", - "group": "3_gitlens@2" + "when": "viewItem == gitlens:file:commit && gitlens:hasRemotes", + "group": "4_gitlens@2" }, { - "command": "gitlens.explorers.applyChanges", - "when": "viewItem == gitlens:commit-file", - "group": "4_gitlens@1" + "command": "gitlens.openFileInRemote", + "when": "viewItem =~ /gitlens:(history-file|status:file)\\b/ && gitlens:hasRemotes", + "group": "3_gitlens@2" }, { "command": "gitlens.showQuickFileHistory", - "when": "viewItem == gitlens:commit-file && gitlens:gitExplorer:view == repository", - "group": "5_gitlens@1" + "when": "viewItem =~ /gitlens:file\\b/ && gitlens:gitExplorer:view == repository", + "group": "8_gitlens@1" }, { "command": "gitlens.showQuickCommitFileDetails", - "when": "viewItem == gitlens:commit-file", - "group": "5_gitlens@2" + "when": "viewItem =~ /gitlens:file\\b(?!:stash)/", + "group": "8_gitlens@2" }, { - "command": "gitlens.explorers.openFile", - "when": "viewItem == gitlens:file-history", - "group": "inline" + "command": "gitlens.explorers.applyChanges", + "when": "viewItem == gitlens:file:commit", + "group": "5_gitlens@1" }, { - "command": "gitlens.explorers.openFile", - "when": "viewItem == gitlens:file-history", + "command": "gitlens.explorers.applyChanges", + "when": "viewItem == gitlens:file:stash", "group": "1_gitlens@1" }, { - "command": "gitlens.openFileInRemote", - "when": "viewItem == gitlens:file-history && gitlens:hasRemotes", - "group": "1_gitlens@2" + "command": "gitlens.openRepoInRemote", + "when": "viewItem == gitlens:status && gitlens:hasRemotes", + "group": "1_gitlens@1" }, { "command": "gitlens.openBranchesInRemote", @@ -2891,30 +2576,20 @@ }, { "command": "gitlens.resultsExplorer.clearResultsNode", - "when": "viewItem == gitlens:comparison-results", + "when": "viewItem =~ /gitlens:results\\b/", "group": "inline" }, { "command": "gitlens.resultsExplorer.clearResultsNode", - "when": "viewItem == gitlens:comparison-results", + "when": "viewItem =~ /gitlens:results\\b/", "group": "1_gitlens@1" }, { "command": "gitlens.explorers.openDirectoryDiff", - "when": "viewItem == gitlens:comparison-results", + "when": "viewItem == gitlens:results:comparison", "group": "7_gitlens@1" }, { - "command": "gitlens.resultsExplorer.clearResultsNode", - "when": "viewItem == gitlens:search-results", - "group": "inline" - }, - { - "command": "gitlens.resultsExplorer.clearResultsNode", - "when": "viewItem == gitlens:search-results", - "group": "1_gitlens@1" - }, - { "command": "gitlens.stashSave", "when": "viewItem == gitlens:stashes", "group": "1_gitlens@1" @@ -2930,203 +2605,13 @@ "group": "1_gitlens@2" }, { - "command": "gitlens.explorers.openChangedFileChanges", - "when": "viewItem == gitlens:stash", - "group": "2_gitlens@1" - }, - { - "command": "gitlens.explorers.openChangedFileChangesWithWorking", - "when": "viewItem == gitlens:stash", - "group": "2_gitlens@1" - }, - { - "command": "gitlens.explorers.openChangedFiles", - "when": "viewItem == gitlens:stash", - "group": "3_gitlens@1" - }, - { - "command": "gitlens.explorers.openChangedFileRevisions", - "when": "viewItem == gitlens:stash", - "group": "3_gitlens@2" - }, - { - "command": "gitlens.copyMessageToClipboard", - "when": "viewItem == gitlens:stash", - "group": "4_gitlens@1" - }, - { - "command": "gitlens.explorers.compareWithHead", - "when": "viewItem == gitlens:stash", - "group": "7_gitlens@1" - }, - { - "command": "gitlens.explorers.compareWithWorking", - "when": "viewItem == gitlens:stash", - "group": "7_gitlens@2" - }, - { - "command": "gitlens.explorers.compareWithSelected", - "when": "viewItem == gitlens:stash && gitlens:explorers:canCompare", - "group": "7_gitlens_@1" - }, - { - "command": "gitlens.explorers.selectForCompare", - "when": "viewItem == gitlens:stash", - "group": "7_gitlens_@2" - }, - { - "command": "gitlens.explorers.openFile", - "when": "viewItem == gitlens:stash-file", - "group": "inline" - }, - { - "command": "gitlens.explorers.applyChanges", - "when": "viewItem == gitlens:stash-file", - "group": "1_gitlens@1" - }, - { - "command": "gitlens.explorers.openChanges", - "when": "viewItem == gitlens:stash-file", - "group": "2_gitlens@1" - }, - { - "command": "gitlens.explorers.openChangesWithWorking", - "when": "viewItem == gitlens:stash-file", - "group": "2_gitlens@2" - }, - { - "command": "gitlens.explorers.openFile", - "when": "viewItem == gitlens:stash-file", - "group": "3_gitlens@1" - }, - { - "command": "gitlens.explorers.openFileRevision", - "when": "viewItem == gitlens:stash-file", - "group": "3_gitlens@2" - }, - { - "command": "gitlens.openFileInRemote", - "when": "viewItem == gitlens:stash-file && gitlens:hasRemotes", - "group": "4_gitlens@1" - }, - { - "command": "gitlens.showQuickFileHistory", - "when": "viewItem == gitlens:stash-file", - "group": "5_gitlens@1" - }, - { - "command": "gitlens.openRepoInRemote", - "when": "viewItem == gitlens:status && gitlens:hasRemotes", - "group": "1_gitlens@1" - }, - { - "command": "gitlens.explorers.openFile", - "when": "viewItem == gitlens:status-file", - "group": "inline" - }, - { - "command": "gitlens.explorers.openChanges", - "when": "viewItem == gitlens:status-file", - "group": "1_gitlens@1" - }, - { - "command": "gitlens.explorers.openChangesWithWorking", - "when": "viewItem == gitlens:status-file", - "group": "1_gitlens@2" - }, - { - "command": "gitlens.explorers.openFile", - "when": "viewItem == gitlens:status-file", - "group": "2_gitlens@1" - }, - { - "command": "gitlens.explorers.openFileRevision", - "when": "viewItem == gitlens:status-file", - "group": "2_gitlens@2" - }, - { - "command": "gitlens.openFileInRemote", - "when": "viewItem == gitlens:status-file && gitlens:hasRemotes", - "group": "3_gitlens@1" - }, - { - "command": "gitlens.showQuickFileHistory", - "when": "viewItem == gitlens:status-file && gitlens:gitExplorer:view == repository", - "group": "5_gitlens@1" - }, - { - "command": "gitlens.showQuickCommitFileDetails", - "when": "viewItem == gitlens:status-file", - "group": "5_gitlens@2" - }, - { - "command": "gitlens.explorers.openFile", - "when": "viewItem == gitlens:stash-file-commits", - "group": "inline" - }, - { - "command": "gitlens.explorers.openFile", - "when": "viewItem == gitlens:status-file-commits", - "group": "1_gitlens@1" - }, - { - "command": "gitlens.openFileInRemote", - "when": "viewItem == gitlens:status-file-commits && gitlens:hasRemotes", - "group": "1_gitlens@2" - }, - { - "command": "gitlens.explorers.terminalRebaseBranchToRemote", - "when": "viewItem == gitlens:status-upstream", - "group": "8_gitlens@1" - }, - { - "command": "gitlens.explorers.terminalCreateBranch", - "when": "viewItem == gitlens:status-upstream", - "group": "8_gitlens@2" - }, - { - "command": "gitlens.explorers.terminalCreateTag", - "when": "viewItem == gitlens:status-upstream", - "group": "8_gitlens@3" - }, - { - "command": "gitlens.explorers.compareWithHead", - "when": "viewItem == gitlens:tag", - "group": "7_gitlens@1" - }, - { - "command": "gitlens.explorers.compareWithWorking", - "when": "viewItem == gitlens:tag", - "group": "7_gitlens@2" - }, - { - "command": "gitlens.explorers.compareWithSelected", - "when": "viewItem == gitlens:tag && gitlens:explorers:canCompare", - "group": "7_gitlens_@1" - }, - { - "command": "gitlens.explorers.selectForCompare", - "when": "viewItem == gitlens:tag", - "group": "7_gitlens_@2" - }, - { - "command": "gitlens.explorers.openDirectoryDiffWithWorking", - "when": "viewItem == gitlens:tag", - "group": "7_gitlens_diff@1" - }, - { "command": "gitlens.explorers.terminalDeleteTag", "when": "viewItem == gitlens:tag", "group": "8_gitlens" }, { "command": "gitlens.gitExplorer.refreshNode", - "when": "view == gitlens.gitExplorer && viewItem != gitlens:commit-file && viewItem != gitlens:stash-file && viewItem != gitlens:status-file", - "group": "9_gitlens@1" - }, - { - "command": "gitlens.resultsExplorer.refreshNode", - "when": "view == gitlens.resultsExplorer && viewItem != gitlens:commit-file && viewItem != gitlens:stash-file && viewItem != gitlens:status-file", + "when": "view =~ /gitlens\\.(git|results)Explorer/ && viewItem =~ /gitlens:(?!file\\b)/", "group": "9_gitlens@1" } ] diff --git a/src/views/explorerNode.ts b/src/views/explorerNode.ts index ad1c246..836b8d7 100644 --- a/src/views/explorerNode.ts +++ b/src/views/explorerNode.ts @@ -23,15 +23,15 @@ export enum ResourceType { BranchWithTracking = 'gitlens:branch:tracking', Branches = 'gitlens:branches', BranchesWithRemotes = 'gitlens:branches:remotes', - CurrentBranch = 'gitlens:current-branch', - CurrentBranchWithTracking = 'gitlens:current-branch:tracking', - RemoteBranch = 'gitlens:remote-branch', + CurrentBranch = 'gitlens:branch:current', + CurrentBranchWithTracking = 'gitlens:branch:current:tracking', + RemoteBranch = 'gitlens:branch:remote', Commit = 'gitlens:commit', CommitOnCurrentBranch = 'gitlens:commit:current', - CommitFile = 'gitlens:commit-file', + CommitFile = 'gitlens:file:commit', Commits = 'gitlens:commits', - ComparisonResults = 'gitlens:comparison-results', - FileHistory = 'gitlens:file-history', + ComparisonResults = 'gitlens:results:comparison', + FileHistory = 'gitlens:history-file', Folder = 'gitlens:folder', History = 'gitlens:history', Message = 'gitlens:message', @@ -41,15 +41,15 @@ export enum ResourceType { Repositories = 'gitlens:repositories', Repository = 'gitlens:repository', Results = 'gitlens:results', - SearchResults = 'gitlens:search-results', + SearchResults = 'gitlens:results:search', Stash = 'gitlens:stash', - StashFile = 'gitlens:stash-file', + StashFile = 'gitlens:file:stash', Stashes = 'gitlens:stashes', Status = 'gitlens:status', - StatusFile = 'gitlens:status-file', - StatusFiles = 'gitlens:status-files', - StatusFileCommits = 'gitlens:status-file-commits', - StatusUpstream = 'gitlens:status-upstream', + StatusFile = 'gitlens:file:status', + StatusFiles = 'gitlens:status:files', + StatusFileCommits = 'gitlens:status:file-commits', + StatusUpstream = 'gitlens:status:upstream', Tag = 'gitlens:tag', Tags = 'gitlens:tags' }