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

Tests: Fixed pretty print incorrectly calculating print width #2821

Merged
merged 2 commits into from
Apr 3, 2021
Merged

Tests: Fixed pretty print incorrectly calculating print width #2821

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7786c4b
Tests: Fixed pretty print incorrectly calculating print width
RunDevelopment Mar 21, 2021
cec0435
Merge branch 'master' into pretty-print-width-fix
RunDevelopment Apr 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions tests/helper/token-stream-transformer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,10 @@ class GlueItem { }

/**
* @param {TokenStream} tokenStream
* @param {number} [level]
* @returns {PrettyTokenStream}
*/
function toPrettyTokenStream(tokenStream) {
function toPrettyTokenStream(tokenStream, level = 0) {
/** @type {PrettyTokenStream} */
const prettyStream = [];
for (const token of tokenStream) {
Expand Down Expand Up @@ -116,26 +117,27 @@ function toPrettyTokenStream(tokenStream) {
*/
function innerSimple(value) {
if (Array.isArray(value.content)) {
return [value.type, toPrettyTokenStream(value.content)];
return [value.type, toPrettyTokenStream(value.content, level + 1)];
} else {
return [value.type, value.content];
}
}

prettyFormat(prettyStream);
prettyFormat(prettyStream, (level + 1) * 4);
return prettyStream;
}

/**
* @param {PrettyTokenStream} prettyStream
* @param {number} indentationWidth
* @returns {void}
*/
function prettyFormat(prettyStream) {
function prettyFormat(prettyStream, indentationWidth) {
// The maximum number of (glued) tokens per line
const MAX_TOKEN_PER_LINE = 5;
// The maximum number of characters per line
// (this is based on an estimation. The actual output might be longer.)
const MAX_PRINT_WIDTH = 80;
const MAX_PRINT_WIDTH = 80 - indentationWidth;

prettyTrimLineBreaks(prettyStream);
// enable all line breaks with >=2 breaks in the source token stream
Expand Down Expand Up @@ -181,7 +183,17 @@ function prettyFormat(prettyStream) {
return lines.map(g => {
if (g.length > 1) {
return g
.map(item => isToken(item) ? ", ".length + JSON.stringify(item).length : 0)
.map(item => {
if (isToken(item)) {
if (typeof item === "string") {
return ", ".length + JSON.stringify(item).length;
} else {
return ", ".length + JSON.stringify(item).length + " ".length;
}
} else {
return 0;
}
})
.reduce((a, b) => a + b, 0) - ", ".length;
} else {
// we don't really care about the print width of a single-token line
Expand Down