Merge from vscode 1b314ab317fbff7d799b21754326b7d849889ceb

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

@@ -33,6 +33,7 @@ export interface ParsedArgs {
 	trace?: boolean;
 	'trace-category-filter'?: string;
 	'trace-options'?: string;
+	'open-devtools'?: boolean;
 	log?: string;
 	logExtensionHostCommunication?: boolean;
 	'extensions-dir'?: string;
@@ -202,6 +203,7 @@ export const OPTIONS: OptionDescriptions<Required<ParsedArgs>> = {
 	'trace-category-filter': { type: 'string' },
 	'trace-options': { type: 'string' },
 	'force-user-env': { type: 'boolean' },
+	'open-devtools': { type: 'boolean' },
 
 	// {{SQL CARBON EDIT}} Start
 	'command': { type: 'string', alias: 'c', cat: 'o', args: 'command-name', description: localize('commandParameter', 'Name of command to run') },

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

@@ -39,9 +39,6 @@ export interface INativeEnvironmentService extends IEnvironmentService {
 	extensionsDownloadPath: string;
 	builtinExtensionsPath: string;
 
-	globalStorageHome: string;
-	workspaceStorageHome: string;
-
 	driverHandle?: string;
 	driverVerbose: boolean;
 
@@ -102,10 +99,10 @@ export class EnvironmentService implements INativeEnvironmentService {
 	get machineSettingsResource(): URI { return resources.joinPath(URI.file(path.join(this.userDataPath, 'Machine')), 'settings.json'); }
 
 	@memoize
-	get globalStorageHome(): string { return path.join(this.appSettingsHome.fsPath, 'globalStorage'); }
+	get globalStorageHome(): URI { return URI.joinPath(this.appSettingsHome, 'globalStorage'); }
 
 	@memoize
-	get workspaceStorageHome(): string { return path.join(this.appSettingsHome.fsPath, 'workspaceStorage'); }
+	get workspaceStorageHome(): URI { return URI.joinPath(this.appSettingsHome, 'workspaceStorage'); }
 
 	@memoize
 	get keybindingsResource(): URI { return resources.joinPath(this.userRoamingDataHome, 'keybindings.json'); }

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

@@ -56,7 +56,10 @@ export async function readFromStdin(targetPath: string, verbose: boolean): Promi
 	const decoder = iconv.getDecoder(encoding);
 	process.stdin.on('data', chunk => stdinFileStream.write(decoder.write(chunk)));
 	process.stdin.on('end', () => {
-		stdinFileStream.write(decoder.end());
+		const end = decoder.end();
+		if (typeof end === 'string') {
+			stdinFileStream.write(end);
+		}
 		stdinFileStream.end();
 	});
 	process.stdin.on('error', error => stdinFileStream.destroy(error));