From 515adefc54bb6097ad2fdc076614606ad0ae4262 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lu=C3=ADs=20Couto?= <hello@luiscouto.pt>
Date: Mon, 20 Mar 2017 21:45:11 +0000
Subject: [PATCH] Add option to disable code frame. (#446)

* Add option to disable code hightlight.

* Rename codeHighlight with codeFrame

* Add codeFrame tests

* Remove colors from test assertions
---
 index.js                            | 19 ++++++++----
 test/fixtures/rules/syntax-error.js |  6 ++++
 test/integration.js                 | 48 +++++++++++++++++++++++++++++
 3 files changed, 67 insertions(+), 6 deletions(-)
 create mode 100644 test/fixtures/rules/syntax-error.js

diff --git a/index.js b/index.js
index 7b742494..22e791b3 100644
--- a/index.js
+++ b/index.js
@@ -366,6 +366,7 @@ exports.parse = function (code, options) {
 
 exports.parseNoPatch = function (code, options) {
   var opts = {
+    codeFrame: options.hasOwnProperty("codeFrame") ? options.codeFrame : true,
     sourceType: options.sourceType,
     allowImportExportEverywhere: options.allowImportExportEverywhere, // consistent with espree
     allowReturnOutsideFunction: true,
@@ -394,14 +395,20 @@ exports.parseNoPatch = function (code, options) {
     ast = parse(code, opts);
   } catch (err) {
     if (err instanceof SyntaxError) {
+
       err.lineNumber = err.loc.line;
-      err.column = err.loc.column + 1;
+      err.column = err.loc.column;
+
+      if (opts.codeFrame) {
+        err.lineNumber = err.loc.line;
+        err.column = err.loc.column + 1;
 
-      // remove trailing "(LINE:COLUMN)" acorn message and add in esprima syntax error message start
-      err.message = "Line " + err.lineNumber + ": " + err.message.replace(/ \((\d+):(\d+)\)$/, "") +
-      // add codeframe
-      "\n\n" +
-      codeFrame(code, err.lineNumber, err.column, { highlightCode: true });
+        // remove trailing "(LINE:COLUMN)" acorn message and add in esprima syntax error message start
+        err.message = "Line " + err.lineNumber + ": " + err.message.replace(/ \((\d+):(\d+)\)$/, "") +
+        // add codeframe
+        "\n\n" +
+        codeFrame(code, err.lineNumber, err.column, { highlightCode: true });
+      }
     }
 
     throw err;
diff --git a/test/fixtures/rules/syntax-error.js b/test/fixtures/rules/syntax-error.js
new file mode 100644
index 00000000..6fa194a1
--- /dev/null
+++ b/test/fixtures/rules/syntax-error.js
@@ -0,0 +1,6 @@
+class ClassName {
+  constructor() {
+
+  },
+  aMethod() {}
+}
diff --git a/test/integration.js b/test/integration.js
index 2814b4c3..c446ed34 100644
--- a/test/integration.js
+++ b/test/integration.js
@@ -200,4 +200,52 @@ function strictSuite () {
     // it
   });
   // describe
+  describe("When \"codeFrame\"", () => {
+    // Strip chalk colors, these are not relevant for the test
+    const stripAnsi = (str) => str.replace(
+      /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g,
+      ""
+    );
+
+    it("should display codeFrame when option is absent", (done) => {
+      lint({
+        fixture: ["syntax-error"],
+        eslint: baseEslintOpts
+      }, (err, report) => {
+        if (err) return done(err);
+        assert(stripAnsi(report[0].message).indexOf("^\n  5 |") > -1);
+        done();
+      });
+    });
+
+    it("should display codeFrame when option is true", (done) => {
+      lint({
+        fixture: ["syntax-error"],
+        eslint: Object.assign({}, baseEslintOpts, {
+          parserOptions: {
+            codeFrame: true
+          }
+        })
+      }, (err, report) => {
+        if (err) return done(err);
+        assert(stripAnsi(report[0].message).indexOf("^\n  5 |") > -1);
+        done();
+      });
+    });
+
+    it("should not display codeFrame when option is false", (done) => {
+      lint({
+        fixture: ["syntax-error"],
+        eslint: Object.assign({}, baseEslintOpts, {
+          parserOptions: {
+            codeFrame: false
+          }
+        })
+      }, (err, report) => {
+        if (err) return done(err);
+        assert(stripAnsi(report[0].message).indexOf("^\n  5 |") === -1);
+        done();
+      });
+    });
+  });
 }