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

fix code-frame marker with highlighting (#10211)

Browse Source
This commit is contained in:
Tan Li Hau
2019-07-16 03:16:18 +08:00
committed by Nicolò Ribaudo
parent 7dc5fdb390
commit eb3230f9db
2 changed files with 44 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,7 +76,7 @@ function getMarkerLines(
} else if (i === 0) {
const sourceLength = source[lineNumber - 1].length;
markerLines[lineNumber] = [startColumn, sourceLength - startColumn];
markerLines[lineNumber] = [startColumn, sourceLength - startColumn + 1];
} else if (i === lineDiff) {
markerLines[lineNumber] = [0, endColumn];
} else {
@@ -112,15 +112,16 @@ export function codeFrameColumns(
const maybeHighlight = (chalkFn, string) => {
return highlighted ? chalkFn(string) : string;
};
if (highlighted) rawLines = highlight(rawLines, opts);
const lines = rawLines.split(NEWLINE);
const { start, end, markerLines } = getMarkerLines(loc, lines, opts);
const hasColumns = loc.start && typeof loc.start.column === "number";
const numberMaxWidth = String(end).length;
let frame = lines
const highlightedLines = highlighted ? highlight(rawLines, opts) : rawLines;
let frame = highlightedLines
.split(NEWLINE)
.slice(start, end)
.map((line, index) => {
const number = start + 1 + index;