Magic-Mirror/js-beautify
1
0
Fork 0
mirror of https://github.com/beautifier/js-beautify.git synced 2024-11-27 06:30:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix #134, a regex-as-parameter regression

Browse Source
This commit is contained in:
Einar Lielmanis 2012-07-20 22:07:40 +03:00
parent b147439fa2
commit 57ad392ed2
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
beautify.js
View File

@ -491,7 +491,7 @@ function js_beautify(js_source_text, options) {
(c === '/' &&
((last_type === 'TK_WORD' && is_special_word(last_text)) ||
(last_text === ')' && in_array(flags.previous_mode, ['(COND-EXPRESSION)', '(FOR-EXPRESSION)'])) ||
(last_type === 'TK_COMMENT' || last_type === 'TK_START_EXPR' || last_type === 'TK_START_BLOCK' || last_type === 'TK_END_BLOCK' || last_type === 'TK_OPERATOR' || last_type === 'TK_EQUALS' || last_type === 'TK_EOF' || last_type === 'TK_SEMICOLON')))) { // regexp
(last_type === 'TK_COMMA' || last_type === 'TK_COMMENT' || last_type === 'TK_START_EXPR' || last_type === 'TK_START_BLOCK' || last_type === 'TK_END_BLOCK' || last_type === 'TK_OPERATOR' || last_type === 'TK_EQUALS' || last_type === 'TK_EOF' || last_type === 'TK_SEMICOLON')))) { // regexp
var sep = c;
var esc = false;
var esc1 = 0;

2
python/jsbeautifier/__init__.py
View File

@ -526,7 +526,7 @@ class Beautifier:
(c == '/' and ((self.last_type == 'TK_WORD' and self.is_special_word(self.last_text)) or \
(self.last_type == 'TK_END_EXPR' and self.flags.previous_mode in ['(FOR-EXPRESSION)', '(COND-EXPRESSION)']) or \
(self.last_type in ['TK_COMMENT', 'TK_START_EXPR', 'TK_START_BLOCK', 'TK_END_BLOCK', 'TK_OPERATOR',
'TK_EQUALS', 'TK_EOF', 'TK_SEMICOLON']))):
'TK_EQUALS', 'TK_EOF', 'TK_SEMICOLON', 'TK_COMMA']))):
sep = c
esc = False
esc1 = 0

1
python/jsbeautifier/tests/testjsbeautifier.py
View File

@ -453,6 +453,7 @@ class TestJSBeautifier(unittest.TestCase):
bt('import foo.*;', 'import foo.*;') # actionscript's import
test_fragment('function f(a: a, b: b)') # actionscript
bt('foo(a, function() {})');
bt('foo(a, /regex/)');
def decodesto(self, input, expectation=None):

2
tests/beautify-tests.js
View File

@ -510,6 +510,8 @@ function run_beautifier_tests(test_obj)
bt('function a(a) {} function b(b) {} function c(c) {}', 'function a(a) {}\nfunction b(b) {}\nfunction c(c) {}');
bt('foo(a, function() {})');
bt('foo(a, /regex/)');
return sanitytest;
}