Merge pull request #4 from AtomLinter/tests-added

Get some more tests working

Author: savetheclocktower

lib/config.js

@@ -1,5 +1,6 @@
 'use babel';
 import { CompositeDisposable, Disposable } from 'atom';
+import get from 'lodash.get';
 
 import console from './console';
 
@@ -56,24 +57,23 @@ const Config = {
     try {
       this.overrides = JSON.parse(this.configFile.readSync());
     } catch (err) {
-      console.error('Linter ESLint v8: Error parsing .linter-eslint file', err);
+      console.error('Error parsing .linter-eslint file', err);
       this.overrides = {};
     }
     this.triggerConfigChange();
   },
 
   get (keyName = null) {
-    if (!keyName) {
-      return Object.assign(
-        {},
-        atom.config.get('linter-eslint-node'),
-        this.overrides
-      );
-    }
-    if (keyName in this.overrides) {
-      return this.overrides[keyName];
-    }
-    return atom.config.get(`linter-eslint-node.${keyName}`);
+    // TODO: Once we're certain that no config changes will go unnoticed by us,
+    // we could just reuse this._currentConfig instead of building a new object
+    // every time.
+    let config = Object.assign(
+      {},
+      atom.config.get('linter-eslint-node'),
+      this.overrides
+    );
+    if (!keyName) { return config; }
+    return get(config, keyName);
   },
 
   triggerConfigChange () {

lib/job-manager.js

@@ -85,8 +85,6 @@ class JobManager {
         this.createWorker();
       }
     });
-
-    console.log('Created worker:', this.worker);
   }
 
   killWorker () {
@@ -102,7 +100,10 @@ class JobManager {
   }
 
   receiveMessage (data) {
-    console.debug('receiveMessage:', data);
+    if (data.log) {
+      console.log('WORKER LOG:', data.log);
+      return;
+    }
     let key = data.key;
     if (!key) {
       throw new Error(`Received message from worker without key`);
@@ -122,6 +123,10 @@ class JobManager {
   // just throw an error and let it get handled elsewhere.
   receiveError (data) {
     if (typeof data === 'object' && data.key) {
+      if (!this.handlersForJobs.has(data.key)) {
+        // Assume this has already been handled and silently fail.
+        return;
+      }
       let [, reject] = this.handlersForJobs.get(data.key);
       this.handlersForJobs.delete(data.key);
       reject(data);

lib/main.js

@@ -43,7 +43,6 @@ export default {
   async activate () {
     Config.initialize();
     this.workerPath = Path.join(__dirname, 'worker.js');
-    NodePathTester.test(Config.get('nodeBin'));
     this.jobManager = new JobManager();
 
     // Keep track of whether the user has seen certain notifications. Absent
@@ -159,6 +158,29 @@ export default {
             this.clearESLintCache();
           }
         }
+      }),
+
+      // Add item to editor context menu.
+      atom.contextMenu.add({
+        'atom-text-editor:not(.mini), .overlayer': [{
+          label: 'ESLint Fix',
+          command: 'linter-eslint-node:fix-file',
+          shouldDisplay: (evt) => {
+            const activeEditor = atom.workspace.getActiveTextEditor();
+            if (!activeEditor) {
+              return false;
+            }
+            // Black magic!
+            // Compares the private component property of the active TextEditor
+            //   against the components of the elements
+            const evtIsActiveEditor = evt.path.some((elem) => (
+              // Atom v1.19.0+
+              elem.component && activeEditor.component
+                && elem.component === activeEditor.component));
+            // Only show if it was the active editor and it is a valid scope
+            return evtIsActiveEditor && helpers.hasValidScope(activeEditor, Config.get('scopes'));
+          }
+        }]
       })
     );
 
@@ -377,6 +399,19 @@ export default {
       return;
     }
 
+    if (err.type && err.type === 'config-not-found') {
+      if (Config.get('disabling.disableWhenNoEslintConfig')) {
+        return;
+      }
+      atom.notifications.addError(
+        `linter-eslint-node: No .eslintrc found`,
+        {
+          description: err.error,
+          dismissable: false
+        }
+      );
+    }
+
     if (err.type && err.type === 'no-project') {
       // No project means nowhere to look for an `.eslintrc`.
       return;
@@ -519,7 +554,7 @@ export default {
           return filteredResults;
         } catch (err) {
           this.handleError(err);
-          return null;
+          return [];
         }
       }
     };