restore old ext host debug port logic, microsoft#39569

jrieken · jrieken · commit 99352b6653ea · 2017-12-06T15:55:21.000+01:00
diff --git a/src/vs/platform/environment/node/environmentService.ts b/src/vs/platform/environment/node/environmentService.ts
@@ -173,16 +173,16 @@ export class EnvironmentService implements IEnvironmentService {
 }
 
 export function parseExtensionHostPort(args: ParsedArgs, isBuild: boolean): IExtensionHostDebugParams {
-	return parseDebugPort(args.debugPluginHost, args.debugBrkPluginHost, 5870, args.debugId);
+	return parseDebugPort(args.debugPluginHost, args.debugBrkPluginHost, 5870, isBuild, args.debugId);
 }
 
 export function parseSearchPort(args: ParsedArgs, isBuild: boolean): IDebugParams {
-	return parseDebugPort(args.debugSearch, args.debugBrkSearch, !isBuild ? 5876 : null);
+	return parseDebugPort(args.debugSearch, args.debugBrkSearch, 5876, isBuild);
 }
 
-export function parseDebugPort(debugArg: string, debugBrkArg: string, defaultBuildPort: number, debugId?: string): IExtensionHostDebugParams {
+export function parseDebugPort(debugArg: string, debugBrkArg: string, defaultBuildPort: number, isBuild: boolean, debugId?: string): IExtensionHostDebugParams {
 	const portStr = debugBrkArg || debugArg;
-	const port = Number(portStr) || defaultBuildPort;
+	const port = Number(portStr) || (!isBuild ? defaultBuildPort : null);
 	const brk = port ? Boolean(!!debugBrkArg) : false;
 	return { port, break: brk, debugId };
 }
diff --git a/src/vs/platform/environment/test/node/environmentService.test.ts b/src/vs/platform/environment/test/node/environmentService.test.ts
@@ -14,10 +14,10 @@ suite('EnvironmentService', () => {
 	test('parseExtensionHostPort when built', () => {
 		const parse = a => parseExtensionHostPort(parseArgs(a), true);
 
-		assert.deepEqual(parse([]), { port: 5870, break: false, debugId: undefined });
-		assert.deepEqual(parse(['--debugPluginHost']), { port: 5870, break: false, debugId: undefined });
+		assert.deepEqual(parse([]), { port: null, break: false, debugId: undefined });
+		assert.deepEqual(parse(['--debugPluginHost']), { port: null, break: false, debugId: undefined });
 		assert.deepEqual(parse(['--debugPluginHost=1234']), { port: 1234, break: false, debugId: undefined });
-		assert.deepEqual(parse(['--debugBrkPluginHost']), { port: 5870, break: false, debugId: undefined });
+		assert.deepEqual(parse(['--debugBrkPluginHost']), { port: null, break: false, debugId: undefined });
 		assert.deepEqual(parse(['--debugBrkPluginHost=5678']), { port: 5678, break: true, debugId: undefined });
 		assert.deepEqual(parse(['--debugPluginHost=1234', '--debugBrkPluginHost=5678', '--debugId=7']), { port: 5678, break: true, debugId: '7' });
 	});

Original file line number	Diff line number	Diff line change
`@@ -173,16 +173,16 @@ export class EnvironmentService implements IEnvironmentService {`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`export function parseExtensionHostPort(args: ParsedArgs, isBuild: boolean): IExtensionHostDebugParams {`
`176`		`- return parseDebugPort(args.debugPluginHost, args.debugBrkPluginHost, 5870, args.debugId);`
	`176`	`+ return parseDebugPort(args.debugPluginHost, args.debugBrkPluginHost, 5870, isBuild, args.debugId);`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`export function parseSearchPort(args: ParsedArgs, isBuild: boolean): IDebugParams {`
`180`		`- return parseDebugPort(args.debugSearch, args.debugBrkSearch, !isBuild ? 5876 : null);`
	`180`	`+ return parseDebugPort(args.debugSearch, args.debugBrkSearch, 5876, isBuild);`
`181`	`181`	`}`
`182`	`182`
`183`		`-export function parseDebugPort(debugArg: string, debugBrkArg: string, defaultBuildPort: number, debugId?: string): IExtensionHostDebugParams {`
	`183`	`+export function parseDebugPort(debugArg: string, debugBrkArg: string, defaultBuildPort: number, isBuild: boolean, debugId?: string): IExtensionHostDebugParams {`
`184`	`184`	`const portStr = debugBrkArg \|\| debugArg;`
`185`		`- const port = Number(portStr) \|\| defaultBuildPort;`
	`185`	`+ const port = Number(portStr) \|\| (!isBuild ? defaultBuildPort : null);`
`186`	`186`	`const brk = port ? Boolean(!!debugBrkArg) : false;`
`187`	`187`	`return { port, break: brk, debugId };`
`188`	`188`	`}`