Show the npm script explorer when there is a top level package.json

egamma · egamma · commit af4bfe6ef4ff · 2019-07-29T14:27:07.000+02:00
diff --git a/extensions/npm/package.json b/extensions/npm/package.json
@@ -31,6 +31,7 @@
   "activationEvents": [
     "onCommand:workbench.action.tasks.runTask",
     "onLanguage:json",
+    "workspaceContains:package.json",
     "onView:npm"
   ],
   "contributes": {
@@ -47,7 +48,7 @@
         {
           "id": "npm",
           "name": "%view.name%",
-          "when": "config.npm.enableScriptExplorer"
+          "when": "npm:showScriptExplorer || config.npm.enableScriptExplorer"
         }
       ]
     },
diff --git a/extensions/npm/src/main.ts b/extensions/npm/src/main.ts
@@ -7,7 +7,7 @@ import * as httpRequest from 'request-light';
 import * as vscode from 'vscode';
 import { addJSONProviders } from './features/jsonContributions';
 import { NpmScriptsTreeDataProvider } from './npmView';
-import { invalidateTasksCache, NpmTaskProvider } from './tasks';
+import { invalidateTasksCache, NpmTaskProvider, hasPackageJson } from './tasks';
 import { invalidateHoverScriptsCache, NpmScriptHoverProvider } from './scriptHover';
 import { runSelectedScript } from './commands';
 
@@ -41,6 +41,10 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
 	context.subscriptions.push(d);
 	context.subscriptions.push(vscode.commands.registerCommand('npm.runSelectedScript', runSelectedScript));
 	context.subscriptions.push(addJSONProviders(httpRequest.xhr));
+
+	if (await hasPackageJson()) {
+		vscode.commands.executeCommand('setContext', 'npm:showScriptExplorer', true);
+	}
 }
 
 function registerTaskProvider(context: vscode.ExtensionContext): vscode.Disposable | undefined {
diff --git a/extensions/npm/src/tasks.ts b/extensions/npm/src/tasks.ts
@@ -262,6 +262,22 @@ export function getPackageJsonUriFromTask(task: Task): Uri | null {
 	return null;
 }
 
+export async function hasPackageJson(): Promise<boolean> {
+	let folders = workspace.workspaceFolders;
+	if (!folders) {
+		return false;
+	}
+	for (const folder of folders) {
+		if (folder.uri.scheme === 'file') {
+			let packageJson = path.join(folder.uri.fsPath, 'package.json');
+			if (await exists(packageJson)) {
+				return true;
+			}
+		}
+	}
+	return false;
+}
+
 async function exists(file: string): Promise<boolean> {
 	return new Promise<boolean>((resolve, _reject) => {
 		fs.exists(file, (value) => {

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@`
`31`	`31`	`"activationEvents": [`
`32`	`32`	`"onCommand:workbench.action.tasks.runTask",`
`33`	`33`	`"onLanguage:json",`
	`34`	`+ "workspaceContains:package.json",`
`34`	`35`	`"onView:npm"`
`35`	`36`	`],`
`36`	`37`	`"contributes": {`
`@@ -47,7 +48,7 @@`
`47`	`48`	`{`
`48`	`49`	`"id": "npm",`
`49`	`50`	`"name": "%view.name%",`
`50`		`- "when": "config.npm.enableScriptExplorer"`
	`51`	`+ "when": "npm:showScriptExplorer \|\| config.npm.enableScriptExplorer"`
`51`	`52`	`}`
`52`	`53`	`]`
`53`	`54`	`},`