Added option max_preserve_newlines in CSS beautifier #1867
Merged
Conversation
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
bitwiseman
requested changes
Dec 23, 2020
js/src/css/beautifier.js
Outdated
| @@ -92,11 +92,15 @@ Beautifier.prototype.eatString = function(endChars) { | |||
| Beautifier.prototype.eatWhitespace = function(allowAtLeastOneNewLine) { | |||
| var result = whitespaceChar.test(this._input.peek()); | |||
| var isFirstNewLine = true; | |||
|
|
|||
| var newlines = this._options.max_preserve_newlines; | |||
There was a problem hiding this comment.
Delete var isFirstNewLine = true; and then
Suggested change
| var newlines = this._options.max_preserve_newlines; | |
| var newline_count = 0; |
js/src/css/beautifier.js
Outdated
Comment on lines
99
to
103
| if ((this._options.preserve_newlines || isFirstNewLine) && (this._options.max_preserve_newlines === 32786 || this._options.max_preserve_newlines === 0)) { | ||
| isFirstNewLine = false; | ||
| this._output.add_new_line(true); | ||
| } else if ((this._options.preserve_newlines || isFirstNewLine) && newlines > 0) { | ||
| newlines--; |
There was a problem hiding this comment.
max_preserve_newlines is already sanitized by the options object:
Suggested change
| if ((this._options.preserve_newlines || isFirstNewLine) && (this._options.max_preserve_newlines === 32786 || this._options.max_preserve_newlines === 0)) { | |
| isFirstNewLine = false; | |
| this._output.add_new_line(true); | |
| } else if ((this._options.preserve_newlines || isFirstNewLine) && newlines > 0) { | |
| newlines--; | |
| if (newline_count === 0 || newline_count < this._options.max_preserve_newlines) { | |
| newline_count++; |
Also delete isFirstNewLine = false; below.
And implement same in python, of course.
There was a problem hiding this comment.
Yes I liked this way better, is way cleaner, thank you!
JuanFML
force-pushed
the
css-max-newlines
branch
from
dbc7542 to
fba76bd
Compare
I think I already fix it, although I don't know how I can erase the commits at the top, but I could also close this and open a new one. |
bitwiseman
approved these changes
Dec 28, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Added option max_preserve_newlines to CSS beautifier, as well tests with more lines, less lines and the same as the ones requested in the option.
master)Fixes #1863:
Before Merge Checklist
These items can be completed after PR is created.
(Check any items that are not applicable (NA) for this PR)