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

Capture empty tags #1868

Merged
merged 4 commits into from
Dec 23, 2020
Merged

Capture empty tags #1868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
95e29b8
Fixing bug #1244
JuanFML Dec 3, 2020
b14e245
Revert "Fixing bug #1244"
JuanFML Dec 19, 2020
30ca630
Update tokenizer to accept empty tags
JuanFML Dec 23, 2020
f13a684
Changed test back to empty tags
JuanFML Dec 23, 2020
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
2 changes: 1 addition & 1 deletion js/src/javascript/tokenizer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ var Tokenizer = function(input_string, options) {
html_comment_end: pattern_reader.matching(/-->/),
include: pattern_reader.starting_with(/#include/).until_after(acorn.lineBreak),
shebang: pattern_reader.starting_with(/#!/).until_after(acorn.lineBreak),
xml: pattern_reader.matching(/[\s\S]*?<(\/?)([-a-zA-Z:0-9_.]+|{[\s\S]+?}|!\[CDATA\[[\s\S]*?\]\])(\s+{[\s\S]+?}|\s+[-a-zA-Z:0-9_.]+|\s+[-a-zA-Z:0-9_.]+\s*=\s*('[^']*'|"[^"]*"|{[\s\S]+?}))*\s*(\/?)\s*>/),
xml: pattern_reader.matching(/[\s\S]*?<(\/?)([-a-zA-Z:0-9_.]+|{[\s\S]+?}|!\[CDATA\[[\s\S]*?\]\]|)(\s+{[\s\S]+?}|\s+[-a-zA-Z:0-9_.]+|\s+[-a-zA-Z:0-9_.]+\s*=\s*('[^']*'|"[^"]*"|{[\s\S]+?}))*\s*(\/?)\s*>/),
Copy link
Member

@bitwiseman bitwiseman Dec 23, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

I think it is clearer to say this group is optional, but that might cause the number groups to change, right?

This is not a suggestion, I'm just using that to show a clear diff.

Suggested change
xml: pattern_reader.matching(/[\s\S]*?<(\/?)([-a-zA-Z:0-9_.]+|{[\s\S]+?}|!\[CDATA\[[\s\S]*?\]\]|)(\s+{[\s\S]+?}|\s+[-a-zA-Z:0-9_.]+|\s+[-a-zA-Z:0-9_.]+\s*=\s*('[^']*'|"[^"]*"|{[\s\S]+?}))*\s*(\/?)\s*>/),
xml: pattern_reader.matching(/[\s\S]*?<(\/?)([-a-zA-Z:0-9_.]+|{[\s\S]+?}|!\[CDATA\[[\s\S]*?\]\])?(\s+{[\s\S]+?}|\s+[-a-zA-Z:0-9_.]+|\s+[-a-zA-Z:0-9_.]+\s*=\s*('[^']*'|"[^"]*"|{[\s\S]+?}))*\s*(\/?)\s*>/),

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh I see what you mean, but yes it causes other problems

single_quote: templatable.until(/['\\\n\r\u2028\u2029]/),
double_quote: templatable.until(/["\\\n\r\u2028\u2029]/),
template_text: templatable.until(/[`\\$]/),
Expand Down
11 changes: 11 additions & 0 deletions js/test/generated/beautify-javascript-tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4418,6 +4418,17 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
' {children}\n' +
' </{a + b}>\n' +
');');
bt(
'class Columns extends React.Component {\n' +
' render() {\n' +
' return (\n' +
' <>\n' +
' <td>Hello</td>\n' +
' <td>World</td>\n' +
' </>\n' +
' );\n' +
' }\n' +
'}');


//============================================================
Expand Down
2 changes: 1 addition & 1 deletion python/jsbeautifier/javascript/tokenizer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ def __init__(self):
directives_core = Directives(r"/\*", r"\*/")

xmlRegExp = re.compile(
r'[\s\S]*?<(\/?)([-a-zA-Z:0-9_.]+|{[\s\S]+?}|!\[CDATA\[[\s\S]*?\]\])(\s+{[\s\S]+?}|\s+[-a-zA-Z:0-9_.]+|\s+[-a-zA-Z:0-9_.]+\s*=\s*(\'[^\']*\'|"[^"]*"|{[\s\S]+?}))*\s*(/?)\s*>'
r'[\s\S]*?<(\/?)([-a-zA-Z:0-9_.]+|{[\s\S]+?}|!\[CDATA\[[\s\S]*?\]\]|)(\s+{[\s\S]+?}|\s+[-a-zA-Z:0-9_.]+|\s+[-a-zA-Z:0-9_.]+\s*=\s*(\'[^\']*\'|"[^"]*"|{[\s\S]+?}))*\s*(/?)\s*>'
)


Expand Down
11 changes: 11 additions & 0 deletions python/jsbeautifier/tests/generated/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4168,6 +4168,17 @@ def unicode_char(value):
' {children}\n' +
' </{a + b}>\n' +
');')
bt(
'class Columns extends React.Component {\n' +
' render() {\n' +
' return (\n' +
' <>\n' +
' <td>Hello</td>\n' +
' <td>World</td>\n' +
' </>\n' +
' );\n' +
' }\n' +
'}')


#============================================================
Expand Down
14 changes: 14 additions & 0 deletions test/data/javascript/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2490,6 +2490,20 @@ exports.test_data = {
' </{a + b}>',
');'
]
},
{
unchanged: [
'class Columns extends React.Component {',
' render() {',
' return (',
' <>',
' <td>Hello</td>',
' <td>World</td>',
' </>',
' );',
' }',
'}'
]
}
]
},
Expand Down