Revert "Revert "Merge from vscode ada4bddb8edc69eea6ebaaa0e88c5f903cbd43d8 (#5529)" (#5553)" (#5562)

This reverts commit c9a4f8f664.

src/vs/workbench/api/browser/mainThreadDocuments.ts

@@ -228,10 +228,10 @@ export class MainThreadDocuments implements MainThreadDocumentsShape {
 		});
 	}
 
-	private _doCreateUntitled(resource?: URI, modeId?: string, initialValue?: string): Promise<URI> {
+	private _doCreateUntitled(resource?: URI, mode?: string, initialValue?: string): Promise<URI> {
 		return this._untitledEditorService.loadOrCreate({
 			resource,
-			modeId,
+			mode,
 			initialValue,
 			useResourcePath: Boolean(resource && resource.path)
 		}).then(model => {

src/vs/workbench/api/browser/mainThreadSaveParticipant.ts

@@ -295,14 +295,18 @@ class CodeActionOnSaveParticipant implements ISaveParticipant {
 		const codeActionsOnSave = Object.keys(setting)
 			.filter(x => setting[x]).map(x => new CodeActionKind(x))
 			.sort((a, b) => {
-				if (a.value === CodeActionKind.SourceFixAll.value) {
-					return -1;
-				}
-				if (b.value === CodeActionKind.SourceFixAll.value) {
+				if (CodeActionKind.SourceFixAll.contains(a)) {
+					if (CodeActionKind.SourceFixAll.contains(b)) {
+						return 0;
+					}
 					return 1;
 				}
+				if (CodeActionKind.SourceFixAll.contains(b)) {
+					return -1;
+				}
 				return 0;
 			});
+
 		if (!codeActionsOnSave.length) {
 			return undefined;
 		}
@@ -318,11 +322,8 @@ class CodeActionOnSaveParticipant implements ISaveParticipant {
 					reject(localize('codeActionsOnSave.didTimeout', "Aborted codeActionsOnSave after {0}ms", timeout));
 				}, timeout)),
 			this.applyOnSaveActions(model, codeActionsOnSave, tokenSource.token)
-		]).then(() => {
+		]).finally(() => {
 			tokenSource.cancel();
-		}, (e) => {
-			tokenSource.cancel();
-			return Promise.reject(e);
 		});
 	}
 

src/vs/workbench/api/common/extHostExtensionActivator.ts

@@ -25,6 +25,7 @@ export interface IExtensionContext {
 	globalStoragePath: string;
 	asAbsolutePath(relativePath: string): string;
 	readonly logPath: string;
+	executionContext: number;
 }
 
 /**

src/vs/workbench/api/common/extHostTypes.ts

@@ -2307,3 +2307,8 @@ export class QuickInputButtons {
 
 	private constructor() { }
 }
+
+export enum ExtensionExecutionContext {
+	Local = 1,
+	Remote = 2
+}

src/vs/workbench/api/electron-browser/mainThreadWebview.ts

@@ -182,7 +182,7 @@ export class MainThreadWebviews extends Disposable implements MainThreadWebviews
 
 	public $setHtml(handle: WebviewPanelHandle | WebviewInsetHandle, value: string): void {
 		if (typeof handle === 'number') {
-			this.getWebviewElement(handle).contents = value;
+			this.getWebviewElement(handle).html = value;
 		} else {
 			const webview = this.getWebview(handle);
 			webview.html = value;

src/vs/workbench/api/node/extHost.api.impl.ts

@@ -800,6 +800,7 @@ export function createApiFactory(
 			DocumentSymbol: extHostTypes.DocumentSymbol,
 			EndOfLine: extHostTypes.EndOfLine,
 			EventEmitter: Emitter,
+			ExtensionExecutionContext: extHostTypes.ExtensionExecutionContext,
 			CustomExecution: extHostTypes.CustomExecution,
 			FileChangeType: extHostTypes.FileChangeType,
 			FileSystemError: extHostTypes.FileSystemError,

src/vs/workbench/api/node/extHostExtensionService.ts

@@ -36,7 +36,7 @@ import { VSBuffer } from 'vs/base/common/buffer';
 import { ISchemeTransformer } from 'vs/workbench/api/common/extHostLanguageFeatures';
 import { ExtensionMemento } from 'vs/workbench/api/common/extHostMemento';
 import { ExtensionStoragePaths } from 'vs/workbench/api/node/extHostStoragePaths';
-import { RemoteAuthorityResolverError } from 'vs/workbench/api/common/extHostTypes';
+import { RemoteAuthorityResolverError, ExtensionExecutionContext } from 'vs/workbench/api/common/extHostTypes';
 
 interface ITestRunner {
 	run(testsRoot: string, clb: (error: Error, failures?: number) => void): void;
@@ -367,7 +367,8 @@ export class ExtHostExtensionService implements ExtHostExtensionServiceShape {
 				storagePath: this._storagePath.workspaceValue(extensionDescription),
 				globalStoragePath: this._storagePath.globalValue(extensionDescription),
 				asAbsolutePath: (relativePath: string) => { return path.join(extensionDescription.extensionLocation.fsPath, relativePath); },
-				logPath: that._extHostLogService.getLogDirectory(extensionDescription.identifier)
+				logPath: that._extHostLogService.getLogDirectory(extensionDescription.identifier),
+				executionContext: this._initData.remoteAuthority ? ExtensionExecutionContext.Remote : ExtensionExecutionContext.Local
 			});
 		});
 	}
@@ -628,7 +629,7 @@ export class ExtHostExtensionService implements ExtHostExtensionServiceShape {
 
 		const resolver = this._resolvers[authorityPrefix];
 		if (!resolver) {
-			throw new Error(`No resolver available for ${authorityPrefix}`);
+			throw new Error(`No remote extension installed to resolve ${authorityPrefix}.`);
 		}
 
 		try {

src/vs/workbench/api/node/extHostTerminalService.ts

@@ -21,6 +21,7 @@ import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 // {{SQL CARBON EDIT}}
 // import { ExtHostVariableResolverService } from 'vs/workbench/api/node/extHostDebugService';
 import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocumentsAndEditors';
+import { getDefaultShell } from 'vs/workbench/contrib/terminal/node/terminal';
 
 const RENDERER_NO_PROCESS_ID = -1;
 
@@ -471,7 +472,7 @@ export class ExtHostTerminalService implements ExtHostTerminalServiceShape {
 					.inspect<string | string[]>(key.substr(key.lastIndexOf('.') + 1));
 				return this._apiInspectConfigToPlain<string | string[]>(setting);
 			};
-			terminalEnvironment.mergeDefaultShellPathAndArgs(shellLaunchConfig, fetchSetting, isWorkspaceShellAllowed || false);
+			terminalEnvironment.mergeDefaultShellPathAndArgs(shellLaunchConfig, fetchSetting, isWorkspaceShellAllowed || false, getDefaultShell(platform.platform));
 		}
 
 		// Get the initial cwd
@@ -506,7 +507,7 @@ export class ExtHostTerminalService implements ExtHostTerminalServiceShape {
 
 		// Fork the process and listen for messages
 		this._logService.debug(`Terminal process launching on ext host`, shellLaunchConfig, initialCwd, cols, rows, env);
-		const p = new TerminalProcess(shellLaunchConfig, initialCwd, cols, rows, env, terminalConfig.get('windowsEnableConpty') as boolean);
+		const p = new TerminalProcess(shellLaunchConfig, initialCwd, cols, rows, env, terminalConfig.get('windowsEnableConpty') as boolean, this._logService);
 		p.onProcessIdReady(pid => this._proxy.$sendProcessPid(id, pid));
 		p.onProcessTitleChanged(title => this._proxy.$sendProcessTitle(id, title));
 		p.onProcessData(data => this._proxy.$sendProcessData(id, data));