foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-21 15:04:11 -05:00
Code Issues Packages 1 Wiki Activity

fix(console): invalid unchanged color check with %c

Browse source
This commit is contained in:
Nicolò Ribaudo 2023-12-16 15:34:01 +01:00
parent cd480b481e
commit 543718629c
No known key found for this signature in database
GPG key ID: AAFDA9101C58F338
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
ext/console/01_console.js
View file

@ -2939,15 +2939,20 @@ function parseCss(cssString) {
return css; return css;
} }
function colorEquals(color1, color2) { // The same color can be represented in multiple formats. This function
return color1?.[0] == color2?.[0] && color1?.[1] == color2?.[1] && // returns `false` in that case.
color1?.[2] == color2?.[2]; function colorsObviouslyEqual(color1, color2) {
if (ArrayIsArray(color1) && ArrayIsArray(color2)) {
return color1[0] === color2[0] && color1[1] === color2[1] &&
color1[2] === color2[2];
}
return color1 === color2;
} }
function cssToAnsi(css, prevCss = null) { function cssToAnsi(css, prevCss = null) {
prevCss = prevCss ?? getDefaultCss(); prevCss = prevCss ?? getDefaultCss();
let ansi = ""; let ansi = "";
if (!colorEquals(css.backgroundColor, prevCss.backgroundColor)) { if (!colorsObviouslyEqual(css.backgroundColor, prevCss.backgroundColor)) {
if (css.backgroundColor == null) { if (css.backgroundColor == null) {
ansi += "\x1b[49m"; ansi += "\x1b[49m";
} else if (css.backgroundColor == "black") { } else if (css.backgroundColor == "black") {
@ -2981,7 +2986,7 @@ function cssToAnsi(css, prevCss = null) {
} }
} }
} }
if (!colorEquals(css.color, prevCss.color)) { if (!colorsObviouslyEqual(css.color, prevCss.color)) {
if (css.color == null) { if (css.color == null) {
ansi += "\x1b[39m"; ansi += "\x1b[39m";
} else if (css.color == "black") { } else if (css.color == "black") {
@ -3029,7 +3034,9 @@ function cssToAnsi(css, prevCss = null) {
ansi += "\x1b[23m"; ansi += "\x1b[23m";
} }
} }
if (!colorEquals(css.textDecorationColor, prevCss.textDecorationColor)) { if (
!colorsObviouslyEqual(css.textDecorationColor, prevCss.textDecorationColor)
) {
if (css.textDecorationColor != null) { if (css.textDecorationColor != null) {
const { 0: r, 1: g, 2: b } = css.textDecorationColor; const { 0: r, 1: g, 2: b } = css.textDecorationColor;
ansi += `\x1b[58;2;${r};${g};${b}m`; ansi += `\x1b[58;2;${r};${g};${b}m`;