Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use background color to show colored spaces in an inline diff #4287

Merged
merged 7 commits into from Jun 22, 2020
Merged

Use background color to show colored spaces in an inline diff #4287

Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b4d7825
use Open Box char to show colored spaces in an inline diff
michael-brade May 13, 2020
926a4ed
don't change the color() function
michael-brade May 13, 2020
a01b05e
diffs: switch to using background color instead of visible spaces
michael-brade May 13, 2020
166ff91
only use background color for inline diffs
michael-brade Jun 9, 2020
ccad228
Merge branch 'master' into color-spaces
michael-brade Jun 14, 2020
f75a2a4
format
michael-brade Jun 14, 2020
30ea7a0
if you say so...
michael-brade Jun 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 15 additions & 7 deletions lib/reporters/base.js
View file
Open in desktop
Expand Up @@ -69,7 +69,9 @@ exports.colors = {
light: 90,
'diff gutter': 90,
'diff added': 32,
'diff removed': 31
'diff removed': 31,
'diff added inline': '30;42',
'diff removed inline': '30;41'
};

/**
Expand Down Expand Up @@ -189,9 +191,15 @@ var generateDiff = (exports.generateDiff = function(actual, expected) {
} catch (err) {
var msg =
'\n ' +
color('diff added', '+ expected') +
color(
juergba marked this conversation as resolved.
Show resolved Hide resolved
'diff added' + (exports.inlineDiffs ? ' inline' : ''),
'+ expected'
) +
' ' +
color('diff removed', '- actual: failed to generate Mocha diff') +
color(
'diff removed' + (exports.inlineDiffs ? ' inline' : ''),
'- actual: failed to generate Mocha diff'
) +
'\n';
return msg;
}
Expand Down Expand Up @@ -406,9 +414,9 @@ function inlineDiff(actual, expected) {
// legend
msg =
'\n' +
color('diff removed', 'actual') +
color('diff removed inline', 'actual') +
' ' +
color('diff added', 'expected') +
color('diff added inline', 'expected') +
'\n\n' +
msg +
'\n';
Expand Down Expand Up @@ -474,10 +482,10 @@ function errorDiff(actual, expected) {
.diffWordsWithSpace(actual, expected)
.map(function(str) {
if (str.added) {
return colorLines('diff added', str.value);
return colorLines('diff added inline', str.value);
}
if (str.removed) {
return colorLines('diff removed', str.value);
return colorLines('diff removed inline', str.value);
}
return str.value;
})
Expand Down