cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3464 from lydell/code-frame-tabs

Browse Source 
babel-code-frame: Handle code with tabs
This commit is contained in:
Henry Zhu 2016-04-11 13:42:37 -04:00
commit 98685d21d7
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/babel-code-frame/package.json
View File

@ -11,7 +11,6 @@
"babel-runtime": "^5.0.0",
"chalk": "^1.1.0",
"esutils": "^2.0.2",
"js-tokens": "^1.0.1",
"repeating": "^1.1.3"
"js-tokens": "^1.0.2"
}
}

9
packages/babel-code-frame/src/index.js
View File

@ -1,4 +1,3 @@
import repeating from "repeating";
import jsTokens from "js-tokens";
import esutils from "esutils";
import chalk from "chalk";
@ -100,9 +99,11 @@ export default function (
let paddedNumber = ` ${number}`.slice(-numberMaxWidth);
let gutter = ` ${paddedNumber} | `;
if (number === lineNumber) {
let markerLine = colNumber
? `\n ${gutter.replace(/\d/g, " ")}${repeating(" ", colNumber - 1)}^`
: "";
let markerLine = "";
if (colNumber) {
let markerSpacing = line.slice(0, colNumber - 1).replace(/[^\t]/g, " ");
markerLine =`\n ${gutter.replace(/\d/g, " ")}${markerSpacing}^`;
}
return `>${gutter}${line}${markerLine}`;
} else {
return ` ${gutter}${line}`;

14
packages/babel-code-frame/test/index.js
View File

@ -93,6 +93,20 @@ suite("babel-code-frame", function () {
].join("\n"));
});
test("tabs", function () {
const rawLines = [
"\tclass Foo {",
"\t \t\t constructor\t(\t)",
"\t};",
].join('\n');
assert.equal(codeFrame(rawLines, 2, 25), [
" 1 | \tclass Foo {",
"> 2 | \t \t\t constructor\t(\t)",
" | \t \t\t \t \t ^",
" 3 | \t};",
].join('\n'));
});
test("opts.highlightCode", function () {
const rawLines = "console.log('babel')";
const result = codeFrame(rawLines, 1, 9, {highlightCode: true})