Fixes microsoft#1203: Using eslint.nodePath globally rather than lo…

…cally, yet on every new window: `The eslint.nodePath setting requires user confirmation. To do so execute the Select Node Path command.`

CHANGELOG.md

@@ -1,3 +1,7 @@
+### 2.1.19
+
+- fixe [Using `eslint.nodePath` globally rather than locally, yet on every new window: `The eslint.nodePath setting requires user confirmation. To do so execute the Select Node Path command.`](https://github.com/microsoft/vscode-eslint/issues/1203)
+
 ### 2.1.18
 
 - warn about nodePath values being defined separately in the workspace folder although a multi workspace folder setup is open.

client/src/extension.ts

@@ -1312,9 +1312,10 @@ function realActivate(context: ExtensionContext): void {
 		} else {
 			// The setting is not confirmed. So always take the global value.
 			value = (inspect.globalValue ?? inspect.defaultValue ?? undefined) as (T | undefined | null);
-			// If confirmedSettings is undefined we need to check whether there was a value local that is different from the
-			// global value. If so still take the global value but let the user know that he can confirm a local value.
-			if (confirmedSettings === undefined && (inspect.workspaceValue !== value || inspect.workspaceFolderValue !== value)) {
+			// If confirmedSettings is undefined we need to check whether there was a value local either as a workspace or
+			// workspace folder value. It is enough to check for undefined since values not in scope default to undefined (e.g.
+			// the folder value is undefined if a workspace is open).
+			if (confirmedSettings === undefined && (inspect.workspaceValue !== undefined || inspect.workspaceFolderValue !== undefined)) {
 				confirm = true;
 			}
 		}

package.json

@@ -2,7 +2,7 @@
 	"name": "vscode-eslint",
 	"displayName": "ESLint",
 	"description": "Integrates ESLint JavaScript into VS Code.",
-	"version": "2.1.18",
+	"version": "2.1.19",
 	"author": "Microsoft Corporation",
 	"license": "MIT",
 	"repository": {