chore: fix ansi escaping for diffs #557
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,161 @@ | ||
| /* | ||
| Copyright (c) Microsoft Corporation. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| export function ansi2html(text: string, defaultColors?: { bg: string, fg: string }): string { | ||
| const regex = /(\x1b\[(\d+(;\d+)*)m)|([^\x1b]+)/g; | ||
| const tokens: string[] = []; | ||
| let match; | ||
| let style: any = {}; | ||
|
|
||
| let reverse = false; | ||
| let fg: string | undefined = defaultColors?.fg; | ||
| let bg: string | undefined = defaultColors?.bg; | ||
|
|
||
| while ((match = regex.exec(text)) !== null) { | ||
| const [, , codeStr, , text] = match; | ||
| if (codeStr) { | ||
| const code = +codeStr; | ||
| switch (code) { | ||
| case 0: style = {}; break; | ||
| case 1: style['font-weight'] = 'bold'; break; | ||
| case 2: style['opacity'] = '0.8'; break; | ||
| case 3: style['font-style'] = 'italic'; break; | ||
| case 4: style['text-decoration'] = 'underline'; break; | ||
| case 7: | ||
| reverse = true; | ||
| break; | ||
| case 8: style.display = 'none'; break; | ||
| case 9: style['text-decoration'] = 'line-through'; break; | ||
| case 22: | ||
| delete style['font-weight']; | ||
| delete style['font-style']; | ||
| delete style['opacity']; | ||
| delete style['text-decoration']; | ||
| break; | ||
| case 23: | ||
| delete style['font-weight']; | ||
| delete style['font-style']; | ||
| delete style['opacity']; | ||
| break; | ||
| case 24: | ||
| delete style['text-decoration']; | ||
| break; | ||
| case 27: | ||
| reverse = false; | ||
| break; | ||
| case 30: | ||
| case 31: | ||
| case 32: | ||
| case 33: | ||
| case 34: | ||
| case 35: | ||
| case 36: | ||
| case 37: | ||
| fg = ansiColors[code - 30]; | ||
| break; | ||
| case 39: | ||
| fg = defaultColors?.fg; | ||
| break; | ||
| case 40: | ||
| case 41: | ||
| case 42: | ||
| case 43: | ||
| case 44: | ||
| case 45: | ||
| case 46: | ||
| case 47: | ||
| bg = ansiColors[code - 40]; | ||
| break; | ||
| case 49: | ||
| bg = defaultColors?.bg; | ||
| break; | ||
| case 53: style['text-decoration'] = 'overline'; break; | ||
| case 90: | ||
| case 91: | ||
| case 92: | ||
| case 93: | ||
| case 94: | ||
| case 95: | ||
| case 96: | ||
| case 97: | ||
| fg = brightAnsiColors[code - 90]; | ||
| break; | ||
| case 100: | ||
| case 101: | ||
| case 102: | ||
| case 103: | ||
| case 104: | ||
| case 105: | ||
| case 106: | ||
| case 107: | ||
| bg = brightAnsiColors[code - 100]; | ||
| break; | ||
| } | ||
| } else if (text) { | ||
| let token = escapeHTML(text); | ||
| const isBold = style['font-weight'] === 'bold'; | ||
| if (isBold) | ||
| token = `<b>${token}</b>`; | ||
| const isItalic = style['font-style'] === 'italic'; | ||
| if (isItalic) | ||
| token = `<i>${token}</i>`; | ||
| const hasOpacity = style['opacity'] === '0.8'; | ||
|
There was a problem hiding this comment. It is assigned in the line 34, the idea is that we use upstream code for style definition, but then we sanitize it for vscode to accept it. |
||
| if (hasOpacity) | ||
| token = `<span style='color:#666;'>${token}</span>`; | ||
| const color = reverse ? (bg || '#000') : fg; | ||
|
There was a problem hiding this comment. I believe default background will depend on dark/light mode. There was a problem hiding this comment. Yeah, I checked it in both modes and it is ok because we only do reverse on mid-light background. |
||
| if (color) | ||
| token = `<span style='color:${color};'>${token}</span>`; | ||
| const backgroundColor = reverse ? fg : bg; | ||
| if (backgroundColor) | ||
| token = `<span style='background-color:${backgroundColor};'>${token}</span>`; | ||
| tokens.push(token); | ||
| } | ||
| } | ||
| return tokens.join(''); | ||
| } | ||
|
|
||
| const ansiColors: Record<number, string> = { | ||
| 0: '#000', | ||
| 1: '#f14c4c', | ||
| 2: '#73c991', | ||
| 3: '#ffcc66', | ||
| 4: '#44a8f2', | ||
| 5: '#b084eb', | ||
| 6: '#afdab6', | ||
| 7: '#fff', | ||
| }; | ||
|
|
||
| const brightAnsiColors: Record<number, string> = { | ||
| 0: '#808080', | ||
| 1: '#f14c4c', | ||
| 2: '#73c991', | ||
| 3: '#ffcc66', | ||
| 4: '#44a8f2', | ||
| 5: '#b084eb', | ||
| 6: '#afdab6', | ||
| 7: '#fff', | ||
| }; | ||
|
|
||
| function escapeHTML(text: string): string { | ||
| return text.replace(/[&"<> \n]/g, c => ({ | ||
| ' ': ' ', | ||
|
There was a problem hiding this comment. this won't match other whitespaces, such as \t. Also, do we want to map all whitespaces to non-breaking? There was a problem hiding this comment. This has not changed There was a problem hiding this comment. hmm, this is what I see upstream: function escapeHTML(text: string): string {
return text.replace(/[&"<>]/g, c => ({ '&': '&', '"': '"', '<': '<', '>': '>' }[c]!));
} |
||
| '\n': '\n<br>\n', | ||
| '&': '&', | ||
| '"': '"', | ||
| '<': '<', | ||
| '>': '>' | ||
| }[c]!)); | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's have a type for
styleand also just check if style.italic is true?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That would fork the code from the upstream a lot.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This part is already different