Update to Linter v2 and use ranges

Update to the v2 Linter API. Also moves to generating a range for errors
when clang doesn't provide us one in the first place, leading to a
_much_ better user experience.

Author: Arcanemagus

lib/main.js

@@ -5,6 +5,7 @@ import { CompositeDisposable } from 'atom';
 
 let helpers = null;
 let clangFlags = null;
+const regex = /(.+):(\d+):(\d+):(?:{(\d+):(\d+)-(\d+):(\d+)}.*:)? ([\w \\-]+): (.*)/g;
 
 export default {
   activate() {
@@ -57,11 +58,10 @@ export default {
   },
 
   provideLinter() {
-    const regex = '(?<file>.+):(?<line>\\d+):(?<col>\\d+):({(?<lineStart>\\d+):(?<colStart>\\d+)-(?<lineEnd>\\d+):(?<colEnd>\\d+)}.*:)? (?<type>[\\w \\-]+): (?<message>.*)';
     return {
       name: 'clang',
       scope: 'file',
-      lintOnFly: false,
+      lintsOnChange: false,
       grammarScopes: ['source.c', 'source.cpp', 'source.objc', 'source.objcpp'],
       lint: async (editor) => {
         if (helpers === null) {
@@ -146,7 +146,32 @@ export default {
           return null;
         }
 
-        return helpers.parse(output, regex);
+        const toReturn = [];
+        let match = regex.exec(output);
+
+        while (match !== null) {
+          let position;
+          if (match[4] !== undefined) {
+            const lineStart = Number.parseInt(match[4], 10) - 1;
+            const colStart = Number.parseInt(match[5], 10) - 1;
+            const lineEnd = Number.parseInt(match[6], 10) - 1;
+            const colEnd = Number.parseInt(match[7], 10) - 1;
+            position = [[lineStart, colStart], [lineEnd, colEnd]];
+          } else {
+            const line = Number.parseInt(match[2], 10) - 1;
+            const col = Number.parseInt(match[3], 10) - 1;
+            position = helpers.generateRange(editor, line, col);
+          }
+          const severity = /error/.test(match[8]) ? 'error' : 'warning';
+          toReturn.push({
+            severity,
+            location: { file: match[1], position },
+            excerpt: match[9],
+          });
+          match = regex.exec(output);
+        }
+
+        return toReturn;
       },
     };
   },

package.json

@@ -54,13 +54,13 @@
   "providedServices": {
     "linter": {
       "versions": {
-        "1.0.0": "provideLinter"
+        "2.0.0": "provideLinter"
       }
     }
   },
   "dependencies": {
     "atom-linter": "^9.0.0",
-    "atom-package-deps": "^4.0.1",
+    "atom-package-deps": "^4.5.0",
     "clang-flags": "^0.2.2"
   },
   "devDependencies": {
@@ -70,7 +70,7 @@
     "jasmine-fix": "^1.0.1"
   },
   "package-deps": [
-    "linter"
+    "linter:2.0.0"
   ],
   "eslintConfig": {
     "extends": "airbnb-base",

spec/linter-clang-spec.js

@@ -26,32 +26,40 @@ describe('The Clang provider for AtomLinter', () => {
       const editor = await atom.workspace.open(`${miPath}.c`);
       const messages = await lint(editor);
       expect(messages.length).toBe(1);
-      expect(messages[0].type).toBe('fatal error');
-      expect(messages[0].text).toBe("'nothing.h' file not found");
+      expect(messages[0].severity).toBe('error');
+      expect(messages[0].excerpt).toBe("'nothing.h' file not found");
+      expect(messages[0].location.file).toBe(`${miPath}.c`);
+      expect(messages[0].location.position).toEqual([[1, 9], [1, 17]]);
     });
 
     it('finds a fatal error in "missing_import.cpp"', async () => {
       const editor = await atom.workspace.open(`${miPath}.cpp`);
       const messages = await lint(editor);
       expect(messages.length).toBe(1);
-      expect(messages[0].type).toEqual('fatal error');
-      expect(messages[0].text).toEqual("'nothing.h' file not found");
+      expect(messages[0].severity).toBe('error');
+      expect(messages[0].excerpt).toBe("'nothing.h' file not found");
+      expect(messages[0].location.file).toBe(`${miPath}.cpp`);
+      expect(messages[0].location.position).toEqual([[1, 9], [1, 17]]);
     });
 
     it('finds a fatal error in "missing_import.m"', async () => {
       const editor = await atom.workspace.open(`${miPath}.m`);
       const messages = await lint(editor);
       expect(messages.length).toBe(1);
-      expect(messages[0].type).toEqual('fatal error');
-      expect(messages[0].text).toEqual("'nothing.h' file not found");
+      expect(messages[0].severity).toBe('error');
+      expect(messages[0].excerpt).toBe("'nothing.h' file not found");
+      expect(messages[0].location.file).toBe(`${miPath}.m`);
+      expect(messages[0].location.position).toEqual([[1, 9], [1, 17]]);
     });
 
     it('finds a fatal error in "missing_import.mm"', async () => {
       const editor = await atom.workspace.open(`${miPath}.mm`);
       const messages = await lint(editor);
       expect(messages.length).toBe(1);
-      expect(messages[0].type).toEqual('fatal error');
-      expect(messages[0].text).toEqual("'nothing.h' file not found");
+      expect(messages[0].severity).toBe('error');
+      expect(messages[0].excerpt).toBe("'nothing.h' file not found");
+      expect(messages[0].location.file).toBe(`${miPath}.mm`);
+      expect(messages[0].location.position).toEqual([[1, 9], [1, 17]]);
     });
   });
 });