Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463 (#7206)

* Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463

* fix config changes

* fix strictnull checks

test/automation/src/activityBar.ts

@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Code } from './code';
+
+export const enum ActivityBarPosition {
+	LEFT = 0,
+	RIGHT = 1
+}
+
+export class ActivityBar {
+
+	constructor(private code: Code) { }
+
+	async waitForActivityBar(position: ActivityBarPosition): Promise<void> {
+		let positionClass: string;
+
+		if (position === ActivityBarPosition.LEFT) {
+			positionClass = 'left';
+		} else if (position === ActivityBarPosition.RIGHT) {
+			positionClass = 'right';
+		} else {
+			throw new Error('No such position for activity bar defined.');
+		}
+
+		await this.code.waitForElement(`.part.activitybar.${positionClass}`);
+	}
+}