Merge pull request #104639 from microsoft/alexr00/issue#104591

Fix when NPM view is shown

Author: alexr00

extensions/npm/package.json

@@ -56,7 +56,6 @@
         {
           "id": "npm",
           "name": "%view.name%",
-          "when": "npm:showScriptExplorer",
           "icon": "images/code.svg",
           "visibility": "hidden"
         }
@@ -237,6 +236,7 @@
           "type": "boolean",
           "default": false,
           "scope": "resource",
+          "deprecationMessage": "The NPM Script Explorer is now available in the 'Views' menu in the Explorer in all folders.",
           "description": "%config.npm.enableScriptExplorer%"
         },
         "npm.enableRunFromFolder": {

extensions/npm/src/npmMain.ts

@@ -8,7 +8,7 @@ import * as vscode from 'vscode';
 import { addJSONProviders } from './features/jsonContributions';
 import { runSelectedScript, selectAndRunScriptFromFolder } from './commands';
 import { NpmScriptsTreeDataProvider } from './npmView';
-import { invalidateTasksCache, NpmTaskProvider, hasPackageJson } from './tasks';
+import { invalidateTasksCache, NpmTaskProvider } from './tasks';
 import { invalidateHoverScriptsCache, NpmScriptHoverProvider } from './scriptHover';
 
 let treeDataProvider: NpmScriptsTreeDataProvider | undefined;
@@ -44,11 +44,6 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
 	registerHoverProvider(context);
 
 	context.subscriptions.push(vscode.commands.registerCommand('npm.runSelectedScript', runSelectedScript));
-
-	if (await hasPackageJson()) {
-		vscode.commands.executeCommand('setContext', 'npm:showScriptExplorer', true);
-	}
-
 	context.subscriptions.push(vscode.commands.registerCommand('npm.runScriptFromFolder', selectAndRunScriptFromFolder));
 }
 

extensions/npm/src/tasks.ts

@@ -311,22 +311,6 @@ 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) => {