Skip to content

Commit

Permalink
Added coalescing operator to positioning test
Browse files Browse the repository at this point in the history
  • Loading branch information
@bitwiseman
bitwiseman committed Aug 13, 2020
1 parent ba04879 commit c82a98e
Show file tree
Hide file tree
Showing 4 changed files with 63 additions and 35 deletions.
48 changes: 30 additions & 18 deletions js/test/generated/beautify-javascript-tests.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3221,14 +3221,14 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,


//============================================================
// operator_position option - ensure no neswlines if preserve_newlines is false - (preserve_newlines = "false")
// operator_position option - ensure no newlines if preserve_newlines is false - (preserve_newlines = "false")
reset_options();
set_name('operator_position option - ensure no neswlines if preserve_newlines is false - (preserve_newlines = "false")');
set_name('operator_position option - ensure no newlines if preserve_newlines is false - (preserve_newlines = "false")');
opts.preserve_newlines = false;
bt(
'var res = a + b - c / d * e % f;\n' +
'var res = g & h | i ^ j |> console.log;\n' +
'var res = (k && l || m) ? n : o;\n' +
'var res = (k && l || m) ? n ?? nn : o;\n' +
'var res = p >> q << r >>> s;\n' +
'var res = t === u !== v != w == x >= y <= z > aa < ab;\n' +
'ac + -ad');
Expand All @@ -3246,6 +3246,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
'l\n' +
'|| m) ?\n' +
'n\n' +
'?? nn\n' +
': o\n' +
';\n' +
'var res = p\n' +
Expand All @@ -3266,20 +3267,20 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
// -- output --
'var res = a + b - c / d * e % f;\n' +
'var res = g & h | i ^ j |> console.log;\n' +
'var res = (k && l || m) ? n : o;\n' +
'var res = (k && l || m) ? n ?? nn : o;\n' +
'var res = p >> q << r >>> s;\n' +
'var res = t === u !== v != w == x >= y <= z > aa < ab;\n' +
'ac + -ad');

// operator_position option - ensure no neswlines if preserve_newlines is false - (operator_position = ""before-newline"", preserve_newlines = "false")
// operator_position option - ensure no newlines if preserve_newlines is false - (operator_position = ""before-newline"", preserve_newlines = "false")
reset_options();
set_name('operator_position option - ensure no neswlines if preserve_newlines is false - (operator_position = ""before-newline"", preserve_newlines = "false")');
set_name('operator_position option - ensure no newlines if preserve_newlines is false - (operator_position = ""before-newline"", preserve_newlines = "false")');
opts.operator_position = 'before-newline';
opts.preserve_newlines = false;
bt(
'var res = a + b - c / d * e % f;\n' +
'var res = g & h | i ^ j |> console.log;\n' +
'var res = (k && l || m) ? n : o;\n' +
'var res = (k && l || m) ? n ?? nn : o;\n' +
'var res = p >> q << r >>> s;\n' +
'var res = t === u !== v != w == x >= y <= z > aa < ab;\n' +
'ac + -ad');
Expand All @@ -3297,6 +3298,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
'l\n' +
'|| m) ?\n' +
'n\n' +
'?? nn\n' +
': o\n' +
';\n' +
'var res = p\n' +
Expand All @@ -3317,20 +3319,20 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
// -- output --
'var res = a + b - c / d * e % f;\n' +
'var res = g & h | i ^ j |> console.log;\n' +
'var res = (k && l || m) ? n : o;\n' +
'var res = (k && l || m) ? n ?? nn : o;\n' +
'var res = p >> q << r >>> s;\n' +
'var res = t === u !== v != w == x >= y <= z > aa < ab;\n' +
'ac + -ad');

