simplify by using new 'when' patterns

microsoft · Feb 7, 2018 · 11efc1d · 11efc1d
1 parent 5c16bf8
commit 11efc1d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 22 deletions.
diff --git a/package.json b/package.json
@@ -89,24 +89,9 @@
 		"views": {
 			"debug": [
 				{
-					"id": "extension.node-debug.loadedScriptsExplorer.node",
+					"id": "extension.node-debug.loadedScriptsExplorer",
 					"name": "%loaded.scripts.view.name%",
-					"when": "inDebugMode && debugType == 'node'"
-				},
-				{
-					"id": "extension.node-debug.loadedScriptsExplorer.node2",
-					"name": "%loaded.scripts.view.name%",
-					"when": "inDebugMode && debugType == 'node2'"
-				},
-				{
-					"id": "extension.node-debug.loadedScriptsExplorer.extensionHost",
-					"name": "%loaded.scripts.view.name%",
-					"when": "inDebugMode && debugType == 'extensionHost'"
-				},
-				{
-					"id": "extension.node-debug.loadedScriptsExplorer.chrome",
-					"name": "%loaded.scripts.view.name%",
-					"when": "inDebugMode && debugType == 'chrome'"
+					"when": "inDebugMode && debugType =~ /^(node|node2|extensionHost|chrome)$/"
 				}
 			]
 		},

diff --git a/src/node/extension/extension.ts b/src/node/extension/extension.ts
@@ -24,11 +24,7 @@ export function activate(context: vscode.ExtensionContext) {
 	context.subscriptions.push(vscode.commands.registerCommand('extension.pickNodeProcess', () => pickProcess()));
 
 	// loaded scripts
-	const provider = new LoadedScriptsProvider(context);
-	vscode.window.registerTreeDataProvider('extension.node-debug.loadedScriptsExplorer.node', provider);
-	vscode.window.registerTreeDataProvider('extension.node-debug.loadedScriptsExplorer.node2', provider);
-	vscode.window.registerTreeDataProvider('extension.node-debug.loadedScriptsExplorer.extensionHost', provider);
-	vscode.window.registerTreeDataProvider('extension.node-debug.loadedScriptsExplorer.chrome', provider);
+	vscode.window.registerTreeDataProvider('extension.node-debug.loadedScriptsExplorer', new LoadedScriptsProvider(context));
 	context.subscriptions.push(vscode.commands.registerCommand('extension.node-debug.pickLoadedScript', () => pickLoadedScript()));
 	context.subscriptions.push(vscode.commands.registerCommand('extension.node-debug.openScript', (session: vscode.DebugSession, source) => openScript(session, source)));