Backed out changeset 48cfe823a5da
authorPaul Rouget <paul@mozilla.com>
Wed, 26 Sep 2012 12:49:42 +0100
changeset 108305 4b211b444e7f866085c4fbd29bf7dd33a93cf78a
parent 108304 48cfe823a5da9fd59a6b1a4f224cb338af9b17d9
child 108306 4419d3a40bde1c0df75d2ec0b87311f22580bf0b
push id82
push usershu@rfrn.org
push dateFri, 05 Oct 2012 13:20:22 +0000
milestone18.0a1
backs out48cfe823a5da9fd59a6b1a4f224cb338af9b17d9
Backed out changeset 48cfe823a5da
browser/devtools/commandline/CmdJsb.jsm
browser/devtools/commandline/test/browser_cmd_jsb.js
browser/devtools/commandline/test/browser_cmd_jsb_script.jsi
browser/devtools/shared/Jsbeautify.jsm
browser/locales/en-US/chrome/browser/devtools/gclicommands.properties
--- a/browser/devtools/commandline/CmdJsb.jsm
+++ b/browser/devtools/commandline/CmdJsb.jsm
@@ -23,117 +23,112 @@ gcli.addCommand({
   returnValue:'string',
   params: [
     {
       name: 'url',
       type: 'string',
       description: gcli.lookup('jsbUrlDesc')
     },
     {
-      group: gcli.lookup("jsbOptionsDesc"),
-      params: [
-        {
-          name: 'indentSize',
-          type: 'number',
-          description: gcli.lookup('jsbIndentSizeDesc'),
-          manual: gcli.lookup('jsbIndentSizeManual'),
-          defaultValue: 2
-        },
-        {
-          name: 'indentChar',
-          type: {
-            name: 'selection',
-            lookup: [
-              { name: "space", value: " " },
-              { name: "tab", value: "\t" }
-            ]
-          },
-          description: gcli.lookup('jsbIndentCharDesc'),
-          manual: gcli.lookup('jsbIndentCharManual'),
-          defaultValue: ' ',
-        },
-        {
-          name: 'doNotPreserveNewlines',
-          type: 'boolean',
-          description: gcli.lookup('jsbDoNotPreserveNewlinesDesc')
-        },
-        {
-          name: 'preserveMaxNewlines',
-          type: 'number',
-          description: gcli.lookup('jsbPreserveMaxNewlinesDesc'),
-          manual: gcli.lookup('jsbPreserveMaxNewlinesManual'),
-          defaultValue: -1
-        },
-        {
-          name: 'jslintHappy',
-          type: 'boolean',
-          description: gcli.lookup('jsbJslintHappyDesc'),
-          manual: gcli.lookup('jsbJslintHappyManual')
-        },
-        {
-          name: 'braceStyle',
-          type: {
-            name: 'selection',
-            data: ['collapse', 'expand', 'end-expand', 'expand-strict']
-          },
-          description: gcli.lookup('jsbBraceStyleDesc'),
-          manual: gcli.lookup('jsbBraceStyleManual'),
-          defaultValue: "collapse"
-        },
-        {
-          name: 'noSpaceBeforeConditional',
-          type: 'boolean',
-          description: gcli.lookup('jsbNoSpaceBeforeConditionalDesc')
-        },
-        {
-          name: 'unescapeStrings',
-          type: 'boolean',
-          description: gcli.lookup('jsbUnescapeStringsDesc'),
-          manual: gcli.lookup('jsbUnescapeStringsManual')
-        }
-      ]
+      name: 'indentSize',
+      type: 'number',
+      description: gcli.lookup('jsbIndentSizeDesc'),
+      manual: gcli.lookup('jsbIndentSizeManual'),
+      defaultValue: 2
+    },
+    {
+      name: 'indentChar',
+      type: {
+        name: 'selection',
+        lookup: [
+          { name: "space", value: " " },
+          { name: "tab", value: "\t" }
+        ]
+      },
+      description: gcli.lookup('jsbIndentCharDesc'),
+      manual: gcli.lookup('jsbIndentCharManual'),
+      defaultValue: ' ',
+    },
+    {
+      name: 'preserveNewlines',
+      type: 'boolean',
+      description: gcli.lookup('jsbPreserveNewlinesDesc'),
+      manual: gcli.lookup('jsbPreserveNewlinesManual')
+    },
+    {
+      name: 'preserveMaxNewlines',
+      type: 'number',
+      description: gcli.lookup('jsbPreserveMaxNewlinesDesc'),
+      manual: gcli.lookup('jsbPreserveMaxNewlinesManual'),
+      defaultValue: -1
+    },
+    {
+      name: 'jslintHappy',
+      type: 'boolean',
+      description: gcli.lookup('jsbJslintHappyDesc'),
+      manual: gcli.lookup('jsbJslintHappyManual')
+    },
+    {
+      name: 'braceStyle',
+      type: {
+        name: 'selection',
+        data: ['collapse', 'expand', 'end-expand', 'expand-strict']
+      },
+      description: gcli.lookup('jsbBraceStyleDesc'),
+      manual: gcli.lookup('jsbBraceStyleManual'),
+      defaultValue: "collapse"
+    },
+    {
+      name: 'spaceBeforeConditional',
+      type: 'boolean',
+      description: gcli.lookup('jsbSpaceBeforeConditionalDesc'),
+      manual: gcli.lookup('jsbSpaceBeforeConditionalManual')
+    },
+    {
+      name: 'unescapeStrings',
+      type: 'boolean',
+      description: gcli.lookup('jsbUnescapeStringsDesc'),
+      manual: gcli.lookup('jsbUnescapeStringsManual')
     }
   ],
   exec: function(args, context) {
     let opts = {
       indent_size: args.indentSize,
       indent_char: args.indentChar,
-      preserve_newlines: !args.doNotPreserveNewlines,
+      preserve_newlines: args.preserveNewlines,
       max_preserve_newlines: args.preserveMaxNewlines == -1 ?
                              undefined : args.preserveMaxNewlines,
       jslint_happy: args.jslintHappy,
       brace_style: args.braceStyle,
-      space_before_conditional: !args.noSpaceBeforeConditional,
+      space_before_conditional: args.spaceBeforeConditional,
       unescape_strings: args.unescapeStrings
-    };
+    }
 
     let xhr = new XMLHttpRequest();
 
     try {
       xhr.open("GET", args.url, true);
     } catch(e) {
       return gcli.lookup('jsbInvalidURL');
     }
 
     let promise = context.createPromise();
 
     xhr.onreadystatechange = function(aEvt) {
       if (xhr.readyState == 4) {
         if (xhr.status == 200 || xhr.status == 0) {
           let browserDoc = context.environment.chromeDocument;
           let browserWindow = browserDoc.defaultView;
-          let gBrowser = browserWindow.gBrowser;
-          let result = js_beautify(xhr.responseText, opts);
-
-          // FIXME: btoa currently only works with ISO-8859-1
-          // Remove "unescape(encodeURIComponent(" when Bug 213047 is fixed.
-          gBrowser.selectedTab = gBrowser.addTab("data:text/plain;base64," +
-            browserWindow.btoa(unescape(encodeURIComponent(result))));
+          let browser = browserWindow.gBrowser;
+  
+          browser.selectedTab = browser.addTab("data:text/plain;base64," +
+            browserWindow.btoa(js_beautify(xhr.responseText, opts)));
           promise.resolve();
-        } else {
+        }
+        else {
           promise.resolve("Unable to load page to beautify: " + args.url + " " +
                           xhr.status + " " + xhr.statusText);
         }
       };
     }
     xhr.send(null);
     return promise;
   }
--- a/browser/devtools/commandline/test/browser_cmd_jsb.js
+++ b/browser/devtools/commandline/test/browser_cmd_jsb.js
@@ -2,49 +2,56 @@
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // Tests that the jsb command works as it should
 
 const TEST_URI = "http://example.com/browser/browser/devtools/commandline/" +
                  "test/browser_cmd_jsb_script.jsi";
 
 function test() {
-  DeveloperToolbarTest.test("about:blank", [ GJT_test ]);
+  DeveloperToolbarTest.test("about:blank", [ /*GJT_test*/ ]);
 }
 
 function GJT_test() {
   helpers.setInput('jsb');
   helpers.check({
     input:  'jsb',
-    hints:     ' <url> [options]',
+    hints:     ' <url> [indentSize] [indentChar] [preserveNewlines] [preserveMaxNewlines] [jslintHappy] [braceStyle] [spaceBeforeConditional] [unescapeStrings]',
     markup: 'VVV',
     status: 'ERROR'
   });
 
   gBrowser.addTabsProgressListener({
     onProgressChange: DeveloperToolbarTest.checkCalled(function GJT_onProgressChange(aBrowser) {
       gBrowser.removeTabsProgressListener(this);
 
       let win = aBrowser._contentWindow;
       let uri = win.document.location.href;
       let result = win.atob(uri.replace(/.*,/, ""));
 
       result = result.replace(/[\r\n]]/g, "\n");
 
       let correct = "function somefunc() {\n" +
-                    "  if (true) // Some comment\n" +
-                    "  doSomething();\n" +
-                    "  for (let n = 0; n < 500; n++) {\n" +
-                    "    if (n % 2 == 1) {\n" +
-                    "      console.log(n);\n" +
-                    "      console.log(n + 1);\n" +
+                    "    for (let n = 0; n < 500; n++) {\n" +
+                    "        if (n % 2 == 1) {\n" +
+                    "            console.log(n);\n" +
+                    "            console.log(n + 1);\n" +
+                    "        }\n" +
                     "    }\n" +
-                    "  }\n" +
                     "}";
       is(result, correct, "JS has been correctly prettified");
     })
   });
 
   info("Checking beautification");
+
   helpers.setInput('jsb ' + TEST_URI);
+  /*
+  helpers.check({
+    input:  'jsb',
+    hints:     ' [options]',
+    markup: 'VVV',
+    status: 'VALID'
+  });
+  */
 
   DeveloperToolbarTest.exec({ completed: false });
 }
--- a/browser/devtools/commandline/test/browser_cmd_jsb_script.jsi
+++ b/browser/devtools/commandline/test/browser_cmd_jsb_script.jsi
@@ -1,2 +1,1 @@
-function somefunc(){if (true) // Some comment
-doSomething();for(let n=0;n<500;n++){if(n%2==1){console.log(n);console.log(n+1);}}}
+function somefunc(){for(let n=0;n<500;n++){if(n%2==1){console.log(n);console.log(n+1);}}}
--- a/browser/devtools/shared/Jsbeautify.jsm
+++ b/browser/devtools/shared/Jsbeautify.jsm
@@ -1,1303 +1,1317 @@
-/*jslint onevar: false, plusplus: false */
-/*jshint curly:true, eqeqeq:true, laxbreak:true, noempty:false */
-/*
-
- JS Beautifier
----------------
+/* Any copyright is dedicated to the Public Domain.
+* http://creativecommons.org/publicdomain/zero/1.0/ */
 
