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

New option "force-expand-multiline" for "wrap_attributes" #1070

Merged
merged 6 commits into from
Dec 16, 2016
Merged

New option "force-expand-multiline" for "wrap_attributes" #1070

merged 6 commits into from
Dec 16, 2016

Conversation

tobias-zucali
Copy link

@tobias-zucali tobias-zucali commented Dec 9, 2016 •
edited
Loading

This adds a new option "force-all" for "wrap_attributes".

  • if there is just one attribute, it is not wrapped (like "wrap_attributes": "force"
  • if there is more than one attribute, each of them has it's own line
  • if attributes are wrapped, the ending part of the tag (> or />) is in its own line

For example:

<a
  accesskey="l"
  class="link link-blue"
  href="https://github.com/beautify-web/js-beautify/"
>
  Link to a great <strong class="link-emphasis">project</strong>
</a>

We use this formatting style because

  • all attributes are aligned without losing the indent from nesting level like with force-aligned
  • attributes can be easily sorted (we use alphabetical sorting for attributes, would be great to implement that in js-beautify as well)
  • the ending part of the tag on it's own line emphasises the indent of the tag and makes indent level more visible

Tobias Zucali added 4 commits December 7, 2016 22:58
introduce "wrap_attributes": "force-all"
e7ca224 
result:
<tag
  attribute="hugo"
  other-attribute="sepp"
/>
introduce "wrap_attributes": "force-all"
f5857d0 
fix bug with indendation of previous wrap options
introduce "wrap_attributes": "force-all"
c91e0b5 
cleanup
introduce "wrap_attributes": "force-all"
c13116f 
add unit tests
@bitwiseman
Copy link
Member

Wow, great PR. Tests and everything. Thanks!

Only one change needed: the name force-all needs changing. force-all indicates that you're going to "force all" items to do something, which is not the case. How about force-expand-multiline?

@tobias-zucali
Copy link
Author

@bitwiseman I changed force-all to force-expand-multiline, hope it is ok now. Just tell me if I can improve something else!
I am happy that I was able to contribute ;-)

@bitwiseman bitwiseman added this to the v1.6.5 milestone Dec 13, 2016
@bitwiseman bitwiseman changed the title New option "force-all" for "wrap_attributes" New option "force-expand-multiline" for "wrap_attributes" Dec 13, 2016
@bitwiseman bitwiseman merged commit a32d9d8 into beautifier:master Dec 16, 2016
@pyup-bot pyup-bot mentioned this pull request Mar 5, 2017
Merged
0-wiz-0 pushed a commit to NetBSD/pkgsrc-wip that referenced this pull request Apr 14, 2017
@iamleot
py-jsbeautifier: Update wip/py-jsbeautifier to 1.6.12
99e2edb 
pkgsrc changes:
 - Use ALTERNATIVES in order to permit multi-pkgs to coexists and adjust
   PLIST and introduce Makefile post-install target accordingly

