Merge from vscode 709a07d51919d3266ca71699c6ddfb2d3547c0e1 (#6575)

src/vs/platform/configuration/common/configuration.ts

@@ -5,7 +5,7 @@
 
 import * as objects from 'vs/base/common/objects';
 import * as types from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
+import { URI, UriComponents } from 'vs/base/common/uri';
 import { Event } from 'vs/base/common/event';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
@@ -124,7 +124,7 @@ export interface IConfigurationData {
 	defaults: IConfigurationModel;
 	user: IConfigurationModel;
 	workspace: IConfigurationModel;
-	folders: { [folder: string]: IConfigurationModel };
+	folders: [UriComponents, IConfigurationModel][];
 }
 
 export function compare(from: IConfigurationModel, to: IConfigurationModel): { added: string[], removed: string[], updated: string[] } {

src/vs/platform/configuration/common/configurationModels.ts

@@ -8,7 +8,7 @@ import { ResourceMap } from 'vs/base/common/map';
 import * as arrays from 'vs/base/common/arrays';
 import * as types from 'vs/base/common/types';
 import * as objects from 'vs/base/common/objects';
-import { URI } from 'vs/base/common/uri';
+import { URI, UriComponents } from 'vs/base/common/uri';
 import { OVERRIDE_PROPERTY_PATTERN, ConfigurationScope, IConfigurationRegistry, Extensions, IConfigurationPropertySchema } from 'vs/platform/configuration/common/configurationRegistry';
 import { IOverrides, overrideIdentifierFromKey, addToValueTree, toValuesTree, IConfigurationModel, getConfigurationValue, IConfigurationOverrides, IConfigurationData, getDefaultValues, getConfigurationKeys, IConfigurationChangeEvent, ConfigurationTarget, removeFromValueTree, toOverrides } from 'vs/platform/configuration/common/configuration';
 import { Workspace } from 'vs/platform/workspace/common/workspace';
@@ -546,11 +546,11 @@ export class Configuration {
 				overrides: this._workspaceConfiguration.overrides,
 				keys: this._workspaceConfiguration.keys
 			},
-			folders: this._folderConfigurations.keys().reduce((result, folder) => {
+			folders: this._folderConfigurations.keys().reduce<[UriComponents, IConfigurationModel][]>((result, folder) => {
 				const { contents, overrides, keys } = this._folderConfigurations.get(folder)!;
-				result[folder.toString()] = { contents, overrides, keys };
+				result.push([folder, { contents, overrides, keys }]);
 				return result;
-			}, Object.create({}))
+			}, [])
 		};
 	}
 

src/vs/platform/contextview/browser/contextMenuHandler.ts

@@ -85,6 +85,10 @@ export class ContextMenuHandler {
 				menu.onDidBlur(() => this.contextViewService.hideContextView(true), null, menuDisposables);
 				domEvent(window, EventType.BLUR)(() => { this.contextViewService.hideContextView(true); }, null, menuDisposables);
 				domEvent(window, EventType.MOUSE_DOWN)((e: MouseEvent) => {
+					if (e.defaultPrevented) {
+						return;
+					}
+
 					let event = new StandardMouseEvent(e);
 					let element: HTMLElement | null = event.target;
 

src/vs/platform/environment/node/environmentService.ts

@@ -19,7 +19,7 @@ import { URI } from 'vs/base/common/uri';
 
 // Read this before there's any chance it is overwritten
 // Related to https://github.com/Microsoft/vscode/issues/30624
-const xdgRuntimeDir = process.env['XDG_RUNTIME_DIR'];
+export const xdgRuntimeDir = process.env['XDG_RUNTIME_DIR'];
 
 function getNixIPCHandle(userDataPath: string, type: string): string {
 	const vscodePortable = process.env['VSCODE_PORTABLE'];

src/vs/platform/menubar/electron-main/menubar.ts

@@ -559,7 +559,7 @@ export class Menubar {
 				})];
 
 			case StateType.CheckingForUpdates:
-				return [new MenuItem({ label: nls.localize('miCheckingForUpdates', "Checking For Updates..."), enabled: false })];
+				return [new MenuItem({ label: nls.localize('miCheckingForUpdates', "Checking for Updates..."), enabled: false })];
 
 			case StateType.AvailableForDownload:
 				return [new MenuItem({

src/vs/platform/remote/common/remoteAgentConnection.ts

@@ -35,7 +35,6 @@ export interface ConnectionTypeRequest {
 	signedData?: string;
 	desiredConnectionType?: ConnectionType;
 	args?: any;
-	isBuilt: boolean;
 }
 
 export interface ErrorMessage {
@@ -51,7 +50,6 @@ export type HandshakeMessage = AuthRequest | SignRequest | ConnectionTypeRequest
 
 
 interface ISimpleConnectionOptions {
-	isBuilt: boolean;
 	commit: string | undefined;
 	host: string;
 	port: number;
@@ -110,8 +108,7 @@ async function connectToRemoteExtensionHostAgent(options: ISimpleConnectionOptio
 					type: 'connectionType',
 					commit: options.commit,
 					signedData: signed,
-					desiredConnectionType: connectionType,
-					isBuilt: options.isBuilt
+					desiredConnectionType: connectionType
 				};
 				if (args) {
 					connTypeRequest.args = args;
@@ -200,7 +197,6 @@ async function doConnectRemoteAgentTunnel(options: ISimpleConnectionOptions, sta
 }
 
 export interface IConnectionOptions {
-	isBuilt: boolean;
 	commit: string | undefined;
 	socketFactory: ISocketFactory;
 	addressProvider: IAddressProvider;
@@ -210,7 +206,6 @@ export interface IConnectionOptions {
 async function resolveConnectionOptions(options: IConnectionOptions, reconnectionToken: string, reconnectionProtocol: PersistentProtocol | null): Promise<ISimpleConnectionOptions> {
 	const { host, port } = await options.addressProvider.getAddress();
 	return {
-		isBuilt: options.isBuilt,
 		commit: options.commit,
 		host: host,
 		port: port,

src/vs/platform/sign/browser/signService.ts

@@ -13,22 +13,7 @@ export class SignService implements ISignService {
 	private readonly _tkn: string | null;
 
 	constructor(token: string | undefined) {
-		if (typeof token !== 'undefined') {
-			this._tkn = token;
-		} else {
-			this._tkn = SignService._readTokenFromURL();
-		}
-	}
-
-	private static _readTokenFromURL(): string | null {
-		if (!document.location.hash) {
-			return null;
-		}
-		const m = document.location.hash.match(/[#&]tkn=([^&]+)/);
-		if (!m) {
-			return null;
-		}
-		return m[1];
+		this._tkn = token || null;
 	}
 
 	async sign(value: string): Promise<string> {

src/vs/platform/windows/common/windows.ts

@@ -444,6 +444,7 @@ export interface IWindowConfiguration extends ParsedArgs {
 	filesToDiff?: IPath[];
 	filesToWait?: IPathsToWaitFor;
 	termProgram?: string;
+	connectionToken?: string;
 }
 
 export interface IRunActionInWindowRequest {