fix(code-frame): do not pad gutter of empty lines (#12567)

* fix(code-frame): do not pad gutter of empty lines

* Add workaround for expected Jest e2e test failure

Co-authored-by: Nicolò Ribaudo <nicolo.ribaudo@gmail.com>
This commit is contained in:
Simen Bekkhus
2020-12-29 15:26:13 +01:00
committed by GitHub
parent fbef603c43
commit 2d35f5a8f7
3 changed files with 23 additions and 15 deletions

View File

@@ -42,7 +42,7 @@ describe("@babel/code-frame", function () {
" 6 | * @returns Number",
"> 7 | */",
" | ^",
" 8 | ",
" 8 |",
" 9 | function sum(a, b) {",
" 10 | return a + b",
].join("\n"),
@@ -70,7 +70,7 @@ describe("@babel/code-frame", function () {
"> 6 | * @returns Number",
" | ^",
" 7 | */",
" 8 | ",
" 8 |",
" 9 | function sum(a, b) {",
].join("\n"),
);
@@ -105,8 +105,8 @@ describe("@babel/code-frame", function () {
test("opts.highlightCode with multiple columns and lines", function () {
// prettier-ignore
const rawLines = [
"function a(b, c) {",
" return b + c;",
"function a(b, c) {",
" return b + c;",
"}"
].join("\n");
@@ -160,7 +160,7 @@ describe("@babel/code-frame", function () {
" 6 | * @returns Number",
"> 7 | */",
" | ^",
" 8 | ",
" 8 |",
" 9 | function sum(a, b) {",
" 10 | return a + b",
].join("\n"),
@@ -187,7 +187,7 @@ describe("@babel/code-frame", function () {
" 6 | * @returns Number",
"> 7 | */",
" | ^",
" 8 | ",
" 8 |",
].join("\n"),
);
});
@@ -207,9 +207,7 @@ describe("@babel/code-frame", function () {
"}",
].join("\n");
expect(codeFrame(rawLines, 7, 2, { linesAbove: 1, linesBelow: 1 })).toEqual(
[" 6 | * @returns Number", "> 7 | */", " | ^", " 8 | "].join(
"\n",
),
[" 6 | * @returns Number", "> 7 | */", " | ^", " 8 |"].join("\n"),
);
});
@@ -277,9 +275,9 @@ describe("@babel/code-frame", function () {
).toEqual(
chalk.reset(
[
" " + gutter(" 2 | "),
marker(">") + gutter(" 3 | "),
" " + gutter(" 4 | "),
" " + gutter(" 2 |"),
marker(">") + gutter(" 3 |"),
" " + gutter(" 4 |"),
].join("\n"),
),
);