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

Turn new angular templating off by default in html #2247

Merged
merged 2 commits into from
Feb 16, 2024
Merged

Turn new angular templating off by default in html #2247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96340d5
Turn off new angular templating by default in html
bitwiseman Feb 16, 2024
5233c8f
Add test for angular css conflict
bitwiseman Feb 16, 2024
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
7 changes: 4 additions & 3 deletions js/src/cli.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ var path = require('path'),
// no shorthand for "config"
// no shorthand for "editorconfig"
// no shorthand for "indent_empty_lines"
// not shorthad for "templating"
// no shorthad for "templating"
});

function verifyExists(fullPath) {
Expand Down Expand Up @@ -370,7 +370,8 @@ function usage(err) {
' [first newline in file, otherwise "\\n]',
' -n, --end-with-newline End output with newline',
' --indent-empty-lines Keep indentation on empty lines',
' --templating List of templating languages (auto,none,django,erb,handlebars,php,smarty,angular) ["auto"] auto = none in JavaScript, all in html',
' --templating List of templating languages (auto,none,angular,django,erb,handlebars,php,smarty)',
' ["auto", auto = none in JavaScript, auto = all except angular in html (and inline javascript/css)]',
' --editorconfig Use EditorConfig to set up the options'
];

Expand Down Expand Up @@ -409,7 +410,7 @@ function usage(err) {
msg.push(' -U, --unformatted List of tags (defaults to inline) that should not be reformatted');
msg.push(' -T, --content_unformatted List of tags (defaults to pre) whose content should not be reformatted');
msg.push(' -E, --extra_liners List of tags (defaults to [head,body,/html] that should have an extra newline');
msg.push(' --unformatted_content_delimiter Keep text content together between this string [""]');
msg.push(' --unformatted_content_delimiter Keep text content together between this string [""]');
break;
case "css":
msg.push(' -b, --brace-style [collapse|expand] ["collapse"]');
Expand Down
4 changes: 2 additions & 2 deletions js/src/core/options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ function Options(options, merge_child_field) {
this.indent_empty_lines = this._get_boolean('indent_empty_lines');

// valid templating languages ['django', 'erb', 'handlebars', 'php', 'smarty', 'angular']
// For now, 'auto' = all off for javascript, all on for html (and inline javascript).
// For now, 'auto' = all off for javascript, all except angular on for html (and inline javascript/css).
// other values ignored
this.templating = this._get_selection_list('templating', ['auto', 'none', 'django', 'erb', 'handlebars', 'php', 'smarty', 'angular'], ['auto']);
this.templating = this._get_selection_list('templating', ['auto', 'none', 'angular', 'django', 'erb', 'handlebars', 'php', 'smarty'], ['auto']);
}

Options.prototype._get_array = function(name, default_value) {
Expand Down
2 changes: 1 addition & 1 deletion js/src/html/options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ var BaseOptions = require('../core/options').Options;
function Options(options) {
BaseOptions.call(this, options, 'html');
if (this.templating.length === 1 && this.templating[0] === 'auto') {
this.templating = ['django', 'erb', 'handlebars', 'php', 'angular'];
this.templating = ['django', 'erb', 'handlebars', 'php'];
}

this.indent_inner_html = this._get_boolean('indent_inner_html');
Expand Down
4 changes: 2 additions & 2 deletions python/jsbeautifier/core/options.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,11 @@ def __init__(self, options=None, merge_child_field=None):
self.indent_empty_lines = self._get_boolean("indent_empty_lines")

# valid templating languages ['django', 'erb', 'handlebars', 'php', 'smarty', 'angular']
# For now, 'auto' = all off for javascript, all on for html (and inline javascript).
# For now, 'auto' = all off for javascript, all except angular on for html (and inline javascript/css).
# other values ignored
self.templating = self._get_selection_list(
"templating",
["auto", "none", "django", "erb", "handlebars", "php", "smarty", "angular"],
["auto", "none", "angular", "django", "erb", "handlebars", "php", "smarty"],
["auto"],
)

Expand Down
10 changes: 4 additions & 6 deletions python/jsbeautifier/tests/core/test_options.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,15 +102,13 @@ def test__is_valid_selection(self):

def test__get_selection_list(self):
# should raise error with empty selection
with self.assertRaisesRegexp(
ValueError, "Selection list cannot" + " be empty."
):
with self.assertRaisesRegex(ValueError, "Selection list cannot" + " be empty."):
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are aliases that were retained for backward compat to python 2.x apparently. In typical python style, they just suddenly stopped working on my system. All versions of 3 support the modern names.

Options()._get_selection_list("a", [])
# should raise error with invalid default
with self.assertRaisesRegexp(ValueError, "Invalid Default Value!"):
with self.assertRaisesRegex(ValueError, "Invalid Default Value!"):
Options()._get_selection_list("a", ["a", "b"], ["c"])
# should raise error with invalid option
with self.assertRaisesRegexp(
with self.assertRaisesRegex(
ValueError, "^Invalid Option Value:" + " The option"
):
Options({"a": ["c", "d"]})._get_selection_list("a", ["a", "b"], ["a", "b"])
Expand All @@ -120,7 +118,7 @@ def test__get_selection_list(self):

def test__get_selection(self):
# should raise error with multiple selection
with self.assertRaisesRegexp(
with self.assertRaisesRegex(
ValueError, "^Invalid Option" + " Value: The option"
):
Options({"a": ["a", "b"]})._get_selection("a", ["a", "b"], ["a"])
Expand Down
49 changes: 49 additions & 0 deletions test/data/html/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4238,6 +4238,43 @@ exports.test_data = {
' </div>',
'}'
]
}, {
comment: 'CSS @media should remain unchanged',
// This behavior is currently incorrect. This codifies the way it fails.
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is why #2219 should use a specific list of at-strings. There's just too many ways to break things otherwise.

// unchanged: [
// '<style type="text/css">',
// ' @media only screen and (min-width:480px) {',
// ' .mj-column-per-100 {',
// ' width: 100% !important;',
// ' max-width: 100%;',
// ' }',
// ' }',
// '</style>'
// ]
input: [
'<style type="text/css">',
' @media only screen and (min-width:480px) {',
' .mj-column-per-100 {',
' width: 100% !important;',
' max-width: 100%;',
' }',
' }',
'</style>'
],
output: [
'<style type="text/css">',
'@media only screen and (min-width:480px) {',
' .mj-column-per-100',
' {',
' width:',
' 100%',
' !important;',
' max-width:',
' 100%;',
'}',
' }',
'</style>'
]
}]
}, {
name: "No indenting for angular control flow should be done if indent_handlebars is false",
Expand Down Expand Up @@ -4329,6 +4366,18 @@ exports.test_data = {
' }',
'</div>'
]
}, {
comment: 'CSS @media should remain unchanged',
unchanged: [
'<style type="text/css">',
' @media only screen and (min-width:480px) {',
' .mj-column-per-100 {',
' width: 100% !important;',
' max-width: 100%;',
' }',
' }',
'</style>'
]
}]
}, {
name: "New Test Suite"
Expand Down