// operator_position option - ensure no neswlines if preserve_newlines is false - (operator_position = ""after-newline"", preserve_newlines = "false")
// operator_position option - ensure no newlines if preserve_newlines is false - (operator_position = ""after-newline"", preserve_newlines = "false")
reset_options();
set_name('operator_position option - ensure no neswlines if preserve_newlines is false - (operator_position = ""after-newline"", preserve_newlines = "false")');
set_name('operator_position option - ensure no newlines if preserve_newlines is false - (operator_position = ""after-newline"", preserve_newlines = "false")');
opts.operator_position = 'after-newline';
opts.preserve_newlines = false;
bt(
'var res = a + b - c / d * e % f;\n' +
'var res = g & h | i ^ j |> console.log;\n' +
'var res = (k && l || m) ? n : o;\n' +
'var res = (k && l || m) ? n ?? nn : o;\n' +
'var res = p >> q << r >>> s;\n' +
'var res = t === u !== v != w == x >= y <= z > aa < ab;\n' +
'ac + -ad');
Expand All @@ -3348,6 +3350,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
'l\n' +
'|| m) ?\n' +
'n\n' +
'?? nn\n' +
': o\n' +
';\n' +
'var res = p\n' +
Expand All @@ -3368,20 +3371,20 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
// -- output --
'var res = a + b - c / d * e % f;\n' +
'var res = g & h | i ^ j |> console.log;\n' +
'var res = (k && l || m) ? n : o;\n' +
'var res = (k && l || m) ? n ?? nn : o;\n' +
'var res = p >> q << r >>> s;\n' +
'var res = t === u !== v != w == x >= y <= z > aa < ab;\n' +
'ac + -ad');

// operator_position option - ensure no neswlines if preserve_newlines is false - (operator_position = ""preserve-newline"", preserve_newlines = "false")
// operator_position option - ensure no newlines if preserve_newlines is false - (operator_position = ""preserve-newline"", preserve_newlines = "false")
reset_options();
set_name('operator_position option - ensure no neswlines if preserve_newlines is false - (operator_position = ""preserve-newline"", preserve_newlines = "false")');
set_name('operator_position option - ensure no newlines if preserve_newlines is false - (operator_position = ""preserve-newline"", preserve_newlines = "false")');
opts.operator_position = 'preserve-newline';
opts.preserve_newlines = false;
bt(
'var res = a + b - c / d * e % f;\n' +
'var res = g & h | i ^ j |> console.log;\n' +
'var res = (k && l || m) ? n : o;\n' +
'var res = (k && l || m) ? n ?? nn : o;\n' +
'var res = p >> q << r >>> s;\n' +
'var res = t === u !== v != w == x >= y <= z > aa < ab;\n' +
'ac + -ad');
Expand All @@ -3399,6 +3402,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
'l\n' +
'|| m) ?\n' +
'n\n' +
'?? nn\n' +
': o\n' +
';\n' +
'var res = p\n' +
Expand All @@ -3419,7 +3423,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
// -- output --
'var res = a + b - c / d * e % f;\n' +
'var res = g & h | i ^ j |> console.log;\n' +
'var res = (k && l || m) ? n : o;\n' +
'var res = (k && l || m) ? n ?? nn : o;\n' +
'var res = p >> q << r >>> s;\n' +
'var res = t === u !== v != w == x >= y <= z > aa < ab;\n' +
'ac + -ad');
Expand All @@ -3445,6 +3449,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
'l\n' +
'|| m) ?\n' +
'n\n' +
'?? nn\n' +
': o\n' +
';\n' +
'var res = p\n' +
Expand Down Expand Up @@ -3474,7 +3479,8 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
'var res = (k &&\n' +
' l ||\n' +
' m) ?\n' +
' n :\n' +
' n ??\n' +
' nn :\n' +
' o;\n' +
'var res = p >>\n' +
' q <<\n' +
Expand Down Expand Up @@ -3569,6 +3575,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
'l\n' +
'|| m) ?\n' +
'n\n' +
'?? nn\n' +
': o\n' +
';\n' +
'var res = p\n' +
Expand Down Expand Up @@ -3598,7 +3605,8 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
'var res = (k &&\n' +
' l ||\n' +
' m) ?\n' +
' n :\n' +
' n ??\n' +
' nn :\n' +
' o;\n' +
'var res = p >>\n' +
' q <<\n' +
Expand Down Expand Up @@ -3695,6 +3703,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
'l\n' +
'|| m) ?\n' +
'n\n' +
'?? nn\n' +
': o\n' +
';\n' +
'var res = p\n' +
Expand Down Expand Up @@ -3725,6 +3734,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
' && l\n' +
' || m)\n' +
' ? n\n' +
' ?? nn\n' +
' : o;\n' +
'var res = p\n' +
' >> q\n' +
Expand Down Expand Up @@ -3820,6 +3830,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
'l\n' +
'|| m) ?\n' +
'n\n' +
'?? nn\n' +
': o\n' +
';\n' +
'var res = p\n' +
Expand Down Expand Up @@ -3851,6 +3862,7 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
' l\n' +
' || m) ?\n' +
' n\n' +
' ?? nn\n' +
' : o;\n' +
'var res = p\n' +
' >> q <<\n' +
Expand Down
40 changes: 26 additions & 14 deletions python/jsbeautifier/tests/generated/tests.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2982,13 +2982,13 @@ def unicode_char(value):


