diff --git a/designer-base/src/com/fr/design/ExtraDesignClassManager.java b/designer-base/src/com/fr/design/ExtraDesignClassManager.java index bfef815c8..9529994f5 100644 --- a/designer-base/src/com/fr/design/ExtraDesignClassManager.java +++ b/designer-base/src/com/fr/design/ExtraDesignClassManager.java @@ -46,8 +46,8 @@ public class ExtraDesignClassManager extends AbstractExtraClassManager implement private static ExtraDesignClassManager classManager = new ExtraDesignClassManager(); private Set shortCuts = new CloseableContainedSet<>(HashSet.class); - - public synchronized static ExtraDesignClassManager getInstance() { + + public static ExtraDesignClassManager getInstance() { return classManager; } diff --git a/designer-base/src/com/fr/design/javascript/beautify/JavaScriptFormatHelper.java b/designer-base/src/com/fr/design/javascript/beautify/JavaScriptFormatHelper.java index fef32a875..7f1468a45 100644 --- a/designer-base/src/com/fr/design/javascript/beautify/JavaScriptFormatHelper.java +++ b/designer-base/src/com/fr/design/javascript/beautify/JavaScriptFormatHelper.java @@ -40,7 +40,7 @@ public class JavaScriptFormatHelper { Reader reader = new InputStreamReader(resourceAsStream); scriptEngine.eval(reader); Invocable invocable = (Invocable) scriptEngine; - result = (String) invocable.invokeFunction("js_beautify", jsCode, option.toFormatArgument()); + result = (String) invocable.invokeFunction("js_beautify_global", jsCode, option.toFormatArgument()); } catch (ScriptException | NoSuchMethodException e) { FineLoggerFactory.getLogger().error(e.getMessage(), e); } diff --git a/designer-base/src/com/fr/design/javascript/beautify/beautify.js b/designer-base/src/com/fr/design/javascript/beautify/beautify.js index 3196471dc..b843e2232 100755 --- a/designer-base/src/com/fr/design/javascript/beautify/beautify.js +++ b/designer-base/src/com/fr/design/javascript/beautify/beautify.js @@ -1,122 +1,594 @@ -/*jslint onevar: false, plusplus: false */ -/*jshint curly:true, eqeqeq:true, laxbreak:true, noempty:false */ - +/*jshint curly:false, eqeqeq:true, laxbreak:true, noempty:false */ +/* AUTO-GENERATED. DO NOT MODIFY. */ +/* see js/src/javascript/index.js */ /* - JS Beautifier - --------------- - + The MIT License (MIT) - Written by Einar Lielmanis, - http://jsbeautifier.org/ + Copyright (c) 2007-2017 Einar Lielmanis, Liam Newman, and contributors. - Originally converted to javascript by Vital, - "End braces on own line" added by Chris J. Shull, + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation files + (the "Software"), to deal in the Software without restriction, + including without limitation the rights to use, copy, modify, merge, + publish, distribute, sublicense, and/or sell copies of the Software, + and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: - You are free to use this in any way you want, in case you find this useful or working for you. + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. - Usage: - js_beautify(js_source_text); - js_beautify(js_source_text, options); + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. - 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, + JS Beautifier +--------------- + + + Written by Einar Lielmanis, + http://jsbeautifier.org/ + + Originally converted to javascript by Vital, + "End braces on own line" added by Chris J. Shull, + Parsing improvements for brace-less statements by Liam Newman + + + 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. + + jslint_happy !jslint_happy + --------------------------------- + function () function() + + switch () { switch() { + case 1: case 1: + break; break; + } } + + space_after_anon_function (default false) - should the space before an anonymous function's parens be added, "function()" vs "function ()", + NOTE: This option is overriden by jslint_happy (i.e. if jslint_happy is true, space_after_anon_function is true by design) + + brace_style (default "collapse") - "collapse" | "expand" | "end-expand" | "none" | any of the former + ",preserve-inline" + 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, or attempt to keep them where they are. + preserve-inline will try to preserve inline blocks of curly braces + + 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" + + wrap_line_length (default unlimited) - lines should wrap at next opportunity after this number of characters. + NOTE: This is not a hard limit. Lines will continue until a point where a newline would + be preserved if it were present. + + end_with_newline (default false) - end output with a newline + + + e.g + + js_beautify(js_source_text, { + 'indent_size': 1, + 'indent_char': '\t' + }); + +*/ + +(function() { +var legacy_beautify_js = +/******/ (function(modules) { // webpackBootstrap +/******/ // The module cache +/******/ var installedModules = {}; +/******/ +/******/ // The require function +/******/ function __webpack_require__(moduleId) { +/******/ +/******/ // Check if module is in cache +/******/ if(installedModules[moduleId]) { +/******/ return installedModules[moduleId].exports; +/******/ } +/******/ // Create a new module (and put it into the cache) +/******/ var module = installedModules[moduleId] = { +/******/ i: moduleId, +/******/ l: false, +/******/ exports: {} +/******/ }; +/******/ +/******/ // Execute the module function +/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); +/******/ +/******/ // Flag the module as loaded +/******/ module.l = true; +/******/ +/******/ // Return the exports of the module +/******/ return module.exports; +/******/ } +/******/ +/******/ +/******/ // expose the modules object (__webpack_modules__) +/******/ __webpack_require__.m = modules; +/******/ +/******/ // expose the module cache +/******/ __webpack_require__.c = installedModules; +/******/ +/******/ // identity function for calling harmony imports with the correct context +/******/ __webpack_require__.i = function(value) { return value; }; +/******/ +/******/ // define getter function for harmony exports +/******/ __webpack_require__.d = function(exports, name, getter) { +/******/ if(!__webpack_require__.o(exports, name)) { +/******/ Object.defineProperty(exports, name, { +/******/ configurable: false, +/******/ enumerable: true, +/******/ get: getter +/******/ }); +/******/ } +/******/ }; +/******/ +/******/ // getDefaultExport function for compatibility with non-harmony modules +/******/ __webpack_require__.n = function(module) { +/******/ var getter = module && module.__esModule ? +/******/ function getDefault() { return module['default']; } : +/******/ function getModuleExports() { return module; }; +/******/ __webpack_require__.d(getter, 'a', getter); +/******/ return getter; +/******/ }; +/******/ +/******/ // Object.prototype.hasOwnProperty.call +/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); }; +/******/ +/******/ // __webpack_public_path__ +/******/ __webpack_require__.p = ""; +/******/ +/******/ // Load entry module and return exports +/******/ return __webpack_require__(__webpack_require__.s = 6); +/******/ }) +/************************************************************************/ +/******/ ([ +/* 0 */ +/***/ (function(module, exports) { + +/* jshint curly: false */ +// This section of code is taken from acorn. +// +// Acorn was written by Marijn Haverbeke and released under an MIT +// license. The Unicode regexps (for identifiers and whitespace) were +// taken from [Esprima](http://esprima.org) by Ariya Hidayat. +// +// Git repositories for Acorn are available at +// +// http://marijnhaverbeke.nl/git/acorn +// https://github.com/marijnh/acorn.git + +// ## Character categories + +// Big ugly regular expressions that match characters in the +// whitespace, identifier, and identifier-start categories. These +// are only applied when a character is found to actually have a +// code point above 128. + +var nonASCIIwhitespace = /[\u1680\u180e\u2000-\u200a\u202f\u205f\u3000\ufeff]/; // jshint ignore:line +var nonASCIIidentifierStartChars = "\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0370-\u0374\u0376\u0377\u037a-\u037d\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u048a-\u0527\u0531-\u0556\u0559\u0561-\u0587\u05d0-\u05ea\u05f0-\u05f2\u0620-\u064a\u066e\u066f\u0671-\u06d3\u06d5\u06e5\u06e6\u06ee\u06ef\u06fa-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u07a5\u07b1\u07ca-\u07ea\u07f4\u07f5\u07fa\u0800-\u0815\u081a\u0824\u0828\u0840-\u0858\u08a0\u08a2-\u08ac\u0904-\u0939\u093d\u0950\u0958-\u0961\u0971-\u0977\u0979-\u097f\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc\u09dd\u09df-\u09e1\u09f0\u09f1\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0\u0ae1\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3d\u0b5c\u0b5d\u0b5f-\u0b61\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bd0\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c33\u0c35-\u0c39\u0c3d\u0c58\u0c59\u0c60\u0c61\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cde\u0ce0\u0ce1\u0cf1\u0cf2\u0d05-\u0d0c\u0d0e-\u0d10\u0d12-\u0d3a\u0d3d\u0d4e\u0d60\u0d61\u0d7a-\u0d7f\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0e01-\u0e30\u0e32\u0e33\u0e40-\u0e46\u0e81\u0e82\u0e84\u0e87\u0e88\u0e8a\u0e8d\u0e94-\u0e97\u0e99-\u0e9f\u0ea1-\u0ea3\u0ea5\u0ea7\u0eaa\u0eab\u0ead-\u0eb0\u0eb2\u0eb3\u0ebd\u0ec0-\u0ec4\u0ec6\u0edc-\u0edf\u0f00\u0f40-\u0f47\u0f49-\u0f6c\u0f88-\u0f8c\u1000-\u102a\u103f\u1050-\u1055\u105a-\u105d\u1061\u1065\u1066\u106e-\u1070\u1075-\u1081\u108e\u10a0-\u10c5\u10c7\u10cd\u10d0-\u10fa\u10fc-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f4\u1401-\u166c\u166f-\u167f\u1681-\u169a\u16a0-\u16ea\u16ee-\u16f0\u1700-\u170c\u170e-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1780-\u17b3\u17d7\u17dc\u1820-\u1877\u1880-\u18a8\u18aa\u18b0-\u18f5\u1900-\u191c\u1950-\u196d\u1970-\u1974\u1980-\u19ab\u19c1-\u19c7\u1a00-\u1a16\u1a20-\u1a54\u1aa7\u1b05-\u1b33\u1b45-\u1b4b\u1b83-\u1ba0\u1bae\u1baf\u1bba-\u1be5\u1c00-\u1c23\u1c4d-\u1c4f\u1c5a-\u1c7d\u1ce9-\u1cec\u1cee-\u1cf1\u1cf5\u1cf6\u1d00-\u1dbf\u1e00-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u2071\u207f\u2090-\u209c\u2102\u2107\u210a-\u2113\u2115\u2119-\u211d\u2124\u2126\u2128\u212a-\u212d\u212f-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2160-\u2188\u2c00-\u2c2e\u2c30-\u2c5e\u2c60-\u2ce4\u2ceb-\u2cee\u2cf2\u2cf3\u2d00-\u2d25\u2d27\u2d2d\u2d30-\u2d67\u2d6f\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u2e2f\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303c\u3041-\u3096\u309d-\u309f\u30a1-\u30fa\u30fc-\u30ff\u3105-\u312d\u3131-\u318e\u31a0-\u31ba\u31f0-\u31ff\u3400-\u4db5\u4e00-\u9fcc\ua000-\ua48c\ua4d0-\ua4fd\ua500-\ua60c\ua610-\ua61f\ua62a\ua62b\ua640-\ua66e\ua67f-\ua697\ua6a0-\ua6ef\ua717-\ua71f\ua722-\ua788\ua78b-\ua78e\ua790-\ua793\ua7a0-\ua7aa\ua7f8-\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\ua882-\ua8b3\ua8f2-\ua8f7\ua8fb\ua90a-\ua925\ua930-\ua946\ua960-\ua97c\ua984-\ua9b2\ua9cf\uaa00-\uaa28\uaa40-\uaa42\uaa44-\uaa4b\uaa60-\uaa76\uaa7a\uaa80-\uaaaf\uaab1\uaab5\uaab6\uaab9-\uaabd\uaac0\uaac2\uaadb-\uaadd\uaae0-\uaaea\uaaf2-\uaaf4\uab01-\uab06\uab09-\uab0e\uab11-\uab16\uab20-\uab26\uab28-\uab2e\uabc0-\uabe2\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\uf900-\ufa6d\ufa70-\ufad9\ufb00-\ufb06\ufb13-\ufb17\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe70-\ufe74\ufe76-\ufefc\uff21-\uff3a\uff41-\uff5a\uff66-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc"; +var nonASCIIidentifierChars = "\u0300-\u036f\u0483-\u0487\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u0620-\u0649\u0672-\u06d3\u06e7-\u06e8\u06fb-\u06fc\u0730-\u074a\u0800-\u0814\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0840-\u0857\u08e4-\u08fe\u0900-\u0903\u093a-\u093c\u093e-\u094f\u0951-\u0957\u0962-\u0963\u0966-\u096f\u0981-\u0983\u09bc\u09be-\u09c4\u09c7\u09c8\u09d7\u09df-\u09e0\u0a01-\u0a03\u0a3c\u0a3e-\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a66-\u0a71\u0a75\u0a81-\u0a83\u0abc\u0abe-\u0ac5\u0ac7-\u0ac9\u0acb-\u0acd\u0ae2-\u0ae3\u0ae6-\u0aef\u0b01-\u0b03\u0b3c\u0b3e-\u0b44\u0b47\u0b48\u0b4b-\u0b4d\u0b56\u0b57\u0b5f-\u0b60\u0b66-\u0b6f\u0b82\u0bbe-\u0bc2\u0bc6-\u0bc8\u0bca-\u0bcd\u0bd7\u0be6-\u0bef\u0c01-\u0c03\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62-\u0c63\u0c66-\u0c6f\u0c82\u0c83\u0cbc\u0cbe-\u0cc4\u0cc6-\u0cc8\u0cca-\u0ccd\u0cd5\u0cd6\u0ce2-\u0ce3\u0ce6-\u0cef\u0d02\u0d03\u0d46-\u0d48\u0d57\u0d62-\u0d63\u0d66-\u0d6f\u0d82\u0d83\u0dca\u0dcf-\u0dd4\u0dd6\u0dd8-\u0ddf\u0df2\u0df3\u0e34-\u0e3a\u0e40-\u0e45\u0e50-\u0e59\u0eb4-\u0eb9\u0ec8-\u0ecd\u0ed0-\u0ed9\u0f18\u0f19\u0f20-\u0f29\u0f35\u0f37\u0f39\u0f41-\u0f47\u0f71-\u0f84\u0f86-\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u1000-\u1029\u1040-\u1049\u1067-\u106d\u1071-\u1074\u1082-\u108d\u108f-\u109d\u135d-\u135f\u170e-\u1710\u1720-\u1730\u1740-\u1750\u1772\u1773\u1780-\u17b2\u17dd\u17e0-\u17e9\u180b-\u180d\u1810-\u1819\u1920-\u192b\u1930-\u193b\u1951-\u196d\u19b0-\u19c0\u19c8-\u19c9\u19d0-\u19d9\u1a00-\u1a15\u1a20-\u1a53\u1a60-\u1a7c\u1a7f-\u1a89\u1a90-\u1a99\u1b46-\u1b4b\u1b50-\u1b59\u1b6b-\u1b73\u1bb0-\u1bb9\u1be6-\u1bf3\u1c00-\u1c22\u1c40-\u1c49\u1c5b-\u1c7d\u1cd0-\u1cd2\u1d00-\u1dbe\u1e01-\u1f15\u200c\u200d\u203f\u2040\u2054\u20d0-\u20dc\u20e1\u20e5-\u20f0\u2d81-\u2d96\u2de0-\u2dff\u3021-\u3028\u3099\u309a\ua640-\ua66d\ua674-\ua67d\ua69f\ua6f0-\ua6f1\ua7f8-\ua800\ua806\ua80b\ua823-\ua827\ua880-\ua881\ua8b4-\ua8c4\ua8d0-\ua8d9\ua8f3-\ua8f7\ua900-\ua909\ua926-\ua92d\ua930-\ua945\ua980-\ua983\ua9b3-\ua9c0\uaa00-\uaa27\uaa40-\uaa41\uaa4c-\uaa4d\uaa50-\uaa59\uaa7b\uaae0-\uaae9\uaaf2-\uaaf3\uabc0-\uabe1\uabec\uabed\uabf0-\uabf9\ufb20-\ufb28\ufe00-\ufe0f\ufe20-\ufe26\ufe33\ufe34\ufe4d-\ufe4f\uff10-\uff19\uff3f"; +var nonASCIIidentifierStart = new RegExp("[" + nonASCIIidentifierStartChars + "]"); +var nonASCIIidentifier = new RegExp("[" + nonASCIIidentifierStartChars + nonASCIIidentifierChars + "]"); + +// Whether a single character denotes a newline. + +exports.newline = /[\n\r\u2028\u2029]/; + +// Matches a whole line break (where CRLF is considered a single +// line break). Used to count lines. + +// in javascript, these two differ +// in python they are the same, different methods are called on them +exports.lineBreak = new RegExp('\r\n|' + exports.newline.source); +exports.allLineBreaks = new RegExp(exports.lineBreak.source, 'g'); + + +// Test whether a given character code starts an identifier. + +exports.isIdentifierStart = function(code) { + // permit $ (36) and @ (64). @ is used in ES7 decorators. + if (code < 65) return code === 36 || code === 64; + // 65 through 91 are uppercase letters. + if (code < 91) return true; + // permit _ (95). + if (code < 97) return code === 95; + // 97 through 123 are lowercase letters. + if (code < 123) return true; + return code >= 0xaa && nonASCIIidentifierStart.test(String.fromCharCode(code)); +}; + +// Test whether a given character is part of an identifier. + +exports.isIdentifierChar = function(code) { + if (code < 48) return code === 36; + if (code < 58) return true; + if (code < 65) return false; + if (code < 91) return true; + if (code < 97) return code === 95; + if (code < 123) return true; + return code >= 0xaa && nonASCIIidentifier.test(String.fromCharCode(code)); +}; + + +/***/ }), +/* 1 */ +/***/ (function(module, exports, __webpack_require__) { - jslint_happy (default false) - if true, then jslint-stricter mode is enforced. +/*jshint curly:true, eqeqeq:true, laxbreak:true, noempty:false */ +/* - jslint_happy !jslint_happy - --------------------------------- - function () function() + The MIT License (MIT) + + Copyright (c) 2007-2017 Einar Lielmanis, Liam Newman, and contributors. + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation files + (the "Software"), to deal in the Software without restriction, + including without limitation the rights to use, copy, modify, merge, + publish, distribute, sublicense, and/or sell copies of the Software, + and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. +*/ + +var mergeOpts = __webpack_require__(3).mergeOpts; +var acorn = __webpack_require__(0); +var Output = __webpack_require__(4).Output; +var Tokenizer = __webpack_require__(7).Tokenizer; + +function remove_redundant_indentation(output, frame) { + // This implementation is effective but has some issues: + // - can cause line wrap to happen too soon due to indent removal + // after wrap points are calculated + // These issues are minor compared to ugly indentation. + + if (frame.multiline_frame || + frame.mode === MODE.ForInitializer || + frame.mode === MODE.Conditional) { + return; + } - 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. + // remove one indent from each line inside this section + var start_index = frame.start_line_index; - expand-strict: put brace on own line even in such cases: + output.remove_indent(start_index); +} - 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. +function in_array(what, arr) { + for (var i = 0; i < arr.length; i += 1) { + if (arr[i] === what) { + return true; + } + } + return false; +} - space_before_conditional (default true) - should the space before conditional statement be added, "if(true)" vs "if (true)", +function trim(s) { + return s.replace(/^\s+|\s+$/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" +function ltrim(s) { + return s.replace(/^\s+/g, ''); +} - e.g +// function rtrim(s) { +// return s.replace(/\s+$/g, ''); +// } - js_beautify(js_source_text, { - 'indent_size': 1, - 'indent_char': '\t' - }); +function generateMapFromStrings(list) { + var result = {}; + for (var x = 0; x < list.length; x++) { + // make the mapped names underscored instead of dash + result[list[x].replace(/-/g, '_')] = list[x]; + } + return result; +} - */ +function sanitizeOperatorPosition(opPosition) { + opPosition = opPosition || OPERATOR_POSITION.before_newline; + if (!in_array(opPosition, validPositionValues)) { + throw new Error("Invalid Option Value: The option 'operator_position' must be one of the following values\n" + + validPositionValues + + "\nYou passed in: '" + opPosition + "'"); + } -function js_beautify(js_source_text, options) { + return opPosition; +} - 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 = ''; +var validPositionValues = ['before-newline', 'after-newline', 'preserve-newline']; + +// Generate map from array +var OPERATOR_POSITION = generateMapFromStrings(validPositionValues); + +var OPERATOR_POSITION_BEFORE_OR_PRESERVE = [OPERATOR_POSITION.before_newline, OPERATOR_POSITION.preserve_newline]; + +var MODE = { + BlockStatement: 'BlockStatement', // 'BLOCK' + Statement: 'Statement', // 'STATEMENT' + ObjectLiteral: 'ObjectLiteral', // 'OBJECT', + ArrayLiteral: 'ArrayLiteral', //'[EXPRESSION]', + ForInitializer: 'ForInitializer', //'(FOR-EXPRESSION)', + Conditional: 'Conditional', //'(COND-EXPRESSION)', + Expression: 'Expression' //'(EXPRESSION)' +}; + +function Beautifier(js_source_text, options) { + "use strict"; + var output; + var tokens = [], + token_pos; + var tokenizer; + var current_token; + var last_type, last_last_text, indent_string; + var flags, previous_flags, flag_store; + var prefix; + + var handlers, opt; + var baseIndentString = ''; + + handlers = { + 'TK_START_EXPR': handle_start_expr, + 'TK_END_EXPR': handle_end_expr, + 'TK_START_BLOCK': handle_start_block, + 'TK_END_BLOCK': handle_end_block, + 'TK_WORD': handle_word, + 'TK_RESERVED': handle_word, + 'TK_SEMICOLON': handle_semicolon, + 'TK_STRING': handle_string, + 'TK_EQUALS': handle_equals, + 'TK_OPERATOR': handle_operator, + 'TK_COMMA': handle_comma, + 'TK_BLOCK_COMMENT': handle_block_comment, + 'TK_COMMENT': handle_comment, + 'TK_DOT': handle_dot, + 'TK_UNKNOWN': handle_unknown, + 'TK_EOF': handle_eof + }; + + function create_flags(flags_base, mode) { + var next_indent_level = 0; + if (flags_base) { + next_indent_level = flags_base.indentation_level; + if (!output.just_added_newline() && + flags_base.line_indent_level > next_indent_level) { + next_indent_level = flags_base.line_indent_level; + } + } + var next_flags = { + mode: mode, + parent: flags_base, + last_text: flags_base ? flags_base.last_text : '', // last token text + last_word: flags_base ? flags_base.last_word : '', // last 'TK_WORD' passed + declaration_statement: false, + declaration_assignment: false, + multiline_frame: false, + inline_frame: false, + if_block: false, + else_block: false, + do_block: false, + do_while: false, + import_block: 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 + indentation_level: next_indent_level, + line_indent_level: flags_base ? flags_base.line_indent_level : next_indent_level, + start_line_index: output.get_line_number(), + ternary_depth: 0 + }; + return next_flags; + } // Some interpreters have unexpected results with foo = baz || bar; options = options ? options : {}; - var opt_brace_style; + // Allow the setting of language/file-type specific options + // with inheritance of overall settings + options = mergeOpts(options, 'js'); + + opt = {}; + + // compatibility, re + if (options.brace_style === "expand-strict") { //graceful handling of deprecated option + options.brace_style = "expand"; + } else if (options.brace_style === "collapse-preserve-inline") { //graceful handling of deprecated option + options.brace_style = "collapse,preserve-inline"; + } else if (options.braces_on_own_line !== undefined) { //graceful handling of deprecated option + options.brace_style = options.braces_on_own_line ? "expand" : "collapse"; + } else if (!options.brace_style) { //Nothing exists to set it + options.brace_style = "collapse"; + } - // compatibility - if (options.space_after_anon_function !== undefined && options.jslint_happy === undefined) { - options.jslint_happy = options.space_after_anon_function; + //preserve-inline in delimited string will trigger brace_preserve_inline, everything + //else is considered a brace_style and the last one only will have an effect + var brace_style_split = options.brace_style.split(/[^a-zA-Z0-9_\-]+/); + opt.brace_preserve_inline = false; //Defaults in case one or other was not specified in meta-option + opt.brace_style = "collapse"; + for (var bs = 0; bs < brace_style_split.length; bs++) { + if (brace_style_split[bs] === "preserve-inline") { + opt.brace_preserve_inline = true; + } else { + opt.brace_style = brace_style_split[bs]; + } } - if (options.braces_on_own_line !== undefined) { //graceful handling of deprecated option - opt_brace_style = options.braces_on_own_line ? "expand" : "collapse"; + + opt.indent_size = options.indent_size ? parseInt(options.indent_size, 10) : 4; + opt.indent_char = options.indent_char ? options.indent_char : ' '; + opt.eol = options.eol ? options.eol : 'auto'; + opt.preserve_newlines = (options.preserve_newlines === undefined) ? true : options.preserve_newlines; + opt.unindent_chained_methods = (options.unindent_chained_methods === undefined) ? false : options.unindent_chained_methods; + opt.break_chained_methods = (options.break_chained_methods === undefined) ? false : options.break_chained_methods; + opt.max_preserve_newlines = (options.max_preserve_newlines === undefined) ? 0 : parseInt(options.max_preserve_newlines, 10); + opt.space_in_paren = (options.space_in_paren === undefined) ? false : options.space_in_paren; + opt.space_in_empty_paren = (options.space_in_empty_paren === undefined) ? false : options.space_in_empty_paren; + opt.jslint_happy = (options.jslint_happy === undefined) ? false : options.jslint_happy; + opt.space_after_anon_function = (options.space_after_anon_function === undefined) ? false : options.space_after_anon_function; + opt.keep_array_indentation = (options.keep_array_indentation === undefined) ? false : options.keep_array_indentation; + opt.space_before_conditional = (options.space_before_conditional === undefined) ? true : options.space_before_conditional; + opt.unescape_strings = (options.unescape_strings === undefined) ? false : options.unescape_strings; + opt.wrap_line_length = (options.wrap_line_length === undefined) ? 0 : parseInt(options.wrap_line_length, 10); + opt.e4x = (options.e4x === undefined) ? false : options.e4x; + opt.end_with_newline = (options.end_with_newline === undefined) ? false : options.end_with_newline; + opt.comma_first = (options.comma_first === undefined) ? false : options.comma_first; + opt.operator_position = sanitizeOperatorPosition(options.operator_position); + + // For testing of beautify ignore:start directive + opt.test_output_raw = (options.test_output_raw === undefined) ? false : options.test_output_raw; + + // force opt.space_after_anon_function to true if opt.jslint_happy + if (opt.jslint_happy) { + opt.space_after_anon_function = true; } - opt_brace_style = options.brace_style ? options.brace_style : (opt_brace_style ? opt_brace_style : "collapse"); + if (options.indent_with_tabs) { + opt.indent_char = '\t'; + opt.indent_size = 1; + } - var opt_indent_size = options.indent_size ? options.indent_size : 4, - opt_indent_char = options.indent_char ? options.indent_char : ' ', - opt_preserve_newlines = typeof options.preserve_newlines === 'undefined' ? true : options.preserve_newlines, - opt_break_chained_methods = typeof options.break_chained_methods === 'undefined' ? false : options.break_chained_methods, - opt_max_preserve_newlines = typeof options.max_preserve_newlines === 'undefined' ? false : options.max_preserve_newlines, - opt_jslint_happy = options.jslint_happy === 'undefined' ? false : options.jslint_happy, - opt_keep_array_indentation = typeof options.keep_array_indentation === 'undefined' ? false : options.keep_array_indentation, - opt_space_before_conditional = typeof options.space_before_conditional === 'undefined' ? true : options.space_before_conditional, - opt_unescape_strings = typeof options.unescape_strings === 'undefined' ? false : options.unescape_strings; + if (opt.eol === 'auto') { + opt.eol = '\n'; + if (js_source_text && acorn.lineBreak.test(js_source_text || '')) { + opt.eol = js_source_text.match(acorn.lineBreak)[0]; + } + } - just_added_newline = false; + opt.eol = opt.eol.replace(/\\r/, '\r').replace(/\\n/, '\n'); - // cache the source's length. - var input_length = js_source_text.length; + //---------------------------------- + indent_string = ''; + while (opt.indent_size > 0) { + indent_string += opt.indent_char; + opt.indent_size -= 1; + } - 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(); + var preindent_index = 0; + if (js_source_text && js_source_text.length) { + while ((js_source_text.charAt(preindent_index) === ' ' || + js_source_text.charAt(preindent_index) === '\t')) { + preindent_index += 1; } + baseIndentString = js_source_text.substring(0, preindent_index); + js_source_text = js_source_text.substring(preindent_index); } - function trim(s) { - return s.replace(/^\s\s*|\s\s*$/, ''); + last_type = 'TK_START_BLOCK'; // last token type + last_last_text = ''; // pre-last token text + output = new Output(indent_string, baseIndentString); + + // If testing the ignore directive, start with output disable set to true + output.raw = opt.test_output_raw; + + + // Stack of parsing/formatting states, including MODE. + // We tokenize, parse, and output in an almost purely a forward-only stream of token input + // and formatted output. This makes the beautifier less accurate than full parsers + // but also far more tolerant of syntax errors. + // + // For example, the default mode is MODE.BlockStatement. If we see a '{' we push a new frame of type + // MODE.BlockStatement on the the stack, even though it could be object literal. If we later + // encounter a ":", we'll switch to to MODE.ObjectLiteral. If we then see a ";", + // most full parsers would die, but the beautifier gracefully falls back to + // MODE.BlockStatement and continues on. + flag_store = []; + set_mode(MODE.BlockStatement); + + this.beautify = function() { + + /*jshint onevar:true */ + var sweet_code; + tokenizer = new Tokenizer(js_source_text, opt, indent_string); + tokens = tokenizer.tokenize(); + token_pos = 0; + + current_token = get_token(); + while (current_token) { + handlers[current_token.type](); + + last_last_text = flags.last_text; + last_type = current_token.type; + flags.last_text = current_token.text; + + token_pos += 1; + current_token = get_token(); + } + + sweet_code = output.get_code(opt.end_with_newline, opt.eol); + + return sweet_code; + }; + + function handle_whitespace_and_comments(local_token, preserve_statement_flags) { + var newlines = local_token.newlines; + var keep_whitespace = opt.keep_array_indentation && is_array(flags.mode); + var temp_token = current_token; + + for (var h = 0; h < local_token.comments_before.length; h++) { + // The cleanest handling of inline comments is to treat them as though they aren't there. + // Just continue formatting and the behavior should be logical. + // Also ignore unknown tokens. Again, this should result in better behavior. + current_token = local_token.comments_before[h]; + handle_whitespace_and_comments(current_token, preserve_statement_flags); + handlers[current_token.type](preserve_statement_flags); + } + current_token = temp_token; + + if (keep_whitespace) { + for (var i = 0; i < newlines; i += 1) { + print_newline(i > 0, preserve_statement_flags); + } + } else { + if (opt.max_preserve_newlines && newlines > opt.max_preserve_newlines) { + newlines = opt.max_preserve_newlines; + } + + if (opt.preserve_newlines) { + if (local_token.newlines > 1) { + print_newline(false, preserve_statement_flags); + for (var j = 1; j < newlines; j += 1) { + print_newline(true, preserve_statement_flags); + } + } + } + } + } // we could use just string.split, but // IE doesn't like returning empty strings - function split_newlines(s) { + function split_linebreaks(s) { //return s.split(/\x0d\x0a|\x0a/); - s = s.replace(/\x0d/g, ''); + s = s.replace(acorn.allLineBreaks, '\n'); var out = [], idx = s.indexOf("\n"); while (idx !== -1) { @@ -130,123 +602,184 @@ function js_beautify(js_source_text, options) { return out; } - 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; - } + var newline_restricted_tokens = ['break', 'continue', 'return', 'throw', 'yield']; - function print_newline(ignore_repeated, reset_statement_flags) { + function allow_wrap_or_preserved_newline(force_linewrap) { + force_linewrap = (force_linewrap === undefined) ? false : force_linewrap; - flags.eat_next_space = false; - if (opt_keep_array_indentation && is_array(flags.mode)) { + // Never wrap the first token on a line + if (output.just_added_newline()) { return; } - ignore_repeated = typeof ignore_repeated === 'undefined' ? true : ignore_repeated; - reset_statement_flags = typeof reset_statement_flags === 'undefined' ? true : reset_statement_flags; + var shouldPreserveOrForce = (opt.preserve_newlines && current_token.wanted_newline) || force_linewrap; + var operatorLogicApplies = in_array(flags.last_text, tokenizer.positionable_operators) || in_array(current_token.text, tokenizer.positionable_operators); - if (reset_statement_flags) { - flags.if_line = false; - flags.chain_extra_indentation = 0; + if (operatorLogicApplies) { + var shouldPrintOperatorNewline = ( + in_array(flags.last_text, tokenizer.positionable_operators) && + in_array(opt.operator_position, OPERATOR_POSITION_BEFORE_OR_PRESERVE) + ) || + in_array(current_token.text, tokenizer.positionable_operators); + shouldPreserveOrForce = shouldPreserveOrForce && shouldPrintOperatorNewline; } - trim_output(); - - if (!output.length) { - return; // no newline on start of file + if (shouldPreserveOrForce) { + print_newline(false, true); + } else if (opt.wrap_line_length) { + if (last_type === 'TK_RESERVED' && in_array(flags.last_text, newline_restricted_tokens)) { + // These tokens should never have a newline inserted + // between them and the following expression. + return; + } + var proposed_line_length = output.current_line.get_character_count() + current_token.text.length + + (output.space_before_token ? 1 : 0); + if (proposed_line_length >= opt.wrap_line_length) { + print_newline(false, true); + } } + } - 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 + flags.chain_extra_indentation; i += 1) { - output.push(indent_string); + function print_newline(force_newline, preserve_statement_flags) { + if (!preserve_statement_flags) { + if (flags.last_text !== ';' && flags.last_text !== ',' && flags.last_text !== '=' && last_type !== 'TK_OPERATOR') { + var next_token = get_token(1); + while (flags.mode === MODE.Statement && + !(flags.if_block && next_token && next_token.type === 'TK_RESERVED' && next_token.text === 'else') && + !flags.do_block) { + restore_mode(); + } + } } - if (flags.var_line && flags.var_line_reindented) { - output.push(indent_string); // skip space-stuffing, if indenting with a tab + + if (output.add_new_line(force_newline)) { + flags.multiline_frame = true; } } + function print_token_line_indentation() { + if (output.just_added_newline()) { + if (opt.keep_array_indentation && is_array(flags.mode) && current_token.wanted_newline) { + output.current_line.push(current_token.whitespace_before); + output.space_before_token = false; + } else if (output.set_indent(flags.indentation_level)) { + flags.line_indent_level = flags.indentation_level; + } + } + } - function print_single_space() { + function print_token(printable_token) { + if (output.raw) { + output.add_raw_token(current_token); + return; + } - var last_output = ' '; + if (opt.comma_first && last_type === 'TK_COMMA' && + output.just_added_newline()) { + if (output.previous_line.last() === ',') { + var popped = output.previous_line.pop(); + // if the comma was already at the start of the line, + // pull back onto that line and reprint the indentation + if (output.previous_line.is_empty()) { + output.previous_line.push(popped); + output.trim(true); + output.current_line.pop(); + output.trim(); + } - if (flags.eat_next_space) { - flags.eat_next_space = false; - } else if (last_type === 'TK_COMMENT') { - print_newline(); - } else { - 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(' '); + // add the comma in front of the next token + print_token_line_indentation(); + output.add_token(','); + output.space_before_token = true; } } - } - - function print_token() { - just_added_newline = false; - flags.eat_next_space = false; - output.push(token_text); + printable_token = printable_token || current_token.text; + print_token_line_indentation(); + output.add_token(printable_token); } function indent() { flags.indentation_level += 1; } + function deindent() { + if (flags.indentation_level > 0 && + ((!flags.parent) || flags.indentation_level > flags.parent.indentation_level)) { + flags.indentation_level -= 1; - function remove_indent() { - if (output.length && output[output.length - 1] === indent_string) { - output.pop(); } } function set_mode(mode) { if (flags) { flag_store.push(flags); + previous_flags = flags; + } else { + previous_flags = create_flags(null, mode); } - 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, - chain_extra_indentation: 0, - 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_level: (flags ? flags.indentation_level + ((flags.var_line && flags.var_line_reindented) ? 1 : 0) : 0), - ternary_depth: 0 - }; + + flags = create_flags(previous_flags, mode); } function is_array(mode) { - return mode === '[EXPRESSION]' || mode === '[INDENTED-EXPRESSION]'; + return mode === MODE.ArrayLiteral; } function is_expression(mode) { - return in_array(mode, ['[EXPRESSION]', '(EXPRESSION)', '(FOR-EXPRESSION)', '(COND-EXPRESSION)']); + return in_array(mode, [MODE.Expression, MODE.ForInitializer, MODE.Conditional]); } function restore_mode() { - do_block_just_closed = flags.mode === 'DO_BLOCK'; if (flag_store.length > 0) { - var mode = flags.mode; + previous_flags = flags; flags = flag_store.pop(); - flags.previous_mode = mode; + if (previous_flags.mode === MODE.Statement && !opt.unindent_chained_methods) { + remove_redundant_indentation(output, previous_flags); + } + } + } + + function start_of_object_property() { + return flags.parent.mode === MODE.ObjectLiteral && flags.mode === MODE.Statement && ( + (flags.last_text === ':' && flags.ternary_depth === 0) || (last_type === 'TK_RESERVED' && in_array(flags.last_text, ['get', 'set']))); + } + + function start_of_statement() { + if ( + (last_type === 'TK_RESERVED' && in_array(flags.last_text, ['var', 'let', 'const']) && current_token.type === 'TK_WORD') || + (last_type === 'TK_RESERVED' && flags.last_text === 'do') || + (last_type === 'TK_RESERVED' && in_array(flags.last_text, newline_restricted_tokens) && !current_token.wanted_newline) || + (last_type === 'TK_RESERVED' && flags.last_text === 'else' && + !(current_token.type === 'TK_RESERVED' && current_token.text === 'if' && !current_token.comments_before.length)) || + (last_type === 'TK_END_EXPR' && (previous_flags.mode === MODE.ForInitializer || previous_flags.mode === MODE.Conditional)) || + (last_type === 'TK_WORD' && flags.mode === MODE.BlockStatement && + !flags.in_case && + !(current_token.text === '--' || current_token.text === '++') && + last_last_text !== 'function' && + current_token.type !== 'TK_WORD' && current_token.type !== 'TK_RESERVED') || + (flags.mode === MODE.ObjectLiteral && ( + (flags.last_text === ':' && flags.ternary_depth === 0) || (last_type === 'TK_RESERVED' && in_array(flags.last_text, ['get', 'set'])))) + ) { + + set_mode(MODE.Statement); + if (!opt.unindent_chained_methods) { + indent(); + } + + handle_whitespace_and_comments(current_token, true); + + // Issue #276: + // If starting a new statement with [if, for, while, do], push to a new line. + // if (a) if (b) if(c) d(); else e(); else f(); + if (!start_of_object_property()) { + allow_wrap_or_preserved_newline( + current_token.type === 'TK_RESERVED' && in_array(current_token.text, ['do', 'for', 'if', 'while'])); + } + + return true; } + return false; } function all_lines_start_with(lines, c) { @@ -259,1092 +792,2038 @@ function js_beautify(js_source_text, options) { return true; } + function each_line_matches_indent(lines, indent) { + var i = 0, + len = lines.length, + line; + for (; i < len; i++) { + line = lines[i]; + // allow empty lines to pass through + if (line && line.indexOf(indent) !== 0) { + return false; + } + } + return true; + } + function is_special_word(word) { return in_array(word, ['case', 'return', 'do', 'if', 'throw', 'else']); } - function in_array(what, arr) { - for (var i = 0; i < arr.length; i += 1) { - if (arr[i] === what) { - return true; - } - } - return false; + function get_token(offset) { + var index = token_pos + (offset || 0); + return (index < 0 || index >= tokens.length) ? null : tokens[index]; } - function unescape_string(s) { - var esc = false, - out = '', - pos = 0, - s_hex = '', - escaped = 0, - c; - - while (esc || pos < s.length) { - - c = s.charAt(pos); - pos++; - - if (esc) { - esc = false; - if (c === 'x') { - // simple hex-escape \x24 - s_hex = s.substr(pos, 2); - pos += 2; - } else if (c === 'u') { - // unicode-escape, \u2134 - s_hex = s.substr(pos, 4); - pos += 4; - } else { - // some common escape, e.g \n - out += '\\' + c; - continue; + function handle_start_expr() { + // The conditional starts the statement if appropriate. + if (!start_of_statement()) { + handle_whitespace_and_comments(current_token); + } + + var next_mode = MODE.Expression; + if (current_token.text === '[') { + + if (last_type === 'TK_WORD' || flags.last_text === ')') { + // this is array index specifier, break immediately + // a[x], fn()[x] + if (last_type === 'TK_RESERVED' && in_array(flags.last_text, tokenizer.line_starters)) { + output.space_before_token = true; } - if (!s_hex.match(/^[0123456789abcdefABCDEF]+$/)) { - // some weird escaping, bail out, - // leaving whole string intact - return s; + set_mode(next_mode); + print_token(); + indent(); + if (opt.space_in_paren) { + output.space_before_token = true; } + return; + } - escaped = parseInt(s_hex, 16); - - if (escaped >= 0x00 && escaped < 0x20) { - // leave 0x00...0x1f escaped - if (c === 'x') { - out += '\\x' + s_hex; - } else { - out += '\\u' + s_hex; + next_mode = MODE.ArrayLiteral; + if (is_array(flags.mode)) { + if (flags.last_text === '[' || + (flags.last_text === ',' && (last_last_text === ']' || last_last_text === '}'))) { + // ], [ goes to new line + // }, [ goes to new line + if (!opt.keep_array_indentation) { + print_newline(); } - continue; - } else if (escaped == 0x22 || escaped === 0x27 || escaped == 0x5c) { - // single-quote, apostrophe, backslash - escape these - out += '\\' + String.fromCharCode(escaped); - } else if (c === 'x' && escaped > 0x7e && escaped <= 0xff) { - // we bail out on \x7f..\xff, - // leaving whole string escaped, - // as it's probably completely binary - return s; - } else { - out += String.fromCharCode(escaped); } - } else if (c == '\\') { - esc = true; + } + + } else { + if (last_type === 'TK_RESERVED' && flags.last_text === 'for') { + next_mode = MODE.ForInitializer; + } else if (last_type === 'TK_RESERVED' && in_array(flags.last_text, ['if', 'while'])) { + next_mode = MODE.Conditional; } else { - out += c; + // next_mode = MODE.Expression; } } - return out; - } - 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; + if (flags.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' || flags.last_text === '.') { + // TODO: Consider whether forcing this is required. Review failing tests when removed. + allow_wrap_or_preserved_newline(current_token.wanted_newline); + // do nothing on (( and )( and ][ and ]( and .( + } else if (!(last_type === 'TK_RESERVED' && current_token.text === '(') && last_type !== 'TK_WORD' && last_type !== 'TK_OPERATOR') { + output.space_before_token = true; + } else if ((last_type === 'TK_RESERVED' && (flags.last_word === 'function' || flags.last_word === 'typeof')) || + (flags.last_text === '*' && + (in_array(last_last_text, ['function', 'yield']) || + (flags.mode === MODE.ObjectLiteral && in_array(last_last_text, ['{', ',']))))) { + // function() vs function () + // yield*() vs yield* () + // function*() vs function* () + if (opt.space_after_anon_function) { + output.space_before_token = true; + } + } else if (last_type === 'TK_RESERVED' && (in_array(flags.last_text, tokenizer.line_starters) || flags.last_text === 'catch')) { + if (opt.space_before_conditional) { + output.space_before_token = true; } - c = input.charAt(local_pos); } - return c; - } - function get_next_token() { - var i; - var resulting_string; + // Should be a space between await and an IIFE, or async and an arrow function + if (current_token.text === '(' && last_type === 'TK_RESERVED' && in_array(flags.last_word, ['await', 'async'])) { + output.space_before_token = true; + } - n_newlines = 0; + // Support of this kind of newline preservation. + // a = (b && + // (c || d)); + if (current_token.text === '(') { + if (last_type === 'TK_EQUALS' || last_type === 'TK_OPERATOR') { + if (!start_of_object_property()) { + allow_wrap_or_preserved_newline(); + } + } + } - if (parser_pos >= input_length) { - return ['', 'TK_EOF']; + // Support preserving wrapped arrow function expressions + // a.b('c', + // () => d.e + // ) + if (current_token.text === '(' && last_type !== 'TK_WORD' && last_type !== 'TK_RESERVED') { + allow_wrap_or_preserved_newline(); } - wanted_newline = false; + set_mode(next_mode); + print_token(); + if (opt.space_in_paren) { + output.space_before_token = true; + } - var c = input.charAt(parser_pos); - parser_pos += 1; + // In all cases, if we newline while inside an expression it should be indented. + indent(); + } + function handle_end_expr() { + // statements inside expressions are not valid syntax, but... + // statements must all be closed when their container closes + while (flags.mode === MODE.Statement) { + restore_mode(); + } - var keep_whitespace = opt_keep_array_indentation && is_array(flags.mode); + handle_whitespace_and_comments(current_token); - if (keep_whitespace) { + if (flags.multiline_frame) { + allow_wrap_or_preserved_newline(current_token.text === ']' && is_array(flags.mode) && !opt.keep_array_indentation); + } - var whitespace_count = 0; + if (opt.space_in_paren) { + if (last_type === 'TK_START_EXPR' && !opt.space_in_empty_paren) { + // () [] no inner space in empty parens like these, ever, ref #320 + output.trim(); + output.space_before_token = false; + } else { + output.space_before_token = true; + } + } + if (current_token.text === ']' && opt.keep_array_indentation) { + print_token(); + restore_mode(); + } else { + restore_mode(); + print_token(); + } + remove_redundant_indentation(output, previous_flags); - while (in_array(c, whitespace)) { + // do {} while () // no statement required after + if (flags.do_while && previous_flags.mode === MODE.Conditional) { + previous_flags.mode = MODE.Expression; + flags.do_block = false; + flags.do_while = false; - 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']; - } + function handle_start_block() { + handle_whitespace_and_comments(current_token); + + // Check if this is should be treated as a ObjectLiteral + var next_token = get_token(1); + var second_token = get_token(2); + if (second_token && ( + (in_array(second_token.text, [':', ',']) && in_array(next_token.type, ['TK_STRING', 'TK_WORD', 'TK_RESERVED'])) || + (in_array(next_token.text, ['get', 'set', '...']) && in_array(second_token.type, ['TK_WORD', 'TK_RESERVED'])) + )) { + // We don't support TypeScript,but we didn't break it for a very long time. + // We'll try to keep not breaking it. + if (!in_array(last_last_text, ['class', 'interface'])) { + set_mode(MODE.ObjectLiteral); + } else { + set_mode(MODE.BlockStatement); + } + } else if (last_type === 'TK_OPERATOR' && flags.last_text === '=>') { + // arrow function: (param1, paramN) => { statements } + set_mode(MODE.BlockStatement); + } else if (in_array(last_type, ['TK_EQUALS', 'TK_START_EXPR', 'TK_COMMA', 'TK_OPERATOR']) || + (last_type === 'TK_RESERVED' && in_array(flags.last_text, ['return', 'throw', 'import', 'default'])) + ) { + // Detecting shorthand function syntax is difficult by scanning forward, + // so check the surrounding context. + // If the block is being returned, imported, export default, passed as arg, + // assigned with = or assigned in a nested object, treat as an ObjectLiteral. + set_mode(MODE.ObjectLiteral); + } else { + set_mode(MODE.BlockStatement); + } - c = input.charAt(parser_pos); - parser_pos += 1; + var empty_braces = !next_token.comments_before.length && next_token.text === '}'; + var empty_anonymous_function = empty_braces && flags.last_word === 'function' && + last_type === 'TK_END_EXPR'; + + if (opt.brace_preserve_inline) // check for inline, set inline_frame if so + { + // search forward for a newline wanted inside this block + var index = 0; + var check_token = null; + flags.inline_frame = true; + do { + index += 1; + check_token = get_token(index); + if (check_token.wanted_newline) { + flags.inline_frame = false; + break; + } + } while (check_token.type !== 'TK_EOF' && + !(check_token.type === 'TK_END_BLOCK' && check_token.opened === current_token)); + } + if ((opt.brace_style === "expand" || + (opt.brace_style === "none" && current_token.wanted_newline)) && + !flags.inline_frame) { + if (last_type !== 'TK_OPERATOR' && + (empty_anonymous_function || + last_type === 'TK_EQUALS' || + (last_type === 'TK_RESERVED' && is_special_word(flags.last_text) && flags.last_text !== 'else'))) { + output.space_before_token = true; + } else { + print_newline(false, true); } + } else { // collapse || inline_frame + if (is_array(previous_flags.mode) && (last_type === 'TK_START_EXPR' || last_type === 'TK_COMMA')) { + if (last_type === 'TK_COMMA' || opt.space_in_paren) { + output.space_before_token = true; + } - if (just_added_newline) { - for (i = 0; i < whitespace_count; i++) { - output.push(' '); + if (last_type === 'TK_COMMA' || (last_type === 'TK_START_EXPR' && flags.inline_frame)) { + allow_wrap_or_preserved_newline(); + previous_flags.multiline_frame = previous_flags.multiline_frame || flags.multiline_frame; + flags.multiline_frame = false; } } - - } 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 (last_type !== 'TK_OPERATOR' && last_type !== 'TK_START_EXPR') { + if (last_type === 'TK_START_BLOCK' && !flags.inline_frame) { + print_newline(); + } else { + output.space_before_token = true; } + } + } + print_token(); + indent(); + } + function handle_end_block() { + // statements must all be closed when their container closes + handle_whitespace_and_comments(current_token); - if (parser_pos >= input_length) { - return ['', 'TK_EOF']; - } + while (flags.mode === MODE.Statement) { + restore_mode(); + } - c = input.charAt(parser_pos); - parser_pos += 1; + var empty_braces = last_type === 'TK_START_BLOCK'; + if (flags.inline_frame && !empty_braces) { // try inline_frame (only set if opt.braces-preserve-inline) first + output.space_before_token = true; + } else if (opt.brace_style === "expand") { + if (!empty_braces) { + print_newline(); } + } else { + // skip {} + if (!empty_braces) { + 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 (opt_preserve_newlines) { - if (n_newlines > 1) { - for (i = 0; i < n_newlines; i += 1) { - print_newline(i === 0); - just_added_newline = true; - } + } else { + print_newline(); } } - wanted_newline = n_newlines > 0; } + restore_mode(); + print_token(); + } - - 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; - } + function handle_word() { + if (current_token.type === 'TK_RESERVED') { + if (in_array(current_token.text, ['set', 'get']) && flags.mode !== MODE.ObjectLiteral) { + current_token.type = 'TK_WORD'; + } else if (in_array(current_token.text, ['as', 'from']) && !flags.import_block) { + current_token.type = 'TK_WORD'; + } else if (flags.mode === MODE.ObjectLiteral) { + var next_token = get_token(1); + if (next_token.text === ':') { + current_token.type = 'TK_WORD'; } } + } - // 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 (start_of_statement()) { + // The conditional starts the statement if appropriate. + if (last_type === 'TK_RESERVED' && in_array(flags.last_text, ['var', 'let', 'const']) && current_token.type === 'TK_WORD') { + flags.declaration_statement = true; } + } else if (current_token.wanted_newline && !is_expression(flags.mode) && + (last_type !== 'TK_OPERATOR' || (flags.last_text === '--' || flags.last_text === '++')) && + last_type !== 'TK_EQUALS' && + (opt.preserve_newlines || !(last_type === 'TK_RESERVED' && in_array(flags.last_text, ['var', 'let', 'const', 'set', 'get'])))) { + handle_whitespace_and_comments(current_token); + print_newline(); + } else { + handle_whitespace_and_comments(current_token); + } - 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')) { + if (flags.do_block && !flags.do_while) { + if (current_token.type === 'TK_RESERVED' && current_token.text === 'while') { + // do {} ## while () + output.space_before_token = true; + print_token(); + output.space_before_token = true; + flags.do_while = true; + return; + } else { + // do {} should always have while as the next word. + // if we don't see the expected while, recover print_newline(); + flags.do_block = false; } - 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 may be followed by else, or not + // Bare/inline ifs are tricky + // Need to unwind the modes correctly: if (a) if (b) c(); else d(); else e(); + if (flags.if_block) { + if (!flags.else_block && (current_token.type === 'TK_RESERVED' && current_token.text === 'else')) { + flags.else_block = true; + } else { + while (flags.mode === MODE.Statement) { + restore_mode(); + } + flags.if_block = false; + flags.else_block = false; + } } - if (c === '}') { - return [c, 'TK_END_BLOCK']; + if (current_token.type === 'TK_RESERVED' && (current_token.text === 'case' || (current_token.text === 'default' && flags.in_case_statement))) { + print_newline(); + if (flags.case_body || opt.jslint_happy) { + // switch cases following one another + deindent(); + flags.case_body = false; + } + print_token(); + flags.in_case = true; + flags.in_case_statement = true; + return; } - if (c === ';') { - return [c, 'TK_SEMICOLON']; + if (last_type === 'TK_COMMA' || last_type === 'TK_START_EXPR' || last_type === 'TK_EQUALS' || last_type === 'TK_OPERATOR') { + if (!start_of_object_property()) { + allow_wrap_or_preserved_newline(); + } } - 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']; + if (current_token.type === 'TK_RESERVED' && current_token.text === 'function') { + if (in_array(flags.last_text, ['}', ';']) || + (output.just_added_newline() && !(in_array(flags.last_text, ['(', '[', '{', ':', '=', ',']) || last_type === 'TK_OPERATOR'))) { + // make sure there is a nice clean space of at least one blank line + // before a new function definition + if (!output.just_added_blankline() && !current_token.comments_before.length) { + print_newline(); + print_newline(true); } } - // 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) { + if (last_type === 'TK_RESERVED' || last_type === 'TK_WORD') { + if (last_type === 'TK_RESERVED' && ( + in_array(flags.last_text, ['get', 'set', 'new', 'export', 'async']) || + in_array(flags.last_text, newline_restricted_tokens))) { + output.space_before_token = true; + } else if (last_type === 'TK_RESERVED' && flags.last_text === 'default' && last_last_text === 'export') { + output.space_before_token = true; + } else { print_newline(); } - return [comment, 'TK_COMMENT']; + } else if (last_type === 'TK_OPERATOR' || flags.last_text === '=') { + // foo = function + output.space_before_token = true; + } else if (!flags.multiline_frame && (is_expression(flags.mode) || is_array(flags.mode))) { + // (function + } else { + print_newline(); } + print_token(); + flags.last_word = current_token.text; + return; } - 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, - has_char_escapes = false; - resulting_string = c; + prefix = 'NONE'; - 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']; - } - } + if (last_type === 'TK_END_BLOCK') { + if (previous_flags.inline_frame) { + prefix = 'SPACE'; + } else if (!(current_token.type === 'TK_RESERVED' && in_array(current_token.text, ['else', 'catch', 'finally', 'from']))) { + prefix = 'NEWLINE'; + } else { + if (opt.brace_style === "expand" || + opt.brace_style === "end-expand" || + (opt.brace_style === "none" && current_token.wanted_newline)) { + prefix = 'NEWLINE'; } else { - // - // and handle string also separately - // - while (esc || input.charAt(parser_pos) !== sep) { - resulting_string += input.charAt(parser_pos); - if (esc) { - if (input.charAt(parser_pos) === 'x' || input.charAt(parser_pos) === 'u') { - has_char_escapes = true; - } - esc = false; - } else { - esc = input.charAt(parser_pos) === '\\'; - } - parser_pos += 1; - } - + prefix = 'SPACE'; + output.space_before_token = true; } } - - parser_pos += 1; - resulting_string += sep; - - if (has_char_escapes && opt_unescape_strings) { - resulting_string = unescape_string(resulting_string); - } - - 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; - } + } else if (last_type === 'TK_SEMICOLON' && flags.mode === MODE.BlockStatement) { + // TODO: Should this be for STATEMENT as well? + 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_RESERVED' || last_type === 'TK_WORD' || + (flags.last_text === '*' && + (in_array(last_last_text, ['function', 'yield']) || + (flags.mode === MODE.ObjectLiteral && in_array(last_last_text, ['{', ',']))))) { + prefix = 'SPACE'; + } else if (last_type === 'TK_START_BLOCK') { + if (flags.inline_frame) { + prefix = 'SPACE'; + } else { + prefix = 'NEWLINE'; } - return [resulting_string, 'TK_STRING']; + } else if (last_type === 'TK_END_EXPR') { + output.space_before_token = true; + prefix = 'NEWLINE'; } - if (c === '#') { + if (current_token.type === 'TK_RESERVED' && in_array(current_token.text, tokenizer.line_starters) && flags.last_text !== ')') { + if (flags.inline_frame || flags.last_text === 'else' || flags.last_text === 'export') { + prefix = 'SPACE'; + } else { + prefix = 'NEWLINE'; + } + } - 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'); + if (current_token.type === 'TK_RESERVED' && in_array(current_token.text, ['else', 'catch', 'finally'])) { + if ((!(last_type === 'TK_END_BLOCK' && previous_flags.mode === MODE.BlockStatement) || + opt.brace_style === "expand" || + opt.brace_style === "end-expand" || + (opt.brace_style === "none" && current_token.wanted_newline)) && + !flags.inline_frame) { print_newline(); - return get_next_token(); + } else { + output.trim(true); + var line = output.current_line; + // If we trimmed and there's something other than a close block before us + // put a newline back in. Handles '} // comment' scenario. + if (line.last() !== '}') { + print_newline(); + } + output.space_before_token = true; } - - - // 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; + } else if (prefix === 'NEWLINE') { + if (last_type === 'TK_RESERVED' && is_special_word(flags.last_text)) { + // no newline between 'return nnn' + output.space_before_token = true; + } else if (last_type !== 'TK_END_EXPR') { + if ((last_type !== 'TK_START_EXPR' || !(current_token.type === 'TK_RESERVED' && in_array(current_token.text, ['var', 'let', 'const']))) && flags.last_text !== ':') { + // no need to force newline on 'var': for (var x = 0...) + if (current_token.type === 'TK_RESERVED' && current_token.text === 'if' && flags.last_text === 'else') { + // no newline for } else if { + output.space_before_token = true; + } else { + print_newline(); + } } - return [sharp, 'TK_WORD']; + } else if (current_token.type === 'TK_RESERVED' && in_array(current_token.text, tokenizer.line_starters) && flags.last_text !== ')') { + print_newline(); } + } else if (flags.multiline_frame && is_array(flags.mode) && flags.last_text === ',' && last_last_text === '}') { + print_newline(); // }, in lists get a newline treatment + } else if (prefix === 'SPACE') { + output.space_before_token = true; } - - if (c === '<' && input.substring(parser_pos - 1, parser_pos + 3) === '') { - flags.in_html_comment = false; - parser_pos += 2; - if (wanted_newline) { - print_newline(); - } - return ['-->', 'TK_COMMENT']; + function handle_semicolon() { + if (start_of_statement()) { + // The conditional starts the statement if appropriate. + // Semicolon can be the start (and end) of a statement + output.space_before_token = false; + } else { + handle_whitespace_and_comments(current_token); } - if (c === '.') { - return [c, 'TK_DOT']; + var next_token = get_token(1); + while (flags.mode === MODE.Statement && + !(flags.if_block && next_token && next_token.type === 'TK_RESERVED' && next_token.text === 'else') && + !flags.do_block) { + restore_mode(); } - 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; - } - } + // hacky but effective for the moment + if (flags.import_block) { + flags.import_block = false; + } + print_token(); + } - if (c === ',') { - return [c, 'TK_COMMA']; - } else if (c === '=') { - return [c, 'TK_EQUALS']; + function handle_string() { + if (start_of_statement()) { + // The conditional starts the statement if appropriate. + // One difference - strings want at least a space before + output.space_before_token = true; + } else { + handle_whitespace_and_comments(current_token); + if (last_type === 'TK_RESERVED' || last_type === 'TK_WORD' || flags.inline_frame) { + output.space_before_token = true; + } else if (last_type === 'TK_COMMA' || last_type === 'TK_START_EXPR' || last_type === 'TK_EQUALS' || last_type === 'TK_OPERATOR') { + if (!start_of_object_property()) { + allow_wrap_or_preserved_newline(); + } } else { - return [c, 'TK_OPERATOR']; + print_newline(); } } - - return [c, 'TK_UNKNOWN']; + print_token(); } - //---------------------------------- - indent_string = ''; - while (opt_indent_size > 0) { - indent_string += opt_indent_char; - opt_indent_size -= 1; - } + function handle_equals() { + if (start_of_statement()) { + // The conditional starts the statement if appropriate. + } else { + handle_whitespace_and_comments(current_token); + } - 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); + if (flags.declaration_statement) { + // just got an '=' in a var-line, different formatting/line-breaking, etc will now be done + flags.declaration_assignment = true; + } + output.space_before_token = true; + print_token(); + output.space_before_token = true; } - 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; + function handle_comma() { + handle_whitespace_and_comments(current_token, true); - whitespace = "\n\r\t ".split(''); - wordchar = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_$'.split(''); - digits = '0123456789'.split(''); + print_token(); + output.space_before_token = true; + if (flags.declaration_statement) { + if (is_expression(flags.parent.mode)) { + // do not break on comma, for(var a = 1, b = 2) + flags.declaration_assignment = false; + } - punct = '+ - * / % & ++ -- = += -= *= /= %= == === != !== > < >= <= >> << >>> >>>= >>= <<= && &= | || ! !! , : ? ^ ^= |= ::'; - punct += ' <%= <% %> '; // try to be a good boy and try not to break the markup language identifiers - punct = punct.split(' '); + if (flags.declaration_assignment) { + flags.declaration_assignment = false; + print_newline(false, true); + } else if (opt.comma_first) { + // for comma-first, we want to allow a newline before the comma + // to turn into a newline after the comma, which we will fixup later + allow_wrap_or_preserved_newline(); + } + } else if (flags.mode === MODE.ObjectLiteral || + (flags.mode === MODE.Statement && flags.parent.mode === MODE.ObjectLiteral)) { + if (flags.mode === MODE.Statement) { + restore_mode(); + } - // words which should always start on new line. - line_starters = 'continue,try,throw,return,var,if,switch,case,default,for,while,break,function'.split(','); + if (!flags.inline_frame) { + print_newline(); + } + } else if (opt.comma_first) { + // EXPR or DO_BLOCK + // for comma-first, we want to allow a newline before the comma + // to turn into a newline after the comma, which we will fixup later + allow_wrap_or_preserved_newline(); + } + } - // 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'); + function handle_operator() { + var isGeneratorAsterisk = current_token.text === '*' && + ((last_type === 'TK_RESERVED' && in_array(flags.last_text, ['function', 'yield'])) || + (in_array(last_type, ['TK_START_BLOCK', 'TK_COMMA', 'TK_END_BLOCK', 'TK_SEMICOLON'])) + ); + var isUnary = in_array(current_token.text, ['-', '+']) && ( + in_array(last_type, ['TK_START_BLOCK', 'TK_START_EXPR', 'TK_EQUALS', 'TK_OPERATOR']) || + in_array(flags.last_text, tokenizer.line_starters) || + flags.last_text === ',' + ); + + if (start_of_statement()) { + // The conditional starts the statement if appropriate. + } else { + var preserve_statement_flags = !isGeneratorAsterisk; + handle_whitespace_and_comments(current_token, preserve_statement_flags); + } - 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 (last_type === 'TK_RESERVED' && is_special_word(flags.last_text)) { + // "return" had a special handling in TK_WORD. Now we need to return the favor + output.space_before_token = true; + print_token(); + return; } - switch (token_type) { + // hack for actionscript's import .*; + if (current_token.text === '*' && last_type === 'TK_DOT') { + print_token(); + return; + } - case 'TK_START_EXPR': + if (current_token.text === '::') { + // no spaces around exotic namespacing syntax operator + print_token(); + return; + } - if (token_text === '[') { + // Allow line wrapping between operators when operator_position is + // set to before or preserve + if (last_type === 'TK_OPERATOR' && in_array(opt.operator_position, OPERATOR_POSITION_BEFORE_OR_PRESERVE)) { + allow_wrap_or_preserved_newline(); + } - 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 (current_token.text === ':' && flags.in_case) { + flags.case_body = true; + indent(); + print_token(); + print_newline(); + flags.in_case = false; + return; + } - 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]'); + var space_before = true; + var space_after = true; + var in_ternary = false; + if (current_token.text === ':') { + if (flags.ternary_depth === 0) { + // Colon is invalid javascript outside of ternary and object, but do our best to guess what was meant. + space_before = false; + } else { + flags.ternary_depth -= 1; + in_ternary = true; + } + } else if (current_token.text === '?') { + flags.ternary_depth += 1; + } - if (!opt_keep_array_indentation) { - print_newline(); - } - } else { - set_mode('[EXPRESSION]'); - } - } else { - set_mode('[EXPRESSION]'); - } + // let's handle the operator_position option prior to any conflicting logic + if (!isUnary && !isGeneratorAsterisk && opt.preserve_newlines && in_array(current_token.text, tokenizer.positionable_operators)) { + var isColon = current_token.text === ':'; + var isTernaryColon = (isColon && in_ternary); + var isOtherColon = (isColon && !in_ternary); + switch (opt.operator_position) { + case OPERATOR_POSITION.before_newline: + // if the current token is : and it's not a ternary statement then we set space_before to false + output.space_before_token = !isOtherColon; - } 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)'); - } - } + print_token(); - 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(); + if (!isColon || isTernaryColon) { + allow_wrap_or_preserved_newline(); } - } else if (in_array(last_text, line_starters) || last_text === 'catch') { - if (opt_space_before_conditional) { - print_single_space(); - } - } - print_token(); - - break; - case 'TK_DOT': + output.space_before_token = true; + return; - if (is_special_word(last_text)) { - print_single_space(); - } else if (last_text === ')') { - if (opt_break_chained_methods || wanted_newline) { - flags.chain_extra_indentation = 1; - print_newline(true /* ignore_repeated */, false /* reset_statement_flags */); - } - } - - 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 OPERATOR_POSITION.after_newline: + // if the current token is anything but colon, or (via deduction) it's a colon and in a ternary statement, + // then print a newline. - case 'TK_START_BLOCK': + output.space_before_token = true; - 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(); - } - } else { - if (last_type !== 'TK_OPERATOR' && last_type !== 'TK_START_EXPR') { - if (last_type === 'TK_START_BLOCK') { - print_newline(); + if (!isColon || isTernaryColon) { + if (get_token(1).wanted_newline) { + print_newline(false, true); } else { - print_single_space(); + allow_wrap_or_preserved_newline(); } } 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, { - } - } + output.space_before_token = false; } - indent(); + print_token(); - } - break; + output.space_before_token = true; + return; - case 'TK_END_BLOCK': - restore_mode(); - if (opt_brace_style === "expand" || opt_brace_style === "expand-strict") { - if (last_text !== '{') { - print_newline(); + case OPERATOR_POSITION.preserve_newline: + if (!isOtherColon) { + allow_wrap_or_preserved_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; - } else { - print_newline(); - } - } + // if we just added a newline, or the current token is : and it's not a ternary statement, + // then we set space_before to false + space_before = !(output.just_added_newline() || isOtherColon); + + output.space_before_token = space_before; print_token(); - } - break; + output.space_before_token = true; + return; + } + } + + if (isGeneratorAsterisk) { + allow_wrap_or_preserved_newline(); + space_before = false; + var next_token = get_token(1); + space_after = next_token && in_array(next_token.type, ['TK_WORD', 'TK_RESERVED']); + } else if (current_token.text === '...') { + allow_wrap_or_preserved_newline(); + space_before = last_type === 'TK_START_BLOCK'; + space_after = false; + } else if (in_array(current_token.text, ['--', '++', '!', '~']) || isUnary) { + // unary operators (and binary +/- pretending to be unary) special cases + + space_before = false; + space_after = false; + + // http://www.ecma-international.org/ecma-262/5.1/#sec-7.9.1 + // if there is a newline between -- or ++ and anything else we should preserve it. + if (current_token.wanted_newline && (current_token.text === '--' || current_token.text === '++')) { + print_newline(false, true); + } - case 'TK_WORD': + if (flags.last_text === ';' && is_expression(flags.mode)) { + // for (;; ++i) + // ^^^ + space_before = true; + } - // 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 (last_type === 'TK_RESERVED') { + space_before = true; + } else if (last_type === 'TK_END_EXPR') { + space_before = !(flags.last_text === ']' && (current_token.text === '--' || current_token.text === '++')); + } else if (last_type === 'TK_OPERATOR') { + // a++ + ++b; + // a - -b + space_before = in_array(current_token.text, ['--', '-', '++', '+']) && in_array(flags.last_text, ['--', '-', '++', '+']); + // + and - are not unary when preceeded by -- or ++ operator + // a-- + b + // a * +b + // a - -b + if (in_array(current_token.text, ['+', '-']) && in_array(flags.last_text, ['--', '++'])) { + space_after = true; } + } - 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 (((flags.mode === MODE.BlockStatement && !flags.inline_frame) || flags.mode === MODE.Statement) && + (flags.last_text === '{' || flags.last_text === ';')) { + // { foo; --i } + // foo(); --bar; + print_newline(); + } + } - 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(); - } + output.space_before_token = output.space_before_token || space_before; + print_token(); + output.space_before_token = space_after; + } - print_token(); - last_word = token_text; - break; - } + function handle_block_comment(preserve_statement_flags) { + if (output.raw) { + output.add_raw_token(current_token); + if (current_token.directives && current_token.directives.preserve === 'end') { + // If we're testing the raw output behavior, do not allow a directive to turn it off. + output.raw = opt.test_output_raw; + } + return; + } - if (token_text === 'case' || (token_text === 'default' && flags.in_case_statement)) { - print_newline(); - if (flags.case_body) { - // switch cases following one another - flags.indentation_level--; - flags.case_body = false; - remove_indent(); - } - print_token(); - flags.in_case = true; - flags.in_case_statement = true; - break; - } + if (current_token.directives) { + print_newline(false, preserve_statement_flags); + print_token(); + if (current_token.directives.preserve === 'start') { + output.raw = true; + } + print_newline(false, true); + return; + } - if (last_type === 'TK_END_BLOCK') { + // inline block + if (!acorn.newline.test(current_token.text) && !current_token.wanted_newline) { + output.space_before_token = true; + print_token(); + output.space_before_token = true; + return; + } - 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'; - } + var lines = split_linebreaks(current_token.text); + var j; // iterator for this case + var javadoc = false; + var starless = false; + var lastIndent = current_token.whitespace_before; + var lastIndentLength = lastIndent.length; + + // block comment starts with a new line + print_newline(false, preserve_statement_flags); + if (lines.length > 1) { + javadoc = all_lines_start_with(lines.slice(1), '*'); + starless = each_line_matches_indent(lines.slice(1), lastIndent); + } - if (in_array(token_text, line_starters) && last_text !== ')') { - if (last_text === 'else') { - prefix = 'SPACE'; - } else { - prefix = 'NEWLINE'; - } + // first line always indented + print_token(lines[0]); + for (j = 1; j < lines.length; j++) { + print_newline(false, true); + if (javadoc) { + // javadoc: reformat and re-indent + print_token(' ' + ltrim(lines[j])); + } else if (starless && lines[j].length > lastIndentLength) { + // starless: re-indent non-empty content, avoiding trim + print_token(lines[j].substring(lastIndentLength)); + } else { + // normal comments output raw + output.add_token(lines[j]); + } + } - } + // for comments of more than one line, make sure there's a new line after + print_newline(false, preserve_statement_flags); + } - 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; + function handle_comment(preserve_statement_flags) { + if (current_token.wanted_newline) { + print_newline(false, preserve_statement_flags); + } else { + output.trim(true); + } - if (token_text === 'var') { - flags.var_line = true; - flags.var_line_reindented = false; - flags.var_line_tainted = false; - } + output.space_before_token = true; + print_token(); + print_newline(false, preserve_statement_flags); + } - if (token_text === 'if') { - flags.if_line = true; - } - if (token_text === 'else') { - flags.if_line = false; - } + function handle_dot() { + if (start_of_statement()) { + // The conditional starts the statement if appropriate. + } else { + handle_whitespace_and_comments(current_token, true); + } - break; + if (last_type === 'TK_RESERVED' && is_special_word(flags.last_text)) { + output.space_before_token = true; + } else { + // allow preserved newlines before dots in general + // force newlines on dots after close paren when break_chained - for bar().baz() + allow_wrap_or_preserved_newline(flags.last_text === ')' && opt.break_chained_methods); + } - case 'TK_SEMICOLON': + print_token(); + } - 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; + function handle_unknown(preserve_statement_flags) { + print_token(); - case 'TK_STRING': + if (current_token.text[current_token.text.length - 1] === '\n') { + print_newline(false, preserve_statement_flags); + } + } - if (last_type === 'TK_END_EXPR' && in_array(flags.previous_mode, ['(COND-EXPRESSION)', '(FOR-EXPRESSION)'])) { - print_single_space(); - } else if (last_type === 'TK_WORD') { - print_single_space(); - } else if (last_type === 'TK_COMMA' || last_type === 'TK_START_EXPR' || last_type === 'TK_EQUALS' || last_type === 'TK_OPERATOR') { - if (opt_preserve_newlines && wanted_newline && flags.mode !== 'OBJECT') { - print_newline(); - output.push(indent_string); - } - } else { - print_newline(); - } - print_token(); - break; + function handle_eof() { + // Unwind any open statements + while (flags.mode === MODE.Statement) { + restore_mode(); + } + handle_whitespace_and_comments(current_token); + } +} - 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; - - 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; - } +module.exports.Beautifier = Beautifier; - print_token(); - print_single_space(); - break; +/***/ }), +/* 2 */ +/***/ (function(module, exports) { + +/*jshint curly:true, eqeqeq:true, laxbreak:true, noempty:false */ +/* + + The MIT License (MIT) + + Copyright (c) 2007-2017 Einar Lielmanis, Liam Newman, and contributors. + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation files + (the "Software"), to deal in the Software without restriction, + including without limitation the rights to use, copy, modify, merge, + publish, distribute, sublicense, and/or sell copies of the Software, + and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. +*/ + +function InputScanner(input) { + var _input = input; + var _input_length = _input.length; + var _position = 0; + + this.back = function() { + _position -= 1; + }; + + this.hasNext = function() { + return _position < _input_length; + }; + + this.next = function() { + var val = null; + if (this.hasNext()) { + val = _input.charAt(_position); + _position += 1; + } + return val; + }; + + this.peek = function(index) { + var val = null; + index = index || 0; + index += _position; + if (index >= 0 && index < _input_length) { + val = _input.charAt(index); + } + return val; + }; + + this.peekCharCode = function(index) { + var val = 0; + index = index || 0; + index += _position; + if (index >= 0 && index < _input_length) { + val = _input.charCodeAt(index); + } + return val; + }; + + this.test = function(pattern, index) { + index = index || 0; + pattern.lastIndex = _position + index; + return pattern.test(_input); + }; + + this.testChar = function(pattern, index) { + var val = this.peek(index); + return val !== null && pattern.test(val); + }; + + this.match = function(pattern) { + pattern.lastIndex = _position; + var pattern_match = pattern.exec(_input); + if (pattern_match && pattern_match.index === _position) { + _position += pattern_match[0].length; + } else { + pattern_match = null; + } + return pattern_match; + }; +} + + +module.exports.InputScanner = InputScanner; + + +/***/ }), +/* 3 */ +/***/ (function(module, exports) { + +/*jshint curly:true, eqeqeq:true, laxbreak:true, noempty:false */ +/* + + The MIT License (MIT) + + Copyright (c) 2007-2017 Einar Lielmanis, Liam Newman, and contributors. + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation files + (the "Software"), to deal in the Software without restriction, + including without limitation the rights to use, copy, modify, merge, + publish, distribute, sublicense, and/or sell copies of the Software, + and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. +*/ + +function mergeOpts(allOptions, targetType) { + var finalOpts = {}; + var name; + + for (name in allOptions) { + if (name !== targetType) { + finalOpts[name] = allOptions[name]; + } + } + + //merge in the per type settings for the targetType + if (targetType in allOptions) { + for (name in allOptions[targetType]) { + finalOpts[name] = allOptions[targetType][name]; + } + } + return finalOpts; +} + +module.exports.mergeOpts = mergeOpts; + + +/***/ }), +/* 4 */ +/***/ (function(module, exports) { + +/*jshint curly:true, eqeqeq:true, laxbreak:true, noempty:false */ +/* + + The MIT License (MIT) + + Copyright (c) 2007-2017 Einar Lielmanis, Liam Newman, and contributors. + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation files + (the "Software"), to deal in the Software without restriction, + including without limitation the rights to use, copy, modify, merge, + publish, distribute, sublicense, and/or sell copies of the Software, + and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. +*/ + +function OutputLine(parent) { + var _character_count = 0; + // use indent_count as a marker for lines that have preserved indentation + var _indent_count = -1; + + var _items = []; + var _empty = true; + + this.set_indent = function(level) { + _character_count = parent.baseIndentLength + level * parent.indent_length; + _indent_count = level; + }; + + this.get_character_count = function() { + return _character_count; + }; + + this.is_empty = function() { + return _empty; + }; + + this.last = function() { + if (!this._empty) { + return _items[_items.length - 1]; + } else { + return null; + } + }; + + this.push = function(input) { + _items.push(input); + _character_count += input.length; + _empty = false; + }; + + this.pop = function() { + var item = null; + if (!_empty) { + item = _items.pop(); + _character_count -= item.length; + _empty = _items.length === 0; + } + return item; + }; + + this.remove_indent = function() { + if (_indent_count > 0) { + _indent_count -= 1; + _character_count -= parent.indent_length; + } + }; + + this.trim = function() { + while (this.last() === ' ') { + _items.pop(); + _character_count -= 1; + } + _empty = _items.length === 0; + }; + + this.toString = function() { + var result = ''; + if (!this._empty) { + if (_indent_count >= 0) { + result = parent.indent_cache[_indent_count]; + } + result += _items.join(''); + } + return result; + }; +} + +function Output(indent_string, baseIndentString) { + baseIndentString = baseIndentString || ''; + this.indent_cache = [baseIndentString]; + this.baseIndentLength = baseIndentString.length; + this.indent_length = indent_string.length; + this.raw = false; + + var lines = []; + this.baseIndentString = baseIndentString; + this.indent_string = indent_string; + this.previous_line = null; + this.current_line = null; + this.space_before_token = false; + + this.add_outputline = function() { + this.previous_line = this.current_line; + this.current_line = new OutputLine(this); + lines.push(this.current_line); + }; + + // initialize + this.add_outputline(); + + + this.get_line_number = function() { + return lines.length; + }; + + // Using object instead of string to allow for later expansion of info about each line + this.add_new_line = function(force_newline) { + if (this.get_line_number() === 1 && this.just_added_newline()) { + return false; // no newline on start of file + } + + if (force_newline || !this.just_added_newline()) { + if (!this.raw) { + this.add_outputline(); + } + return true; + } + + return false; + }; + + this.get_code = function(end_with_newline, eol) { + var sweet_code = lines.join('\n').replace(/[\r\n\t ]+$/, ''); + + if (end_with_newline) { + sweet_code += '\n'; + } + + if (eol !== '\n') { + sweet_code = sweet_code.replace(/[\n]/g, eol); + } + + return sweet_code; + }; + + this.set_indent = function(level) { + // Never indent your first output indent at the start of the file + if (lines.length > 1) { + while (level >= this.indent_cache.length) { + this.indent_cache.push(this.indent_cache[this.indent_cache.length - 1] + this.indent_string); + } + + this.current_line.set_indent(level); + return true; + } + this.current_line.set_indent(0); + return false; + }; + + this.add_raw_token = function(token) { + for (var x = 0; x < token.newlines; x++) { + this.add_outputline(); + } + this.current_line.push(token.whitespace_before); + this.current_line.push(token.text); + this.space_before_token = false; + }; + + this.add_token = function(printable_token) { + this.add_space_before_token(); + this.current_line.push(printable_token); + }; + + this.add_space_before_token = function() { + if (this.space_before_token && !this.just_added_newline()) { + this.current_line.push(' '); + } + this.space_before_token = false; + }; + + this.remove_indent = function(index) { + var output_length = lines.length; + while (index < output_length) { + lines[index].remove_indent(); + index++; + } + }; + + this.trim = function(eat_newlines) { + eat_newlines = (eat_newlines === undefined) ? false : eat_newlines; + + this.current_line.trim(indent_string, baseIndentString); + + while (eat_newlines && lines.length > 1 && + this.current_line.is_empty()) { + lines.pop(); + this.current_line = lines[lines.length - 1]; + this.current_line.trim(); + } + + this.previous_line = lines.length > 1 ? lines[lines.length - 2] : null; + }; + + this.just_added_newline = function() { + return this.current_line.is_empty(); + }; + + this.just_added_blankline = function() { + if (this.just_added_newline()) { + if (lines.length === 1) { + return true; // start of the file and newline = blank + } + + var line = lines[lines.length - 2]; + return line.is_empty(); + } + return false; + }; +} + +module.exports.Output = Output; + + +/***/ }), +/* 5 */ +/***/ (function(module, exports) { + +/*jshint curly:true, eqeqeq:true, laxbreak:true, noempty:false */ +/* + + The MIT License (MIT) + + Copyright (c) 2007-2017 Einar Lielmanis, Liam Newman, and contributors. + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation files + (the "Software"), to deal in the Software without restriction, + including without limitation the rights to use, copy, modify, merge, + publish, distribute, sublicense, and/or sell copies of the Software, + and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. +*/ + +function Token(type, text, newlines, whitespace_before, parent) { + this.type = type; + this.text = text; + + // comments_before are + // comments that have a new line before them + // and may or may not have a newline after + // this is a set of comments before + this.comments_before = /* inline comment*/ []; + + + this.comments_after = []; // no new line before and newline after + this.newlines = newlines || 0; + this.wanted_newline = newlines > 0; + this.whitespace_before = whitespace_before || ''; + this.parent = parent || null; + this.opened = null; + this.directives = null; +} + +module.exports.Token = Token; + + +/***/ }), +/* 6 */ +/***/ (function(module, exports, __webpack_require__) { + +/*jshint curly:true, eqeqeq:true, laxbreak:true, noempty:false */ +/* + + The MIT License (MIT) + + Copyright (c) 2007-2017 Einar Lielmanis, Liam Newman, and contributors. + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation files + (the "Software"), to deal in the Software without restriction, + including without limitation the rights to use, copy, modify, merge, + publish, distribute, sublicense, and/or sell copies of the Software, + and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. +*/ + +var Beautifier = __webpack_require__(1).Beautifier; + +function js_beautify(js_source_text, options) { + var beautifier = new Beautifier(js_source_text, options); + return beautifier.beautify(); +} + +module.exports = js_beautify; + +/***/ }), +/* 7 */ +/***/ (function(module, exports, __webpack_require__) { + +/*jshint curly:true, eqeqeq:true, laxbreak:true, noempty:false */ +/* + + The MIT License (MIT) + + Copyright (c) 2007-2017 Einar Lielmanis, Liam Newman, and contributors. + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation files + (the "Software"), to deal in the Software without restriction, + including without limitation the rights to use, copy, modify, merge, + publish, distribute, sublicense, and/or sell copies of the Software, + and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. +*/ + +var InputScanner = __webpack_require__(2).InputScanner; +var Token = __webpack_require__(5).Token; +var acorn = __webpack_require__(0); + +function trim(s) { + return s.replace(/^\s+|\s+$/g, ''); +} + +function in_array(what, arr) { + for (var i = 0; i < arr.length; i += 1) { + if (arr[i] === what) { + return true; + } + } + return false; +} + +function Tokenizer(input_string, opts) { + + var whitespace = "\n\r\t ".split(''); + var digit = /[0-9]/; + var digit_bin = /[01]/; + var digit_oct = /[01234567]/; + var digit_hex = /[0123456789abcdefABCDEF]/; + + this.positionable_operators = '!= !== % & && * ** + - / : < << <= == === > >= >> >>> ? ^ | ||'.split(' '); + var punct = this.positionable_operators.concat( + // non-positionable operators - these do not follow operator position settings + '! %= &= *= **= ++ += , -- -= /= :: <<= = => >>= >>>= ^= |= ~ ...'.split(' ')); + + // words which should always start on new line. + this.line_starters = 'continue,try,throw,return,var,let,const,if,switch,case,default,for,while,break,function,import,export'.split(','); + var reserved_words = this.line_starters.concat(['do', 'in', 'of', 'else', 'get', 'set', 'new', 'catch', 'finally', 'typeof', 'yield', 'async', 'await', 'from', 'as']); + + // /* ... */ comment ends with nearest */ or end of file + var block_comment_pattern = /([\s\S]*?)((?:\*\/)|$)/g; + + // comment ends just before nearest linefeed or end of file + var comment_pattern = /([^\n\r\u2028\u2029]*)/g; + + var directives_block_pattern = /\/\* beautify( \w+[:]\w+)+ \*\//g; + var directive_pattern = / (\w+)[:](\w+)/g; + var directives_end_ignore_pattern = /([\s\S]*?)((?:\/\*\sbeautify\signore:end\s\*\/)|$)/g; + + var template_pattern = /((<\?php|<\?=)[\s\S]*?\?>)|(<%[\s\S]*?%>)/g; + + var n_newlines, whitespace_before_token, in_html_comment, tokens; + var input; + + this.tokenize = function() { + input = new InputScanner(input_string); + in_html_comment = false; + tokens = []; + + var next, last; + var token_values; + var open = null; + var open_stack = []; + var comments = []; + + while (!(last && last.type === 'TK_EOF')) { + token_values = tokenize_next(); + next = new Token(token_values[1], token_values[0], n_newlines, whitespace_before_token); + while (next.type === 'TK_COMMENT' || next.type === 'TK_BLOCK_COMMENT' || next.type === 'TK_UNKNOWN') { + if (next.type === 'TK_BLOCK_COMMENT') { + next.directives = token_values[2]; } + comments.push(next); + token_values = tokenize_next(); + next = new Token(token_values[1], token_values[0], n_newlines, whitespace_before_token); + } - if (last_type === 'TK_COMMENT') { - print_newline(); + if (comments.length) { + next.comments_before = comments; + comments = []; + } + + if (next.type === 'TK_START_BLOCK' || next.type === 'TK_START_EXPR') { + next.parent = last; + open_stack.push(open); + open = next; + } else if ((next.type === 'TK_END_BLOCK' || next.type === 'TK_END_EXPR') && + (open && ( + (next.text === ']' && open.text === '[') || + (next.text === ')' && open.text === '(') || + (next.text === '}' && open.text === '{')))) { + next.parent = open.parent; + next.opened = open; + + open = open_stack.pop(); + } + + tokens.push(next); + last = next; + } + + return tokens; + }; + + function get_directives(text) { + if (!text.match(directives_block_pattern)) { + return null; + } + + var directives = {}; + directive_pattern.lastIndex = 0; + var directive_match = directive_pattern.exec(text); + + while (directive_match) { + directives[directive_match[1]] = directive_match[2]; + directive_match = directive_pattern.exec(text); + } + + return directives; + } + + function tokenize_next() { + var resulting_string; + var whitespace_on_this_line = []; + + n_newlines = 0; + whitespace_before_token = ''; + + var c = input.next(); + + if (c === null) { + return ['', 'TK_EOF']; + } + + var last_token; + if (tokens.length) { + last_token = tokens[tokens.length - 1]; + } else { + // For the sake of tokenizing we can pretend that there was on open brace to start + last_token = new Token('TK_START_BLOCK', '{'); + } + + while (in_array(c, whitespace)) { + + if (acorn.newline.test(c)) { + if (!(c === '\n' && input.peek(-2) === '\r')) { + n_newlines += 1; + whitespace_on_this_line = []; } + } else { + whitespace_on_this_line.push(c); + } - if (last_type === 'TK_END_BLOCK' && flags.mode !== "(EXPRESSION)") { - print_token(); - if (flags.mode === 'OBJECT' && last_text === '}') { - print_newline(); - } else { - print_single_space(); - } + c = input.next(); + + if (c === null) { + return ['', 'TK_EOF']; + } + } + + if (whitespace_on_this_line.length) { + whitespace_before_token = whitespace_on_this_line.join(''); + } + + if (digit.test(c) || (c === '.' && input.testChar(digit))) { + var allow_decimal = true; + var allow_e = true; + var local_digit = digit; + + if (c === '0' && input.testChar(/[XxOoBb]/)) { + // switch to hex/oct/bin number, no decimal or e, just hex/oct/bin digits + allow_decimal = false; + allow_e = false; + if (input.testChar(/[Bb]/)) { + local_digit = digit_bin; + } else if (input.testChar(/[Oo]/)) { + local_digit = digit_oct; } else { - if (flags.mode === 'OBJECT') { - print_token(); - print_newline(); - } else { - // EXPR or DO_BLOCK - print_token(); - print_single_space(); - } + local_digit = digit_hex; } - break; + c += input.next(); + } else if (c === '.') { + // Already have a decimal for this literal, don't allow another + allow_decimal = false; + } else { + // we know this first loop will run. It keeps the logic simpler. + c = ''; + input.back(); + } + // Add the digits + while (input.testChar(local_digit)) { + c += input.next(); - case 'TK_OPERATOR': + if (allow_decimal && input.peek() === '.') { + c += input.next(); + allow_decimal = false; + } - 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; + // a = 1.e-7 is valid, so we test for . then e in one loop + if (allow_e && input.testChar(/[Ee]/)) { + c += input.next(); + + if (input.testChar(/[+-]/)) { + c += input.next(); + } + + allow_e = false; + allow_decimal = false; } + } - // hack for actionscript's import .*; - if (token_text === '*' && last_type === 'TK_DOT' && !last_last_text.match(/^\d+$/)) { - print_token(); - break; + return [c, 'TK_WORD']; + } + + if (acorn.isIdentifierStart(input.peekCharCode(-1))) { + if (input.hasNext()) { + while (acorn.isIdentifierChar(input.peekCharCode())) { + c += input.next(); + if (!input.hasNext()) { + break; + } } + } - if (token_text === ':' && flags.in_case) { - flags.case_body = true; - indent(); - print_token(); - print_newline(); - flags.in_case = false; - break; + if (!(last_token.type === 'TK_DOT' || + (last_token.type === 'TK_RESERVED' && in_array(last_token.text, ['set', 'get']))) && + in_array(c, reserved_words)) { + if (c === 'in' || c === 'of') { // hack for 'in' and 'of' operators + return [c, 'TK_OPERATOR']; } + return [c, 'TK_RESERVED']; + } - if (token_text === '::') { - // no spaces around exotic namespacing syntax operator - print_token(); - break; + 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 = ''; + var comment_match; + // peek for comment /* ... */ + if (input.peek() === '*') { + input.next(); + comment_match = input.match(block_comment_pattern); + comment = '/*' + comment_match[0]; + var directives = get_directives(comment); + if (directives && directives.ignore === 'start') { + comment_match = input.match(directives_end_ignore_pattern); + comment += comment_match[0]; } + comment = comment.replace(acorn.allLineBreaks, '\n'); + return [comment, 'TK_BLOCK_COMMENT', directives]; + } + // peek for comment // ... + if (input.peek() === '/') { + input.next(); + comment_match = input.match(comment_pattern); + comment = '//' + comment_match[0]; + return [comment, 'TK_COMMENT']; + } - 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) || last_text == ','))) { - // unary operators (and binary +/- pretending to be unary) special cases + } - space_before = false; - space_after = false; + var startXmlRegExp = /<()([-a-zA-Z:0-9_.]+|{[\s\S]+?}|!\[CDATA\[[\s\S]*?\]\])(\s+{[\s\S]+?}|\s+[-a-zA-Z:0-9_.]+|\s+[-a-zA-Z:0-9_.]+\s*=\s*('[^']*'|"[^"]*"|{[\s\S]+?}))*\s*(\/?)\s*>/g; + + if (c === '`' || c === "'" || c === '"' || // string + ( + (c === '/') || // regexp + (opts.e4x && c === "<" && input.test(startXmlRegExp, -1)) // xml + ) && ( // regex and xml can only appear in specific locations during parsing + (last_token.type === 'TK_RESERVED' && in_array(last_token.text, ['return', 'case', 'throw', 'else', 'do', 'typeof', 'yield'])) || + (last_token.type === 'TK_END_EXPR' && last_token.text === ')' && + last_token.parent && last_token.parent.type === 'TK_RESERVED' && in_array(last_token.parent.text, ['if', 'while', 'for'])) || + (in_array(last_token.type, ['TK_COMMENT', 'TK_START_EXPR', 'TK_START_BLOCK', + 'TK_END_BLOCK', 'TK_OPERATOR', 'TK_EQUALS', 'TK_EOF', 'TK_SEMICOLON', 'TK_COMMA' + ])) + )) { + + var sep = c, + esc = false, + has_char_escapes = 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; - } + resulting_string = c; - if (flags.mode === 'BLOCK' && (last_text === '{' || last_text === ';')) { - // { foo; --i } - // foo(); --bar; - print_newline(); - } - } else if (token_text === ':') { - if (flags.ternary_depth === 0) { - if (flags.mode === 'BLOCK') { - flags.mode = 'OBJECT'; + if (sep === '/') { + // + // handle regexp + // + var in_char_class = false; + while (input.hasNext() && + ((esc || in_char_class || input.peek() !== sep) && + !input.testChar(acorn.newline))) { + resulting_string += input.peek(); + if (!esc) { + esc = input.peek() === '\\'; + if (input.peek() === '[') { + in_char_class = true; + } else if (input.peek() === ']') { + in_char_class = false; } - space_before = false; } else { - flags.ternary_depth -= 1; + esc = false; } - } else if (token_text === '?') { - flags.ternary_depth += 1; + input.next(); } - if (space_before) { - print_single_space(); + } else if (opts.e4x && sep === '<') { + // + // handle e4x xml literals + // + + var xmlRegExp = /[\s\S]*?<(\/?)([-a-zA-Z:0-9_.]+|{[\s\S]+?}|!\[CDATA\[[\s\S]*?\]\])(\s+{[\s\S]+?}|\s+[-a-zA-Z:0-9_.]+|\s+[-a-zA-Z:0-9_.]+\s*=\s*('[^']*'|"[^"]*"|{[\s\S]+?}))*\s*(\/?)\s*>/g; + input.back(); + var xmlStr = ''; + var match = input.match(startXmlRegExp); + if (match) { + // Trim root tag to attempt to + var rootTag = match[2].replace(/^{\s+/, '{').replace(/\s+}$/, '}'); + var isCurlyRoot = rootTag.indexOf('{') === 0; + var depth = 0; + while (match) { + var isEndTag = !!match[1]; + var tagName = match[2]; + var isSingletonTag = (!!match[match.length - 1]) || (tagName.slice(0, 8) === "![CDATA["); + if (!isSingletonTag && + (tagName === rootTag || (isCurlyRoot && tagName.replace(/^{\s+/, '{').replace(/\s+}$/, '}')))) { + if (isEndTag) { + --depth; + } else { + ++depth; + } + } + xmlStr += match[0]; + if (depth <= 0) { + break; + } + match = input.match(xmlRegExp); + } + // if we didn't close correctly, keep unformatted. + if (!match) { + xmlStr += input.match(/[\s\S]*/g)[0]; + } + xmlStr = xmlStr.replace(acorn.allLineBreaks, '\n'); + return [xmlStr, "TK_STRING"]; } + } else { + // + // handle string + // + var parse_string = function(delimiter, allow_unescaped_newlines, start_sub) { + // Template strings can travers lines without escape characters. + // Other strings cannot + var current_char; + while (input.hasNext()) { + current_char = input.peek(); + if (!(esc || (current_char !== delimiter && + (allow_unescaped_newlines || !acorn.newline.test(current_char))))) { + break; + } - print_token(); - - if (space_after) { - print_single_space(); - } + // Handle \r\n linebreaks after escapes or in template strings + if ((esc || allow_unescaped_newlines) && acorn.newline.test(current_char)) { + if (current_char === '\r' && input.peek(1) === '\n') { + input.next(); + current_char = input.peek(); + } + resulting_string += '\n'; + } else { + resulting_string += current_char; + } - break; + if (esc) { + if (current_char === 'x' || current_char === 'u') { + has_char_escapes = true; + } + esc = false; + } else { + esc = current_char === '\\'; + } - case 'TK_BLOCK_COMMENT': + input.next(); - var lines = split_newlines(token_text); - var j; // iterator for this case + if (start_sub && resulting_string.indexOf(start_sub, resulting_string.length - start_sub.length) !== -1) { + if (delimiter === '`') { + parse_string('}', allow_unescaped_newlines, '`'); + } else { + parse_string('`', allow_unescaped_newlines, '${'); + } - 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])); + if (input.hasNext()) { + resulting_string += input.next(); + } + } } + }; + if (sep === '`') { + parse_string('`', true, '${'); } else { + parse_string(sep); + } + } - // 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(); - } + if (has_char_escapes && opts.unescape_strings) { + resulting_string = unescape_string(resulting_string); + } - } + if (input.peek() === sep) { + resulting_string += sep; + input.next(); - for (j = 0; j < lines.length; j++) { - output.push(lines[j]); - output.push("\n"); + if (sep === '/') { + // regexps may have modifiers /regexp/MOD , so fetch those, too + // Only [gim] are valid, but if the user puts in garbage, do what we can to take it. + while (input.hasNext() && acorn.isIdentifierStart(input.peekCharCode())) { + resulting_string += input.next(); } - - } - if (look_up('\n') !== '\n') { - print_newline(); } - break; + } + return [resulting_string, 'TK_STRING']; + } - case 'TK_INLINE_COMMENT': - print_single_space(); - print_token(); - if (is_expression(flags.mode)) { - print_single_space(); - } else { - force_newline(); + if (c === '#') { + + if (tokens.length === 0 && input.peek() === '!') { + // shebang + resulting_string = c; + while (input.hasNext() && c !== '\n') { + c = input.next(); + resulting_string += c; } - break; + return [trim(resulting_string) + '\n', 'TK_UNKNOWN']; + } - case 'TK_COMMENT': - if (last_text === ',' && !wanted_newline) { - trim_output(true); + + // 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 (input.hasNext() && input.testChar(digit)) { + do { + c = input.next(); + sharp += c; + } while (input.hasNext() && c !== '#' && c !== '='); + if (c === '#') { + // + } else if (input.peek() === '[' && input.peek(1) === ']') { + sharp += '[]'; + input.next(); + input.next(); + } else if (input.peek() === '{' && input.peek(1) === '}') { + sharp += '{}'; + input.next(); + input.next(); } - if (last_type !== 'TK_COMMENT') { - if (wanted_newline) { - print_newline(); - } else { - print_single_space(); - } + return [sharp, 'TK_WORD']; + } + } + + if (c === '<' && (input.peek() === '?' || input.peek() === '%')) { + input.back(); + var template_match = input.match(template_pattern); + if (template_match) { + c = template_match[0]; + c = c.replace(acorn.allLineBreaks, '\n'); + return [c, 'TK_STRING']; + } + } + + if (c === '<' && input.match(/\!--/g)) { + c = '', 'TK_COMMENT']; + } + + if (c === '.') { + if (input.peek() === '.' && input.peek(1) === '.') { + c += input.next() + input.next(); + return [c, 'TK_OPERATOR']; + } + return [c, 'TK_DOT']; + } + + if (in_array(c, punct)) { + while (input.hasNext() && in_array(c + input.peek(), punct)) { + c += input.next(); + if (!input.hasNext()) { + break; } - print_token(); - print_newline(); - break; + } - case 'TK_UNKNOWN': - print_token(); - break; + if (c === ',') { + return [c, 'TK_COMMA']; + } else if (c === '=') { + return [c, 'TK_EQUALS']; + } else { + return [c, 'TK_OPERATOR']; + } } - last_last_text = last_text; - last_type = token_type; - last_text = token_text; + return [c, 'TK_UNKNOWN']; } - var sweet_code = preindent_string + output.join('').replace(/[\r\n ]+$/, ''); - return sweet_code; + function unescape_string(s) { + // You think that a regex would work for this + // return s.replace(/\\x([0-9a-f]{2})/gi, function(match, val) { + // return String.fromCharCode(parseInt(val, 16)); + // }) + // However, dealing with '\xff', '\\xff', '\\\xff' makes this more fun. + var out = '', + escaped = 0; + + var input_scan = new InputScanner(s); + var matched = null; + + while (input_scan.hasNext()) { + // Keep any whitespace, non-slash characters + // also keep slash pairs. + matched = input_scan.match(/([\s]|[^\\]|\\\\)+/g); + + if (matched) { + out += matched[0]; + } + + if (input_scan.peek() === '\\') { + input_scan.next(); + if (input_scan.peek() === 'x') { + matched = input_scan.match(/x([0-9A-Fa-f]{2})/g); + } else if (input_scan.peek() === 'u') { + matched = input_scan.match(/u([0-9A-Fa-f]{4})/g); + } else { + out += '\\'; + if (input_scan.hasNext()) { + out += input_scan.next(); + } + continue; + } + + // If there's some error decoding, return the original string + if (!matched) { + return s; + } + + escaped = parseInt(matched[1], 16); + + if (escaped > 0x7e && escaped <= 0xff && matched[0].indexOf('x') === 0) { + // we bail out on \x7f..\xff, + // leaving whole string escaped, + // as it's probably completely binary + return s; + } else if (escaped >= 0x00 && escaped < 0x20) { + // leave 0x00...0x1f escaped + out += '\\' + matched[0]; + continue; + } else if (escaped === 0x22 || escaped === 0x27 || escaped === 0x5c) { + // single-quote, apostrophe, backslash - escape these + out += '\\' + String.fromCharCode(escaped); + } else { + out += String.fromCharCode(escaped); + } + } + } + + return out; + } } -// Add support for CommonJS. Just put this file somewhere on your require.paths -// and you will be able to `var js_beautify = require("beautify").js_beautify`. -if (typeof exports !== "undefined") { +module.exports.Tokenizer = Tokenizer; + +/***/ }) +/******/ ]); +var js_beautify = legacy_beautify_js; +/* Footer */ +if (typeof define === "function" && define.amd) { + // Add support for AMD ( https://github.com/amdjs/amdjs-api/wiki/AMD#defineamd-property- ) + define([], function() { + return { js_beautify: js_beautify }; + }); +} else if (typeof exports !== "undefined") { + // Add support for CommonJS. Just put this file somewhere on your require.paths + // and you will be able to `var js_beautify = require("beautify").js_beautify`. exports.js_beautify = js_beautify; +} else if (typeof window !== "undefined") { + // If we're running a web page and don't have either of the above, add our one global + window.js_beautify = js_beautify; +} else if (typeof global !== "undefined") { + // If we don't even have window, try global. + global.js_beautify = js_beautify; +} else { + js_beautify_global = js_beautify; } + +}()); diff --git a/designer-base/src/com/fr/design/style/background/impl/ImageBackgroundPane.java b/designer-base/src/com/fr/design/style/background/impl/ImageBackgroundPane.java index cd35373bf..fdbb2d4ac 100644 --- a/designer-base/src/com/fr/design/style/background/impl/ImageBackgroundPane.java +++ b/designer-base/src/com/fr/design/style/background/impl/ImageBackgroundPane.java @@ -2,6 +2,7 @@ package com.fr.design.style.background.impl; import com.fr.base.Style; import com.fr.base.background.ImageBackground; +import com.fr.base.background.ImageFileBackground; import com.fr.design.gui.frpane.ImgChooseWrapper; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ibutton.UIRadioButton; @@ -192,7 +193,7 @@ public class ImageBackgroundPane extends BackgroundDetailPane { @Override public Background update() throws Exception { - ImageBackground imageBackground = new ImageBackground(previewPane.getImageWithSuffix()); + ImageBackground imageBackground = new ImageFileBackground(previewPane.getImageWithSuffix()); setImageStyle(); imageBackground.setLayout(imageStyle.getImageLayout()); return imageBackground; diff --git a/designer-base/src/com/fr/design/style/background/impl/ImageButtonBackgroundPane.java b/designer-base/src/com/fr/design/style/background/impl/ImageButtonBackgroundPane.java index 3e8540a3c..fe0cadaa5 100644 --- a/designer-base/src/com/fr/design/style/background/impl/ImageButtonBackgroundPane.java +++ b/designer-base/src/com/fr/design/style/background/impl/ImageButtonBackgroundPane.java @@ -2,6 +2,7 @@ package com.fr.design.style.background.impl; import com.fr.base.Style; import com.fr.base.background.ImageBackground; +import com.fr.base.background.ImageFileBackground; import com.fr.design.gui.ibutton.UIButton; import com.fr.general.Background; import com.fr.general.Inter; @@ -81,6 +82,6 @@ public class ImageButtonBackgroundPane extends ImageBackgroundPane { if (previewPane.getImage() == null) { return null; } - return new ImageBackground(previewPane.getImageWithSuffix()); + return new ImageFileBackground(previewPane.getImageWithSuffix()); } }