chore(vscode): update to 1.54.2

lib/vscode/test/automation/src/application.ts

@@ -51,6 +51,10 @@ export class Application {
 		return !!this.options.remote;
 	}
 
+	get web(): boolean {
+		return !!this.options.web;
+	}
+
 	private _workspacePathOrFolder: string;
 	get workspacePathOrFolder(): string {
 		return this._workspacePathOrFolder;
@@ -69,7 +73,12 @@ export class Application {
 		await this.code.waitForElement('.explorer-folders-view');
 
 		if (expectWalkthroughPart) {
-			await this.code.waitForActiveElement(`.editor-instance[data-editor-id="workbench.editor.walkThroughPart"] > div > div[tabIndex="0"]`);
+			if (this.quality === Quality.Stable) {
+				// TODO@bpasero remove me in March 2021
+				await this.code.waitForActiveElement(`.editor-instance[data-editor-id="workbench.editor.walkThroughPart"] > div > div[tabIndex="0"]`);
+			} else {
+				await this.code.waitForElement(`.editor-instance > div > div.welcomePageFocusElement[tabIndex="0"]`);
+			}
 		}
 	}
 

lib/vscode/test/automation/src/code.ts

@@ -120,7 +120,7 @@ export async function spawn(options: SpawnOptions): Promise<Code> {
 	let child: cp.ChildProcess | undefined;
 	let connectDriver: typeof connectElectronDriver;
 
-	copyExtension(options, 'vscode-notebook-tests');
+	copyExtension(options.extensionsPath, 'vscode-notebook-tests');
 
 	if (options.web) {
 		await launch(options.userDataDir, options.workspacePath, options.codePath, options.extensionsPath);
@@ -138,23 +138,36 @@ export async function spawn(options: SpawnOptions): Promise<Code> {
 		'--disable-telemetry',
 		'--no-cached-data',
 		'--disable-updates',
+		'--disable-keytar',
 		'--disable-crash-reporter',
 		`--extensions-dir=${options.extensionsPath}`,
 		`--user-data-dir=${options.userDataDir}`,
 		'--driver', handle
 	];
 
+	if (process.platform === 'linux') {
+		args.push('--disable-gpu'); // Linux has trouble in VMs to render properly with GPU enabled
+	}
+
 	if (options.remote) {
 		// Replace workspace path with URI
 		args[0] = `--${options.workspacePath.endsWith('.code-workspace') ? 'file' : 'folder'}-uri=vscode-remote://test+test/${URI.file(options.workspacePath).path}`;
 
 		if (codePath) {
 			// running against a build: copy the test resolver extension
-			copyExtension(options, 'vscode-test-resolver');
+			copyExtension(options.extensionsPath, 'vscode-test-resolver');
 		}
 		args.push('--enable-proposed-api=vscode.vscode-test-resolver');
 		const remoteDataDir = `${options.userDataDir}-server`;
 		mkdirp.sync(remoteDataDir);
+
+		if (codePath) {
+			// running against a build: copy the test resolver extension into remote extensions dir
+			const remoteExtensionsDir = path.join(remoteDataDir, 'extensions');
+			mkdirp.sync(remoteExtensionsDir);
+			copyExtension(remoteExtensionsDir, 'vscode-notebook-tests');
+		}
+
 		env['TESTRESOLVER_DATA_FOLDER'] = remoteDataDir;
 	}
 
@@ -186,11 +199,11 @@ export async function spawn(options: SpawnOptions): Promise<Code> {
 	return connect(connectDriver, child, outPath, handle, options.logger);
 }
 
-async function copyExtension(options: SpawnOptions, extId: string): Promise<void> {
-	const testResolverExtPath = path.join(options.extensionsPath, extId);
-	if (!fs.existsSync(testResolverExtPath)) {
+async function copyExtension(extensionsPath: string, extId: string): Promise<void> {
+	const dest = path.join(extensionsPath, extId);
+	if (!fs.existsSync(dest)) {
 		const orig = path.join(repoPath, 'extensions', extId);
-		await new Promise((c, e) => ncp(orig, testResolverExtPath, err => err ? e(err) : c()));
+		await new Promise<void>((c, e) => ncp(orig, dest, err => err ? e(err) : c()));
 	}
 }
 

lib/vscode/test/automation/src/extensions.ts

@@ -32,6 +32,12 @@ export class Extensions extends Viewlet {
 		await this.code.waitAndClick(SEARCH_BOX);
 		await this.code.waitForActiveElement(SEARCH_BOX);
 		await this.code.waitForTypeInEditor(SEARCH_BOX, `@id:${id}`);
+		await this.code.waitForElement(`div.extensions-viewlet[id="workbench.view.extensions"] .monaco-list-row[data-extension-id="${id}"]`);
+	}
+
+	async openExtension(id: string): Promise<any> {
+		await this.searchForExtension(id);
+		await this.code.waitAndClick(`div.extensions-viewlet[id="workbench.view.extensions"] .monaco-list-row[data-extension-id="${id}"]`);
 	}
 
 	async installExtension(id: string, waitUntilEnabled: boolean): Promise<void> {

lib/vscode/test/automation/src/playwrightDriver.ts

@@ -101,6 +101,7 @@ export async function launch(userDataDir: string, _workspacePath: string, codeSe
 		VSCODE_REMOTE_SERVER_PATH: codeServerPath,
 		...process.env
 	};
+	const args = ['--browser', 'none', '--driver', 'web', '--extensions-dir', extPath];
 	let serverLocation: string | undefined;
 	if (codeServerPath) {
 		serverLocation = join(codeServerPath, `server.${process.platform === 'win32' ? 'cmd' : 'sh'}`);
@@ -111,7 +112,7 @@ export async function launch(userDataDir: string, _workspacePath: string, codeSe
 	}
 	server = spawn(
 		serverLocation,
-		['--browser', 'none', '--driver', 'web', '--extensions-dir', extPath],
+		args,
 		{ env }
 	);
 	server.stderr?.on('data', error => console.log(`Server stderr: ${error}`));

lib/vscode/test/automation/src/settings.ts

@@ -19,13 +19,13 @@ export class SettingsEditor {
 		await this.editor.waitForEditorFocus('settings.json', 1);
 
 		await this.code.dispatchKeybinding('right');
-		await this.editor.waitForTypeInEditor('settings.json', `"${setting}": ${value}`);
+		await this.editor.waitForTypeInEditor('settings.json', `"${setting}": ${value},`);
 		await this.editors.saveOpenedFile();
 	}
 
 	async clearUserSettings(): Promise<void> {
 		const settingsPath = path.join(this.userDataPath, 'User', 'settings.json');
-		await new Promise((c, e) => fs.writeFile(settingsPath, '{\n}', 'utf8', err => err ? e(err) : c()));
+		await new Promise<void>((c, e) => fs.writeFile(settingsPath, '{\n}', 'utf8', err => err ? e(err) : c()));
 
 		await this.openSettings();
 		await this.editor.waitForEditorContents('settings.json', c => c === '{}');