#============================================================
# operator_position option - ensure no neswlines if preserve_newlines is false - (preserve_newlines = "false")
# operator_position option - ensure no newlines if preserve_newlines is false - (preserve_newlines = "false")
self.reset_options()
self.options.preserve_newlines = false
bt(
'var res = a + b - c / d * e % f;\n' +
'var res = g & h | i ^ j |> console.log;\n' +
'var res = (k && l || m) ? n : o;\n' +
'var res = (k && l || m) ? n ?? nn : o;\n' +
'var res = p >> q << r >>> s;\n' +
'var res = t === u !== v != w == x >= y <= z > aa < ab;\n' +
'ac + -ad')
Expand All @@ -3006,6 +3006,7 @@ def unicode_char(value):
'l\n' +
'|| m) ?\n' +
'n\n' +
'?? nn\n' +
': o\n' +
';\n' +
'var res = p\n' +
Expand All @@ -3026,19 +3027,19 @@ def unicode_char(value):
# -- output --
'var res = a + b - c / d * e % f;\n' +
'var res = g & h | i ^ j |> console.log;\n' +
'var res = (k && l || m) ? n : o;\n' +
'var res = (k && l || m) ? n ?? nn : o;\n' +
'var res = p >> q << r >>> s;\n' +
'var res = t === u !== v != w == x >= y <= z > aa < ab;\n' +
'ac + -ad')

# operator_position option - ensure no neswlines if preserve_newlines is false - (operator_position = ""before-newline"", preserve_newlines = "false")
# operator_position option - ensure no newlines if preserve_newlines is false - (operator_position = ""before-newline"", preserve_newlines = "false")
self.reset_options()
self.options.operator_position = 'before-newline'
self.options.preserve_newlines = false
bt(
'var res = a + b - c / d * e % f;\n' +
'var res = g & h | i ^ j |> console.log;\n' +
'var res = (k && l || m) ? n : o;\n' +
'var res = (k && l || m) ? n ?? nn : o;\n' +
'var res = p >> q << r >>> s;\n' +
'var res = t === u !== v != w == x >= y <= z > aa < ab;\n' +
'ac + -ad')
Expand All @@ -3056,6 +3057,7 @@ def unicode_char(value):
'l\n' +
'|| m) ?\n' +
'n\n' +
'?? nn\n' +
': o\n' +
';\n' +
'var res = p\n' +
Expand All @@ -3076,19 +3078,19 @@ def unicode_char(value):
# -- output --
'var res = a + b - c / d * e % f;\n' +
'var res = g & h | i ^ j |> console.log;\n' +
'var res = (k && l || m) ? n : o;\n' +
'var res = (k && l || m) ? n ?? nn : o;\n' +
'var res = p >> q << r >>> s;\n' +
'var res = t === u !== v != w == x >= y <= z > aa < ab;\n' +
'ac + -ad')

# operator_position option - ensure no neswlines if preserve_newlines is false - (operator_position = ""after-newline"", preserve_newlines = "false")
# operator_position option - ensure no newlines if preserve_newlines is false - (operator_position = ""after-newline"", preserve_newlines = "false")
self.reset_options()
self.options.operator_position = 'after-newline'
self.options.preserve_newlines = false
bt(
'var res = a + b - c / d * e % f;\n' +
'var res = g & h | i ^ j |> console.log;\n' +
'var res = (k && l || m) ? n : o;\n' +
'var res = (k && l || m) ? n ?? nn : o;\n' +
'var res = p >> q << r >>> s;\n' +
'var res = t === u !== v != w == x >= y <= z > aa < ab;\n' +
'ac + -ad')
Expand All @@ -3106,6 +3108,7 @@ def unicode_char(value):
'l\n' +
'|| m) ?\n' +
'n\n' +
'?? nn\n' +
': o\n' +
';\n' +
'var res = p\n' +
Expand All @@ -3126,19 +3129,19 @@ def unicode_char(value):
# -- output --
'var res = a + b - c / d * e % f;\n' +
'var res = g & h | i ^ j |> console.log;\n' +
'var res = (k && l || m) ? n : o;\n' +
'var res = (k && l || m) ? n ?? nn : o;\n' +
'var res = p >> q << r >>> s;\n' +
'var res = t === u !== v != w == x >= y <= z > aa < ab;\n' +
'ac + -ad')

