Merge pull request #99 from AtomLinter/arcanemagus/cleanup

Cleanup and bugfixes

Author: Arcanemagus

CONTRIBUTING.md

@@ -11,7 +11,7 @@ If you would like to contribute enhancements or fixes, please do the following:
 Please note that modifications should follow these coding guidelines:
 
 -   Indent is 2 spaces.
--   Code should pass coffeelint linter.
+-   Code should pass ESLint linter (`npm run lint`).
 -   Vertical whitespace helps readability, don’t be afraid to use it.
 
 Thank you for helping out!

lib/main.js

@@ -1,62 +1,65 @@
 'use babel';
 
+import * as helpers from 'atom-linter';
+import { extname } from 'path';
+// eslint-disable-next-line import/extensions, import/no-extraneous-dependencies
+import { CompositeDisposable } from 'atom';
+
 export default {
-  config: {
-    rubyExecutablePath: {
-      type: 'string',
-      default: 'ruby',
-    },
-    ignoredExtensions: {
-      type: 'array',
-      default: ['erb', 'md'],
-      items: {
-        type: 'string',
-      },
-    },
+  activate() {
+    require('atom-package-deps').install('linter-ruby');
+
+    this.subscriptions = new CompositeDisposable();
+    this.subscriptions.add(atom.config.observe('linter-ruby.rubyExecutablePath',
+      (value) => { this.executablePath = value; }));
+    this.subscriptions.add(atom.config.observe('linter-ruby.ignoredExtensions',
+      (value) => { this.ignoredExtensions = value; }));
   },
 
-  activate: () => {
-    // We are now using steelbrain's package dependency package to install our
-    //  dependencies.
-    require('atom-package-deps').install();
+  deactivate() {
+    this.subscriptions.dispose();
   },
 
-  provideLinter: () => {
-    const helpers = require('atom-linter');
-    const Path = require('path');
-    const regex = /.+:(\d+):\s*(.+?)[,:]\s(.+)/;
+  provideLinter() {
+    const regex = /.+:(\d+):\s*(.+?)[,:]\s(.+)/g;
     return {
       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 filePath = activeEditor.getPath();
-        const fileExtension = Path.extname(filePath).substr(1);
+      lint: async (textEditor) => {
+        const filePath = textEditor.getPath();
+        const fileText = textEditor.getText();
+        const fileExtension = extname(filePath).substr(1);
 
-        if (ignored.includes(fileExtension)) {
+        if (this.ignoredExtensions.includes(fileExtension)) {
           return [];
         }
 
-        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, msgLine),
-              type: matches[2],
-              text: matches[3],
-              filePath,
-            });
+        const execArgs = ['-wc', '-Eutf-8'];
+        const execOpts = {
+          stdin: fileText,
+          stream: 'stderr',
+          allowEmptyStderr: true,
+        };
+        const output = await helpers.exec(this.executablePath, execArgs, execOpts);
+        if (textEditor.getText() !== fileText) {
+          // File contents have changed, just tell Linter not to update messages
+          return null;
+        }
+        const toReturn = [];
+        let match = regex.exec(output);
+        while (match !== null) {
+          const msgLine = Number.parseInt(match[1] - 1, 10);
+          toReturn.push({
+            range: helpers.rangeFromLineNumber(textEditor, msgLine),
+            type: match[2],
+            text: match[3],
+            filePath,
           });
-          return toReturn;
-        });
+          match = regex.exec(output);
+        }
+        return toReturn;
       },
     };
   },

package.json

@@ -6,12 +6,25 @@
   "repository": "https://github.com/AtomLinter/linter-ruby",
   "license": "MIT",
   "engines": {
-    "atom": ">0.180.0"
+    "atom": ">=1.4.0 <2.0.0"
   },
   "activationHooks": [
     "language-ruby:grammar-used",
     "language-ruby-on-rails:grammar-used"
   ],
+  "configSchema": {
+    "rubyExecutablePath": {
+      "type": "string",
+      "default": "ruby"
+    },
+    "ignoredExtensions": {
+      "type": "array",
+      "default": ["erb", "md"],
+      "items": {
+        "type": "string"
+      }
+    }
+  },
   "providedServices": {
     "linter": {
       "versions": {