Merge from vscode 3d67364fbfcf676d93be64f949e9b33e7f1b969e (#5028)

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

@@ -47,7 +47,7 @@ export class OpenFolderAPICommand {
 			arg = { forceNewWindow: arg };
 		}
 		if (!uri) {
-			return executor.executeCommand('_files.pickFolderAndOpen', arg.forceNewWindow);
+			return executor.executeCommand('_files.pickFolderAndOpen', { forceNewWindow: arg.forceNewWindow });
 		}
 		const options: IOpenSettings = { forceNewWindow: arg.forceNewWindow, noRecentEntry: arg.noRecentEntry };
 		uri = URI.revive(uri);
@@ -144,6 +144,13 @@ export class RemoveFromRecentlyOpenedAPICommand {
 }
 CommandsRegistry.registerCommand(RemoveFromRecentlyOpenedAPICommand.ID, adjustHandler(RemoveFromRecentlyOpenedAPICommand.execute));
 
+export class OpenIssueReporter {
+	public static ID = 'vscode.openIssueReporter';
+	public static execute(executor: ICommandsExecutor, extensionId: string): Promise<void> {
+		return executor.executeCommand('workbench.action.openIssueReporter', [extensionId]);
+	}
+}
+
 interface RecentEntry {
 	uri: URI;
 	type: 'workspace' | 'folder' | 'file';

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

@@ -35,16 +35,17 @@ const configurationEntrySchema: IJSONSchema = {
 						properties: {
 							isExecutable: {
 								type: 'boolean',
-								deprecationMessage: 'This property is deprecated. Instead use `scope` property and set it to `application` value.'
+								deprecationMessage: 'This property is deprecated. Instead use `scope` property and set it to `machine` value.'
 							},
 							scope: {
 								type: 'string',
-								enum: ['application', 'window', 'resource'],
+								enum: ['application', 'machine', 'window', 'resource'],
 								default: 'window',
 								enumDescriptions: [
-									nls.localize('scope.application.description', "Application specific configuration, which can be configured only in User settings."),
-									nls.localize('scope.window.description', "Window specific configuration, which can be configured in the User or Workspace settings."),
-									nls.localize('scope.resource.description', "Resource specific configuration, which can be configured in the User, Workspace or Folder settings.")
+									nls.localize('scope.application.description', "Application specific configuration, which can be configured only in local user settings."),
+									nls.localize('scope.machine.description', "Machine specific configuration, which can be configured only in local and remote user settings."),
+									nls.localize('scope.window.description', "Window specific configuration, which can be configured in the user or workspace settings."),
+									nls.localize('scope.resource.description', "Resource specific configuration, which can be configured in the user, workspace or folder settings.")
 								],
 								description: nls.localize('scope.description', "Scope in which the configuration is applicable. Available scopes are `window` and `resource`.")
 							},
@@ -161,7 +162,7 @@ configurationExtPoint.setHandler((extensions, { added, removed }) => {
 		validateProperties(configuration, extension);
 
 		configuration.id = node.id || extension.description.identifier.value;
-		configuration.contributedByExtension = true;
+		configuration.extensionInfo = { id: extension.description.identifier.value };
 		configuration.title = configuration.title || extension.description.displayName || extension.description.identifier.value;
 		configurations.push(configuration);
 		return configurations;
@@ -210,6 +211,8 @@ function validateProperties(configuration: IConfigurationNode, extension: IExten
 			if (propertyConfiguration.scope) {
 				if (propertyConfiguration.scope.toString() === 'application') {
 					propertyConfiguration.scope = ConfigurationScope.APPLICATION;
+				} else if (propertyConfiguration.scope.toString() === 'machine') {
+					propertyConfiguration.scope = ConfigurationScope.MACHINE;
 				} else if (propertyConfiguration.scope.toString() === 'resource') {
 					propertyConfiguration.scope = ConfigurationScope.RESOURCE;
 				} else {

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

@@ -15,7 +15,7 @@ import * as search from 'vs/workbench/contrib/search/common/search';
 import { ICommandHandlerDescription } from 'vs/platform/commands/common/commands';
 import { ExtHostCommands } from 'vs/workbench/api/common/extHostCommands';
 import { CustomCodeAction } from 'vs/workbench/api/common/extHostLanguageFeatures';
-import { ICommandsExecutor, OpenFolderAPICommand, DiffAPICommand, OpenAPICommand, RemoveFromRecentlyOpenedAPICommand, SetEditorLayoutAPICommand } from './apiCommands';
+import { ICommandsExecutor, OpenFolderAPICommand, DiffAPICommand, OpenAPICommand, RemoveFromRecentlyOpenedAPICommand, SetEditorLayoutAPICommand, OpenIssueReporter } from './apiCommands';
 import { EditorGroupLayout } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { isFalsyOrEmpty } from 'vs/base/common/arrays';
 
@@ -258,6 +258,13 @@ export class ExtHostApiCommands {
 				{ name: 'layout', description: 'The editor layout to set.', constraint: (value: EditorGroupLayout) => typeof value === 'object' && Array.isArray(value.groups) }
 			]
 		});
+
+		this._register(OpenIssueReporter.ID, adjustHandler(OpenIssueReporter.execute), {
+			description: 'Opens the issue reporter with the provided extension id as the selected source',
+			args: [
+				{ name: 'extensionId', description: 'extensionId to report an issue on', constraint: (value: any) => typeof value === 'string' }
+			]
+		});
 	}
 
 	// --- command impl

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

@@ -17,7 +17,7 @@ export class ExtHostDialogs {
 
 	showOpenDialog(options: vscode.OpenDialogOptions): Promise<URI[] | undefined> {
 		return this._proxy.$showOpenDialog(options).then(filepaths => {
-			return filepaths ? filepaths.map(URI.revive) : undefined;
+			return filepaths ? filepaths.map(p => URI.revive(p)) : undefined;
 		});
 	}
 

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

@@ -0,0 +1,59 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IDisposable } from 'vs/base/common/lifecycle';
+import { IExtensionMemento } from 'vs/workbench/api/common/extHostExtensionActivator';
+import { ExtHostStorage } from 'vs/workbench/api/common/extHostStorage';
+
+export class ExtensionMemento implements IExtensionMemento {
+
+	private readonly _id: string;
+	private readonly _shared: boolean;
+	private readonly _storage: ExtHostStorage;
+
+	private readonly _init: Promise<ExtensionMemento>;
+	private _value: { [n: string]: any; };
+	private readonly _storageListener: IDisposable;
+
+	constructor(id: string, global: boolean, storage: ExtHostStorage) {
+		this._id = id;
+		this._shared = global;
+		this._storage = storage;
+
+		this._init = this._storage.getValue(this._shared, this._id, Object.create(null)).then(value => {
+			this._value = value;
+			return this;
+		});
+
+		this._storageListener = this._storage.onDidChangeStorage(e => {
+			if (e.shared === this._shared && e.key === this._id) {
+				this._value = e.value;
+			}
+		});
+	}
+
+	get whenReady(): Promise<ExtensionMemento> {
+		return this._init;
+	}
+
+	get<T>(key: string, defaultValue: T): T {
+		let value = this._value[key];
+		if (typeof value === 'undefined') {
+			value = defaultValue;
+		}
+		return value;
+	}
+
+	update(key: string, value: any): Promise<boolean> {
+		this._value[key] = value;
+		return this._storage
+			.setValue(this._shared, this._id, this._value)
+			.then(() => true);
+	}
+
+	dispose(): void {
+		this._storageListener.dispose();
+	}
+}

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

@@ -8,6 +8,7 @@ import * as vscode from 'vscode';
 import { URI } from 'vs/base/common/uri';
 import { Event, Emitter } from 'vs/base/common/event';
 import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { VSBuffer } from 'vs/base/common/buffer';
 
 export abstract class AbstractExtHostOutputChannel extends Disposable implements vscode.OutputChannel {
 
@@ -35,7 +36,7 @@ export abstract class AbstractExtHostOutputChannel extends Disposable implements
 
 	append(value: string): void {
 		this.validate();
-		this._offset += value ? Buffer.from(value).byteLength : 0;
+		this._offset += value ? VSBuffer.fromString(value).byteLength : 0;
 	}
 
 	update(): void {

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

@@ -478,8 +478,8 @@ export namespace WorkspaceEdit {
 				);
 			} else {
 				result.renameFile(
-					URI.revive((<ResourceFileEditDto>edit).oldUri),
-					URI.revive((<ResourceFileEditDto>edit).newUri),
+					URI.revive((<ResourceFileEditDto>edit).oldUri!),
+					URI.revive((<ResourceFileEditDto>edit).newUri!),
 					(<ResourceFileEditDto>edit).options
 				);
 			}

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

@@ -420,7 +420,7 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape, IExtHostWorkspac
 		}
 
 		return this._proxy.$startFileSearch(includePattern, includeFolder, excludePatternOrDisregardExcludes, maxResults, token)
-			.then(data => Array.isArray(data) ? data.map(URI.revive) : []);
+			.then(data => Array.isArray(data) ? data.map(d => URI.revive(d)) : []);
 	}
 
 	findTextInFiles(query: vscode.TextSearchQuery, options: vscode.FindTextInFilesOptions, callback: (result: vscode.TextSearchResult) => void, extensionId: ExtensionIdentifier, token: vscode.CancellationToken = CancellationToken.None): Promise<vscode.TextSearchComplete | undefined> {