From a87478c19e3ab55392e64fd469487f459c7709a1 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Tue, 26 May 2020 17:51:31 +0200 Subject: [PATCH 01/10] #98530 add commit --- src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts index 27f7095a451..23b661add1c 100644 --- a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts +++ b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts @@ -292,7 +292,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo this.disableSync(); this.notificationService.notify({ severity: Severity.Error, - message: localize('error upgrade required', "Turned off sync because the current version ({0}) of {1} is not compatible with the Preferences Sync Service. Please update and turn on sync to continue syncing.", this.productService.version, this.productService.nameLong), + message: localize('error upgrade required', "Turned off sync because the current version ({0}, {1}) of {2} is not compatible with the Preferences Sync Service. Please update and turn on sync to continue syncing.", this.productService.version, this.productService.commit, this.productService.nameLong), }); return true; } From 5575473244abeb32a537ba5fe52d10d0d0a8817e Mon Sep 17 00:00:00 2001 From: isidor Date: Tue, 26 May 2020 18:07:41 +0200 Subject: [PATCH 02/10] #98584 --- src/vs/base/browser/ui/selectBox/selectBoxCustom.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts index 4924646f11c..50558044d09 100644 --- a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts +++ b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts @@ -727,7 +727,7 @@ export class SelectBoxList extends Disposable implements ISelectBoxDelegate, ILi mouseSupport: false, accessibilityProvider: { getAriaLabel: (element) => element.text, - getWidgetAriaLabel: () => localize('selectBox', "Select Box"), + getWidgetAriaLabel: () => localize({ key: 'selectBox', comment: ['Behave like native select dropdown element.'] }, "Select Box"), getRole: () => 'option', getWidgetRole: () => 'listbox' } From dd62fa471cb39a36df06afb416d2b98966626251 Mon Sep 17 00:00:00 2001 From: SteVen Batten Date: Tue, 26 May 2020 09:10:54 -0700 Subject: [PATCH 03/10] refs #98576 --- src/vs/workbench/browser/actions/layoutActions.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/browser/actions/layoutActions.ts b/src/vs/workbench/browser/actions/layoutActions.ts index 6312c90b200..88371fe8b4c 100644 --- a/src/vs/workbench/browser/actions/layoutActions.ts +++ b/src/vs/workbench/browser/actions/layoutActions.ts @@ -687,7 +687,7 @@ export class MoveFocusedViewAction extends Action { const quickPick = this.quickInputService.createQuickPick(); quickPick.placeholder = nls.localize('moveFocusedView.selectDestination', "Select a Destination for the View"); - quickPick.title = nls.localize('moveFocusedView.title', "View: Move {0}", viewDescriptor.name); + quickPick.title = nls.localize({ key: 'moveFocusedView.title', comment: ['{0} indicates the title of the view the user has selected to move.'] }, "View: Move {0}", viewDescriptor.name); const items: Array = []; const currentContainer = this.viewDescriptorService.getViewContainerByViewId(focusedViewId)!; From 19bab9afecbd835af3b7e87e879b9208835cdceb Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Tue, 26 May 2020 18:15:39 +0200 Subject: [PATCH 04/10] clarify nls string, #98584 --- src/vs/editor/contrib/rename/renameInputField.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/editor/contrib/rename/renameInputField.ts b/src/vs/editor/contrib/rename/renameInputField.ts index d527c20ea96..2be443c8c55 100644 --- a/src/vs/editor/contrib/rename/renameInputField.ts +++ b/src/vs/editor/contrib/rename/renameInputField.ts @@ -82,7 +82,7 @@ export class RenameInputField implements IContentWidget { const updateLabel = () => { const [accept, preview] = this._acceptKeybindings; this._keybindingService.lookupKeybinding(accept); - this._label!.innerText = localize('label', "{0} to Rename, {1} to Preview", this._keybindingService.lookupKeybinding(accept)?.getLabel(), this._keybindingService.lookupKeybinding(preview)?.getLabel()); + this._label!.innerText = localize({ key: 'label', comment: ['placeholders are keybindings, e.g "F2 to Rename, Shift+F2 to Preview"'] }, "{0} to Rename, {1} to Preview", this._keybindingService.lookupKeybinding(accept)?.getLabel(), this._keybindingService.lookupKeybinding(preview)?.getLabel()); }; updateLabel(); this._disposables.add(this._keybindingService.onDidUpdateKeybindings(updateLabel)); From cc8c848416b7a042255b6257ba9bd58963bcf630 Mon Sep 17 00:00:00 2001 From: SteVen Batten Date: Tue, 26 May 2020 09:56:51 -0700 Subject: [PATCH 05/10] fixes #98337 --- .../browser/parts/views/viewPaneContainer.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/vs/workbench/browser/parts/views/viewPaneContainer.ts b/src/vs/workbench/browser/parts/views/viewPaneContainer.ts index 5ef6556da13..e7665253a05 100644 --- a/src/vs/workbench/browser/parts/views/viewPaneContainer.ts +++ b/src/vs/workbench/browser/parts/views/viewPaneContainer.ts @@ -49,7 +49,7 @@ import { RunOnceScheduler } from 'vs/base/common/async'; import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement'; import { ScrollbarVisibility } from 'vs/base/common/scrollable'; import { URI } from 'vs/base/common/uri'; -import { KeyMod, KeyCode } from 'vs/base/common/keyCodes'; +import { KeyMod, KeyCode, KeyChord } from 'vs/base/common/keyCodes'; import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry'; export interface IPaneColors extends IColorMapping { @@ -1580,8 +1580,8 @@ registerAction2( id: 'views.moveViewUp', title: nls.localize('viewMoveUp', "Move View Up"), keybinding: { - primary: KeyMod.Shift + KeyMod.Alt + KeyCode.UpArrow, - weight: KeybindingWeight.WorkbenchContrib, + primary: KeyChord(KeyMod.CtrlCmd + KeyCode.KEY_K, KeyCode.UpArrow), + weight: KeybindingWeight.WorkbenchContrib + 1, when: FocusedViewContext.notEqualsTo('') } }, -1); @@ -1596,8 +1596,8 @@ registerAction2( id: 'views.moveViewLeft', title: nls.localize('viewMoveLeft', "Move View Left"), keybinding: { - primary: KeyMod.Shift + KeyMod.Alt + KeyCode.LeftArrow, - weight: KeybindingWeight.WorkbenchContrib, + primary: KeyChord(KeyMod.CtrlCmd + KeyCode.KEY_K, KeyCode.LeftArrow), + weight: KeybindingWeight.WorkbenchContrib + 1, when: FocusedViewContext.notEqualsTo('') } }, -1); @@ -1612,8 +1612,8 @@ registerAction2( id: 'views.moveViewDown', title: nls.localize('viewMoveDown', "Move View Down"), keybinding: { - primary: KeyMod.Shift + KeyMod.Alt + KeyCode.DownArrow, - weight: KeybindingWeight.WorkbenchContrib, + primary: KeyChord(KeyMod.CtrlCmd + KeyCode.KEY_K, KeyCode.DownArrow), + weight: KeybindingWeight.WorkbenchContrib + 1, when: FocusedViewContext.notEqualsTo('') } }, 1); @@ -1628,8 +1628,8 @@ registerAction2( id: 'views.moveViewRight', title: nls.localize('viewMoveRight', "Move View Right"), keybinding: { - primary: KeyMod.Shift + KeyMod.Alt + KeyCode.RightArrow, - weight: KeybindingWeight.WorkbenchContrib, + primary: KeyChord(KeyMod.CtrlCmd + KeyCode.KEY_K, KeyCode.RightArrow), + weight: KeybindingWeight.WorkbenchContrib + 1, when: FocusedViewContext.notEqualsTo('') } }, 1); From 3eb6c1704ba358b7bb20201d9af2ca051ade2b68 Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Tue, 26 May 2020 12:12:34 -0500 Subject: [PATCH 06/10] Disable notebook smoketests in web --- test/smoke/src/main.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/smoke/src/main.ts b/test/smoke/src/main.ts index 51c085de716..4f1565f1a96 100644 --- a/test/smoke/src/main.ts +++ b/test/smoke/src/main.ts @@ -316,7 +316,7 @@ describe(`VSCode Smoke Tests (${opts.web ? 'Web' : 'Electron'})`, () => { if (!opts.web) { setupDataLossTests(); } if (!opts.web) { setupDataPreferencesTests(); } setupDataSearchTests(); - setupDataNotebookTests(); + if (!opts.web) { setupDataNotebookTests(); } setupDataLanguagesTests(); setupDataEditorTests(); setupDataStatusbarTests(!!opts.web); From 56393440fbed29946cb38ba737302d9021f7ae57 Mon Sep 17 00:00:00 2001 From: rebornix Date: Tue, 26 May 2020 10:12:48 -0700 Subject: [PATCH 07/10] add error messages for notebook workflow integration tests. --- extensions/vscode-notebook-tests/src/notebook.test.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/extensions/vscode-notebook-tests/src/notebook.test.ts b/extensions/vscode-notebook-tests/src/notebook.test.ts index 19d9e97a2c4..ec6eab2d898 100644 --- a/extensions/vscode-notebook-tests/src/notebook.test.ts +++ b/extensions/vscode-notebook-tests/src/notebook.test.ts @@ -318,10 +318,14 @@ suite('notebook workflow', () => { // ---- move up and down ---- // await vscode.commands.executeCommand('notebook.cell.moveDown'); + assert.equal(vscode.notebook.activeNotebookEditor!.document.cells.indexOf(vscode.notebook.activeNotebookEditor!.selection!), 1, + `first move down, active cell ${vscode.notebook.activeNotebookEditor!.selection!.uri.toString()}, ${vscode.notebook.activeNotebookEditor!.selection!.source}`); + await vscode.commands.executeCommand('notebook.cell.moveDown'); activeCell = vscode.notebook.activeNotebookEditor!.selection; - assert.equal(vscode.notebook.activeNotebookEditor!.document.cells.indexOf(activeCell!), 2); + assert.equal(vscode.notebook.activeNotebookEditor!.document.cells.indexOf(activeCell!), 2, + `second move down, active cell ${vscode.notebook.activeNotebookEditor!.selection!.uri.toString()}, ${vscode.notebook.activeNotebookEditor!.selection!.source}`); assert.equal(vscode.notebook.activeNotebookEditor!.document.cells[0].source, 'test'); assert.equal(vscode.notebook.activeNotebookEditor!.document.cells[1].source, ''); assert.equal(vscode.notebook.activeNotebookEditor!.document.cells[2].source, 'test'); From acb038266d5eb25826ea7b081cb163b77cfb4aad Mon Sep 17 00:00:00 2001 From: SteVen Batten Date: Tue, 26 May 2020 10:15:44 -0700 Subject: [PATCH 08/10] fixes #98453 in case view pane is asked for title after deregistration --- .../browser/parts/views/viewPaneContainer.ts | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/vs/workbench/browser/parts/views/viewPaneContainer.ts b/src/vs/workbench/browser/parts/views/viewPaneContainer.ts index e7665253a05..ad62952a45e 100644 --- a/src/vs/workbench/browser/parts/views/viewPaneContainer.ts +++ b/src/vs/workbench/browser/parts/views/viewPaneContainer.ts @@ -49,7 +49,7 @@ import { RunOnceScheduler } from 'vs/base/common/async'; import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement'; import { ScrollbarVisibility } from 'vs/base/common/scrollable'; import { URI } from 'vs/base/common/uri'; -import { KeyMod, KeyCode, KeyChord } from 'vs/base/common/keyCodes'; +import { KeyMod, KeyCode } from 'vs/base/common/keyCodes'; import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry'; export interface IPaneColors extends IColorMapping { @@ -377,10 +377,10 @@ export abstract class ViewPane extends Pane implements IView { private calculateTitle(title: string): string { const viewContainer = this.viewDescriptorService.getViewContainerByViewId(this.id)!; const model = this.viewDescriptorService.getViewContainerModel(viewContainer); - const viewDescriptor = this.viewDescriptorService.getViewDescriptorById(this.id)!; + const viewDescriptor = this.viewDescriptorService.getViewDescriptorById(this.id); const isDefault = this.viewDescriptorService.getDefaultContainerById(this.id) === viewContainer; - if (!isDefault && viewDescriptor.containerTitle && model.title !== viewDescriptor.containerTitle) { + if (!isDefault && viewDescriptor?.containerTitle && model.title !== viewDescriptor.containerTitle) { return `${viewDescriptor.containerTitle}: ${title}`; } @@ -1580,8 +1580,8 @@ registerAction2( id: 'views.moveViewUp', title: nls.localize('viewMoveUp', "Move View Up"), keybinding: { - primary: KeyChord(KeyMod.CtrlCmd + KeyCode.KEY_K, KeyCode.UpArrow), - weight: KeybindingWeight.WorkbenchContrib + 1, + primary: KeyMod.Shift + KeyMod.Alt + KeyCode.UpArrow, + weight: KeybindingWeight.WorkbenchContrib, when: FocusedViewContext.notEqualsTo('') } }, -1); @@ -1596,8 +1596,8 @@ registerAction2( id: 'views.moveViewLeft', title: nls.localize('viewMoveLeft', "Move View Left"), keybinding: { - primary: KeyChord(KeyMod.CtrlCmd + KeyCode.KEY_K, KeyCode.LeftArrow), - weight: KeybindingWeight.WorkbenchContrib + 1, + primary: KeyMod.Shift + KeyMod.Alt + KeyCode.LeftArrow, + weight: KeybindingWeight.WorkbenchContrib, when: FocusedViewContext.notEqualsTo('') } }, -1); @@ -1612,8 +1612,8 @@ registerAction2( id: 'views.moveViewDown', title: nls.localize('viewMoveDown', "Move View Down"), keybinding: { - primary: KeyChord(KeyMod.CtrlCmd + KeyCode.KEY_K, KeyCode.DownArrow), - weight: KeybindingWeight.WorkbenchContrib + 1, + primary: KeyMod.Shift + KeyMod.Alt + KeyCode.DownArrow, + weight: KeybindingWeight.WorkbenchContrib, when: FocusedViewContext.notEqualsTo('') } }, 1); @@ -1628,8 +1628,8 @@ registerAction2( id: 'views.moveViewRight', title: nls.localize('viewMoveRight', "Move View Right"), keybinding: { - primary: KeyChord(KeyMod.CtrlCmd + KeyCode.KEY_K, KeyCode.RightArrow), - weight: KeybindingWeight.WorkbenchContrib + 1, + primary: KeyMod.Shift + KeyMod.Alt + KeyCode.RightArrow, + weight: KeybindingWeight.WorkbenchContrib, when: FocusedViewContext.notEqualsTo('') } }, 1); From 5372d9c9623a445b82656048bc6308815bd44c64 Mon Sep 17 00:00:00 2001 From: SteVen Batten Date: Tue, 26 May 2020 10:29:16 -0700 Subject: [PATCH 09/10] fixes #98456 --- src/vs/workbench/contrib/debug/browser/debug.contribution.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/contrib/debug/browser/debug.contribution.ts b/src/vs/workbench/contrib/debug/browser/debug.contribution.ts index 7aa24cd9522..b3df4f720d6 100644 --- a/src/vs/workbench/contrib/debug/browser/debug.contribution.ts +++ b/src/vs/workbench/contrib/debug/browser/debug.contribution.ts @@ -100,7 +100,7 @@ const VIEW_CONTAINER: ViewContainer = Registry.as(ViewE id: OpenDebugConsoleAction.ID, keybindings: openPanelKb }, - order: 3, + order: 2, hideIfEmpty: true }, ViewContainerLocation.Panel); From eb781a2e0a19511458337433ef9cc5b2efb032d5 Mon Sep 17 00:00:00 2001 From: Miguel Solorio Date: Tue, 26 May 2020 11:25:22 -0700 Subject: [PATCH 10/10] Fix #98602 --- extensions/theme-defaults/themes/light_plus.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/theme-defaults/themes/light_plus.json b/extensions/theme-defaults/themes/light_plus.json index 00c2a6cb470..63e97356983 100644 --- a/extensions/theme-defaults/themes/light_plus.json +++ b/extensions/theme-defaults/themes/light_plus.json @@ -169,7 +169,7 @@ "keyword.control.anchor.regexp" ], "settings": { - "foreground": "#ff0000" + "foreground": "#EE0000" } }, { @@ -181,7 +181,7 @@ { "scope": "constant.character.escape", "settings": { - "foreground": "#ff0000" + "foreground": "#EE0000" } }, {