Merge pull request #148 from AtomLinter/es2015-rewrite

Rewrite in ES2015

Author: Arcanemagus

lib/main.coffee

@@ -0,0 +1,104 @@
+'use babel';
+
+/* eslint-disable import/extensions, import/no-extraneous-dependencies */
+import { CompositeDisposable } from 'atom';
+/* eslint-enable import/extensions, import/no-extraneous-dependencies */
+
+let helpers = null;
+let path = null;
+
+export default {
+  activate() {
+    require('atom-package-deps').install('linter-csslint');
+
+    this.subscriptions = new CompositeDisposable();
+    this.subscriptions.add(
+      atom.config.observe('linter-csslint.disableTimeout', (value) => {
+        this.disableTimeout = value;
+      })
+    );
+  },
+
+  deactivate() {
+    this.subscriptions.dispose();
+  },
+
+  provideLinter() {
+    return {
+      name: 'CSSLint',
+      grammarScopes: ['source.css', 'source.html'],
+      scope: 'file',
+      lintOnFly: true,
+      lint(textEditor) {
+        if (!helpers) {
+          helpers = require('atom-linter');
+        }
+        if (!path) {
+          path = require('path');
+        }
+        const filePath = textEditor.getPath();
+        const text = textEditor.getText();
+        if (text.length === 0) {
+          return Promise.resolve([]);
+        }
+        const parameters = ['--format=json', '-'];
+        const exec = path.join(__dirname, '..', 'node_modules', 'atomlinter-csslint', 'cli.js');
+        const projectPath = atom.project.relativizePath(filePath)[0];
+        let cwd = projectPath;
+        if (!(cwd)) {
+          cwd = path.dirname(filePath);
+        }
+        const options = { stdin: text, cwd };
+        if (this.disableTimeout) {
+          options.timeout = Infinity;
+        }
+        return helpers.execNode(exec, parameters, options).then((output) => {
+          if (textEditor.getText() !== text) {
+            // The editor contents have changed, tell Linter not to update
+            return null;
+          }
+
+          const toReturn = [];
+          if (output.length < 1) {
+            // No output, no errors
+            return toReturn;
+          }
+
+          const lintResult = JSON.parse(output);
+
+          if (lintResult.messages.length < 1) {
+            // Output, but no errors found
+            return toReturn;
+          }
+
+          lintResult.messages.forEach((data) => {
+            let line;
+            let col;
+            if (!(data.line && data.col)) {
+              // Use the file start if a location wasn't defined
+              [line, col] = [0, 0];
+            } else {
+              [line, col] = [data.line - 1, data.col - 1];
+            }
+
+            const msg = {
+              type: data.type.charAt(0).toUpperCase() + data.type.slice(1),
+              text: data.message,
+              filePath,
+              range: helpers.rangeFromLineNumber(textEditor, line, col),
+            };
+
+            if (data.rule.id && data.rule.desc) {
+              msg.trace = [{
+                type: 'Trace',
+                text: `[${data.rule.id}] ${data.rule.desc}`,
+              }];
+            }
+            toReturn.push(msg);
+          });
+          return toReturn;
+        });
+      },
+    };
+  },
+};

lib/main.js

@@ -11,6 +11,7 @@
   "description": "Lint CSS on the fly, using csslint",
   "repository": "https://github.com/AtomLinter/linter-csslint",
   "license": "MIT",
+  "private": true,
   "configSchema": {
     "disableTimeout": {
       "type": "boolean",
@@ -24,7 +25,6 @@
     "atom-package-deps": "^4.0.1"
   },
   "devDependencies": {
-    "coffeelint": "^1.15.0",
     "eslint": "^3.6.1",
     "eslint-config-airbnb-base": "^8.0.0",
     "eslint-plugin-import": "^1.16.0"
@@ -57,44 +57,6 @@
       "node": true
     }
   },
-  "coffeelintConfig": {
-    "max_line_length": {
-      "value": 120,
-      "level": "warn"
-    },
-    "no_empty_param_list": {
-      "level": "error"
-    },
-    "arrow_spacing": {
-      "level": "error"
-    },
-    "no_interpolation_in_single_quotes": {
-      "level": "error"
-    },
-    "no_debugger": {
-      "level": "error"
-    },
-    "prefer_english_operator": {
-      "level": "error"
-    },
-    "colon_assignment_spacing": {
-      "spacing": {
-        "left": 0,
-        "right": 1
-      },
-      "level": "error"
-    },
-    "braces_spacing": {
-      "spaces": 0,
-      "level": "error"
-    },
-    "spacing_after_comma": {
-      "level": "error"
-    },
-    "no_stand_alone_at": {
-      "level": "error"
-    }
-  },
   "providedServices": {
     "linter": {
       "versions": {

package.json

@@ -10,7 +10,7 @@ const projectPath = path.join(__dirname, 'fixtures', 'project');
 const projectBadPath = path.join(projectPath, 'files', 'badWC.css');
 
 describe('The csslint provider for Linter', () => {
-  const lint = require('../lib/main.coffee').provideLinter().lint;
+  const lint = require('../lib/main.js').provideLinter().lint;
 
   beforeEach(() => {
     atom.workspace.destroyActivePaneItem();
@@ -44,7 +44,7 @@ describe('The csslint provider for Linter', () => {
           expect(messages[0].type).toBe('Warning');
           expect(messages[0].text).toBe('Rule is empty.');
           expect(messages[0].filePath).toBe(badPath);
-          expect(messages[0].range).toEqual([[0, 0], [0, 0]]);
+          expect(messages[0].range).toEqual([[0, 0], [0, 4]]);
         })
       )
     );
@@ -72,7 +72,7 @@ describe('The csslint provider for Linter', () => {
           expect(messages[0].type).toBe('Error');
           expect(messages[0].text).toBe('Unexpected token \'}\' at line 1, col 1.');
           expect(messages[0].filePath).toBe(invalidPath);
-          expect(messages[0].range).toEqual([[0, 0], [0, 0]]);
+          expect(messages[0].range).toEqual([[0, 0], [0, 1]]);
         })
       )
     );