mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-01-29 17:23:25 -05:00
Merge vscode source through 1.62 release (#19981)
* Build breaks 1 * Build breaks * Build breaks * Build breaks * More build breaks * Build breaks (#2512) * Runtime breaks * Build breaks * Fix dialog location break * Update typescript * Fix ASAR break issue * Unit test breaks * Update distro * Fix breaks in ADO builds (#2513) * Bump to node 16 * Fix hygiene errors * Bump distro * Remove reference to node type * Delete vscode specific extension * Bump to node 16 in CI yaml * Skip integration tests in CI builds (while fixing) * yarn.lock update * Bump moment dependency in remote yarn * Fix drop-down chevron style * Bump to node 16 * Remove playwrite from ci.yaml * Skip building build scripts in hygine check
This commit is contained in:
@@ -140,7 +140,7 @@ actionRegistry.registerWorkbenchAction(
|
||||
EstimatedExecutionPlanKeyboardAction,
|
||||
EstimatedExecutionPlanKeyboardAction.ID,
|
||||
EstimatedExecutionPlanKeyboardAction.LABEL,
|
||||
{ primary: KeyMod.CtrlCmd | KeyCode.KEY_L }
|
||||
{ primary: KeyMod.CtrlCmd | KeyCode.KeyL }
|
||||
),
|
||||
EstimatedExecutionPlanKeyboardAction.LABEL,
|
||||
CATEGORIES.ExecutionPlan.value
|
||||
@@ -151,7 +151,7 @@ actionRegistry.registerWorkbenchAction(
|
||||
ToggleActualPlanKeyboardAction,
|
||||
ToggleActualPlanKeyboardAction.ID,
|
||||
ToggleActualPlanKeyboardAction.LABEL,
|
||||
{ primary: KeyMod.CtrlCmd | KeyCode.KEY_M }
|
||||
{ primary: KeyMod.CtrlCmd | KeyCode.KeyM }
|
||||
),
|
||||
ToggleActualPlanKeyboardAction.LABEL,
|
||||
CATEGORIES.ExecutionPlan.value
|
||||
@@ -162,7 +162,7 @@ actionRegistry.registerWorkbenchAction(
|
||||
CopyQueryWithResultsKeyboardAction,
|
||||
CopyQueryWithResultsKeyboardAction.ID,
|
||||
CopyQueryWithResultsKeyboardAction.LABEL,
|
||||
{ primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_V) }
|
||||
{ primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.CtrlCmd | KeyCode.KeyV) }
|
||||
),
|
||||
CopyQueryWithResultsKeyboardAction.LABEL
|
||||
);
|
||||
@@ -191,7 +191,7 @@ actionRegistry.registerWorkbenchAction(
|
||||
FocusOnCurrentQueryKeyboardAction,
|
||||
FocusOnCurrentQueryKeyboardAction.ID,
|
||||
FocusOnCurrentQueryKeyboardAction.LABEL,
|
||||
{ primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_O }
|
||||
{ primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyO }
|
||||
),
|
||||
FocusOnCurrentQueryKeyboardAction.LABEL
|
||||
);
|
||||
@@ -212,7 +212,7 @@ actionRegistry.registerWorkbenchAction(
|
||||
ToggleQueryResultsKeyboardAction,
|
||||
ToggleQueryResultsKeyboardAction.ID,
|
||||
ToggleQueryResultsKeyboardAction.LABEL,
|
||||
{ primary: KeyMod.WinCtrl | KeyMod.Shift | KeyCode.KEY_R },
|
||||
{ primary: KeyMod.WinCtrl | KeyMod.Shift | KeyCode.KeyR },
|
||||
QueryEditorVisibleCondition
|
||||
),
|
||||
ToggleQueryResultsKeyboardAction.LABEL
|
||||
@@ -223,7 +223,7 @@ actionRegistry.registerWorkbenchAction(
|
||||
ToggleFocusBetweenQueryEditorAndResultsAction,
|
||||
ToggleFocusBetweenQueryEditorAndResultsAction.ID,
|
||||
ToggleFocusBetweenQueryEditorAndResultsAction.LABEL,
|
||||
{ primary: KeyMod.WinCtrl | KeyMod.Shift | KeyCode.KEY_F },
|
||||
{ primary: KeyMod.WinCtrl | KeyMod.Shift | KeyCode.KeyF },
|
||||
QueryEditorVisibleCondition
|
||||
),
|
||||
ToggleFocusBetweenQueryEditorAndResultsAction.LABEL
|
||||
@@ -243,7 +243,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
||||
id: gridActions.GRID_COPY_ID,
|
||||
weight: KeybindingWeight.EditorContrib,
|
||||
when: ResultsGridFocusCondition,
|
||||
primary: KeyMod.CtrlCmd | KeyCode.KEY_C,
|
||||
primary: KeyMod.CtrlCmd | KeyCode.KeyC,
|
||||
handler: gridCommands.copySelection
|
||||
});
|
||||
|
||||
@@ -251,7 +251,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
||||
id: gridActions.MESSAGES_SELECTALL_ID,
|
||||
weight: KeybindingWeight.EditorContrib,
|
||||
when: ResultsMessagesFocusCondition,
|
||||
primary: KeyMod.CtrlCmd | KeyCode.KEY_A,
|
||||
primary: KeyMod.CtrlCmd | KeyCode.KeyA,
|
||||
handler: gridCommands.selectAllMessages
|
||||
});
|
||||
|
||||
@@ -259,7 +259,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
||||
id: gridActions.GRID_SELECTALL_ID,
|
||||
weight: KeybindingWeight.EditorContrib,
|
||||
when: ResultsGridFocusCondition,
|
||||
primary: KeyMod.CtrlCmd | KeyCode.KEY_A,
|
||||
primary: KeyMod.CtrlCmd | KeyCode.KeyA,
|
||||
handler: gridCommands.selectAll
|
||||
});
|
||||
|
||||
@@ -267,7 +267,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
||||
id: gridActions.MESSAGES_COPY_ID,
|
||||
weight: KeybindingWeight.EditorContrib,
|
||||
when: ResultsMessagesFocusCondition,
|
||||
primary: KeyMod.CtrlCmd | KeyCode.KEY_C,
|
||||
primary: KeyMod.CtrlCmd | KeyCode.KeyC,
|
||||
handler: gridCommands.copyMessagesSelection
|
||||
});
|
||||
|
||||
@@ -275,7 +275,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
||||
id: gridActions.GRID_SAVECSV_ID,
|
||||
weight: KeybindingWeight.EditorContrib,
|
||||
when: ResultsGridFocusCondition,
|
||||
primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_R, KeyMod.CtrlCmd | KeyCode.KEY_C),
|
||||
primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyR, KeyMod.CtrlCmd | KeyCode.KeyC),
|
||||
handler: gridCommands.saveAsCsv
|
||||
});
|
||||
|
||||
@@ -283,7 +283,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
||||
id: gridActions.GRID_SAVEJSON_ID,
|
||||
weight: KeybindingWeight.EditorContrib,
|
||||
when: ResultsGridFocusCondition,
|
||||
primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_R, KeyMod.CtrlCmd | KeyCode.KEY_J),
|
||||
primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyR, KeyMod.CtrlCmd | KeyCode.KeyJ),
|
||||
handler: gridCommands.saveAsJson
|
||||
});
|
||||
|
||||
@@ -291,7 +291,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
||||
id: gridActions.GRID_SAVEEXCEL_ID,
|
||||
weight: KeybindingWeight.EditorContrib,
|
||||
when: ResultsGridFocusCondition,
|
||||
primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_R, KeyMod.CtrlCmd | KeyCode.KEY_E),
|
||||
primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyR, KeyMod.CtrlCmd | KeyCode.KeyE),
|
||||
handler: gridCommands.saveAsExcel
|
||||
});
|
||||
|
||||
@@ -299,7 +299,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
||||
id: gridActions.GRID_SAVEXML_ID,
|
||||
weight: KeybindingWeight.EditorContrib,
|
||||
when: ResultsGridFocusCondition,
|
||||
primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_R, KeyMod.CtrlCmd | KeyCode.KEY_X),
|
||||
primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyR, KeyMod.CtrlCmd | KeyCode.KeyX),
|
||||
handler: gridCommands.saveAsXml
|
||||
});
|
||||
|
||||
@@ -307,7 +307,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
||||
id: gridActions.GRID_VIEWASCHART_ID,
|
||||
weight: KeybindingWeight.EditorContrib,
|
||||
when: ResultsGridFocusCondition,
|
||||
primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_R, KeyMod.CtrlCmd | KeyCode.KEY_V),
|
||||
primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyR, KeyMod.CtrlCmd | KeyCode.KeyV),
|
||||
handler: gridCommands.viewAsChart
|
||||
});
|
||||
|
||||
@@ -315,7 +315,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
||||
id: gridActions.GRID_GOTONEXTGRID_ID,
|
||||
weight: KeybindingWeight.EditorContrib,
|
||||
when: ResultsGridFocusCondition,
|
||||
primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_R, KeyMod.CtrlCmd | KeyCode.KEY_N),
|
||||
primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyR, KeyMod.CtrlCmd | KeyCode.KeyN),
|
||||
handler: gridCommands.goToNextGrid
|
||||
});
|
||||
|
||||
@@ -323,7 +323,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
||||
id: gridActions.TOGGLERESULTS_ID,
|
||||
weight: KeybindingWeight.EditorContrib,
|
||||
when: QueryEditorVisibleCondition,
|
||||
primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_R,
|
||||
primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyR,
|
||||
handler: gridCommands.toggleResultsPane
|
||||
});
|
||||
|
||||
@@ -331,7 +331,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
||||
id: gridActions.TOGGLEMESSAGES_ID,
|
||||
weight: KeybindingWeight.EditorContrib,
|
||||
when: QueryEditorVisibleCondition,
|
||||
primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_Y,
|
||||
primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyY,
|
||||
handler: gridCommands.toggleMessagePane
|
||||
});
|
||||
|
||||
@@ -339,7 +339,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
||||
id: gridActions.GOTONEXTQUERYOUTPUTTAB_ID,
|
||||
weight: KeybindingWeight.EditorContrib,
|
||||
when: QueryEditorVisibleCondition,
|
||||
primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_P,
|
||||
primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyP,
|
||||
handler: gridCommands.goToNextQueryOutputTab
|
||||
});
|
||||
|
||||
@@ -458,8 +458,8 @@ const queryEditorConfiguration: IConfigurationNode = {
|
||||
const initialShortcuts = [
|
||||
{ name: 'sp_help', primary: KeyMod.Alt + KeyCode.F2 },
|
||||
// Note: using Ctrl+Shift+N since Ctrl+N is used for "open editor at index" by default. This means it's different from SSMS
|
||||
{ name: 'sp_who', primary: KeyMod.WinCtrl + KeyMod.Shift + KeyCode.KEY_1 },
|
||||
{ name: 'sp_lock', primary: KeyMod.WinCtrl + KeyMod.Shift + KeyCode.KEY_2 }
|
||||
{ name: 'sp_who', primary: KeyMod.WinCtrl + KeyMod.Shift + KeyCode.Digit1 },
|
||||
{ name: 'sp_lock', primary: KeyMod.WinCtrl + KeyMod.Shift + KeyCode.Digit2 }
|
||||
];
|
||||
|
||||
const shortCutConfiguration: IConfigurationNode = {
|
||||
|
||||
Reference in New Issue
Block a user