development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 21:09:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Command palette should return the "File: Compare New Untitled Text Files" command when I search for "diff" (fix #208897) (#208970)

Browse source
This commit is contained in:
Benjamin Pasero 2024-03-28 08:55:36 +01:00 committed by GitHub
parent dc29cb5afd
commit c89a2429d9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/vs/workbench/contrib/files/browser/fileActions.contribution.ts
View file

@ -246,7 +246,10 @@ appendToCommandPalette({
appendToCommandPalette({
id: COMPARE_WITH_SAVED_COMMAND_ID,
title: nls.localize2('compareActiveWithSaved', "Compare Active File with Saved"),
category: Categories.File
category: Categories.File,
metadata: {
description: nls.localize2('compareActiveWithSavedMeta', "Opens a new diff editor to compare the active file with the version on disk.")
}
});
appendToCommandPalette({

15
src/vs/workbench/contrib/files/browser/fileActions.ts
View file

@ -490,7 +490,10 @@ export class GlobalCompareResourcesAction extends Action2 {
title: GlobalCompareResourcesAction.LABEL,
f1: true,
category: Categories.File,
precondition: ActiveEditorContext
precondition: ActiveEditorContext,
metadata: {
description: nls.localize2('compareFileWithMeta', "Opens a picker to select a file to diff with the active editor.")
}
});
}
@ -771,7 +774,10 @@ export class CompareNewUntitledTextFilesAction extends Action2 {
id: CompareNewUntitledTextFilesAction.ID,
title: CompareNewUntitledTextFilesAction.LABEL,
f1: true,
category: Categories.File
category: Categories.File,
metadata: {
description: nls.localize2('compareNewUntitledTextFilesMeta', "Opens a new diff editor with two untitled files.")
}
});
}
@ -800,7 +806,10 @@ export class CompareWithClipboardAction extends Action2 {
title: CompareWithClipboardAction.LABEL,
f1: true,
category: Categories.File,
keybinding: { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyCode.KeyC), weight: KeybindingWeight.WorkbenchContrib }
keybinding: { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyCode.KeyC), weight: KeybindingWeight.WorkbenchContrib },
metadata: {
description: nls.localize2('compareWithClipboardMeta', "Opens a new diff editor to compare the active file with the contents of the clipboard.")
}
});
}