Fix relative user data dirs on Windows

Tyriar · Tyriar · commit 835893e9d774 · 2016-10-22T03:47:07.000-07:00
Fixes microsoft#11735
diff --git a/src/main.js b/src/main.js
@@ -111,6 +111,10 @@ function getNLSConfiguration() {
 	return resolvedLocale ? resolvedLocale : { locale: initialLocale, availableLanguages: {} };
 }
 
+// Set userData path before app 'ready' event and call to process.chdir
+var userData = path.resolve(args['user-data-dir'] || paths.getDefaultUserDataPath(process.platform));
+app.setPath('userData', userData);
+
 // Update cwd based on environment and platform
 try {
 	if (process.platform === 'win32') {
@@ -123,10 +127,6 @@ try {
 	console.error(err);
 }
 
-// Set userData path before app 'ready' event
-var userData = path.resolve(args['user-data-dir'] || paths.getDefaultUserDataPath(process.platform));
-app.setPath('userData', userData);
-
 // Mac: when someone drops a file to the not-yet running VSCode, the open-file event fires even before
 // the app-ready event. We listen very early for open-file and remember this upon startup as path to open.
 global.macOpenFiles = [];
diff --git a/src/vs/platform/environment/node/environmentService.ts b/src/vs/platform/environment/node/environmentService.ts
@@ -65,7 +65,7 @@ export class EnvironmentService implements IEnvironmentService {
 	get userHome(): string { return path.join(os.homedir(), product.dataFolderName); }
 
 	@memoize
-	get userDataPath(): string { return path.resolve(this._args['user-data-dir'] || paths.getDefaultUserDataPath(process.platform)); }
+	get userDataPath(): string { return parseUserDataDir(this._args, process); }
 
 	@memoize
 	get appSettingsHome(): string { return path.join(this.userDataPath, 'User'); }
@@ -110,4 +110,19 @@ export function parseExtensionHostPort(args: ParsedArgs, isBuild: boolean): { po
 	const port = Number(portStr) || (!isBuild ? 5870 : null);
 	const brk = port ? Boolean(!!args.debugBrkPluginHost) : false;
 	return { port, break: brk };
+}
+
+export function parseUserDataDir(args: ParsedArgs, process: NodeJS.Process) {
+	const arg = args['user-data-dir'];
+	if (arg) {
+		// Determine if the arg is relative or absolute, if relative use the original CWD
+		// (VSCODE_CWD), not the potentially overridden one (process.cwd()).
+		const resolved = path.resolve(arg);
+		if (path.normalize(arg) === resolved) {
+			return resolved;
+		} else {
+			return path.resolve(process.env['VSCODE_CWD'] || process.cwd(), arg);
+		}
+	}
+	return path.resolve(paths.getDefaultUserDataPath(process.platform));
 }
diff --git a/src/vs/platform/environment/test/node/environmentService.test.ts b/src/vs/platform/environment/test/node/environmentService.test.ts
@@ -5,8 +5,9 @@
 'use strict';
 
 import * as assert from 'assert';
+import * as path from 'path';
 import { parseArgs } from 'vs/platform/environment/node/argv';
-import { parseExtensionHostPort } from 'vs/platform/environment/node/environmentService';
+import { parseExtensionHostPort, parseUserDataDir } from 'vs/platform/environment/node/environmentService';
 
 suite('EnvironmentService', () => {
 
@@ -31,4 +32,13 @@ suite('EnvironmentService', () => {
 		assert.deepEqual(parse(['--debugBrkPluginHost=5678']), { port: 5678, break: true });
 		assert.deepEqual(parse(['--debugPluginHost=1234', '--debugBrkPluginHost=5678']), { port: 5678, break: true });
 	});
+
+	test('userDataPath', () => {
+		const parse = (a, b: { cwd: () => string, env: { [key: string]: string }}) => parseUserDataDir(parseArgs(a), <any>b);
+
+		assert.equal(parse(['--user-data-dir', './dir'], { cwd: () => '/foo', env: {} }), path.resolve('/foo/dir'),
+			'should use cwd when --user-data-dir is specified');
+		assert.equal(parse(['--user-data-dir', './dir'], { cwd: () => '/foo', env: {'VSCODE_CWD': '/bar'} }), path.resolve('/bar/dir'),
+			'should use VSCODE_CWD as the cwd when --user-data-dir is specified');
+	});
 });
