Inform user when 'npm.autoDetect' is off.

egamma · egamma · commit e77c58dd0b6d · 2020-02-20T16:17:18.000+01:00
diff --git a/extensions/npm/src/main.ts b/extensions/npm/src/main.ts
@@ -21,7 +21,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
 	configureHttpRequest();
 	let d = vscode.workspace.onDidChangeConfiguration((e) => {
 		configureHttpRequest();
-		if (e.affectsConfiguration('npm.exclude')) {
+		if (e.affectsConfiguration('npm.exclude') || e.affectsConfiguration('npm.autoDetect')) {
 			invalidateTasksCache();
 			if (treeDataProvider) {
 				treeDataProvider.refresh();
diff --git a/extensions/npm/src/npmView.ts b/extensions/npm/src/npmView.ts
@@ -12,7 +12,7 @@ import {
 import { visit, JSONVisitor } from 'jsonc-parser';
 import {
 	NpmTaskDefinition, getPackageJsonUriFromTask, getScripts,
-	isWorkspaceFolder, getTaskName, createTask, extractDebugArgFromScript, startDebugging
+	isWorkspaceFolder, getTaskName, createTask, extractDebugArgFromScript, startDebugging, isAutoDetectionEnabled
 } from './tasks';
 import * as nls from 'vscode-nls';
 
@@ -119,8 +119,8 @@ class NpmScript extends TreeItem {
 }
 
 class NoScripts extends TreeItem {
-	constructor() {
-		super(localize('noScripts', 'No scripts found'), TreeItemCollapsibleState.None);
+	constructor(message: string) {
+		super(message, TreeItemCollapsibleState.None);
 		this.contextValue = 'noscripts';
 	}
 }
@@ -260,7 +260,11 @@ export class NpmScriptsTreeDataProvider implements TreeDataProvider<TreeItem> {
 			if (taskItems) {
 				this.taskTree = this.buildTaskTree(taskItems);
 				if (this.taskTree.length === 0) {
-					this.taskTree = [new NoScripts()];
+					let message = localize('noScripts', 'No scripts found.');
+					if (!isAutoDetectionEnabled()) {
+						message = localize('autoDetectIsOff', 'The setting "npm.autoDetect" is "off".');
+					}
+					this.taskTree = [new NoScripts(message)];
 				}
 			}
 		}
diff --git a/extensions/npm/src/tasks.ts b/extensions/npm/src/tasks.ts
@@ -190,8 +190,8 @@ export async function provideNpmScripts(): Promise<Task[]> {
 	return cachedTasks;
 }
 
-function isAutoDetectionEnabled(folder: WorkspaceFolder): boolean {
-	return workspace.getConfiguration('npm', folder.uri).get<AutoDetect>('autoDetect') === 'on';
+export function isAutoDetectionEnabled(folder?: WorkspaceFolder): boolean {
+	return workspace.getConfiguration('npm', folder?.uri).get<AutoDetect>('autoDetect') === 'on';
 }
 
 function isExcluded(folder: WorkspaceFolder, packageJsonUri: Uri) {

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import {`
`12`	`12`	`import { visit, JSONVisitor } from 'jsonc-parser';`
`13`	`13`	`import {`
`14`	`14`	`NpmTaskDefinition, getPackageJsonUriFromTask, getScripts,`
`15`		`- isWorkspaceFolder, getTaskName, createTask, extractDebugArgFromScript, startDebugging`
	`15`	`+ isWorkspaceFolder, getTaskName, createTask, extractDebugArgFromScript, startDebugging, isAutoDetectionEnabled`
`16`	`16`	`} from './tasks';`
`17`	`17`	`import * as nls from 'vscode-nls';`
`18`	`18`
`@@ -119,8 +119,8 @@ class NpmScript extends TreeItem {`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`class NoScripts extends TreeItem {`
`122`		`- constructor() {`
`123`		`- super(localize('noScripts', 'No scripts found'), TreeItemCollapsibleState.None);`
	`122`	`+ constructor(message: string) {`
	`123`	`+ super(message, TreeItemCollapsibleState.None);`
`124`	`124`	`this.contextValue = 'noscripts';`
`125`	`125`	`}`
`126`	`126`	`}`
`@@ -260,7 +260,11 @@ export class NpmScriptsTreeDataProvider implements TreeDataProvider<TreeItem> {`
`260`	`260`	`if (taskItems) {`
`261`	`261`	`this.taskTree = this.buildTaskTree(taskItems);`
`262`	`262`	`if (this.taskTree.length === 0) {`
`263`		`- this.taskTree = [new NoScripts()];`
	`263`	`+ let message = localize('noScripts', 'No scripts found.');`
	`264`	`+ if (!isAutoDetectionEnabled()) {`
	`265`	`+ message = localize('autoDetectIsOff', 'The setting "npm.autoDetect" is "off".');`
	`266`	`+ }`
	`267`	`+ this.taskTree = [new NoScripts(message)];`
`264`	`268`	`}`
`265`	`269`	`}`
`266`	`270`	`}`
Original file line number	Diff line number	Diff line change
`@@ -190,8 +190,8 @@ export async function provideNpmScripts(): Promise<Task[]> {`
`190`	`190`	`return cachedTasks;`
`191`	`191`	`}`
`192`	`192`
`193`		`-function isAutoDetectionEnabled(folder: WorkspaceFolder): boolean {`
`194`		`- return workspace.getConfiguration('npm', folder.uri).get<AutoDetect>('autoDetect') === 'on';`
	`193`	`+export function isAutoDetectionEnabled(folder?: WorkspaceFolder): boolean {`
	`194`	`+ return workspace.getConfiguration('npm', folder?.uri).get<AutoDetect>('autoDetect') === 'on';`
`195`	`195`	`}`
`196`	`196`
`197`	`197`	`function isExcluded(folder: WorkspaceFolder, packageJsonUri: Uri) {`