updating global linter as fallback

package.json

@@ -69,7 +69,7 @@
       "title": "Global ESLint",
       "properties": {
         "useGlobalEslint": {
-          "title": "Use global ESLint installation",
+          "title": "Always use global ESLint installation",
           "description": "Make sure you have it in your $PATH",
           "type": "boolean",
           "default": false,

spec/linter-eslint-spec.js

@@ -530,9 +530,9 @@ describe('The eslint provider for Linter', () => {
 
     it('errors when no config file is found', async () => {
       const messages = await lint(editor)
-      const expected = 'Error while running ESLint: No ESLint configuration found..'
+      const expected = 'Error while running ESLint: ESLint not found, please add a local eslint to this project or ensure the global Node path is set correctly and turned on.'
       const description = `<div style="white-space: pre-wrap">No ESLint configuration found.
-<hr />Error: No ESLint configuration found.
+<hr />Error: ESLint not found, please add a local eslint to this project or ensure the global Node path is set correctly and turned on.
     at Config.getLocalConfigHierarchy`
       // The rest of the description includes paths specific to the computer running it
       expect(messages.length).toBe(1)

spec/worker-helpers-spec.js

@@ -62,14 +62,25 @@ describe('Worker Helpers', () => {
       expect(foundEslint.type).toEqual('global')
     })
 
-    it('falls back to the packaged eslint when no local eslint is found', () => {
+    it('falls back to the global eslint when no local eslint is found and global is turned on', () => {
       const modulesDir = 'not/a/real/path'
-      const config = createConfig({ global: { useGlobalEslint: false } })
+      const config = createConfig({ global: { useGlobalEslint: true, globalNodePath } })
       const foundEslint = Helpers.findESLintDirectory(modulesDir, config)
-      const expectedBundledPath = Path.join(__dirname, '..', 'node_modules', 'eslint')
-      expect(foundEslint.path).toEqual(expectedBundledPath)
-      expect(foundEslint.type).toEqual('bundled fallback')
+      const expectedEslintPath = process.platform === 'win32'
+        ? Path.join(globalNodePath, 'node_modules', 'eslint')
+        : Path.join(globalNodePath, 'lib', 'node_modules', 'eslint')
+      expect(foundEslint.path).toEqual(expectedEslintPath)
+      expect(foundEslint.type).toEqual('global')
     })
+
+    // it('falls back to the packaged eslint when no local or global eslint is found', () => {
+    //   const modulesDir = 'not/a/real/path'
+    //   const config = createConfig({ global: { useGlobalEslint: false } })
+    //   const foundEslint = Helpers.findESLintDirectory(modulesDir, config)
+    //   const expectedBundledPath = Path.join(__dirname, '..', 'node_modules', 'eslint')
+    //   expect(foundEslint.path).toEqual(expectedBundledPath)
+    //   expect(foundEslint.type).toEqual('bundled fallback')
+    // })
   })
 
   describe('getESLintInstance && getESLintFromDirectory', () => {

src/worker-helpers.js

@@ -49,35 +49,47 @@ function isDirectory(dirPath) {
 }
 
 export function findESLintDirectory(modulesDir, config, projectPath) {
+  const { localNodeModules } = config.advanced
+  const { useGlobalEslint, globalNodePath } = config.global
+  const { disableWhenNoEslintConfig } = config.disabling
+
   let eslintDir = null
   let locationType = null
-  if (config.global.useGlobalEslint) {
+
+  if (localNodeModules) {
+    // look for local eslint in dir provided by user
+    locationType = 'advanced specified'
+    // account for absolute path, if one was specified
+    eslintDir = Path.isAbsolute(cleanPath(localNodeModules))
+      ? Path.join(cleanPath(localNodeModules), 'eslint')
+      : Path.join(projectPath || '', cleanPath(localNodeModules), 'eslint')
+  } else if (!useGlobalEslint) {
+  // otherwise look in the default location
+    locationType = 'local project'
+    eslintDir = Path.join(modulesDir || '', 'eslint')
+  }
+
+  if (!isDirectory(eslintDir) && useGlobalEslint) {
+    // global fallback
     locationType = 'global'
-    const configGlobal = cleanPath(config.global.globalNodePath)
+    const configGlobal = cleanPath(globalNodePath)
     const prefixPath = configGlobal || getNodePrefixPath()
     // NPM on Windows and Yarn on all platforms
     eslintDir = Path.join(prefixPath, 'node_modules', 'eslint')
     if (!isDirectory(eslintDir)) {
       // NPM on platforms other than Windows
       eslintDir = Path.join(prefixPath, 'lib', 'node_modules', 'eslint')
     }
-  } else if (!config.advanced.localNodeModules) {
-    locationType = 'local project'
-    eslintDir = Path.join(modulesDir || '', 'eslint')
-  } else if (Path.isAbsolute(cleanPath(config.advanced.localNodeModules))) {
-    locationType = 'advanced specified'
-    eslintDir = Path.join(cleanPath(config.advanced.localNodeModules), 'eslint')
-  } else {
-    locationType = 'advanced specified'
-    eslintDir = Path.join(projectPath || '', cleanPath(config.advanced.localNodeModules), 'eslint')
   }
+
   if (isDirectory(eslintDir)) {
     return {
       path: eslintDir,
       type: locationType,
     }
-  } else if (config.global.useGlobalEslint) {
-    throw new Error('ESLint not found, please ensure the global Node path is set correctly.')
+  }
+  if (!disableWhenNoEslintConfig && !isDirectory(eslintDir)) {
+    throw new Error('ESLint not found, please add a local eslint to this project or ensure the global Node path is set correctly and turned on')
   }
   return {
     path: Cache.ESLINT_LOCAL_PATH,