progress

src/vs/code/electron-main/launch.ts

@@ -117,13 +117,10 @@ export class LaunchService implements ILaunchService {
 
 	private startOpenUrl(args: ParsedArgs): TPromise<void> {
 		const openUrlArg = args['open-url'] || [];
-		if (openUrlArg) {
+		if (openUrlArg && args._urls && args._urls.length) {
 			// --open-url must contain -- followed by the url(s)
-			// process.argv is used over args._ as args._ are resolved to file paths on disk at this point
-			const dashDashIndex = process.argv.indexOf('--');
-			for (let i = dashDashIndex + 1; i < process.argv.length; i++) {
-				this.urlService.open(process.argv[i]);
-			}
+			// process.argv is used over args._ as args._ are resolved to file paths at this point
+			args._urls.forEach(url => this.urlService.open(url));
 
 			return TPromise.as(null);
 		}

src/vs/code/node/paths.ts

@@ -15,6 +15,10 @@ import { ParsedArgs } from 'vs/platform/environment/common/environment';
 import { realpathSync } from 'vs/base/node/extfs';
 
 export function validatePaths(args: ParsedArgs): ParsedArgs {
+	// Track URLs if they're going to be used
+	if (args['open-url']) {
+		args._urls = args._;
+	}
 
 	// Realpath/normalize paths and watch out for goto line mode
 	const paths = doValidatePaths(args._, args.goto);

src/vs/platform/environment/common/environment.ts

@@ -9,6 +9,7 @@ import { LogLevel } from 'vs/platform/log/common/log';
 export interface ParsedArgs {
 	[arg: string]: any;
 	_: string[];
+	_urls?: string[];
 	help?: boolean;
 	version?: boolean;
 	status?: boolean;