From e0ee0570be7903f619dd0fb5957768611417a33f Mon Sep 17 00:00:00 2001 From: Logan Smyth Date: Sun, 26 Aug 2018 13:23:43 -0700 Subject: [PATCH] Default highlightCode:true for the parser highlighting. (#8546) --- .../src/transformation/normalize-file.js | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/packages/babel-core/src/transformation/normalize-file.js b/packages/babel-core/src/transformation/normalize-file.js index 38a015f1ac..1df42ad763 100644 --- a/packages/babel-core/src/transformation/normalize-file.js +++ b/packages/babel-core/src/transformation/normalize-file.js @@ -91,14 +91,18 @@ export default function normalizeFile( }); } -function parser(pluginPasses, options, code) { +function parser( + pluginPasses: PluginPasses, + { parserOpts, highlightCode = true, filename = "unknown" }: Object, + code: string, +) { try { const results = []; for (const plugins of pluginPasses) { for (const plugin of plugins) { const { parserOverride } = plugin; if (parserOverride) { - const ast = parserOverride(code, options.parserOpts, parse); + const ast = parserOverride(code, parserOpts, parse); if (ast !== undefined) results.push(ast); } @@ -106,7 +110,7 @@ function parser(pluginPasses, options, code) { } if (results.length === 0) { - return parse(code, options.parserOpts); + return parse(code, parserOpts); } else if (results.length === 1) { if (typeof results[0].then === "function") { throw new Error( @@ -136,15 +140,16 @@ function parser(pluginPasses, options, code) { column: loc.column + 1, }, }, - options, + { + highlightCode, + }, ); if (missingPlugin) { err.message = - `${options.filename || "unknown"}: ` + + `${filename}: ` + generateMissingPluginMessage(missingPlugin[0], loc, codeFrame); } else { - err.message = - `${options.filename || "unknown"}: ${err.message}\n\n` + codeFrame; + err.message = `${filename}: ${err.message}\n\n` + codeFrame; } err.code = "BABEL_PARSE_ERROR"; }