Refresh master with initial release/0.24 snapshot (#332)

* Initial port of release/0.24 source code

* Fix additional headers

* Fix a typo in launch.json

test/smoke/src/areas/preferences/keybindings.ts

@@ -0,0 +1,28 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { SpectronApplication } from '../../spectron/application';
+
+const SEARCH_INPUT = '.settings-search-input input';
+
+export class KeybindingsEditor {
+
+	constructor(private spectron: SpectronApplication) { }
+
+	async updateKeybinding(command: string, keys: string[], ariaLabel: string): Promise<any> {
+		await this.spectron.runCommand('workbench.action.openGlobalKeybindings');
+		await this.spectron.client.waitForActiveElement(SEARCH_INPUT);
+		await this.spectron.client.setValue(SEARCH_INPUT, command);
+
+		await this.spectron.client.waitAndClick('div[aria-label="Keybindings"] .monaco-list-row.keybinding-item');
+		await this.spectron.client.waitForElement('div[aria-label="Keybindings"] .monaco-list-row.keybinding-item.focused.selected');
+
+		await this.spectron.client.waitAndClick('div[aria-label="Keybindings"] .monaco-list-row.keybinding-item .action-item .icon.add');
+		await this.spectron.client.waitForElement('.defineKeybindingWidget .monaco-inputbox.synthetic-focus');
+
+		await this.spectron.client.keys([...keys, 'NULL', 'Enter', 'NULL']);
+		await this.spectron.client.waitForElement(`div[aria-label="Keybindings"] div[aria-label="Keybinding is ${ariaLabel}."]`);
+	}
+}

test/smoke/src/areas/preferences/preferences.test.ts

@@ -0,0 +1,46 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+
+import { SpectronApplication } from '../../spectron/application';
+import { ActivityBarPosition } from '../activitybar/activityBar';
+
+describe('Preferences', () => {
+	before(function () {
+		this.app.suiteName = 'Preferences';
+	});
+
+	it('turns off editor line numbers and verifies the live change', async function () {
+		const app = this.app as SpectronApplication;
+
+		await app.workbench.explorer.openFile('app.js');
+		let lineNumbers = await app.client.waitForElements('.line-numbers');
+		await app.screenCapturer.capture('app.js has line numbers');
+		assert.ok(!!lineNumbers.length, 'Line numbers are not present in the editor before disabling them.');
+
+		await app.workbench.settingsEditor.addUserSetting('editor.lineNumbers', '"off"');
+		await app.workbench.selectTab('app.js');
+		lineNumbers = await app.client.waitForElements('.line-numbers', result => !result || result.length === 0);
+
+		await app.screenCapturer.capture('line numbers hidden');
+		assert.ok(!lineNumbers.length, 'Line numbers are still present in the editor after disabling them.');
+	});
+
+	it(`changes 'workbench.action.toggleSidebarPosition' command key binding and verifies it`, async function () {
+		const app = this.app as SpectronApplication;
+		assert.ok(await app.workbench.activitybar.getActivityBar(ActivityBarPosition.LEFT), 'Activity bar should be positioned on the left.');
+
+		await app.workbench.keybindingsEditor.updateKeybinding('workbench.action.toggleSidebarPosition', ['Control', 'u'], 'Control+U');
+
+		await app.client.keys(['Control', 'u', 'NULL']);
+		assert.ok(await app.workbench.activitybar.getActivityBar(ActivityBarPosition.RIGHT), 'Activity bar was not moved to right after toggling its position.');
+	});
+
+	after(async function () {
+		const app = this.app as SpectronApplication;
+		await app.workbench.settingsEditor.clearUserSettings();
+	});
+});

test/smoke/src/areas/preferences/settings.ts

@@ -0,0 +1,45 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as fs from 'fs';
+import * as path from 'path';
+import { SpectronApplication } from '../../spectron/application';
+
+export enum ActivityBarPosition {
+	LEFT = 0,
+	RIGHT = 1
+};
+
+const SEARCH_INPUT = '.settings-search-input input';
+const EDITOR = '.editable-preferences-editor-container .monaco-editor textarea';
+
+export class SettingsEditor {
+
+	constructor(private spectron: SpectronApplication) { }
+
+	async addUserSetting(setting: string, value: string): Promise<void> {
+		await this.spectron.runCommand('workbench.action.openGlobalSettings');
+		await this.spectron.client.waitAndClick(SEARCH_INPUT);
+		await this.spectron.client.waitForActiveElement(SEARCH_INPUT);
+
+		await this.spectron.client.keys(['ArrowDown', 'NULL']);
+		await this.spectron.client.waitForActiveElement(EDITOR);
+
+		await this.spectron.client.keys(['ArrowRight', 'NULL']);
+		await this.spectron.screenCapturer.capture('user settings is open and focused');
+
+		await this.spectron.workbench.editor.waitForTypeInEditor('settings.json', `"${setting}": ${value}`, '.editable-preferences-editor-container');
+		await this.spectron.workbench.saveOpenedFile();
+
+		await this.spectron.screenCapturer.capture('user settings has changed');
+	}
+
+	async clearUserSettings(): Promise<void> {
+		const settingsPath = path.join(this.spectron.userDataPath, 'User', 'settings.json');
+		await new Promise((c, e) => fs.writeFile(settingsPath, '{}', 'utf8', err => err ? e(err) : c()));
+
+		await this.spectron.workbench.editor.waitForEditorContents('settings.json', c => c.length === 0, '.editable-preferences-editor-container');
+	}
+}