+/*
+JS Beautifier written by Einar Lielmanis, <einar@jsbeautifier.org>
+    http://jsbeautifier.org/
 
-  Written by Einar Lielmanis, <einar@jsbeautifier.org>
-      http://jsbeautifier.org/
+Originally converted to javascript by Vital, <vital76@gmail.com>
+"End braces on own line" added by Chris J. Shull, <chrisjshull@gmail.com>
 
-  Originally converted to javascript by Vital, <vital76@gmail.com>
-  "End braces on own line" added by Chris J. Shull, <chrisjshull@gmail.com>
+You are free to use this in any way you want, in case you find this useful or
+working for you.
 
-  You are free to use this in any way you want, in case you find this useful or working for you.
-
-  Usage:
-    js_beautify(js_source_text);
-    js_beautify(js_source_text, options);
+Usage:
+js_beautify(js_source_text);
+js_beautify(js_source_text, options);
 
-  The options are:
-    indent_size (default 4)          - indentation size,
-    indent_char (default space)      - character to indent with,
-    preserve_newlines (default true) - whether existing line breaks should be preserved,
-    max_preserve_newlines (default unlimited) - maximum number of line breaks to be preserved in one chunk,
-
-    jslint_happy (default false) - if true, then jslint-stricter mode is enforced.
+The options are:
+indent_size (default 4)          — indentation size.
+indent_char (default space)      — character to indent with.
+preserve_newlines (default true) — whether existing line breaks should be
+                                   preserved.
+max_preserve_newlines (default unlimited) - maximum number of line breaks to be
+                                            preserved in one chunk.
+jslint_happy (default false)     — if true, then jslint-stricter mode is
+                                   enforced.
 
-            jslint_happy   !jslint_happy
-            ---------------------------------
-             function ()      function()
+    jslint_happy   !jslint_happy
+    ---------------------------------
+     function ()    function()
 
-    brace_style (default "collapse") - "collapse" | "expand" | "end-expand" | "expand-strict"
-            put braces on the same line as control statements (default), or put braces on own line (Allman / ANSI style), or just put end braces on own line.
+brace_style (default "collapse") - "collapse" | "expand" | "end-expand" |
+                                   "expand-strict"
+    put braces on the same line as control statements (default), or put braces
+    on own line (Allman / ANSI style), or just put end braces on own line.
 
-            expand-strict: put brace on own line even in such cases:
+    expand-strict: put brace on own line even in such cases:
 
-                var a =
-                {
-                    a: 5,
-                    b: 6
-                }
-            This mode may break your scripts - e.g "return { a: 1 }" will be broken into two lines, so beware.
+      var a =
+      {
+        a: 5,
+        b: 6
+      }
+    This mode may break your scripts - e.g "return { a: 1 }" will be broken into
+    two lines, so beware.
 
-    space_before_conditional (default true) - should the space before conditional statement be added, "if(true)" vs "if (true)",
+space_before_conditional (default true) - should the space before conditional
+statement be added, "if(true)" vs "if (true)",
 
-    unescape_strings (default false) - should printable characters in strings encoded in \xNN notation be unescaped, "example" vs "\x65\x78\x61\x6d\x70\x6c\x65"
-
-    e.g
+unescape_strings (default false) - should printable characters in
+strings encoded in \xNN notation be unescaped, "example" vs
+"\x65\x78\x61\x6d\x70\x6c\x65"
 
-    js_beautify(js_source_text, {
-      'indent_size': 1,
-      'indent_char': '\t'
-    });
+e.g
 
-
+js_beautify(js_source_text, {
+  'indent_size': 1,
+  'indent_char': '\t'
+});
 */
 
-let EXPORTED_SYMBOLS = ["js_beautify"];
+"use strict";
 
