File tree Expand file tree Collapse file tree 1 file changed +9
-2
lines changed Expand file tree Collapse file tree 1 file changed +9
-2
lines changed Original file line number Diff line number Diff line change @@ -9,10 +9,11 @@ const TEST_THEME = Object.fromEntries(
9
9
Object . keys ( ThemeColorName ) . map ( ( name ) => [ name , { } ] )
10
10
) as Theme ;
11
11
12
- const replaceColoredText = ( ) => ( text : string ) => text . replace ( / ./ g, '░' ) ;
12
+ const replaceColoredText =
13
+ ( r : number , g : number , b : number ) => ( text : string ) =>
14
+ text . replace ( / ./ g, '░' ) ;
13
15
14
16
// Provide a fake chalk implementation to make it easier to read snapshots
15
- // @ts -expect-error
16
17
const TEST_CHALK = {
17
18
rgb : replaceColoredText ,
18
19
bgRgb : replaceColoredText ,
@@ -521,6 +522,12 @@ index 2e204671f7,e56bba5ab4..ab6229d1b6
521
522
522
523
test ( 'merge commit with 3 parents' , async function ( ) {
523
524
// Source: the TypeScript repo
525
+
526
+ // TODO: The highlighting here is wrong on lines 2792, 2803 and 2804
527
+ // It's not easy to repro, but looks like a bug somewhere in
528
+ // maintaining spans while merging lines from multiple hunk parts
529
+ // into the final formatted line. We end up formatting the line
530
+ // numbers with a span from earlier in the string somewhere.
524
531
expect (
525
532
await transform ( `
526
533
commit d6d6a4aedfa78794c1b611c13d2ed1d3a66e1798
You can’t perform that action at this time.
0 commit comments