Add column index

jerone · jerone · commit d7194c1042f3 · 2022-08-22T16:55:41.000+02:00
diff --git a/src/index.js b/src/index.js
@@ -21,13 +21,12 @@ module.exports = (results = []) => {
   }
 
   function reportMessage(result) {
+    const lineColumn = `#${result.line}|${result.column}`;
     switch (result.severity) {
       case 2:
-        return `     ${prefixes.error} ${error("#" + result.line)}: ${
-          result.message
-        }`;
+        return `     ${prefixes.error} ${error(lineColumn)}: ${result.message}`;
       case 1:
-        return `     ${prefixes.warning} ${warning("#" + result.line)}: ${
+        return `     ${prefixes.warning} ${warning(lineColumn)}: ${
           result.message
         }`;
     }
diff --git a/tests/fixtures/mixed.json b/tests/fixtures/mixed.json
@@ -1,35 +1,65 @@
 [
   {
+    "errorCount": 0,
     "filePath": "index1.js",
     "messages": [
-      { "line": 1, "severity": 1, "message": "Unexpected console statement." },
-      { "line": 2, "severity": 1, "message": "Unexpected console statement." }
+      {
+        "column": 1,
+        "line": 1,
+        "message": "Unexpected console statement.",
+        "severity": 1
+      },
+      {
+        "column": 2,
+        "line": 2,
+        "message": "Unexpected console statement.",
+        "severity": 1
+      }
     ],
-    "errorCount": 0,
     "warningCount": 2
   },
   {
+    "errorCount": 2,
     "filePath": "index2.js",
     "messages": [
-      { "line": 1, "severity": 2, "message": "Unexpected console statement." },
-      { "line": 2, "severity": 2, "message": "Unexpected console statement." }
+      {
+        "column": 1,
+        "line": 1,
+        "message": "Unexpected console statement.",
+        "severity": 2
+      },
+      {
+        "column": 2,
+        "line": 2,
+        "message": "Unexpected console statement.",
+        "severity": 2
+      }
     ],
-    "errorCount": 2,
     "warningCount": 0
   },
   {
+    "errorCount": 1,
     "filePath": "index3.js",
     "messages": [
-      { "line": 1, "severity": 1, "message": "Unexpected console statement." },
-      { "line": 2, "severity": 2, "message": "Unexpected console statement." }
+      {
+        "column": 1,
+        "line": 1,
+        "message": "Unexpected console statement.",
+        "severity": 1
+      },
+      {
+        "column": 2,
+        "line": 2,
+        "message": "Unexpected console statement.",
+        "severity": 2
+      }
     ],
-    "errorCount": 1,
     "warningCount": 1
   },
   {
+    "errorCount": 0,
     "filePath": "index4.js",
     "messages": [],
-    "errorCount": 0,
     "warningCount": 0
   }
 ]
diff --git a/tests/fixtures/multiple-errors.json b/tests/fixtures/multiple-errors.json
@@ -2,17 +2,37 @@
   {
     "filePath": "index1.js",
     "messages": [
-      { "line": 1, "severity": 1, "message": "Unexpected console statement." },
-      { "line": 2, "severity": 2, "message": "Unexpected console statement." }
+      {
+        "column": 1,
+        "line": 1,
+        "severity": 1,
+        "message": "Unexpected console statement."
+      },
+      {
+        "column": 2,
+        "line": 2,
+        "severity": 2,
+        "message": "Unexpected console statement."
+      }
     ],
     "errorCount": 1,
     "warningCount": 1
   },
   {
     "filePath": "index2.js",
     "messages": [
-      { "line": 1, "severity": 1, "message": "Unexpected console statement." },
-      { "line": 2, "severity": 2, "message": "Unexpected console statement." }
+      {
+        "column": 1,
+        "line": 1,
+        "severity": 1,
+        "message": "Unexpected console statement."
+      },
+      {
+        "column": 2,
+        "line": 2,
+        "severity": 2,
+        "message": "Unexpected console statement."
+      }
     ],
     "errorCount": 1,
     "warningCount": 1
diff --git a/tests/fixtures/multiple-warnings.json b/tests/fixtures/multiple-warnings.json
@@ -1,20 +1,40 @@
 [
   {
+    "errorCount": 0,
     "filePath": "index1.js",
     "messages": [
-      { "line": 1, "severity": 1, "message": "Unexpected console statement." },
-      { "line": 2, "severity": 1, "message": "Unexpected console statement." }
+      {
+        "column": 1,
+        "line": 1,
+        "message": "Unexpected console statement.",
+        "severity": 1
+      },
+      {
+        "column": 2,
+        "line": 2,
+        "message": "Unexpected console statement.",
+        "severity": 1
+      }
     ],
-    "errorCount": 0,
     "warningCount": 2
   },
   {
+    "errorCount": 0,
     "filePath": "index2.js",
     "messages": [
-      { "line": 1, "severity": 1, "message": "Unexpected console statement." },
-      { "line": 2, "severity": 1, "message": "Unexpected console statement." }
+      {
+        "column": 1,
+        "line": 1,
+        "message": "Unexpected console statement.",
+        "severity": 1
+      },
+      {
+        "column": 2,
+        "line": 2,
+        "message": "Unexpected console statement.",
+        "severity": 1
+      }
     ],
-    "errorCount": 0,
     "warningCount": 2
   }
 ]
diff --git a/tests/fixtures/single-error.json b/tests/fixtures/single-error.json
@@ -1,11 +1,21 @@
 [
   {
+    "errorCount": 1,
     "filePath": "index1.js",
     "messages": [
-      { "line": 1, "severity": 1, "message": "Unexpected console statement." },
-      { "line": 2, "severity": 2, "message": "Unexpected console statement." }
+      {
+        "column": 1,
+        "line": 1,
+        "message": "Unexpected console statement.",
+        "severity": 1
+      },
+      {
+        "column": 2,
+        "line": 2,
+        "message": "Unexpected console statement.",
+        "severity": 2
+      }
     ],
-    "errorCount": 1,
     "warningCount": 1
   }
 ]
diff --git a/tests/fixtures/single-warning.json b/tests/fixtures/single-warning.json
@@ -1,10 +1,15 @@
 [
   {
+    "errorCount": 0,
     "filePath": "index1.js",
     "messages": [
-      { "line": 1, "severity": 1, "message": "Unexpected console statement." }
+      {
+        "column": 1,
+        "line": 1,
+        "message": "Unexpected console statement.",
+        "severity": 1
+      }
     ],
-    "errorCount": 0,
     "warningCount": 1
   }
 ]
diff --git a/tests/index.test.js b/tests/index.test.js
@@ -14,8 +14,8 @@ describe("single file", () => {
     const output = formatter(fixtureSingleError);
     expect(output).toBe(`\
   ✗ ${error("index1.js")}
-     ⚡ ${warning("#1")}: Unexpected console statement.
-     ✗ ${error("#2")}: Unexpected console statement.
+     ⚡ ${warning("#1|1")}: Unexpected console statement.
+     ✗ ${error("#2|2")}: Unexpected console statement.
 
 ✗ ${error("Error!")} » 1 error and 1 warning in 1 file`);
   });
@@ -24,7 +24,7 @@ describe("single file", () => {
     const output = formatter(fixtureSingleWarning);
     expect(output).toBe(`\
   ⚡ ${warning("index1.js")}
-     ⚡ ${warning("#1")}: Unexpected console statement.
+     ⚡ ${warning("#1|1")}: Unexpected console statement.
 
 ⚡ ${warning("Warning!")} » 0 errors and 1 warning in 1 file`);
   });
@@ -43,11 +43,11 @@ describe("multiple files", () => {
     const output = formatter(fixtureMultipleErrors);
     expect(output).toBe(`\
   ✗ ${error("index1.js")}
-     ⚡ ${warning("#1")}: Unexpected console statement.
-     ✗ ${error("#2")}: Unexpected console statement.
+     ⚡ ${warning("#1|1")}: Unexpected console statement.
+     ✗ ${error("#2|2")}: Unexpected console statement.
   ✗ ${error("index2.js")}
-     ⚡ ${warning("#1")}: Unexpected console statement.
-     ✗ ${error("#2")}: Unexpected console statement.
+     ⚡ ${warning("#1|1")}: Unexpected console statement.
+     ✗ ${error("#2|2")}: Unexpected console statement.
 
 ✗ ${error("Error!")} » 2 errors and 2 warnings in 2 files`);
   });
@@ -56,11 +56,11 @@ describe("multiple files", () => {
     const output = formatter(fixtureMultipleWarnings);
     expect(output).toBe(`\
   ⚡ ${warning("index1.js")}
-     ⚡ ${warning("#1")}: Unexpected console statement.
-     ⚡ ${warning("#2")}: Unexpected console statement.
+     ⚡ ${warning("#1|1")}: Unexpected console statement.
+     ⚡ ${warning("#2|2")}: Unexpected console statement.
   ⚡ ${warning("index2.js")}
-     ⚡ ${warning("#1")}: Unexpected console statement.
-     ⚡ ${warning("#2")}: Unexpected console statement.
+     ⚡ ${warning("#1|1")}: Unexpected console statement.
+     ⚡ ${warning("#2|2")}: Unexpected console statement.
 
 ⚡ ${warning("Warning!")} » 0 errors and 4 warnings in 2 files`);
   });
@@ -78,14 +78,14 @@ describe("multiple files", () => {
     const output = formatter(fixtureMixed);
     expect(output).toBe(`\
   ⚡ ${warning("index1.js")}
-     ⚡ ${warning("#1")}: Unexpected console statement.
-     ⚡ ${warning("#2")}: Unexpected console statement.
+     ⚡ ${warning("#1|1")}: Unexpected console statement.
+     ⚡ ${warning("#2|2")}: Unexpected console statement.
   ✗ ${error("index2.js")}
-     ✗ ${error("#1")}: Unexpected console statement.
-     ✗ ${error("#2")}: Unexpected console statement.
+     ✗ ${error("#1|1")}: Unexpected console statement.
+     ✗ ${error("#2|2")}: Unexpected console statement.
   ✗ ${error("index3.js")}
-     ⚡ ${warning("#1")}: Unexpected console statement.
-     ✗ ${error("#2")}: Unexpected console statement.
+     ⚡ ${warning("#1|1")}: Unexpected console statement.
+     ✗ ${error("#2|2")}: Unexpected console statement.
   ✓ ${success("index4.js")}
 
 ✗ ${error("Error!")} » 3 errors and 3 warnings in 4 files`);

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,15 @@`
`1`	`1`	`[`
`2`	`2`	`{`
	`3`	`+ "errorCount": 0,`
`3`	`4`	`"filePath": "index1.js",`
`4`	`5`	`"messages": [`
`5`		`- { "line": 1, "severity": 1, "message": "Unexpected console statement." }`
	`6`	`+ {`
	`7`	`+ "column": 1,`
	`8`	`+ "line": 1,`
	`9`	`+ "message": "Unexpected console statement.",`
	`10`	`+ "severity": 1`
	`11`	`+ }`
`6`	`12`	`],`
`7`		`- "errorCount": 0,`
`8`	`13`	`"warningCount": 1`
`9`	`14`	`}`
`10`	`15`	`]`