-function js_beautify(js_source_text, options) {
+var EXPORTED_SYMBOLS = [ "js_beautify" ];
 
-    var input, output, token_text, last_type, last_text, last_last_text, last_word, flags, flag_store, indent_string;
-    var whitespace, wordchar, punct, parser_pos, line_starters, digits;
-    var prefix, token_type, do_block_just_closed;
-    var wanted_newline, just_added_newline, n_newlines;
-    var preindent_string = '';
-
+function js_beautify(js_source_text, options={}) {
+  let input, output, token_text, last_type, last_text, last_last_text,
+    last_word, flags, flag_store, indent_string, whitespace, wordchar,
+    punct, parser_pos, line_starters, digits, prefix, token_type,
+    do_block_just_closed, wanted_newline, just_added_newline, n_newlines,
+    opt_brace_style, preindent_string = '';
 
-    // Some interpreters have unexpected results with foo = baz || bar;
-    options = options ? options : {};
-
-    var opt_brace_style;
-
-    // compatibility
-    if (options.space_after_anon_function !== undefined && options.jslint_happy === undefined) {
-        options.jslint_happy = options.space_after_anon_function;
-    }
-    if (options.braces_on_own_line !== undefined) { //graceful handling of deprecated option
-        opt_brace_style = options.braces_on_own_line ? "expand" : "collapse";
-    }
-    opt_brace_style = options.brace_style ? options.brace_style : (opt_brace_style ? opt_brace_style : "collapse");
+  // compatibility
+  if (options.space_after_anon_function !== undefined &&
+      options.jslint_happy === undefined) {
+    options.jslint_happy = options.space_after_anon_function;
+  }
+  if (options.braces_on_own_line !== undefined) {
+    opt_brace_style = options.braces_on_own_line ? "expand" : "collapse";
+  }
+  opt_brace_style = options.brace_style ? options.brace_style :
+                    (opt_brace_style ? opt_brace_style : "collapse");
 
 
-    var opt_indent_size = options.indent_size ? options.indent_size : 4;
-    var opt_indent_char = options.indent_char ? options.indent_char : ' ';
-    var opt_preserve_newlines = typeof options.preserve_newlines === 'undefined' ? true : options.preserve_newlines;
-    var opt_max_preserve_newlines = typeof options.max_preserve_newlines === 'undefined' ? false : options.max_preserve_newlines;
-    var opt_jslint_happy = options.jslint_happy === 'undefined' ? false : options.jslint_happy;
-    var opt_keep_array_indentation = typeof options.keep_array_indentation === 'undefined' ? false : options.keep_array_indentation;
-    var opt_space_before_conditional = typeof options.space_before_conditional === 'undefined' ? true : options.space_before_conditional;
-    var opt_indent_case = typeof options.indent_case === 'undefined' ? false : options.indent_case;
-    var opt_unescape_strings = typeof options.unescape_strings === 'undefined' ? false : options.unescape_strings;
+  let opt_indent_size = options.indent_size ? options.indent_size : 4;
+  let opt_indent_char = options.indent_char ? options.indent_char : ' ';
+  let opt_preserve_newlines = typeof options.preserve_newlines === 'undefined' ?
+    true : options.preserve_newlines;
+  let opt_max_preserve_newlines =
+    typeof options.max_preserve_newlines === 'undefined' ?
+    false : options.max_preserve_newlines;
+  let opt_jslint_happy = options.jslint_happy === 'undefined' ?
+    false : options.jslint_happy;
+  let opt_keep_array_indentation =
+    typeof options.keep_array_indentation === 'undefined' ?
+    false : options.keep_array_indentation;
+  let opt_space_before_conditional =
+    typeof options.space_before_conditional === 'undefined' ?
+    true : options.space_before_conditional;
+  let opt_indent_case = typeof options.indent_case === 'undefined' ?
+    false : options.indent_case;
+  let opt_unescape_strings = typeof options.unescape_strings === 'undefined' ?
+    false : options.unescape_strings;
 
-    just_added_newline = false;
+  just_added_newline = false;
 
-    // cache the source's length.
-    var input_length = js_source_text.length;
+  // cache the source's length.
+  let input_length = js_source_text.length;
 
-    function trim_output(eat_newlines) {
-        eat_newlines = typeof eat_newlines === 'undefined' ? false : eat_newlines;
-        while (output.length && (output[output.length - 1] === ' '
-            || output[output.length - 1] === indent_string
-            || output[output.length - 1] === preindent_string
-            || (eat_newlines && (output[output.length - 1] === '\n' || output[output.length - 1] === '\r')))) {
-            output.pop();
-        }
-    }
-
-    function trim(s) {
-        return s.replace(/^\s\s*|\s\s*$/, '');
+  function trim_output(eat_newlines) {
+    eat_newlines = typeof eat_newlines === 'undefined' ? false : eat_newlines;
+    while (output.length && (output[output.length - 1] === ' ' ||
+           output[output.length - 1] === indent_string ||
+           output[output.length - 1] === preindent_string ||
+           (eat_newlines && (output[output.length - 1] === '\n' ||
+           output[output.length - 1] === '\r')))) {
+      output.pop();
     }
+  }
 
-    // we could use just string.split, but
-    // IE doesn't like returning empty strings
-    function split_newlines(s) {
-        return s.split(/\x0d\x0a|\x0a/);
-    }
+  function trim(s) {
+    return s.replace(/^\s\s*|\s\s*$/, '');
+  }
+
+  function split_newlines(s)
+  {
+    return s.split(/\x0d\x0a|\x0a/);
+  }
 
-    function force_newline() {
-        var old_keep_array_indentation = opt_keep_array_indentation;
-        opt_keep_array_indentation = false;
-        print_newline();
-        opt_keep_array_indentation = old_keep_array_indentation;
+  function force_newline()
+  {
+    let old_keep_array_indentation = opt_keep_array_indentation;
+    opt_keep_array_indentation = false;
+    print_newline();
+    opt_keep_array_indentation = old_keep_array_indentation;
+  }
+
+  function print_newline(ignore_repeated) {
+
+    flags.eat_next_space = false;
+    if (opt_keep_array_indentation && is_array(flags.mode)) {
+      return;
     }
 
-    function print_newline(ignore_repeated) {
-
-        flags.eat_next_space = false;
-        if (opt_keep_array_indentation && is_array(flags.mode)) {
-            return;
-        }
-
-        ignore_repeated = typeof ignore_repeated === 'undefined' ? true : ignore_repeated;
-
-        flags.if_line = false;
-        trim_output();
-
-        if (!output.length) {
-            return; // no newline on start of file
-        }
+    ignore_repeated = typeof ignore_repeated === 'undefined' ? true : ignore_repeated;
 
-        if (output[output.length - 1] !== "\n" || !ignore_repeated) {
-            just_added_newline = true;
-            output.push("\n");
-        }
-        if (preindent_string) {
-            output.push(preindent_string);
-        }
-        for (var i = 0; i < flags.indentation_level; i += 1) {
-            output.push(indent_string);
-        }
-        if (flags.var_line && flags.var_line_reindented) {
-            output.push(indent_string); // skip space-stuffing, if indenting with a tab
-        }
-        if (flags.case_body) {
-            output.push(indent_string);
-        }
-    }
-
-
-
-    function print_single_space() {
+    flags.if_line = false;
+    trim_output();
 
-        if (last_type === 'TK_COMMENT') {
-            return print_newline();
-        }
-        if (flags.eat_next_space) {
-            flags.eat_next_space = false;
-            return;
-        }
-        var last_output = ' ';
-        if (output.length) {
-            last_output = output[output.length - 1];
-        }
-        if (last_output !== ' ' && last_output !== '\n' && last_output !== indent_string) { // prevent occassional duplicate space
-            output.push(' ');
-        }
-    }
-
-
-    function print_token() {
-        just_added_newline = false;
-        flags.eat_next_space = false;
-        output.push(token_text);
+    if (!output.length) {
+      return; // no newline on start of file
     }
 
-    function indent() {
-        flags.indentation_level += 1;
+    if (output[output.length - 1] !== "\n" || !ignore_repeated) {
+      just_added_newline = true;
+      output.push("\n");
+    }
+    if (preindent_string) {
+      output.push(preindent_string);
+    }
+    for (let i = 0; i < flags.indentation_level; i += 1) {
+      output.push(indent_string);
+    }
+    if (flags.var_line && flags.var_line_reindented) {
+      output.push(indent_string); // skip space-stuffing, if indenting with a tab
+    }
+    if (flags.case_body) {
+      output.push(indent_string);
+    }
+  }
+
+  function print_single_space() {
+
+    if (last_type === 'TK_COMMENT') {
+      return print_newline();
     }
+    if (flags.eat_next_space) {
+      flags.eat_next_space = false;
+      return;
+    }
+    let last_output = ' ';
+    if (output.length) {
+      last_output = output[output.length - 1];
+    }
+    if (last_output !== ' ' && last_output !== '\n' &&
+        last_output !== indent_string) { // prevent occassional duplicate space
+      output.push(' ');
+    }
+  }
+
+
+  function print_token() {
+    just_added_newline = false;
+    flags.eat_next_space = false;
+    output.push(token_text);
+  }
+
+  function indent() {
+    flags.indentation_level += 1;
+  }
 
 
-    function remove_indent() {
-        if (output.length && output[output.length - 1] === indent_string) {
-            output.pop();
-        }
+  function remove_indent() {
+    if (output.length && output[output.length - 1] === indent_string) {
+      output.pop();
+    }
+  }
+
+  function set_mode(mode) {
+    if (flags) {
+      flag_store.push(flags);
     }
+    flags = {
+      previous_mode: flags ? flags.mode : 'BLOCK',
+      mode: mode,
+      var_line: false,
+      var_line_tainted: false,
+      var_line_reindented: false,
+      in_html_comment: false,
+      if_line: false,
+      in_case_statement: false, // switch(..){ INSIDE HERE }
+      in_case: false, // we're on the exact line with "case 0:"
+      case_body: false, // the indented case-action block
+      eat_next_space: false,
+      indentation_baseline: -1,
+      indentation_level: (flags ? flags.indentation_level +
+                         (flags.case_body ? 1 : 0) +
+                         ((flags.var_line && flags.var_line_reindented) ? 1 : 0) : 0),
+      ternary_depth: 0
+    };
+  }
+
+  function is_array(mode) {
+    return mode === '[EXPRESSION]' || mode === '[INDENTED-EXPRESSION]';
+  }
+
+  function is_expression(mode) {
+    return in_array(mode, ['[EXPRESSION]', '(EXPRESSION)',
+           '(FOR-EXPRESSION)', '(COND-EXPRESSION)']);
+  }
 
-    function set_mode(mode) {
-        if (flags) {
-            flag_store.push(flags);
-        }
-        flags = {
-            previous_mode: flags ? flags.mode : 'BLOCK',
-            mode: mode,
-            var_line: false,
-            var_line_tainted: false,
-            var_line_reindented: false,
-            in_html_comment: false,
-            if_line: false,
-            in_case_statement: false, // switch(..){ INSIDE HERE }
-            in_case: false, // we're on the exact line with "case 0:"
-            case_body: false, // the indented case-action block
-            eat_next_space: false,
-            indentation_baseline: -1,
-            indentation_level: (flags ? flags.indentation_level + (flags.case_body ? 1 : 0) + ((flags.var_line && flags.var_line_reindented) ? 1 : 0) : 0),
-            ternary_depth: 0
-        };
+  function restore_mode() {
+    do_block_just_closed = flags.mode === 'DO_BLOCK';
+    if (flag_store.length > 0) {
+      let mode = flags.mode;
+      flags = flag_store.pop();
+      flags.previous_mode = mode;
+    }
+  }
+
+  function all_lines_start_with(lines, c) {
+    for (let line of lines) {
+      line = trim(line);
+      if (line.charAt(0) !== c) {
+        return false;
+      }
     }
+    return true;
+  }
 
-    function is_array(mode) {
-        return mode === '[EXPRESSION]' || mode === '[INDENTED-EXPRESSION]';
+  function is_special_word(word) {
+    return in_array(word, ['case', 'return', 'do', 'if', 'throw', 'else']);
+  }
+
+  function in_array(what, arr) {
+    return arr.indexOf(what) != -1;
+  }
+
+  function look_up(exclude) {
+    let local_pos = parser_pos;
+    let c = input.charAt(local_pos);
+    while (in_array(c, whitespace) && c != exclude) {
+      local_pos++;
+      if (local_pos >= input_length) return 0;
+      c = input.charAt(local_pos);
     }
+    return c;
+  }
 
-    function is_expression(mode) {
-        return in_array(mode, ['[EXPRESSION]', '(EXPRESSION)', '(FOR-EXPRESSION)', '(COND-EXPRESSION)']);
+  function get_next_token() {
+    n_newlines = 0;
+
+    if (parser_pos >= input_length) {
+      return ['', 'TK_EOF'];
     }
 
-    function restore_mode() {
-        do_block_just_closed = flags.mode === 'DO_BLOCK';
-        if (flag_store.length > 0) {
-            var mode = flags.mode;
-            flags = flag_store.pop();
-            flags.previous_mode = mode;
-        }
-    }
+    wanted_newline = false;
 
-    function all_lines_start_with(lines, c) {
-        for (var i = 0; i < lines.length; i++) {
-            var line = trim(lines[i]);
-            if (line.charAt(0) !== c) {
-                return false;
-            }
-        }
-        return true;
-    }
+    let c = input.charAt(parser_pos);
+    parser_pos += 1;
 
-    function is_special_word(word) {
-        return in_array(word, ['case', 'return', 'do', 'if', 'throw', 'else']);
-    }
+    let keep_whitespace = opt_keep_array_indentation && is_array(flags.mode);
+
+    if (keep_whitespace) {
 
-    function in_array(what, arr) {
-        for (var i = 0; i < arr.length; i += 1) {
-            if (arr[i] === what) {
-                return true;
-            }
-        }
-        return false;
-    }
+      //
+      // slight mess to allow nice preservation of array indentation and
+      // reindent that correctly first time when we get to the arrays:
+      // let a = [
+      // ....'something'
+      // we make note of whitespace_count = 4 into flags.indentation_baseline so
+      // we know that 4 whitespaces in original source match indent_level of
+      // reindented source and afterwards, when we get to
+      //  'something,
+      // .......'something else'
+      // we know that this should be indented to indent_level +
+      // (7 - indentation_baseline) spaces
+      //
+      let whitespace_count = 0;
 
-    function look_up(exclude) {
-        var local_pos = parser_pos;
-        var c = input.charAt(local_pos);
-        while (in_array(c, whitespace) && c !== exclude) {
-            local_pos++;
-            if (local_pos >= input_length) {
-                return 0;
-            }
-            c = input.charAt(local_pos);
+      while (in_array(c, whitespace)) {
+        if (c === "\n") {
+          trim_output();
+          output.push("\n");
+          just_added_newline = true;
+          whitespace_count = 0;
+        } else {
+          if (c === '\t') {
+            whitespace_count += 4;
+          } else if (c === '\r') {
+            // nothing
+          } else {
+            whitespace_count += 1;
+          }
         }
-        return c;
-    }
-
-    function get_next_token() {
-        var i;
-        var resulting_string;
-
-        n_newlines = 0;
 
         if (parser_pos >= input_length) {
-            return ['', 'TK_EOF'];
+          return ['', 'TK_EOF'];
         }
 
-        wanted_newline = false;
-
-        var c = input.charAt(parser_pos);
+        c = input.charAt(parser_pos);
         parser_pos += 1;
 
-
-        var keep_whitespace = opt_keep_array_indentation && is_array(flags.mode);
-
-        if (keep_whitespace) {
-
-            //
-            // slight mess to allow nice preservation of array indentation and reindent that correctly
-            // first time when we get to the arrays:
-            // var a = [
-            // ....'something'
-            // we make note of whitespace_count = 4 into flags.indentation_baseline
-            // so we know that 4 whitespaces in original source match indent_level of reindented source
-            //
-            // and afterwards, when we get to
-            //    'something,
-            // .......'something else'
-            // we know that this should be indented to indent_level + (7 - indentation_baseline) spaces
-            //
-            var whitespace_count = 0;
-
-            while (in_array(c, whitespace)) {
-
-                if (c === "\n") {
-                    trim_output();
-                    output.push("\n");
-                    just_added_newline = true;
-                    whitespace_count = 0;
-                } else {
-                    if (c === '\t') {
-                        whitespace_count += 4;
-                    } else if (c === '\r') {
-                        // nothing
-                    } else {
-                        whitespace_count += 1;
-                    }
-                }
-
-                if (parser_pos >= input_length) {
-                    return ['', 'TK_EOF'];
-                }
+      }
+      if (flags.indentation_baseline === -1) {
+        flags.indentation_baseline = whitespace_count;
+      }
 
-                c = input.charAt(parser_pos);
-                parser_pos += 1;
-
-            }
-            if (flags.indentation_baseline === -1) {
-                flags.indentation_baseline = whitespace_count;
-            }
-
-            if (just_added_newline) {
-                for (i = 0; i < flags.indentation_level + 1; i += 1) {
-                    output.push(indent_string);
-                }
-                if (flags.indentation_baseline !== -1) {
-                    for (i = 0; i < whitespace_count - flags.indentation_baseline; i++) {
-                        output.push(' ');
-                    }
-                }
-            }
-
-        } else {
-            while (in_array(c, whitespace)) {
+      if (just_added_newline) {
+        for (let i = 0; i < flags.indentation_level + 1; i += 1) {
+          output.push(indent_string);
+        }
+        if (flags.indentation_baseline !== -1) {
+          for (let i = 0; i < whitespace_count - flags.indentation_baseline; i++) {
+            output.push(' ');
+          }
+        }
+      }
+    } else {
+      while (in_array(c, whitespace)) {
 
-                if (c === "\n") {
-                    n_newlines += ((opt_max_preserve_newlines) ? (n_newlines <= opt_max_preserve_newlines) ? 1 : 0 : 1);
-                }
-
-
-                if (parser_pos >= input_length) {
-                    return ['', 'TK_EOF'];
-                }
-
-                c = input.charAt(parser_pos);
-                parser_pos += 1;
-
-            }
-
-            if (opt_preserve_newlines) {
-                if (n_newlines > 1) {
-                    for (i = 0; i < n_newlines; i += 1) {
-                        print_newline(i === 0);
-                        just_added_newline = true;
-                    }
-                }
-            }
-            wanted_newline = n_newlines > 0;
+        if (c === "\n") {
+          n_newlines += ( (opt_max_preserve_newlines) ?
+            (n_newlines <= opt_max_preserve_newlines) ? 1: 0: 1 );
         }
 
 
-        if (in_array(c, wordchar)) {
-            if (parser_pos < input_length) {
-                while (in_array(input.charAt(parser_pos), wordchar)) {
-                    c += input.charAt(parser_pos);
-                    parser_pos += 1;
-                    if (parser_pos === input_length) {
-                        break;
-                    }
-                }
-            }
-
-            // small and surprisingly unugly hack for 1E-10 representation
-            if (parser_pos !== input_length && c.match(/^[0-9]+[Ee]$/) && (input.charAt(parser_pos) === '-' || input.charAt(parser_pos) === '+')) {
-
-                var sign = input.charAt(parser_pos);
-                parser_pos += 1;
-
-                var t = get_next_token();
-                c += sign + t[0];
-                return [c, 'TK_WORD'];
-            }
-
-            if (c === 'in') { // hack for 'in' operator
-                return [c, 'TK_OPERATOR'];
-            }
-            if (wanted_newline && last_type !== 'TK_OPERATOR'
-                && last_type !== 'TK_EQUALS'
-                && !flags.if_line && (opt_preserve_newlines || last_text !== 'var')) {
-                print_newline();
-            }
-            return [c, 'TK_WORD'];
-        }
-
-        if (c === '(' || c === '[') {
-            return [c, 'TK_START_EXPR'];
-        }
-
-        if (c === ')' || c === ']') {
-            return [c, 'TK_END_EXPR'];
-        }
-
-        if (c === '{') {
-            return [c, 'TK_START_BLOCK'];
-        }
-
-        if (c === '}') {
-            return [c, 'TK_END_BLOCK'];
-        }
-
-        if (c === ';') {
-            return [c, 'TK_SEMICOLON'];
-        }
-
-        if (c === '/') {
-            var comment = '';
-            // peek for comment /* ... */
-            var inline_comment = true;
-            if (input.charAt(parser_pos) === '*') {
-                parser_pos += 1;
-                if (parser_pos < input_length) {
-                    while (parser_pos < input_length &&
-                        ! (input.charAt(parser_pos) === '*' && input.charAt(parser_pos + 1) && input.charAt(parser_pos + 1) === '/')) {
-                        c = input.charAt(parser_pos);
-                        comment += c;
-                        if (c === "\n" || c === "\r") {
-                            inline_comment = false;
-                        }
-                        parser_pos += 1;
-                        if (parser_pos >= input_length) {
-                            break;
-                        }
-                    }
-                }
-                parser_pos += 2;
-                if (inline_comment && n_newlines === 0) {
-                    return ['/*' + comment + '*/', 'TK_INLINE_COMMENT'];
-                } else {
-                    return ['/*' + comment + '*/', 'TK_BLOCK_COMMENT'];
-                }
-            }
-            // peek for comment // ...
-            if (input.charAt(parser_pos) === '/') {
-                comment = c;
-                while (input.charAt(parser_pos) !== '\r' && input.charAt(parser_pos) !== '\n') {
-                    comment += input.charAt(parser_pos);
-                    parser_pos += 1;
-                    if (parser_pos >= input_length) {
-                        break;
-                    }
-                }
-                if (wanted_newline) {
-                    print_newline();
-                }
-                return [comment, 'TK_COMMENT'];
-            }
-
+        if (parser_pos >= input_length) {
+          return ['', 'TK_EOF'];
         }
 
-        if (c === "'" || // string
-        c === '"' || // string
-        (c === '/' &&
-            ((last_type === 'TK_WORD' && is_special_word(last_text)) ||
-                (last_text === ')' && in_array(flags.previous_mode, ['(COND-EXPRESSION)', '(FOR-EXPRESSION)'])) ||
-                (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;
-            var esc2 = 0;
-            resulting_string = c;
+        c = input.charAt(parser_pos);
+        parser_pos += 1;
+      }
+
+      if (opt_preserve_newlines) {
+        if (n_newlines > 1) {
+          for (i = 0; i < n_newlines; i += 1) {
+            print_newline(i === 0);
+            just_added_newline = true;
+          }
+        }
+      }
+      wanted_newline = n_newlines > 0;
+    }
+
+    if (in_array(c, wordchar)) {
+      if (parser_pos < input_length) {
+        while (in_array(input.charAt(parser_pos), wordchar)) {
+          c += input.charAt(parser_pos);
+          parser_pos += 1;
+          if (parser_pos === input_length) {
+            break;
+          }
+        }
+      }
+
+      // small and surprisingly unugly hack for 1E-10 representation
+      if (parser_pos !== input_length && c.match(/^[0-9]+[Ee]$/) &&
+         (input.charAt(parser_pos) === '-' ||
+          input.charAt(parser_pos) === '+')) {
+        let sign = input.charAt(parser_pos);
+        parser_pos += 1;
+
+        let t = get_next_token(parser_pos);
+        c += sign + t[0];
+        return [c, 'TK_WORD'];
+      }
+
+      if (c === 'in') { // hack for 'in' operator
+        return [c, 'TK_OPERATOR'];
+      }
+      if (wanted_newline && last_type !== 'TK_OPERATOR'
+        && last_type !== 'TK_EQUALS'
+        && !flags.if_line && (opt_preserve_newlines || last_text !== 'var')) {
+        print_newline();
+      }
+      return [c, 'TK_WORD'];
+    }
+
+    if (c === '(' || c === '[') {
+      return [c, 'TK_START_EXPR'];
+    }
+
+    if (c === ')' || c === ']') {
+      return [c, 'TK_END_EXPR'];
+    }
+
+    if (c === '{') {
+      return [c, 'TK_START_BLOCK'];
+    }
+
+    if (c === '}') {
+      return [c, 'TK_END_BLOCK'];
+    }
+
+    if (c === ';') {
+      return [c, 'TK_SEMICOLON'];
+    }
+
+    if (c === '/') {
+      let comment = '';
+      // peek for comment /* ... */
+      let inline_comment = true;
+      if (input.charAt(parser_pos) === '*') {
+        parser_pos += 1;
+        if (parser_pos < input_length) {
+          while (parser_pos < input_length && ! (input.charAt(parser_pos) === '*' &&
+            input.charAt(parser_pos + 1) && input.charAt(parser_pos + 1) === '/')) {
 
-            if (parser_pos < input_length) {
-                if (sep === '/') {
-                    //
-                    // handle regexp separately...
-                    //
-                    var in_char_class = false;
-                    while (esc || in_char_class || input.charAt(parser_pos) !== sep) {
-                        resulting_string += input.charAt(parser_pos);
-                        if (!esc) {
-                            esc = input.charAt(parser_pos) === '\\';
-                            if (input.charAt(parser_pos) === '[') {
-                                in_char_class = true;
-                            } else if (input.charAt(parser_pos) === ']') {
-                                in_char_class = false;
-                            }
-                        } else {
-                            esc = false;
-                        }
-                        parser_pos += 1;
-                        if (parser_pos >= input_length) {
-                            // incomplete string/rexp when end-of-file reached.
-                            // bail out with what had been received so far.
-                            return [resulting_string, 'TK_STRING'];
-                        }
-                    }
+            c = input.charAt(parser_pos);
+            comment += c;
+            if (c === "\n" || c === "\r") {
+              inline_comment = false;
+            }
+            parser_pos += 1;
+            if (parser_pos >= input_length) {
+              break;
+            }
+          }
+        }
+        parser_pos += 2;
+        if (inline_comment && n_newlines == 0) {
+          return ['/*' + comment + '*/', 'TK_INLINE_COMMENT'];
+        } else {
+          return ['/*' + comment + '*/', 'TK_BLOCK_COMMENT'];
+        }
+      }
+      // peek for comment // ...
+      if (input.charAt(parser_pos) === '/') {
+        comment = c;
+        while (input.charAt(parser_pos) !== '\r' &&
+               input.charAt(parser_pos) !== '\n') {
+          comment += input.charAt(parser_pos);
+          parser_pos += 1;
+          if (parser_pos >= input_length) {
+            break;
+          }
+        }
+        if (wanted_newline) {
+          print_newline();
+        }
+        return [comment, 'TK_COMMENT'];
+      }
+
+    }
+
+    if (c === "'" || // string
+        c === '"' || // string
+       (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
+
+      let sep = c;
+      let esc = false;
+      let esc1 = 0;
+      let esc2 = 0;
+      let resulting_string = c;
+
+      if (parser_pos < input_length) {
+        if (sep === '/') {
+          //
+          // handle regexp separately...
+          //
+          let in_char_class = false;
+          while (esc || in_char_class || input.charAt(parser_pos) !== sep) {
+            resulting_string += input.charAt(parser_pos);
+            if (!esc) {
+              esc = input.charAt(parser_pos) === '\\';
+              if (input.charAt(parser_pos) === '[') {
+                in_char_class = true;
+              } else if (input.charAt(parser_pos) === ']') {
+                in_char_class = false;
+              }
+            } else {
+              esc = false;
+            }
+            parser_pos += 1;
+            if (parser_pos >= input_length) {
+              // incomplete string/rexp when end-of-file reached.
+              // bail out with what had been received so far.
+              return [resulting_string, 'TK_STRING'];
+            }
+          }
 
-                } else {
-                    //
-                    // and handle string also separately
-                    //
-                    while (esc || input.charAt(parser_pos) !== sep) {
-                        resulting_string += input.charAt(parser_pos);
-                        if (esc1 && esc1 >= esc2) {
-                            esc1 = parseInt(resulting_string.substr(-esc2), 16);
-                            if (esc1 && esc1 >= 0x20 && esc1 <= 0x7e) {
-                                esc1 = String.fromCharCode(esc1);
-                                resulting_string = resulting_string.substr(0, resulting_string.length - esc2 - 2) + (((esc1 === sep) || (esc1 === '\\')) ? '\\' : '') + esc1;
-                            }
-                            esc1 = 0;
-                        }
-                        if (esc1) {
-                            esc1++;
-                        } else if (!esc) {
-                            esc = input.charAt(parser_pos) === '\\';
-                        } else {
-                            esc = false;
-                            if (opt_unescape_strings) {
-                                if (input.charAt(parser_pos) === 'x') {
-                                    esc1++;
-                                    esc2 = 2;
-                                } else if (input.charAt(parser_pos) === 'u') {
-                                    esc1++;
-                                    esc2 = 4;
-                                }
-                            }
-                        }
-                        parser_pos += 1;
-                        if (parser_pos >= input_length) {
-                            // incomplete string/rexp when end-of-file reached.
-                            // bail out with what had been received so far.
-                            return [resulting_string, 'TK_STRING'];
-                        }
-                    }
+        } else {
+          //
+          // and handle string also separately
+          //
+          while (esc || input.charAt(parser_pos) !== sep) {
+            resulting_string += input.charAt(parser_pos);
+            if (esc1 && esc1 >= esc2) {
+              esc1 = parseInt(resulting_string.substr(-esc2), 16);
+              if (esc1 && esc1 >= 0x20 && esc1 <= 0x7e) {
+                esc1 = String.fromCharCode(esc1);
+                resulting_string =
+                  resulting_string.substr(0, resulting_string.length - esc2 - 2) +
+                  (((esc1 === sep) || (esc1 === '\\')) ? '\\' : '') + esc1;
+              }
+              esc1 = 0;
+            }
+            if (esc1) {
+              esc1++;
+            } else if (!esc) {
+              esc = input.charAt(parser_pos) === '\\';
+            } else {
+              esc = false;
+              if (opt_unescape_strings) {
+                if (input.charAt(parser_pos) === 'x') {
+                  esc1++;
+                  esc2 = 2;
+                } else if (input.charAt(parser_pos) === 'u') {
+                  esc1++;
+                  esc2 = 4;
                 }
-
-
-
+              }
+            }
+            parser_pos += 1;
+            if (parser_pos >= input_length) {
+              // incomplete string/rexp when end-of-file reached.
+              // bail out with what had been received so far.
+              return [resulting_string, 'TK_STRING'];
             }
+          }
+        }
+      }
 
-            parser_pos += 1;
+      parser_pos += 1;
+
+      resulting_string += sep;
+
+      if (sep === '/') {
+        // regexps may have modifiers /regexp/MOD , so fetch those, too
+        while (parser_pos < input_length &&
+               in_array(input.charAt(parser_pos), wordchar)) {
+          resulting_string += input.charAt(parser_pos);
+          parser_pos += 1;
+        }
+      }
+      return [resulting_string, 'TK_STRING'];
+    }
+
+    if (c === '#') {
+      if (output.length === 0 && input.charAt(parser_pos) === '!') {
+        // shebang
+        resulting_string = c;
+        while (parser_pos < input_length && c != '\n') {
+          c = input.charAt(parser_pos);
+          resulting_string += c;
+          parser_pos += 1;
+        }
+        output.push(trim(resulting_string) + '\n');
+        print_newline();
+        return get_next_token();
+      }
 
-            resulting_string += sep;
+      // Spidermonkey-specific sharp variables for circular references
+      // https://developer.mozilla.org/En/Sharp_variables_in_JavaScript
+      // http://mxr.mozilla.org/mozilla-central/source/js/src/jsscan.cpp around line 1935
+      let sharp = '#';
+      if (parser_pos < input_length && in_array(input.charAt(parser_pos), digits)) {
+        do {
+          c = input.charAt(parser_pos);
+          sharp += c;
+          parser_pos += 1;
+        } while (parser_pos < input_length && c !== '#' && c !== '=');
+        if (c === '#') {
+          //
+        } else if (input.charAt(parser_pos) === '[' &&
+                   input.charAt(parser_pos + 1) === ']') {
+          sharp += '[]';
+          parser_pos += 2;
+        } else if (input.charAt(parser_pos) === '{' &&
+                   input.charAt(parser_pos + 1) === '}') {
+          sharp += '{}';
+          parser_pos += 2;
+        }
+        return [sharp, 'TK_WORD'];
+      }
+    }
+
+    if (c === '<' && input.substring(parser_pos - 1, parser_pos + 3) === '<!--') {
+      parser_pos += 3;
+      c = '<!--';
+      while (input.charAt(parser_pos) != '\n' && parser_pos < input_length) {
+        c += input.charAt(parser_pos);
+        parser_pos++;
+      }
+      flags.in_html_comment = true;
+      return [c, 'TK_COMMENT'];
+    }
+
+    if (c === '-' && flags.in_html_comment &&
+        input.substring(parser_pos - 1, parser_pos + 2) === '-->') {
+      flags.in_html_comment = false;
+      parser_pos += 2;
+      if (wanted_newline) {
+        print_newline();
+      }
+      return ['-->', 'TK_COMMENT'];
+    }
 
-            if (sep === '/') {
-                // regexps may have modifiers /regexp/MOD , so fetch those, too
-                while (parser_pos < input_length && in_array(input.charAt(parser_pos), wordchar)) {
-                    resulting_string += input.charAt(parser_pos);
-                    parser_pos += 1;
-                }
-            }
-            return [resulting_string, 'TK_STRING'];
+    if (in_array(c, punct)) {
+      while (parser_pos < input_length &&
+             in_array(c + input.charAt(parser_pos), punct)) {
+        c += input.charAt(parser_pos);
+        parser_pos += 1;
+        if (parser_pos >= input_length) {
+          break;
+        }
+      }
+
+      if (c === '=') {
+        return [c, 'TK_EQUALS'];
+      } else {
+        return [c, 'TK_OPERATOR'];
+      }
+    }
+
+    return [c, 'TK_UNKNOWN'];
+  }
+
+  //----------------------------------
+  indent_string = '';
+  while (opt_indent_size > 0) {
+    indent_string += opt_indent_char;
+    opt_indent_size -= 1;
+  }
+
+  while (js_source_text && (js_source_text.charAt(0) === ' ' ||
+         js_source_text.charAt(0) === '\t')) {
+    preindent_string += js_source_text.charAt(0);
+    js_source_text = js_source_text.substring(1);
+  }
+  input = js_source_text;
+
+  last_word = ''; // last 'TK_WORD' passed
+  last_type = 'TK_START_EXPR'; // last token type
+  last_text = ''; // last token text
+  last_last_text = ''; // pre-last token text
+  output = [];
+
+  do_block_just_closed = false;
+
+  whitespace = "\n\r\t ".split('');
+  wordchar = 'abcdefghijklmnopqrstuvwxyz' +
+             'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_$'.split('');
+  digits = '0123456789'.split('');
+
+  punct = '+ - * / % & ++ -- = += -= *= /= %= == === != !== > < >= <= >> << ' +
+          '>>> >>>= >>= <<= && &= | || ! !! , : ? ^ ^= |= ::';
+  punct += ' <%= <% %> <?= <? ?>'; // try not to break markup language identifiers
+  punct = punct.split(' ');
+
+  // words which should always start on new line.
+  line_starters = ['continue', 'try', 'throw', 'return', 'var', 'if', 'switch',
+                   'case', 'default', 'for', 'while', 'break', 'function'];
+
+  // states showing if we are currently in expression (i.e. "if" case) -
+  // 'EXPRESSION', or in usual block (like, procedure), 'BLOCK'.
+  // some formatting depends on that.
+  flag_store = [];
+  set_mode('BLOCK');
+
+  parser_pos = 0;
+  while (true) {
+    let t = get_next_token(parser_pos);
+    token_text = t[0];
+    token_type = t[1];
+    if (token_type === 'TK_EOF') {
+      break;
+    }
+
+    switch (token_type) {
+
+    case 'TK_START_EXPR':
+
+      if (token_text === '[') {
+
+        if (last_type === 'TK_WORD' || last_text === ')') {
+          // this is array index specifier, break immediately
+          // a[x], fn()[x]
+          if (in_array(last_text, line_starters)) {
+            print_single_space();
+          }
+          set_mode('(EXPRESSION)');
+          print_token();
+          break;
         }
 
-        if (c === '#') {
-
+        if (flags.mode === '[EXPRESSION]' || flags.mode === '[INDENTED-EXPRESSION]') {
+          if (last_last_text === ']' && last_text === ',') {
+            // ], [ goes to new line
+            if (flags.mode === '[EXPRESSION]') {
+              flags.mode = '[INDENTED-EXPRESSION]';
+              if (!opt_keep_array_indentation) {
+                indent();
+              }
+            }
+            set_mode('[EXPRESSION]');
+            if (!opt_keep_array_indentation) {
+              print_newline();
+            }
+          } else if (last_text === '[') {
+            if (flags.mode === '[EXPRESSION]') {
+              flags.mode = '[INDENTED-EXPRESSION]';
+              if (!opt_keep_array_indentation) {
+                indent();
+              }
+            }
+            set_mode('[EXPRESSION]');
 
-            if (output.length === 0 && input.charAt(parser_pos) === '!') {
-                // shebang
-                resulting_string = c;
-                while (parser_pos < input_length && c !== '\n') {
-                    c = input.charAt(parser_pos);
-                    resulting_string += c;
-                    parser_pos += 1;
-                }
-                output.push(trim(resulting_string) + '\n');
-                print_newline();
-                return get_next_token();
+            if (!opt_keep_array_indentation) {
+              print_newline();
             }
+          } else {
+            set_mode('[EXPRESSION]');
+          }
+        } else {
+          set_mode('[EXPRESSION]');
+        }
 
 
 
-            // Spidermonkey-specific sharp variables for circular references
-            // https://developer.mozilla.org/En/Sharp_variables_in_JavaScript
-            // http://mxr.mozilla.org/mozilla-central/source/js/src/jsscan.cpp around line 1935
-            var sharp = '#';
-            if (parser_pos < input_length && in_array(input.charAt(parser_pos), digits)) {
-                do {
-                    c = input.charAt(parser_pos);
-                    sharp += c;
-                    parser_pos += 1;
-                } while (parser_pos < input_length && c !== '#' && c !== '=');
-                if (c === '#') {
-                    //
-                } else if (input.charAt(parser_pos) === '[' && input.charAt(parser_pos + 1) === ']') {
-                    sharp += '[]';
-                    parser_pos += 2;
-                } else if (input.charAt(parser_pos) === '{' && input.charAt(parser_pos + 1) === '}') {
-                    sharp += '{}';
-                    parser_pos += 2;
-                }
-                return [sharp, 'TK_WORD'];
-            }
+      } else {
+        if (last_word === 'for') {
+          set_mode('(FOR-EXPRESSION)');
+        } else if (in_array(last_word, ['if', 'while'])) {
+          set_mode('(COND-EXPRESSION)');
+        } else {
+          set_mode('(EXPRESSION)');
+        }
+      }
+
+      if (last_text === ';' || last_type === 'TK_START_BLOCK') {
+        print_newline();
+      } else if (last_type === 'TK_END_EXPR' || last_type === 'TK_START_EXPR' ||
+                last_type === 'TK_END_BLOCK' || last_text === '.') {
+        if (wanted_newline) {
+          print_newline();
         }
+        // do nothing on (( and )( and ][ and ]( and .(
+      } else if (last_type !== 'TK_WORD' && last_type !== 'TK_OPERATOR') {
+        print_single_space();
+      } else if (last_word === 'function' || last_word === 'typeof') {
+        // function() vs function ()
+        if (opt_jslint_happy) {
+          print_single_space();
+        }
+      } else if (in_array(last_text, line_starters) || last_text === 'catch') {
+        if (opt_space_before_conditional) {
+          print_single_space();
+        }
+      }
+      print_token();
+
+      break;
 
-        if (c === '<' && input.substring(parser_pos - 1, parser_pos + 3) === '<!--') {
-            parser_pos += 3;
-            c = '<!--';
-            while (input.charAt(parser_pos) !== '\n' && parser_pos < input_length) {
-                c += input.charAt(parser_pos);
-                parser_pos++;
+    case 'TK_END_EXPR':
+      if (token_text === ']') {
+        if (opt_keep_array_indentation) {
+          if (last_text === '}') {
+            // trim_output();
+            // print_newline(true);
+            remove_indent();
+            print_token();
+            restore_mode();
+            break;
+          }
+        } else {
+          if (flags.mode === '[INDENTED-EXPRESSION]') {
+            if (last_text === ']') {
+              restore_mode();
+              print_newline();
+              print_token();
+              break;
             }
-            flags.in_html_comment = true;
-            return [c, 'TK_COMMENT'];
+          }
         }
+      }
+      restore_mode();
+      print_token();
+      break;
+
+    case 'TK_START_BLOCK':
 
-        if (c === '-' && flags.in_html_comment && input.substring(parser_pos - 1, parser_pos + 2) === '-->') {
-            flags.in_html_comment = false;
-            parser_pos += 2;
-            if (wanted_newline) {
-                print_newline();
+      if (last_word === 'do') {
+        set_mode('DO_BLOCK');
+      } else {
+        set_mode('BLOCK');
+      }
+      if (opt_brace_style=="expand" || opt_brace_style=="expand-strict") {
+        let empty_braces = false;
+        if (opt_brace_style == "expand-strict")
+        {
+          empty_braces = (look_up() == '}');
+          if (!empty_braces) {
+            print_newline(true);
+          }
+        } else {
+          if (last_type !== 'TK_OPERATOR') {
+            if (last_text === '=' || (is_special_word(last_text) &&
+                last_text !== 'else')) {
+              print_single_space();
+            } else {
+              print_newline(true);
             }
-            return ['-->', 'TK_COMMENT'];
+          }
         }
+        print_token();
+        if (!empty_braces) indent();
+      } else {
+        if (last_type !== 'TK_OPERATOR' && last_type !== 'TK_START_EXPR') {
+          if (last_type === 'TK_START_BLOCK') {
+            print_newline();
+          } else {
+            print_single_space();
+          }
+        } else {
+          // if TK_OPERATOR or TK_START_EXPR
+          if (is_array(flags.previous_mode) && last_text === ',') {
+            if (last_last_text === '}') {
+              // }, { in array context
+              print_single_space();
+            } else {
+              print_newline(); // [a, b, c, {
+            }
+          }
+        }
+        indent();
+        print_token();
+      }
 
-        if (in_array(c, punct)) {
-            while (parser_pos < input_length && in_array(c + input.charAt(parser_pos), punct)) {
-                c += input.charAt(parser_pos);
-                parser_pos += 1;
-                if (parser_pos >= input_length) {
-                    break;
-                }
-            }
+      break;
 
-            if (c === ',') {
-                return [c, 'TK_COMMA'];
-            } else if (c === '=') {
-                return [c, 'TK_EQUALS'];
-            } else {
-                return [c, 'TK_OPERATOR'];
-            }
+    case 'TK_END_BLOCK':
+      restore_mode();
+      if (opt_brace_style=="expand" || opt_brace_style == "expand-strict") {
+        if (last_text !== '{') {
+          print_newline();
         }
-
-        return [c, 'TK_UNKNOWN'];
-    }
+        print_token();
+      } else {
+        if (last_type === 'TK_START_BLOCK') {
+          // nothing
+          if (just_added_newline) {
+            remove_indent();
+          } else {
+            // {}
+            trim_output();
+          }
+        } else {
+          if (is_array(flags.mode) && opt_keep_array_indentation) {
+            // we REALLY need a newline here, but newliner would skip that
+            opt_keep_array_indentation = false;
+            print_newline();
+            opt_keep_array_indentation = true;
 
-    //----------------------------------
-    indent_string = '';
-    while (opt_indent_size > 0) {
-        indent_string += opt_indent_char;
-        opt_indent_size -= 1;
-    }
+          } else {
+            print_newline();
+          }
+        }
+        print_token();
+      }
+      break;
+
+    case 'TK_WORD':
 
-    while (js_source_text && (js_source_text.charAt(0) === ' ' || js_source_text.charAt(0) === '\t')) {
-        preindent_string += js_source_text.charAt(0);
-        js_source_text = js_source_text.substring(1);
-    }
-    input = js_source_text;
+      // no, it's not you. even I have problems understanding how this works
+      // and what does what.
+      if (do_block_just_closed) {
+        // do {} ## while ()
+        print_single_space();
+        print_token();
+        print_single_space();
+        do_block_just_closed = false;
+        break;
+      }
+
+      if (token_text === 'function') {
+        if (flags.var_line) {
+          flags.var_line_reindented = true;
+        }
+        if ((just_added_newline || last_text === ';') && last_text !== '{'
+        && last_type != 'TK_BLOCK_COMMENT' && last_type != 'TK_COMMENT') {
+          // make sure there is a nice clean space of at least one blank line
+          // before a new function definition
+          n_newlines = just_added_newline ? n_newlines : 0;
+          if ( ! opt_preserve_newlines) {
+            n_newlines = 1;
+          }
 
-    last_word = ''; // last 'TK_WORD' passed
-    last_type = 'TK_START_EXPR'; // last token type
-    last_text = ''; // last token text
-    last_last_text = ''; // pre-last token text
-    output = [];
-
-    do_block_just_closed = false;
+          for (let i = 0; i < 2 - n_newlines; i++) {
+            print_newline(false);
+          }
+        }
+        if (last_text === 'get' || last_text === 'set' || last_text === 'new') {
+          print_single_space();
+        }
+        print_token();
+        last_word = token_text;
+        break;
+      }
 
-    whitespace = "\n\r\t ".split('');
-    wordchar = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_$'.split('');
-    digits = '0123456789'.split('');
+      if (token_text === 'case' || (token_text === 'default' &&
+          flags.in_case_statement)) {
+        if (last_text === ':' || flags.case_body) {
+          // switch cases following one another
+          remove_indent();
+        } else {
+          // case statement starts in the same line where switch
+          if (!opt_indent_case)
+            flags.indentation_level--;
+          print_newline();
+          if (!opt_indent_case)
+            flags.indentation_level++;
+        }
+        print_token();
+        flags.in_case = true;
+        flags.in_case_statement = true;
+        flags.case_body = false;
+        break;
+      }
 
-    punct = '+ - * / % & ++ -- = += -= *= /= %= == === != !== > < >= <= >> << >>> >>>= >>= <<= && &= | || ! !! , : ? ^ ^= |= ::';
-    punct += ' <%= <% %> <?= <? ?>'; // try to be a good boy and try not to break the markup language identifiers
-    punct = punct.split(' ');
+      prefix = 'NONE';
+
+      if (last_type === 'TK_END_BLOCK') {
 
-    // words which should always start on new line.
-    line_starters = 'continue,try,throw,return,var,if,switch,case,default,for,while,break,function'.split(',');
-
-    // states showing if we are currently in expression (i.e. "if" case) - 'EXPRESSION', or in usual block (like, procedure), 'BLOCK'.
-    // some formatting depends on that.
-    flag_store = [];
-    set_mode('BLOCK');
+        if (!in_array(token_text.toLowerCase(), ['else', 'catch', 'finally'])) {
+          prefix = 'NEWLINE';
+        } else {
+          if (opt_brace_style=="expand" || opt_brace_style=="end-expand" ||
+              opt_brace_style == "expand-strict") {
+            prefix = 'NEWLINE';
+          } else {
+            prefix = 'SPACE';
+            print_single_space();
+          }
+        }
+      } else if (last_type === 'TK_SEMICOLON' && (flags.mode === 'BLOCK' ||
+        flags.mode === 'DO_BLOCK')) {
+        prefix = 'NEWLINE';
+      } else if (last_type === 'TK_SEMICOLON' && is_expression(flags.mode)) {
+        prefix = 'SPACE';
+      } else if (last_type === 'TK_STRING') {
+        prefix = 'NEWLINE';
+      } else if (last_type === 'TK_WORD') {
+        if (last_text === 'else') {
+          // eat newlines between ...else *** some_op...
+          // won't preserve extra newlines in this place (if any),
+          // but don't care that much.
+          trim_output(true);
+        }
+        prefix = 'SPACE';
+      } else if (last_type === 'TK_START_BLOCK') {
+        prefix = 'NEWLINE';
+      } else if (last_type === 'TK_END_EXPR') {
+        print_single_space();
+        prefix = 'NEWLINE';
+      }
 
-    parser_pos = 0;
-    while (true) {
-        var t = get_next_token();
-        token_text = t[0];
-        token_type = t[1];
-        if (token_type === 'TK_EOF') {
-            break;
+      if (in_array(token_text, line_starters) && last_text !== ')') {
+        if (last_text == 'else') {
+          prefix = 'SPACE';
+        } else {
+          prefix = 'NEWLINE';
         }
 
-        switch (token_type) {
-
-        case 'TK_START_EXPR':
-
-            if (token_text === '[') {
-
-                if (last_type === 'TK_WORD' || last_text === ')') {
-                    // this is array index specifier, break immediately
-                    // a[x], fn()[x]
-                    if (in_array(last_text, line_starters)) {
-                        print_single_space();
-                    }
-                    set_mode('(EXPRESSION)');
-                    print_token();
-                    break;
-                }
-
-                if (flags.mode === '[EXPRESSION]' || flags.mode === '[INDENTED-EXPRESSION]') {
-                    if (last_last_text === ']' && last_text === ',') {
-                        // ], [ goes to new line
-                        if (flags.mode === '[EXPRESSION]') {
-                            flags.mode = '[INDENTED-EXPRESSION]';
-                            if (!opt_keep_array_indentation) {
-                                indent();
-                            }
-                        }
-                        set_mode('[EXPRESSION]');
-                        if (!opt_keep_array_indentation) {
-                            print_newline();
-                        }
-                    } else if (last_text === '[') {
-                        if (flags.mode === '[EXPRESSION]') {
-                            flags.mode = '[INDENTED-EXPRESSION]';
-                            if (!opt_keep_array_indentation) {
-                                indent();
-                            }
-                        }
-                        set_mode('[EXPRESSION]');
-
-                        if (!opt_keep_array_indentation) {
-                            print_newline();
-                        }
-                    } else {
-                        set_mode('[EXPRESSION]');
-                    }
-                } else {
-                    set_mode('[EXPRESSION]');
-                }
-
-
-
-            } else {
-                if (last_word === 'for') {
-                    set_mode('(FOR-EXPRESSION)');
-                } else if (in_array(last_word, ['if', 'while'])) {
-                    set_mode('(COND-EXPRESSION)');
-                } else {
-                    set_mode('(EXPRESSION)');
-                }
-            }
-
-            if (last_text === ';' || last_type === 'TK_START_BLOCK') {
-                print_newline();
-            } else if (last_type === 'TK_END_EXPR' || last_type === 'TK_START_EXPR' || last_type === 'TK_END_BLOCK' || last_text === '.') {
-                if (wanted_newline) {
-                    print_newline();
-                }
-                // do nothing on (( and )( and ][ and ]( and .(
-            } else if (last_type !== 'TK_WORD' && last_type !== 'TK_OPERATOR') {
-                print_single_space();
-            } else if (last_word === 'function' || last_word === 'typeof') {
-                // function() vs function ()
-                if (opt_jslint_happy) {
-                    print_single_space();
-                }
-            } else if (in_array(last_text, line_starters) || last_text === 'catch') {
-                if (opt_space_before_conditional) {
-                    print_single_space();
-                }
-            }
-            print_token();
-
-            break;
+      }
 
-        case 'TK_END_EXPR':
-            if (token_text === ']') {
-                if (opt_keep_array_indentation) {
-                    if (last_text === '}') {
-                        // trim_output();
-                        // print_newline(true);
-                        remove_indent();
-                        print_token();
-                        restore_mode();
-                        break;
-                    }
-                } else {
-                    if (flags.mode === '[INDENTED-EXPRESSION]') {
-                        if (last_text === ']') {
-                            restore_mode();
-                            print_newline();
-                            print_token();
-                            break;
-                        }
-                    }
-                }
-            }
-            restore_mode();
-            print_token();
-            break;
-
-        case 'TK_START_BLOCK':
-
-            if (last_word === 'do') {
-                set_mode('DO_BLOCK');
-            } else {
-                set_mode('BLOCK');
-            }
-            if (opt_brace_style === "expand" || opt_brace_style === "expand-strict") {
-                var empty_braces = false;
-                if (opt_brace_style === "expand-strict") {
-                    empty_braces = (look_up() === '}');
-                    if (!empty_braces) {
-                        print_newline(true);
-                    }
-                } else {
-                    if (last_type !== 'TK_OPERATOR') {
-                        if (last_text === '=' || (is_special_word(last_text) && last_text !== 'else')) {
-                            print_single_space();
-                        } else {
-                            print_newline(true);
-                        }
-                    }
-                }
-                print_token();
-                if (!empty_braces) {
-                    indent();
-                }
+      if (flags.if_line && last_type === 'TK_END_EXPR') {
+        flags.if_line = false;
+      }
+      if (in_array(token_text.toLowerCase(), ['else', 'catch', 'finally'])) {
+        if (last_type !== 'TK_END_BLOCK' || opt_brace_style=="expand" ||
+            opt_brace_style=="end-expand" || opt_brace_style == "expand-strict") {
+          print_newline();
+        } else {
+          trim_output(true);
+          print_single_space();
+        }
+      } else if (prefix === 'NEWLINE') {
+        if (is_special_word(last_text)) {
+          // no newline between 'return nnn'
+          print_single_space();
+        } else if (last_type !== 'TK_END_EXPR') {
+          if ((last_type !== 'TK_START_EXPR' || token_text !== 'var') &&
+               last_text !== ':') {
+            // no need to force newline on 'var': for (var x = 0...)
+            if (token_text === 'if' && last_word === 'else' &&
+                last_text !== '{') {
+              // no newline for } else if {
+              print_single_space();
             } else {
-                if (last_type !== 'TK_OPERATOR' && last_type !== 'TK_START_EXPR') {
-                    if (last_type === 'TK_START_BLOCK') {
-                        print_newline();
-                    } else {
-                        print_single_space();
-                    }
-                } else {
-                    // if TK_OPERATOR or TK_START_EXPR
-                    if (is_array(flags.previous_mode) && last_text === ',') {
-                        if (last_last_text === '}') {
-                            // }, { in array context
-                            print_single_space();
-                        } else {
-                            print_newline(); // [a, b, c, {
-                        }
-                    }
-                }
-                indent();
-                print_token();
+              flags.var_line = false;
+              flags.var_line_reindented = false;
+              print_newline();
             }
-
-            break;
+          }
+        } else if (in_array(token_text, line_starters) && last_text != ')') {
+          flags.var_line = false;
+          flags.var_line_reindented = false;
+          print_newline();
+        }
+      } else if (is_array(flags.mode) && last_text === ',' &&
+                 last_last_text === '}') {
+        print_newline(); // }, in lists get a newline treatment
+      } else if (prefix === 'SPACE') {
+        print_single_space();
+      }
+      print_token();
+      last_word = token_text;
 
-        case 'TK_END_BLOCK':
-            restore_mode();
-            if (opt_brace_style === "expand" || opt_brace_style === "expand-strict") {
-                if (last_text !== '{') {
-                    print_newline();
-                }
-                print_token();
-            } else {
-                if (last_type === 'TK_START_BLOCK') {
-                    // nothing
-                    if (just_added_newline) {
-                        remove_indent();
-                    } else {
-                        // {}
-                        trim_output();
-                    }
-                } else {
-                    if (is_array(flags.mode) && opt_keep_array_indentation) {
-                        // we REALLY need a newline here, but newliner would skip that
-                        opt_keep_array_indentation = false;
-                        print_newline();
-                        opt_keep_array_indentation = true;
+      if (token_text === 'var') {
+        flags.var_line = true;
+        flags.var_line_reindented = false;
+        flags.var_line_tainted = false;
+      }
+
+      if (token_text === 'if') {
+        flags.if_line = true;
+      }
+      if (token_text === 'else') {
+        flags.if_line = false;
+      }
 
-                    } else {
-                        print_newline();
-                    }
-                }
-                print_token();
-            }
-            break;
+      break;
+
+    case 'TK_SEMICOLON':
 
-        case 'TK_WORD':
+      print_token();
+      flags.var_line = false;
+      flags.var_line_reindented = false;
+      if (flags.mode == 'OBJECT') {
+        // OBJECT mode is weird and doesn't get reset too well.
+        flags.mode = 'BLOCK';
+      }
+      break;
+
+    case 'TK_STRING':
 
-            // no, it's not you. even I have problems understanding how this works
-            // and what does what.
-            if (do_block_just_closed) {
-                // do {} ## while ()
-                print_single_space();
-                print_token();
-                print_single_space();
-                do_block_just_closed = false;
-                break;
-            }
-
-            prefix = 'NONE';
-
-            if (token_text === 'function') {
-                if (flags.var_line && last_type !== 'TK_EQUALS' ) {
-                    flags.var_line_reindented = true;
-                }
-                if ((just_added_newline || last_text === ';') && last_text !== '{'
-                && last_type !== 'TK_BLOCK_COMMENT' && last_type !== 'TK_COMMENT') {
-                    // make sure there is a nice clean space of at least one blank line
-                    // before a new function definition
-                    n_newlines = just_added_newline ? n_newlines : 0;
-                    if (!opt_preserve_newlines) {
-                        n_newlines = 1;
-                    }
+      if (last_type === 'TK_END_EXPR' && in_array(flags.previous_mode,
+          ['(COND-EXPRESSION)', '(FOR-EXPRESSION)'])) {
+        print_single_space();
+      } else if (last_type === 'TK_COMMENT' || last_type == 'TK_STRING' ||
+                 last_type === 'TK_START_BLOCK' ||
+                 last_type === 'TK_END_BLOCK' || last_type === 'TK_SEMICOLON') {
+        print_newline();
+      } else if (last_type === 'TK_WORD') {
+        print_single_space();
+      }
+      print_token();
+      break;
 
-                    for (var i = 0; i < 2 - n_newlines; i++) {
-                        print_newline(false);
-                    }
-                }
-                if (last_type === 'TK_WORD') {
-                    if (last_text === 'get' || last_text === 'set' || last_text === 'new' || last_text === 'return') {
-                        print_single_space();
-                    } else {
-                        print_newline();
-                    }
-                } else if (last_type === 'TK_OPERATOR' || last_text === '=') {
-                    // foo = function
-                    print_single_space();
-                } else if (is_expression(flags.mode)) {
-                        //ää print nothing
-                } else {
-                    print_newline();
-                }
+    case 'TK_EQUALS':
+      if (flags.var_line) {
+        // just got an '=' in a var-line, different formatting/line-breaking,
+        // etc will now be done.
+        flags.var_line_tainted = true;
+      }
+      print_single_space();
+      print_token();
+      print_single_space();
+      break;
 
-                print_token();
-                last_word = token_text;
-                break;
-            }
+    case 'TK_OPERATOR':
+      let space_before = true;
+      let space_after = true;
 
-            if (token_text === 'case' || (token_text === 'default' && flags.in_case_statement)) {
-                if (last_text === ':' || flags.case_body) {
-                    // switch cases following one another
-                    remove_indent();
-                } else {
-                    // case statement starts in the same line where switch
-                    if (!opt_indent_case) {
-                        flags.indentation_level--;
-                    }
-                    print_newline();
-                    if (!opt_indent_case) {
-                        flags.indentation_level++;
-                    }
-                }
-                print_token();
-                flags.in_case = true;
-                flags.in_case_statement = true;
-                flags.case_body = false;
-                break;
-            }
-
-            if (last_type === 'TK_END_BLOCK') {
+      if (flags.var_line && token_text === ',' && (is_expression(flags.mode))) {
+        // do not break on comma, for(var a = 1, b = 2)
+        flags.var_line_tainted = false;
+      }
 
-                if (!in_array(token_text.toLowerCase(), ['else', 'catch', 'finally'])) {
-                    prefix = 'NEWLINE';
-                } else {
-                    if (opt_brace_style === "expand" || opt_brace_style === "end-expand" || opt_brace_style === "expand-strict") {
-                        prefix = 'NEWLINE';
-                    } else {
-                        prefix = 'SPACE';
-                        print_single_space();
-                    }
-                }
-            } else if (last_type === 'TK_SEMICOLON' && (flags.mode === 'BLOCK' || flags.mode === 'DO_BLOCK')) {
-                prefix = 'NEWLINE';
-            } else if (last_type === 'TK_SEMICOLON' && is_expression(flags.mode)) {
-                prefix = 'SPACE';
-            } else if (last_type === 'TK_STRING') {
-                prefix = 'NEWLINE';
-            } else if (last_type === 'TK_WORD') {
-                if (last_text === 'else') {
-                    // eat newlines between ...else *** some_op...
-                    // won't preserve extra newlines in this place (if any), but don't care that much
-                    trim_output(true);
-                }
-                prefix = 'SPACE';
-            } else if (last_type === 'TK_START_BLOCK') {
-                prefix = 'NEWLINE';
-            } else if (last_type === 'TK_END_EXPR') {
-                print_single_space();
-                prefix = 'NEWLINE';
-            }
+      if (flags.var_line) {
+        if (token_text === ',') {
+          if (flags.var_line_tainted) {
+            print_token();
+            flags.var_line_reindented = true;
+            flags.var_line_tainted = false;
+            print_newline();
+            break;
+          } else {
+            flags.var_line_tainted = false;
+          }
+        // } else if (token_text === ':') {
+          // hmm, when does this happen? tests don't catch this
+          // flags.var_line = false;
+        }
+      }
 
-            if (in_array(token_text, line_starters) && last_text !== ')') {
-                if (last_text === 'else') {
-                    prefix = 'SPACE';
-                } else {
-                    prefix = 'NEWLINE';
-                }
-
-            }
+      if (is_special_word(last_text)) {
+        // "return" had a special handling in TK_WORD. Now we need to return the
+        // favor.
+        print_single_space();
+        print_token();
+        break;
+      }
 
-            if (flags.if_line && last_type === 'TK_END_EXPR') {
-                flags.if_line = false;
-            }
-            if (in_array(token_text.toLowerCase(), ['else', 'catch', 'finally'])) {
-                if (last_type !== 'TK_END_BLOCK' || opt_brace_style === "expand" || opt_brace_style === "end-expand" || opt_brace_style === "expand-strict") {
-                    print_newline();
-                } else {
-                    trim_output(true);
-                    print_single_space();
-                }
-            } else if (prefix === 'NEWLINE') {
-                if (is_special_word(last_text)) {
-                    // no newline between 'return nnn'
-                    print_single_space();
-                } else if (last_type !== 'TK_END_EXPR') {
-                    if ((last_type !== 'TK_START_EXPR' || token_text !== 'var') && last_text !== ':') {
-                        // no need to force newline on 'var': for (var x = 0...)
-                        if (token_text === 'if' && last_word === 'else' && last_text !== '{') {
-                            // no newline for } else if {
-                            print_single_space();
-                        } else {
-                            flags.var_line = false;
-                            flags.var_line_reindented = false;
-                            print_newline();
-                        }
-                    }
-                } else if (in_array(token_text, line_starters) && last_text !== ')') {
-                    flags.var_line = false;
-                    flags.var_line_reindented = false;
-                    print_newline();
-                }
-            } else if (is_array(flags.mode) && last_text === ',' && last_last_text === '}') {
-                print_newline(); // }, in lists get a newline treatment
-            } else if (prefix === 'SPACE') {
-                print_single_space();
-            }
-            print_token();
-            last_word = token_text;
+      // hack for actionscript's import .*;
+      if (token_text == '*' && last_type == 'TK_UNKNOWN' &&
+          !last_last_text.match(/^\d+$/)) {
+        print_token();
+        break;
+      }
 
-            if (token_text === 'var') {
-                flags.var_line = true;
-                flags.var_line_reindented = false;
-                flags.var_line_tainted = false;
-            }
+      if (token_text === ':' && flags.in_case) {
+        if (opt_indent_case) {
+          flags.case_body = true;
+        }
+        print_token(); // colon really asks for separate treatment
+        print_newline();
+        flags.in_case = false;
+        break;
+      }
 
-            if (token_text === 'if') {
-                flags.if_line = true;
-            }
-            if (token_text === 'else') {
-                flags.if_line = false;
-            }
+      if (token_text === '::') {
+        // no spaces around exotic namespacing syntax operator
+        print_token();
+        break;
+      }
 
-            break;
-
-        case 'TK_SEMICOLON':
-
+      if (token_text === ',') {
+        if (flags.var_line) {
+          if (flags.var_line_tainted) {
             print_token();
-            flags.var_line = false;
-            flags.var_line_reindented = false;
-            if (flags.mode === 'OBJECT') {
-                // OBJECT mode is weird and doesn't get reset too well.
-                flags.mode = 'BLOCK';
-            }
-            break;
-
-        case 'TK_STRING':
-
-            if (last_type === 'TK_END_EXPR' && in_array(flags.previous_mode, ['(COND-EXPRESSION)', '(FOR-EXPRESSION)'])) {
-                print_single_space();
-            } else if (last_type === 'TK_COMMENT' || last_type === 'TK_STRING' || last_type === 'TK_START_BLOCK' || last_type === 'TK_END_BLOCK' || last_type === 'TK_SEMICOLON') {
-                print_newline();
-            } else if (last_type === 'TK_WORD') {
-                print_single_space();
-            }
-            print_token();
-            break;
-
-        case 'TK_EQUALS':
-            if (flags.var_line) {
-                // just got an '=' in a var-line, different formatting/line-breaking, etc will now be done
-                flags.var_line_tainted = true;
-            }
-            print_single_space();
+            print_newline();
+            flags.var_line_tainted = false;
+          } else {
             print_token();
             print_single_space();
-            break;
-
-        case 'TK_COMMA':
-            if (flags.var_line) {
-                if (is_expression(flags.mode) || last_type === 'TK_END_BLOCK' ) {
-                    // do not break on comma, for(var a = 1, b = 2)
-                    flags.var_line_tainted = false;
-                }
-                if (flags.var_line_tainted) {
-                    print_token();
-                    flags.var_line_reindented = true;
-                    flags.var_line_tainted = false;
-                    print_newline();
-                    break;
-                } else {
-                    flags.var_line_tainted = false;
-                }
-
-                print_token();
-                print_single_space();
-                break;
-            }
-
-            if (last_type === 'TK_COMMENT') {
-                print_newline();
-            }
-
-            if (last_type === 'TK_END_BLOCK' && flags.mode !== "(EXPRESSION)") {
-                print_token();
-                if (flags.mode === 'OBJECT' && last_text === '}') {
-                    print_newline();
-                } else {
-                    print_single_space();
-                }
-            } else {
-                if (flags.mode === 'OBJECT') {
-                    print_token();
-                    print_newline();
-                } else {
-                    // EXPR or DO_BLOCK
-                    print_token();
-                    print_single_space();
-                }
-            }
-            break;
-
-
-        case 'TK_OPERATOR':
-
-            var space_before = true;
-            var space_after = true;
-
-            if (is_special_word(last_text)) {
-                // "return" had a special handling in TK_WORD. Now we need to return the favor
-                print_single_space();
-                print_token();
-                break;
-            }
-
-            // hack for actionscript's import .*;
-            if (token_text === '*' && last_type === 'TK_UNKNOWN' && !last_last_text.match(/^\d+$/)) {
-                print_token();
-                break;
-            }
-
-            if (token_text === ':' && flags.in_case) {
-                if (opt_indent_case) {
-                    flags.case_body = true;
-                }
-                print_token(); // colon really asks for separate treatment
-                print_newline();
-                flags.in_case = false;
-                break;
-            }
-
-            if (token_text === '::') {
-                // no spaces around exotic namespacing syntax operator
-                print_token();
-                break;
-            }
-
-            if (in_array(token_text, ['--', '++', '!']) || (in_array(token_text, ['-', '+']) && (in_array(last_type, ['TK_START_BLOCK', 'TK_START_EXPR', 'TK_EQUALS', 'TK_OPERATOR']) || in_array(last_text, line_starters)))) {
-                // unary operators (and binary +/- pretending to be unary) special cases
-
-                space_before = false;
-                space_after = false;
-
-                if (last_text === ';' && is_expression(flags.mode)) {
-                    // for (;; ++i)
-                    //        ^^^
-                    space_before = true;
-                }
-                if (last_type === 'TK_WORD' && in_array(last_text, line_starters)) {
-                    space_before = true;
-                }
-
-                if (flags.mode === 'BLOCK' && (last_text === '{' || last_text === ';')) {
-                    // { foo; --i }
-                    // foo(); --bar;
-                    print_newline();
-                }
-            } else if (token_text === '.') {
-                // decimal digits or object.property
-                space_before = false;
-
-            } else if (token_text === ':') {
-                if (flags.ternary_depth === 0) {
-                    if (flags.mode === 'BLOCK') {
-                        flags.mode = 'OBJECT';
-                    }
-                    space_before = false;
-                } else {
-                    flags.ternary_depth -= 1;
-                }
-            } else if (token_text === '?') {
-                flags.ternary_depth += 1;
-            }
-            if (space_before) {
-                print_single_space();
-            }
-
-            print_token();
-
-            if (space_after) {
-                print_single_space();
-            }
-
-            break;
-
-        case 'TK_BLOCK_COMMENT':
-
-            var lines = split_newlines(token_text);
-            var j; // iterator for this case
-
-            if (all_lines_start_with(lines.slice(1), '*')) {
-                // javadoc: reformat and reindent
-                print_newline();
-                output.push(lines[0]);
-                for (j = 1; j < lines.length; j++) {
-                    print_newline();
-                    output.push(' ');
-                    output.push(trim(lines[j]));
-                }
-
-            } else {
-
-                // simple block comment: leave intact
-                if (lines.length > 1) {
-                    // multiline comment block starts with a new line
-                    print_newline();
-                } else {
-                    // single-line /* comment */ stays where it is
-                    if (last_type === 'TK_END_BLOCK') {
-                        print_newline();
-                    } else {
-                        print_single_space();
-                    }
-
-                }
-
-                for (j = 0; j < lines.length; j++) {
-                    output.push(lines[j]);
-                    output.push("\n");
-                }
-
-            }
-            if (look_up('\n') !== '\n') {
-                print_newline();
-            }
-            break;
-
-        case 'TK_INLINE_COMMENT':
+          }
+        } else if (last_type === 'TK_END_BLOCK' &&
+                   flags.mode !== "(EXPRESSION)") {
+          print_token();
+          if (flags.mode === 'OBJECT' && last_text === '}') {
+            print_newline();
+          } else {
             print_single_space();
-            print_token();
-            if (is_expression(flags.mode)) {
-                print_single_space();
-            } else {
-                force_newline();
-            }
-            break;
-
-        case 'TK_COMMENT':
-
-            if (last_text === ',' && !wanted_newline) {
-                trim_output(true);
-            }
-            if (last_type !== 'TK_COMMENT') {
-                if (wanted_newline) {
-                    print_newline();
-                } else {
-                    print_single_space();
-                }
-            }
+          }
+        } else {
+          if (flags.mode === 'OBJECT') {
             print_token();
             print_newline();
-            break;
+          } else {
+            // EXPR or DO_BLOCK
+            print_token();
+            print_single_space();
+          }
+        }
+        break;
+      } else if (in_array(token_text, ['--', '++', '!']) ||
+                (in_array(token_text, ['-', '+']) && (in_array(last_type,
+                 ['TK_START_BLOCK', 'TK_START_EXPR', 'TK_EQUALS', 'TK_OPERATOR']) ||
+                in_array(last_text, line_starters)))) {
+        // unary operators (and binary +/- pretending to be unary) special cases
 
-        case 'TK_UNKNOWN':
-            if (is_special_word(last_text)) {
-                print_single_space();
-            }
-            print_token();
-            break;
+        space_before = false;
+        space_after = false;
+
+        if (last_text === ';' && is_expression(flags.mode)) {
+          // for (;; ++i)
+          //    ^^^
+          space_before = true;
+        }
+        if (last_type === 'TK_WORD' && in_array(last_text, line_starters)) {
+          space_before = true;
         }
 
-        last_last_text = last_text;
-        last_type = token_type;
-        last_text = token_text;
+        if (flags.mode === 'BLOCK' && (last_text === '{' || last_text === ';')) {
+          // { foo; --i }
+          // foo(); --bar;
+          print_newline();
+        }
+      } else if (token_text === '.') {
+        // decimal digits or object.property
+        space_before = false;
+
+      } else if (token_text === ':') {
+        if (flags.ternary_depth == 0) {
+          if (flags.mode == 'BLOCK') {
+            flags.mode = 'OBJECT';
+          }
+          space_before = false;
+        } else {
+          flags.ternary_depth -= 1;
+        }
+      } else if (token_text === '?') {
+        flags.ternary_depth += 1;
+      }
+      if (space_before) {
+        print_single_space();
+      }
+
+      print_token();
+
+      if (space_after) {
+        print_single_space();
+      }
+
+      if (token_text === '!') {
+        // flags.eat_next_space = true;
+      }
+
+      break;
+
+    case 'TK_BLOCK_COMMENT':
+      let lines = split_newlines(token_text);
+
+      if (all_lines_start_with(lines.slice(1), '*')) {
+        // javadoc: reformat and reindent
+        print_newline();
+        output.push(lines[0]);
+        for (let i = 1; i < lines.length; i++) {
+          print_newline();
+          output.push(' ');
+          output.push(trim(lines[i]));
+        }
+      } else {
+        // simple block comment: leave intact
+        if (lines.length > 1) {
+          // multiline comment block starts with a new line
+          print_newline();
+        } else {
+          // single-line /* comment */ stays where it is
+          if (last_type === 'TK_END_BLOCK') {
+            print_newline();
+          } else {
+            print_single_space();
+          }
+
+        }
+
+        for (let i = 0; i < lines.length; i++) {
+          output.push(lines[i]);
+          output.push("\n");
+        }
+      }
+      if(look_up('\n') != '\n') {
+        print_newline();
+      }
+      break;
+
+    case 'TK_INLINE_COMMENT':
+      print_single_space();
+      print_token();
+      if (is_expression(flags.mode)) {
+        print_single_space();
+      } else {
+        force_newline();
+      }
+      break;
+    case 'TK_COMMENT':
+
+      if (last_text == ',' && ! wanted_newline) {
+        trim_output(true);
+      }
+      if (last_type != 'TK_COMMENT') {
+        if (wanted_newline) {
+          print_newline();
+        } else {
+          print_single_space();
+        }
+      }
+      print_token();
+      break;
+    case 'TK_UNKNOWN':
+      if (is_special_word(last_text)) {
+        print_single_space();
+      }
+      print_token();
+      break;
     }
 
-    var sweet_code = preindent_string + output.join('').replace(/[\r\n ]+$/, '');
-    return sweet_code;
+    last_last_text = last_text;
+    last_type = token_type;
+    last_text = token_text;
+  }
 
+  let sweet_code = preindent_string + output.join('').replace(/[\r\n ]+$/, '');
+  return sweet_code;
 }
--- a/browser/locales/en-US/chrome/browser/devtools/gclicommands.properties
+++ b/browser/locales/en-US/chrome/browser/devtools/gclicommands.properties
@@ -804,20 +804,21 @@ jsbIndentSizeManual=The number of chars 
 # alongside the command name, which is why it should be as short as possible.
 jsbIndentCharDesc=The chars used to indent each line
 
 # LOCALIZATION NOTE (jsbIndentCharManual) A fuller description of the
 # 'jsb <indentChar>' parameter, displayed when the user asks for help on what it
 # does.
 jsbIndentCharManual=The chars used to indent each line. The possible choices are space or tab.
 
-# the 'jsb <doNotPreserveNewlines>' parameter. This string is designed to be
-# shown in a menu alongside the command name, which is why it should be as short
-# as possible.
-jsbDoNotPreserveNewlinesDesc=Do not preserve line breaks
+# LOCALIZATION NOTE (jsbPreserveNewlinesDesc) A very short description of the
+# 'jsb <jsbPreserveNewlines>' parameter. This string is designed to be shown
+# in a menu alongside the command name, which is why it should be as short as
+# possible.
+jsbPreserveNewlinesDesc=Keep existing line breaks?
 
 # LOCALIZATION NOTE (jsbPreserveNewlinesManual) A fuller description of the
 # 'jsb <jsbPreserveNewlines>' parameter, displayed when the user asks for help
 # on what it does.
 jsbPreserveNewlinesManual=Should existing line breaks be preserved
 
 # LOCALIZATION NOTE (jsbPreserveMaxNewlinesDesc) A very short description of the
 # 'jsb <preserveMaxNewlines>' parameter. This string is designed to be shown
@@ -847,41 +848,42 @@ jsbJslintHappyManual=When set to true, j
 # possible.
 jsbBraceStyleDesc=Collapse, expand, end-expand, expand-strict
 
 # LOCALIZATION NOTE (jsbBraceStyleManual) A fuller description of the
 # 'jsb <braceStyle>' parameter, displayed when the user asks for help
 # on what it does.
 jsbBraceStyleManual=The coding style of braces. Either collapse, expand, end-expand or expand-strict
 
-# LOCALIZATION NOTE (jsbNoSpaceBeforeConditionalDesc) A very short description
-# of the 'jsb <noSpaceBeforeConditional>' parameter. This string is designed to
-# be shown in a menu alongside the command name, which is why it should be as
-# short as possible.
-jsbNoSpaceBeforeConditionalDesc=No space before conditional statements
+# LOCALIZATION NOTE (jsbSpaceBeforeConditionalDesc) A very short description of
+# the 'jsb <spaceBeforeConditional>' parameter. This string is designed to be
+# shown in a menu alongside the command name, which is why it should be as short
+# as possible.
+jsbSpaceBeforeConditionalDesc=Space before if statements?
+
+# LOCALIZATION NOTE (jsbSpaceBeforeConditionalManual) A fuller description of
+# the 'jsb <spaceBeforeConditional>' parameter, displayed when the user asks for
+# help on what it does.
+jsbSpaceBeforeConditionalManual=Should a space be added before conditional statements?
 
 # LOCALIZATION NOTE (jsbUnescapeStringsDesc) A very short description of the
 # 'jsb <unescapeStrings>' parameter. This string is designed to be shown
 # in a menu alongside the command name, which is why it should be as short as
 # possible.
 jsbUnescapeStringsDesc=Unescape \\xNN characters?
 
 # LOCALIZATION NOTE (jsbUnescapeStringsManual) A fuller description of the
 # 'jsb <unescapeStrings>' parameter, displayed when the user asks for help
 # on what it does.
 jsbUnescapeStringsManual=Should printable characters in strings encoded in \\xNN notation be unescaped?
 
 # LOCALIZATION NOTE (jsbInvalidURL) Displayed when an invalid URL is passed to
 # the jsb command.
 jsbInvalidURL=Please enter a valid URL
 
-# LOCALIZATION NOTE (jsbOptionsDesc) The title of a set of options to
-# the 'jsb' command, displayed as a heading to the list of options.
-jsbOptionsDesc=Options
-
 # LOCALIZATION NOTE (calllogDesc) A very short description of the
 # 'calllog' command. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
 calllogDesc=Commands to manipulate function call logging
 
 # LOCALIZATION NOTE (calllogStartDesc) A very short description of the
 # 'calllog start' command. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.