# operator_position option - ensure no neswlines if preserve_newlines is false - (operator_position = ""preserve-newline"", preserve_newlines = "false")
# operator_position option - ensure no newlines if preserve_newlines is false - (operator_position = ""preserve-newline"", preserve_newlines = "false")
self.reset_options()
self.options.operator_position = 'preserve-newline'
self.options.preserve_newlines = false
bt(
'var res = a + b - c / d * e % f;\n' +
'var res = g & h | i ^ j |> console.log;\n' +
'var res = (k && l || m) ? n : o;\n' +
'var res = (k && l || m) ? n ?? nn : o;\n' +
'var res = p >> q << r >>> s;\n' +
'var res = t === u !== v != w == x >= y <= z > aa < ab;\n' +
'ac + -ad')
Expand All @@ -3156,6 +3159,7 @@ def unicode_char(value):
'l\n' +
'|| m) ?\n' +
'n\n' +
'?? nn\n' +
': o\n' +
';\n' +
'var res = p\n' +
Expand All @@ -3176,7 +3180,7 @@ def unicode_char(value):
# -- output --
'var res = a + b - c / d * e % f;\n' +
'var res = g & h | i ^ j |> console.log;\n' +
'var res = (k && l || m) ? n : o;\n' +
'var res = (k && l || m) ? n ?? nn : o;\n' +
'var res = p >> q << r >>> s;\n' +
'var res = t === u !== v != w == x >= y <= z > aa < ab;\n' +
'ac + -ad')
Expand All @@ -3201,6 +3205,7 @@ def unicode_char(value):
'l\n' +
'|| m) ?\n' +
'n\n' +
'?? nn\n' +
': o\n' +
';\n' +
'var res = p\n' +
Expand Down Expand Up @@ -3230,7 +3235,8 @@ def unicode_char(value):
'var res = (k &&\n' +
' l ||\n' +
' m) ?\n' +
' n :\n' +
' n ??\n' +
' nn :\n' +
' o;\n' +
'var res = p >>\n' +
' q <<\n' +
Expand Down Expand Up @@ -3324,6 +3330,7 @@ def unicode_char(value):
'l\n' +
'|| m) ?\n' +
'n\n' +
'?? nn\n' +
': o\n' +
';\n' +
'var res = p\n' +
Expand Down Expand Up @@ -3353,7 +3360,8 @@ def unicode_char(value):
'var res = (k &&\n' +
' l ||\n' +
' m) ?\n' +
' n :\n' +
' n ??\n' +
' nn :\n' +
' o;\n' +
'var res = p >>\n' +
' q <<\n' +
Expand Down Expand Up @@ -3449,6 +3457,7 @@ def unicode_char(value):
'l\n' +
'|| m) ?\n' +
'n\n' +
'?? nn\n' +
': o\n' +
';\n' +
'var res = p\n' +
Expand Down Expand Up @@ -3479,6 +3488,7 @@ def unicode_char(value):
' && l\n' +
' || m)\n' +
' ? n\n' +
' ?? nn\n' +
' : o;\n' +
'var res = p\n' +
' >> q\n' +
Expand Down Expand Up @@ -3573,6 +3583,7 @@ def unicode_char(value):
'l\n' +
'|| m) ?\n' +
'n\n' +
'?? nn\n' +
': o\n' +
';\n' +
'var res = p\n' +
Expand Down Expand Up @@ -3604,6 +3615,7 @@ def unicode_char(value):
' l\n' +
' || m) ?\n' +
' n\n' +
' ?? nn\n' +
' : o;\n' +
'var res = p\n' +
' >> q <<\n' +
Expand Down
Loading

0 comments on commit c82a98e

Please sign in to comment.