Merge pull request #98 from AtomLinter/arcanemagus/fix-eslint

Configure ESLint and cleanup code

Author: Arcanemagus

lib/main.js

@@ -1,62 +1,63 @@
-"use babel";
+'use babel';
 
 export default {
   config: {
     rubyExecutablePath: {
-      type: "string",
-      default: "ruby"
+      type: 'string',
+      default: 'ruby',
     },
     ignoredExtensions: {
       type: 'array',
       default: ['erb', 'md'],
       items: {
-        type: 'string'
-      }
-    }
+        type: 'string',
+      },
+    },
   },
 
   activate: () => {
     // We are now using steelbrain's package dependency package to install our
     //  dependencies.
-    require("atom-package-deps").install();
+    require('atom-package-deps').install();
   },
 
   provideLinter: () => {
-    const helpers = require("atom-linter");
-    const Path = require("path");
+    const helpers = require('atom-linter');
+    const Path = require('path');
     const regex = /.+:(\d+):\s*(.+?)[,:]\s(.+)/;
     return {
-      name: "Ruby",
-      grammarScopes: ["source.ruby", "source.ruby.rails", "source.ruby.rspec"],
-      scope: "file",
+      name: 'Ruby',
+      grammarScopes: ['source.ruby', 'source.ruby.rails', 'source.ruby.rspec'],
+      scope: 'file',
       lintOnFly: true,
       lint: (activeEditor) => {
-        const command = atom.config.get("linter-ruby.rubyExecutablePath");
-        const ignored = atom.config.get("linter-ruby.ignoredExtensions");
+        const command = atom.config.get('linter-ruby.rubyExecutablePath');
+        const ignored = atom.config.get('linter-ruby.ignoredExtensions');
         const filePath = activeEditor.getPath();
         const fileExtension = Path.extname(filePath).substr(1);
 
-        for (let extension of ignored) {
-          if (fileExtension === extension) return [];
+        if (ignored.includes(fileExtension)) {
+          return [];
         }
 
-        return helpers.exec(command, ['-wc', '-E utf-8'], {stdin: activeEditor.getText(), stream: 'stderr'}).then(output => {
-          var toReturn = [];
-          output.split(/\r?\n/).forEach(function (line) {
+        return helpers.exec(command, ['-wc', '-E utf-8'], { stdin: activeEditor.getText(), stream: 'stderr' }).then((output) => {
+          const toReturn = [];
+          output.split(/\r?\n/).forEach((line) => {
             const matches = regex.exec(line);
             if (matches === null) {
               return;
             }
+            const msgLine = Number.parseInt(matches[1] - 1, 10);
             toReturn.push({
-              range: helpers.rangeFromLineNumber(activeEditor, Number.parseInt((matches[1] - 1))),
+              range: helpers.rangeFromLineNumber(activeEditor, msgLine),
               type: matches[2],
               text: matches[3],
-              filePath: filePath
+              filePath,
             });
           });
           return toReturn;
         });
-      }
+      },
     };
-  }
+  },
 };

package.json

@@ -24,20 +24,34 @@
     "atom-package-deps": "^4.0.1"
   },
   "devDependencies": {
-    "eslint": "latest"
+    "eslint": "^3.9.1",
+    "eslint-config-airbnb-base": "^10.0.1",
+    "eslint-plugin-import": "^2.1.0"
   },
   "package-deps": [
     "linter"
   ],
+  "scripts": {
+    "lint": "eslint .",
+    "test": "apm test"
+  },
   "eslintConfig": {
+    "extends": "airbnb-base",
+    "rules": {
+      "global-require": "off",
+      "import/no-unresolved": [
+        "error",
+        {
+          "ignore": [
+            "atom"
+          ]
+        }
+      ]
+    },
     "env": {
-      "es6": true,
       "browser": true,
       "node": true
     },
-    "ecmaFeatures": {
-      "modules": true
-    },
     "globals": {
       "atom": true
     }