Changes:
* CSS: Preserve Newlines ([#537](beautifier/js-beautify#537))

Reverted #1117 - Preserve newlines broken

* On beautify, new line before next CSS selector ([#1142](beautifier/js-beautify#1142))

Added `preserver_newlines` to css beautifier

* Fixed html formatting issue with attribute wrap (Thanks, @HookyQR!)
* Fixed python package publishing

* Wrong HTML beautification starting with v1.6.5 ([#1115](beautifier/js-beautify#1115))
* Ignore linebreak when meet handlebar ([#1104](beautifier/js-beautify#1104))
* Lines are not un-indented correctly when attributes are wrapped ([#1103](beautifier/js-beautify#1103))
* force-aligned is not aligned when indenting with tabs ([#1102](beautifier/js-beautify#1102))
* Python package fails to publish  ([#1101](beautifier/js-beautify#1101))
* Explaination of 'operator_position' is absent from README.md ([#1047](beautifier/js-beautify#1047))

* Fixed a batch of comment and semicolon-less code bugs

* Incorrect indentation after loop with comment ([#1090](beautifier/js-beautify#1090))
* Extra newline is inserted after beautifying code with anonymous function ([#1085](beautifier/js-beautify#1085))
* end brace with next comment line make bad indent ([#1043](beautifier/js-beautify#1043))
* Javascript comment in last line doesn't beautify well ([#964](beautifier/js-beautify#964))
* indent doesn't work with comment (jsdoc) ([#913](beautifier/js-beautify#913))
* Wrong indentation, when new line between chained methods ([#892](beautifier/js-beautify#892))
* Comments in a non-semicolon style have extra indent ([#815](beautifier/js-beautify#815))
* [bug] Incorrect indentation due to commented line(s) following a function call with a function argument. ([#713](beautifier/js-beautify#713))
* Wrong indent formatting ([#569](beautifier/js-beautify#569))

Added `content_unformatted` option (Thanks @arai-a)

* HTML pre code indentation ([#928](beautifier/js-beautify#928))
* Beautify script/style tags but ignore their inner JS/CSS content ([#906](beautifier/js-beautify#906))

* Added support for editorconfig from stdin
* Added js-beautify to cdnjs
* Fixed CRLF to LF for HTML and CSS on windows
* Added inheritance/overriding to config format (Thanks @DaniGuardiola and @HookyQR)
* Added `force-align` to `wrap-attributes` (Thanks @LukinoS)
* Added `force-expand-multiline` to `wrap-attributes` (Thanks @tobias-zucali)
* Added `preserve-inline` as independent brace setting (Thanks @Coburn37)
* Fixed handlebars with angle-braces (Thanks @mmsqe)

* Wrong indentation for comment after nested unbraced control constructs ([#1079](beautifier/js-beautify#1079))
* Should prefer breaking the line after operator ? instead of before operator < ([#1073](beautifier/js-beautify#1073))
* New option "force-expand-multiline" for "wrap_attributes" ([#1070](beautifier/js-beautify#1070))
* Breaks if html file starts with comment ([#1068](beautifier/js-beautify#1068))
* collapse-preserve-inline restricts users to collapse brace_style ([#1057](beautifier/js-beautify#1057))
* Parsing failure on numbers with "e" ([#1054](beautifier/js-beautify#1054))
* Issue with Browser Instructions ([#1053](beautifier/js-beautify#1053))
* Add preserve inline function for expand style braces ([#1052](beautifier/js-beautify#1052))
* Update years in LICENSE ([#1038](beautifier/js-beautify#1038))
* JS. Switch with template literals. Unexpected indentation. ([#1030](beautifier/js-beautify#1030))
* The object with spread object formatted not correctly ([#1023](beautifier/js-beautify#1023))
* Bad output generator function in class ([#1013](beautifier/js-beautify#1013))
* Support editorconfig for stdin ([#1012](beautifier/js-beautify#1012))
* Publish to cdnjs ([#992](beautifier/js-beautify#992))
* breaks if handlebars comments contain handlebars tags ([#930](beautifier/js-beautify#930))
* Using jsbeautifyrc is broken ([#929](beautifier/js-beautify#929))
* Option to put HTML attributes on their own lines, aligned ([#916](beautifier/js-beautify#916))
* Erroneously changes CRLF to LF on Windows in HTML and CSS ([#899](beautifier/js-beautify#899))
* Weird space in {get } vs { normal } ([#888](beautifier/js-beautify#888))
* Bad for-of formatting with constant Array ([#875](beautifier/js-beautify#875))
* Problems with filter property in css and scss ([#755](beautifier/js-beautify#755))
* Add "collapse-one-line" option for non-collapse brace styles  ([#487](beautifier/js-beautify#487))
@blemaire blemaire mentioned this pull request Feb 5, 2018
Closed
@blemaire
Copy link

blemaire commented Feb 5, 2018

This feature is currently broken #1335

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
type: enhancement
Projects
None yet
Milestone
v1.6.6
Development

Successfully merging this pull request may close these issues.
3 participants
@tobias-zucali @bitwiseman @blemaire