Merge from vscode 8c426f9f3b6b18935cc6c2ec8aa6d45ccd88021e

src/vs/workbench/test/browser/api/extHostDiagnostics.test.ts

@@ -389,6 +389,9 @@ suite('ExtHostDiagnostics', () => {
 			assertRegistered(): void {
 
 			}
+			drain() {
+				return undefined!;
+			}
 		}, new NullLogService());
 
 		let collection1 = diags.createDiagnosticCollection(nullExtensionDescription.identifier, 'foo');
@@ -438,6 +441,9 @@ suite('ExtHostDiagnostics', () => {
 			assertRegistered(): void {
 
 			}
+			drain() {
+				return undefined!;
+			}
 		}, new NullLogService());
 
 

src/vs/workbench/test/browser/api/extHostFileSystemEventService.test.ts

@@ -15,7 +15,8 @@ suite('ExtHostFileSystemEventService', () => {
 		const protocol: IMainContext = {
 			getProxy: () => { return undefined!; },
 			set: undefined!,
-			assertRegistered: undefined!
+			assertRegistered: undefined!,
+			drain: undefined!
 		};
 
 		const watcher1 = new ExtHostFileSystemEventService(protocol, new NullLogService(), undefined!).createFileSystemWatcher('**/somethingInteresting', false, false, false);

src/vs/workbench/test/browser/api/extHostWorkspace.test.ts

@@ -298,7 +298,8 @@ suite('ExtHostWorkspace', function () {
 		const protocol: IMainContext = {
 			getProxy: () => { return undefined!; },
 			set: () => { return undefined!; },
-			assertRegistered: () => { }
+			assertRegistered: () => { },
+			drain: () => { return undefined!; },
 		};
 
 		const ws = createExtHostWorkspace(protocol, { id: 'foo', name: 'Test', folders: [] }, new NullLogService());

src/vs/workbench/test/browser/api/mainThreadDiagnostics.test.ts

@@ -32,6 +32,7 @@ suite('MainThreadDiagnostics', function () {
 						$acceptMarkersChange() { }
 					};
 				}
+				drain(): any { return null; }
 			},
 			markerService,
 			new class extends mock<IUriIdentityService>() {

src/vs/workbench/test/browser/api/mainThreadTreeViews.test.ts

@@ -66,6 +66,7 @@ suite('MainThreadHostTreeView', function () {
 				getProxy(): any {
 					return extHostTreeViewsShape;
 				}
+				drain(): any { return null; }
 			}, new TestViewsService(), new TestNotificationService(), testExtensionService, new NullLogService());
 		mainThreadTreeViews.$registerTreeViewDataProvider(testTreeViewId, { showCollapseAll: false, canSelectMany: false });
 		await testExtensionService.whenInstalledExtensionsRegistered();

src/vs/workbench/test/browser/api/testRPCProtocol.ts

@@ -19,7 +19,8 @@ export function SingleProxyRPCProtocol(thing: any): IExtHostContext & IExtHostRp
 		set<T, R extends T>(identifier: ProxyIdentifier<T>, value: R): R {
 			return value;
 		},
-		assertRegistered: undefined!
+		assertRegistered: undefined!,
+		drain: undefined!
 	};
 }
 
@@ -40,6 +41,10 @@ export class TestRPCProtocol implements IExtHostContext, IExtHostRpcService {
 		this._proxies = Object.create(null);
 	}
 
+	drain(): Promise<void> {
+		return Promise.resolve();
+	}
+
 	private get _callCount(): number {
 		return this._callCountValue;
 	}