diff --git a/js/test/generated/beautify-javascript-tests.js b/js/test/generated/beautify-javascript-tests.js index 400feb66c..7bb597bad 100644 --- a/js/test/generated/beautify-javascript-tests.js +++ b/js/test/generated/beautify-javascript-tests.js @@ -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'); @@ -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' + @@ -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'); @@ -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' + @@ -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'); @@ -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' + @@ -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'); @@ -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' + @@ -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'); @@ -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' + @@ -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' + @@ -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' + @@ -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' + @@ -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' + @@ -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' + @@ -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' + @@ -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' + diff --git a/python/jsbeautifier/tests/generated/tests.py b/python/jsbeautifier/tests/generated/tests.py index 37e60e00b..3ea33818d 100644 --- a/python/jsbeautifier/tests/generated/tests.py +++ b/python/jsbeautifier/tests/generated/tests.py @@ -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') @@ -3006,6 +3006,7 @@ def unicode_char(value): 'l\n' + '|| m) ?\n' + 'n\n' + + '?? nn\n' + ': o\n' + ';\n' + 'var res = p\n' + @@ -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') @@ -3056,6 +3057,7 @@ def unicode_char(value): 'l\n' + '|| m) ?\n' + 'n\n' + + '?? nn\n' + ': o\n' + ';\n' + 'var res = p\n' + @@ -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') @@ -3106,6 +3108,7 @@ def unicode_char(value): 'l\n' + '|| m) ?\n' + 'n\n' + + '?? nn\n' + ': o\n' + ';\n' + 'var res = p\n' + @@ -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') @@ -3156,6 +3159,7 @@ def unicode_char(value): 'l\n' + '|| m) ?\n' + 'n\n' + + '?? nn\n' + ': o\n' + ';\n' + 'var res = p\n' + @@ -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') @@ -3201,6 +3205,7 @@ def unicode_char(value): 'l\n' + '|| m) ?\n' + 'n\n' + + '?? nn\n' + ': o\n' + ';\n' + 'var res = p\n' + @@ -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' + @@ -3324,6 +3330,7 @@ def unicode_char(value): 'l\n' + '|| m) ?\n' + 'n\n' + + '?? nn\n' + ': o\n' + ';\n' + 'var res = p\n' + @@ -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' + @@ -3449,6 +3457,7 @@ def unicode_char(value): 'l\n' + '|| m) ?\n' + 'n\n' + + '?? nn\n' + ': o\n' + ';\n' + 'var res = p\n' + @@ -3479,6 +3488,7 @@ def unicode_char(value): ' && l\n' + ' || m)\n' + ' ? n\n' + + ' ?? nn\n' + ' : o;\n' + 'var res = p\n' + ' >> q\n' + @@ -3573,6 +3583,7 @@ def unicode_char(value): 'l\n' + '|| m) ?\n' + 'n\n' + + '?? nn\n' + ': o\n' + ';\n' + 'var res = p\n' + @@ -3604,6 +3615,7 @@ def unicode_char(value): ' l\n' + ' || m) ?\n' + ' n\n' + + ' ?? nn\n' + ' : o;\n' + 'var res = p\n' + ' >> q <<\n' + diff --git a/test/data/javascript/inputlib.js b/test/data/javascript/inputlib.js index b7d9671f7..97e299455 100644 --- a/test/data/javascript/inputlib.js +++ b/test/data/javascript/inputlib.js @@ -6,7 +6,7 @@ var operator_position = { sanity: [ 'var res = a + b - c / d * e % f;', 'var res = g & h | i ^ j |> console.log;', - 'var res = (k && l || m) ? n : o;', + 'var res = (k && l || m) ? n ?? nn : o;', 'var res = p >> q << r >>> s;', 'var res = t === u !== v != w == x >= y <= z > aa < ab;', 'ac + -ad' @@ -25,6 +25,7 @@ var operator_position = { 'l', '|| m) ?', 'n', + '?? nn', ': o', ';', 'var res = p', diff --git a/test/data/javascript/tests.js b/test/data/javascript/tests.js index ec14c8e54..ad1215496 100644 --- a/test/data/javascript/tests.js +++ b/test/data/javascript/tests.js @@ -1711,7 +1711,7 @@ exports.test_data = { } ] }, { - name: "operator_position option - ensure no neswlines if preserve_newlines is false", + name: "operator_position option - ensure no newlines if preserve_newlines is false", matrix: [{ options: [ // test for default @@ -1767,7 +1767,8 @@ exports.test_data = { 'var res = (k &&', ' l ||', ' m) ?', - ' n :', + ' n ??', + ' nn :', ' o;', 'var res = p >>', ' q <<', @@ -1841,6 +1842,7 @@ exports.test_data = { ' && l', ' || m)', ' ? n', + ' ?? nn', ' : o;', 'var res = p', ' >> q', @@ -1914,6 +1916,7 @@ exports.test_data = { ' l', ' || m) ?', ' n', + ' ?? nn', ' : o;', 'var res = p', ' >> q <<',