[css/html/json] Randomize inspect ports to avoid conflicts

aeschli · aeschli · commit e3a79e9e446c · 2020-11-04T16:03:27.000+01:00
diff --git a/extensions/css-language-features/.vscode/launch.json b/extensions/css-language-features/.vscode/launch.json
@@ -1,14 +1,5 @@
 {
 	"version": "0.2.0",
-	"compounds": [
-		{
-			"name": "Debug Extension and Language Server",
-			"configurations": [
-				"Launch Extension",
-				"Attach Language Server"
-			]
-		}
-	],
 	"configurations": [
 		{
 			"name": "Launch Extension",
@@ -41,19 +32,6 @@
 			]
 		},
 		{
-			"name": "Attach Language Server",
-			"type": "node",
-			"request": "attach",
-			"protocol": "inspector",
-			"port": 6044,
-			"sourceMaps": true,
-			"outFiles": [
-				"${workspaceFolder}/server/out/**/*.js"
-			],
-			"smartStep": true,
-			"restart": true
-    },
-    {
 			"name": "Server Unit Tests",
 			"type": "node",
 			"request": "launch",
@@ -74,4 +52,4 @@
 			]
 		}
 	]
-}
+}
diff --git a/extensions/css-language-features/client/src/node/cssClientMain.ts b/extensions/css-language-features/client/src/node/cssClientMain.ts
@@ -11,14 +11,13 @@ import { TextDecoder } from 'util';
 
 // this method is called when vs code is activated
 export function activate(context: ExtensionContext) {
-
 	const clientMain = extensions.getExtension('vscode.css-language-features')?.packageJSON?.main || '';
 
 	const serverMain = `./server/${clientMain.indexOf('/dist/') !== -1 ? 'dist' : 'out'}/node/cssServerMain`;
 	const serverModule = context.asAbsolutePath(serverMain);
 
 	// The debug options for the server
-	const debugOptions = { execArgv: ['--nolazy', '--inspect=6044'] };
+	const debugOptions = { execArgv: ['--nolazy', '--inspect=' + (7000 + Math.round(Math.random() * 999))] };
 
 	// If the extension is launch in debug mode the debug server options are use
 	// Otherwise the run options are used
diff --git a/extensions/html-language-features/client/src/node/htmlClientMain.ts b/extensions/html-language-features/client/src/node/htmlClientMain.ts
@@ -24,7 +24,7 @@ export function activate(context: ExtensionContext) {
 	const serverModule = context.asAbsolutePath(serverMain);
 
 	// The debug options for the server
-	const debugOptions = { execArgv: ['--nolazy', '--inspect=6044'] };
+	const debugOptions = { execArgv: ['--nolazy', '--inspect=' + (8000 + Math.round(Math.random() * 999))] };
 
 	// If the extension is launch in debug mode the debug server options are use
 	// Otherwise the run options are used
diff --git a/extensions/json-language-features/client/src/node/jsonClientMain.ts b/extensions/json-language-features/client/src/node/jsonClientMain.ts
@@ -25,7 +25,7 @@ export function activate(context: ExtensionContext) {
 	const serverModule = context.asAbsolutePath(serverMain);
 
 	// The debug options for the server
-	const debugOptions = { execArgv: ['--nolazy', '--inspect=6044'] };
+	const debugOptions = { execArgv: ['--nolazy', '--inspect=' + (6000 + Math.round(Math.random() * 999))] };
 
 	// If the extension is launch in debug mode the debug server options are use
 	// Otherwise the run options are used

Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"version": "0.2.0",`
`3`		`- "compounds": [`
`4`		`- {`
`5`		`- "name": "Debug Extension and Language Server",`
`6`		`- "configurations": [`
`7`		`- "Launch Extension",`
`8`		`- "Attach Language Server"`
`9`		`- ]`
`10`		`- }`
`11`		`- ],`
`12`	`3`	`"configurations": [`
`13`	`4`	`{`
`14`	`5`	`"name": "Launch Extension",`
`@@ -41,19 +32,6 @@`
`41`	`32`	`]`
`42`	`33`	`},`
`43`	`34`	`{`
`44`		`- "name": "Attach Language Server",`
`45`		`- "type": "node",`
`46`		`- "request": "attach",`
`47`		`- "protocol": "inspector",`
`48`		`- "port": 6044,`
`49`		`- "sourceMaps": true,`
`50`		`- "outFiles": [`
`51`		`- "${workspaceFolder}/server/out/*/.js"`
`52`		`- ],`
`53`		`- "smartStep": true,`
`54`		`- "restart": true`
`55`		`- },`
`56`		`- {`
`57`	`35`	`"name": "Server Unit Tests",`
`58`	`36`	`"type": "node",`
`59`	`37`	`"request": "launch",`
`@@ -74,4 +52,4 @@`
`74`	`52`	`]`
`75`	`53`	`}`
`76`	`54`	`]`
`77`		`-}`
	`55`	`+}`