Correctly determine message type

gustavnikolaj · Jan 20, 2017 · bfe3936 · bfe3936
1 parent 04b5563
commit bfe3936
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lib/linting.js b/lib/linting.js
@@ -65,8 +65,8 @@ function lint (textEditor, reportError) {
       if (!report) return []
 
       const { filePath } = report
-      return report.messages.map(({ fatal, message: text, line, column, source }) => ({
-        type: fatal ? 'Error' : 'Warning',
+      return report.messages.map(({ message: text, line, column, severity, source }) => ({
+        type: severity === 2 ? 'Error' : 'Warning',
         text,
         filePath,
         range: getRange(line, column, source)

diff --git a/test/lib/linting.spec.js b/test/lib/linting.spec.js
@@ -41,7 +41,7 @@ describe('lib/linting', () => {
             },
             {
               ruleId: 'no-unused-vars',
-              severity: 2,
+              severity: 1,
               message: '"foo" is defined but never used',
               line: 1,
               column: 5,
@@ -59,7 +59,7 @@ describe('lib/linting', () => {
               fix: { range: [10, 15], text: "'bar'" }
             },
             {
-              fatal: true,
+              severity: 2,
               message: 'Made up message to test fallback code paths'
             }
           ],
@@ -75,7 +75,7 @@ describe('lib/linting', () => {
       })
       return expect(linting.lint(textEditor), 'to be fulfilled').then(report => expect(report, 'to equal', [
         {
-          type: 'Warning',
+          type: 'Error',
           text: 'Newline required at end of file but not found.',
           filePath,
           range: [ [ 0, 0 ], [ 0, 1 ] ]
@@ -87,7 +87,7 @@ describe('lib/linting', () => {
           range: [ [ 0, 1 ], [ 0, 4 ] ]
         },
         {
-          type: 'Warning',
+          type: 'Error',
           text: 'Strings must use singlequote.',
           filePath,
           range: [ [ 0, 1 ], [ 0, 10 ] ]