Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 18:49:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Expose editor "blue button" as menu (#158740)

Browse Source 
* Expose editor "blue button" as menu

* rename proposed `MergeToolbar` to `EditorContent` menu
* adopt GIT and sync conflicts usage
* use content menu for "open in 3wm" command
* add new `ctxIsMergeResultEditor` context key

Better fix for https://github.com/microsoft/vscode/issues/153800

* fix typo
This commit is contained in:
Johannes Rieken
2022-08-22 15:24:56 +02:00
committed by GitHub
parent 4162134bd7
commit 337cd4b1cf
11 changed files with 79 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
extensions/git/package.json
View File

@@ -11,7 +11,7 @@
"aiKey": "0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255",
"enabledApiProposals": [
"diffCommand",
"contribMergeEditorToolbar",
"contribEditorContentMenu",
"contribViewsWelcome",
"editSessionIdentityProvider",
"scmActionButton",
@@ -1514,11 +1514,6 @@
"group": "navigation",
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && !isInDiffEditor && !isMergeEditor && resourceScheme == file && scmActiveResourceHasChanges"
},
{
"command": "git.openMergeEditor",
"group": "navigation@-10",
"when": "config.git.enabled && !git.missing && !isInDiffEditor && !isMergeEditor && resource in git.mergeChanges"
},
{
"command": "git.commitMessageAccept",
"group": "navigation",
@@ -1562,10 +1557,15 @@
"when": "isInDiffRightEditor && !isInEmbeddedDiffEditor && config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git$|^file$/"
}
],
"merge/toolbar": [
"editor/content": [
{
"command": "git.acceptMerge",
"when": "isMergeEditor && mergeEditorBaseUri =~ /^(git|file):/ && mergeEditorResultUri in git.mergeChanges"
"when": "isMergeResultEditor && mergeEditorBaseUri =~ /^(git|file):/ && mergeEditorResultUri in git.mergeChanges"
},
{
"command": "git.openMergeEditor",
"group": "navigation@-10",
"when": "config.git.enabled && !git.missing && !isInDiffEditor && !isMergeEditor && resource in git.mergeChanges"
}
],
"scm/change/title": [