orbit-oss/chalk
5
4
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

relaxed loops

Browse source
This commit is contained in:
Yanis Benson 2019-03-26 19:09:35 +03:00
parent efab07c093
commit fb5da89bcb
1 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

26
index.js
View file

@ -193,19 +193,27 @@ const applyStyle = (self, string) => {
}
let styler = self._styler;
while (styler !== undefined) {
// Replace any instances already present with a re-opening code
// otherwise only the part of the string until said closing code
// will be colored, and the rest will simply be 'plain'.
string = stringReplaceAll(string, styler.close, styler.open);
if (styler !== undefined) {
let closeAll = '';
let openAll = '';
while (styler !== undefined) {
// Replace any instances already present with a re-opening code
// otherwise only the part of the string until said closing code
// will be colored, and the rest will simply be 'plain'.
string = stringReplaceAll(string, styler.close, styler.open);
openAll = styler.open + openAll;
closeAll += styler.close;
styler = styler.parent;
}
// We can move both next actions out of loop, because remaining actions in loop won't have any/visible effect on parts we add here
// Close the styling before a linebreak and reopen
// after next line to fix a bleed issue on macOS
// https://github.com/chalk/chalk/pull/92
string = stringEncaseCRLF(string, styler.close, styler.open);
string = styler.open + string + styler.close;
styler = styler.parent;
string = stringEncaseCRLF(string, closeAll, openAll);
string = openAll + string + closeAll;
}
return string;