Merge branch 'master' into misolori/seti-update-05-2020

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"
 			}
 		},
 		{

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');

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'
 			}

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));

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<IQuickPickItem | IQuickPickSeparator> = [];
 		const currentContainer = this.viewDescriptorService.getViewContainerByViewId(focusedViewId)!;

src/vs/workbench/browser/parts/views/viewPaneContainer.ts

@@ -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}`;
 		}
 

src/vs/workbench/contrib/debug/browser/debug.contribution.ts

@@ -100,7 +100,7 @@ const VIEW_CONTAINER: ViewContainer = Registry.as<IViewContainersRegistry>(ViewE
 		id: OpenDebugConsoleAction.ID,
 		keybindings: openPanelKb
 	},
-	order: 3,
+	order: 2,
 	hideIfEmpty: true
 }, ViewContainerLocation.Panel);
 

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;
 		}

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);