Attachment #262926 for bug #496437

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.




 /*******************************************************************************
 * @license
 * Copyright (c) 2016 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials are made 
 * available under the terms of the Eclipse Public License v1.0 
 * (http://www.eclipse.org/legal/epl-v10.html), and the Eclipse Distribution 
 * License v1.0 (http://www.eclipse.org/org/documents/edl-v10.html). 
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
/*eslint-env amd, browser*/
define([
'orion/objects',
'orion/Deferred'
], function(Objects, Deferred) {
	var config = {
		// 0:off, 1:warning, 2:error
		defaults: {
			"indent_size": 4,
			"indent_char": " ",
			"eol": "\n",
			"indent_level": 0,
			"indent_with_tabs": false,
			"preserve_newlines": true,
			"max_preserve_newlines": 10,
			"jslint_happy": false,
			"space_after_anon_function": false,
			"brace_style": "collapse",
			"keep_array_indentation": false,
			"keep_function_indentation": false,
			"space_before_conditional": true,
			"break_chained_methods": false,
			"eval_code": false,
			"unescape_strings": false,
			"wrap_line_length": 0,
			"wrap_attributes": "auto",
			"wrap_attributes_indent_size": 4,
			"end_with_newline": false
		},
		
		setOption: function(ruleId, value, key) {
			if(Array.isArray(this.rules[ruleId])) {
				var ruleConfig = this.rules[ruleId];
				if (key) {
					ruleConfig[1] = ruleConfig[1] || {};
					ruleConfig[1][key] = value;
				} else {
					ruleConfig[0] = value;
				}
			}
			else {
				this.rules[ruleId] = value;
			}
		},
		
		/**
		 * @description Resets the rules to their default values
		 * @function
		 */
		setDefaults: function setDefaults() {
			this.rules = Object.create(null);
			var keys = Object.keys(this.defaults);
			for(var i = 0; i < keys.length; i++) {
				var key = keys[i];
				this.rules[key] = this.defaults[key];
			}
		}
	};

	/**
	 * @name javascript.JavaScriptFormatter
	 * @description creates a new instance of the javascript formatter
	 * @constructor
	 * @public
	 * @param {Worker} ternWorker
	 */
	function JavaScriptFormatter(ternWorker, jsProject) {
		this.ternworker = ternWorker;
		this.project = jsProject;
		config.setDefaults();
	}
	
	Objects.mixin(JavaScriptFormatter.prototype, /** @lends javascript.JavaScriptFormatter.prototype*/ {
		
		/**
		 * @description Callback from the editor to format the source code
		 * @function
		 * @public 
		 * @memberof javascript.JavaScriptFormatter.prototype
		 * @param {orion.edit.EditorContext} editorContext The current editor context
		 * @param {Object} context The current selection context
		 */
		format: function(editorContext, context) {
			var deferred = new Deferred();
			if(this.project) {
				//TODO make sure we can get the options as set in the formatting preference page Right now only the indent character is customizable
				// We should expose all existing options - see defaults above
				this.project.getFormattingOptions().then(function(cfg) {
					this._format(editorContext, deferred, cfg ? cfg : config.rules);
				}.bind(this));
			} else {
				this._format(editorContext, deferred, config.rules);
			}
			return deferred;
		},
	
		/**
		 * @description Format the given editor
		 * @function
		 * @private
		 * @param {orion.edit.EditorContext} editorContext The given editor context
		 * @param {Deferred} deferred the given deferred object
		 * @param {Object} configuration the given configuration
		 * @since 6.0
		 */
		_format: function(editorContext, deferred, configuration) {
			return editorContext.getFileMetadata().then(function(meta) {
				return editorContext.getSelection().then(function(selection) {
					var start = selection.start;
					var end = selection.end;
					var files, request;
					if (end !== start) {
						return editorContext.getText(start, end).then(function(text) {
							files = [{type: 'full', name: meta.location, text: text}]; //$NON-NLS-1$
							request = {request: 'beautify', args: {meta: {location: meta.location}, files: files, config: configuration, start: start, end: end, contentType: meta.contentType.id}}; //$NON-NLS-1$
							this.ternworker.postMessage(
								request, 
								function(formatted, err) {
									if(err) {
										deferred.reject();
									}
									if(formatted && formatted.text) {
										deferred.resolve(editorContext.setText(formatted.text, start, end));
									} else {
										deferred.reject();
									}
								});
							return deferred;
						}.bind(this));
					}
					return editorContext.getText().then(function(text) {
						files = [{type: 'full', name: meta.location, text: text}]; //$NON-NLS-1$
						request = {request: 'beautify', args: {meta: {location: meta.location}, files: files, config: configuration, contentType: meta.contentType.id}}; //$NON-NLS-1$
						this.ternworker.postMessage(
							request, 
							function(formatted, err) {
								if(err) {
									deferred.reject();
								}
								if(formatted && formatted.text) {
									deferred.resolve(editorContext.setText(formatted.text));
								} else {
									deferred.reject();
								}
							});
						return deferred;
					}.bind(this));
				}.bind(this));
			}.bind(this));
		},
		
				/**
		 * @description Callback from orion.cm.managedservice
		 * @function
		 * @public
		 * @param {Object} properties The properties that have been changed
		 */
		updated: function(properties) {
			if (!properties) {
				return;
			}
			var oldconfig = properties.pid === 'jsbeautify.config.js';
			var keys = Object.keys(properties);
			for(var i = 0; i < keys.length; i++) {
				var key = keys[i];
				var originalKey = key;
				/*
				 * Do the key mapping for common options between css, js and html formatters
				 */
				key = key.replace(/^js_/, "");
				var ruleId = key;
				if(oldconfig && config.rules[key] !== config.defaults[key]) {
					//don't overwrite a new setting with an old one
					continue;
				}
				config.setOption(ruleId, properties[originalKey]);
			}
		},
	});
	
	return {
		JavaScriptFormatter: JavaScriptFormatter
	};
});




			} else {
		       callback(null, {message: Messages['failedToComputeOccurrencesNoServer']});
		   }
		},
		/* lint message handler */
		'beautify': function(args, callback) {
			if(ternserver) {
				var query =
					{
						type: "beautify",  //$NON-NLS-1$
						file: args.meta.location,
						args: {
							config: args.config,
							start: args.start,
							end: args.end,
							contentType: args.contentType
						}
					};
				ternserver.request(
					{
						query: query,
						files: args.files
					},
					function(error, text) {
						if(error) {
							callback({request: 'beautify', error: error.message, message: Messages['failedToFormat']}); //$NON-NLS-1$
						} else if(text) {
							callback({request: 'beautify', text: text}); //$NON-NLS-1$
						} else {
							callback({request: 'beautify', text: ""}); //$NON-NLS-1$
						}
					}
				);
			} else {
				callback(null, {message: Messages['failedToFormatNoServer']});
			}
		},
	};

	var ternID = 0;




/*******************************************************************************
 * @license
 * Copyright (c) 2016 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials are made 
 * available under the terms of the Eclipse Public License v1.0 
 * (http://www.eclipse.org/legal/epl-v10.html), and the Eclipse Distribution 
 * License v1.0 (http://www.eclipse.org/org/documents/edl-v10.html). 
 *
 * Contributors:
 *	 IBM Corporation - Allow original requirejs plugin to find files in Orion workspace
 *******************************************************************************/
/* eslint-disable missing-nls */
/*eslint-env node, amd*/
/*globals tern tern */
define([
	"tern/lib/tern",
	"beautifier/beautify-js"
], function(tern, Beautifier) {

	tern.registerPlugin("beautifier", /* @callback */ function(server, options) {
		return {
			//don't need any passes yet
		};
	});

	tern.defineQueryType("beautify", {
		takesFile: true,
		/**
		 * @callback
		 */
		run: function(server, query, file) {
			return format(query, file);
		}
	});

	/**
	 * @description Format the code using the right beautifier
	 * @param {Object} query The original Tern query object
	 * @param {Object} file The file object from Tern 
	 */
	function format(query, file) {
		var args = query.args;
		var text = file.text;
		if (args) {
			if (args.start && args.end) {
				text = file.text.substring(args.start, args.end);
			}
			return Beautifier.js_beautify(text, args.config);
		}
		return text;
	}
});

Lines 105-109 define({ Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/edit/nls/root/messages.js (-1 / +3 lines)
105	"showTooltipTooltip": "Shows the tooltip immediately based on the caret position",	105	"showTooltipTooltip": "Shows the tooltip immediately based on the caret position",
106	"emptyDeploymentInfoMessage": "Use the Launch Configurations dropdown to deploy this project",	106	"emptyDeploymentInfoMessage": "Use the Launch Configurations dropdown to deploy this project",
107	"Orion": "Orion",	107	"Orion": "Orion",
108	"OK": "Ok"	108	"OK": "Ok",
		109	"Format" : "Format",
		110	"FormatTooltip":"Format editor contents"
109	});	111	});




/*******************************************************************************
 * @license
 * Copyright (c) 2016 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials are made 
 * available under the terms of the Eclipse Public License v1.0 
 * (http://www.eclipse.org/legal/epl-v10.html), and the Eclipse Distribution 
 * License v1.0 (http://www.eclipse.org/org/documents/edl-v10.html). 
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
/*eslint-env browser, amd*/

define ([
], function() {
	
	function Formatter(serviceRegistry, inputManager, editor) {
		this.serviceRegistry = serviceRegistry;
		this.inputManager = inputManager;
		this.editor = editor;
	}
	
	Formatter.prototype = {
		getFormatter: function() {
			var inputManagerContentType = this.inputManager.getContentType();
			var formatters = this.serviceRegistry.getServiceReferences("orion.edit.format"); //$NON-NLS-0$
			for (var i=0; i < formatters.length; i++) {
				var serviceReference = formatters[i];
				var contentTypes = serviceReference.getProperty("contentType"); //$NON-NLS-0$
				if (inputManagerContentType && inputManagerContentType.id) {
					var inputContentType = inputManagerContentType.id;
					if (Array.isArray(contentTypes)) {
						for (var j = 0, max = contentTypes.length; j < max; j++) {
							if (contentTypes[j] === inputContentType) {
								return this.serviceRegistry.getService(serviceReference);
							}
						}
					} else if (inputContentType === contentTypes) {
						return this.serviceRegistry.getService(serviceReference);
					}
				}
			}
			return null;
		},
		/*
		getServiceRefs : function(registry, contentType) {
			var contentTypeService = registry.getService("orion.core.contentTypeRegistry"); //$NON-NLS-0$
			function getFilteredServiceRef(registry, sReference, contentType) {
				var contentTypeIds = sReference.getProperty("contentType"); //$NON-NLS-0$
				return contentTypeService.isSomeExtensionOf(contentType, contentTypeIds).then(function(result) {
					return result ? sReference : null;
				});
			}
			var serviceRefs = registry.getServiceReferences("orion.edit.format"); //$NON-NLS-0$
			var filteredServiceRefs = [];
			for (var i=0; i < serviceRefs.length; i++) {
				var serviceRef = serviceRefs[i];
				if (serviceRef.getProperty("contentType")) { //$NON-NLS-0$
					filteredServiceRefs.push(getFilteredServiceRef(registry, serviceRef, contentType));
				}
			}
			
			// Return a promise that gives the service references that aren't null
			return Deferred.all(filteredServiceRefs, function(error) {return {_error: error}; }).then(
				function(serviceRefs) {
					var capableServiceRefs = [];
					for (var i=0; i < serviceRefs.length; i++) {
						var currentServiceRef = serviceRefs[i];
						if (currentServiceRef && !currentServiceRef._error) {
							capableServiceRefs.push(currentServiceRef);
						}
					}
					return capableServiceRefs;
				});
		},
*/
		isVisible: function() {
			return !!this.getFormatter();
		},
		
		doFormat: function() {
			var service = this.getFormatter();
			if (service) {
				var inputManager = this.inputManager;
				var selection = this.editor.getSelection();
				var context = {metadata: inputManager.getFileMetadata(), start: selection.start, end: selection.end};
				return service.format(this.editor.getEditorContext(), context);
			}
		}
	};
	return {Formatter: Formatter}; 
});



Lines 91-96 define({//Default message bundle Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/nls/root/messages.js (+1 lines)
91	"Generate a sample plugin for integrating with Orion.": "Generate a sample plug-in for integrating with Orion.",	91	"Generate a sample plugin for integrating with Orion.": "Generate a sample plug-in for integrating with Orion.",
92	"Browser": "Web Browser",	92	"Browser": "Web Browser",
93	"OutlineProgress": "Getting outline for ${0} from ${1}",	93	"OutlineProgress": "Getting outline for ${0} from ${1}",
		94	"FormatProgress" : "Formatting ${0} from ${1}",
94	"outlineTimeout": "Outline service timed out. Try reloading the page and opening the outline again.",	95	"outlineTimeout": "Outline service timed out. Try reloading the page and opening the outline again.",
95	"UnknownError": "An unknown error occurred.",	96	"UnknownError": "An unknown error occurred.",
96	"Filter": "Filter (* = any string, ? = any character)",	97	"Filter": "Filter (* = any string, ? = any character)",




/*eslint-env amd, node*/
define([
	"./lib/beautify-css",
	"./lib/beautify-html"
], function(css_beautify, html_beautify) {

	function get_beautify(css_beautify, html_beautify) {
		var beautify = Object.create(null);
		// short aliases
		beautify.css = css_beautify.css_beautify;
		beautify.html = html_beautify.html_beautify;
	
		// legacy aliases
		beautify.css_beautify = css_beautify.css_beautify;
		beautify.html_beautify = html_beautify.html_beautify;
	
		return beautify;
	}
	return get_beautify(css_beautify, html_beautify);
});




/*

  The MIT License (MIT)

  Copyright (c) 2007-2013 Einar Lielmanis 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.


 CSS Beautifier
---------------

    Written by Harutyun Amirjanyan, (amirjanyan@gmail.com)

    Based on code initially developed by: Einar Lielmanis, <einar@jsbeautifier.org>
        http://jsbeautifier.org/

    Usage:
        css_beautify(source_text);
        css_beautify(source_text, options);

    The options are (default in brackets):
        indent_size (4)                         - indentation size,
        indent_char (space)                     - character to indent with,
        selector_separator_newline (true)       - separate selectors with newline or
                                                  not (e.g. "a,\nbr" or "a, br")
        end_with_newline (false)                - end with a newline
        newline_between_rules (true)            - add a new line after every css rule
        space_around_selector_separator (false) - ensure space around selector separators:
                                                  '>', '+', '~' (e.g. "a>b" -> "a > b")
    e.g

    css_beautify(css_source_text, {
      'indent_size': 1,
      'indent_char': '\t',
      'selector_separator': ' ',
      'end_with_newline': false,
      'newline_between_rules': true,
      'space_around_selector_separator': true
    });
*/

// http://www.w3.org/TR/CSS21/syndata.html#tokenization
// http://www.w3.org/TR/css3-syntax/
/*eslint-env amd */
define([], function() {
	
    function css_beautify(source_text, options) {
        options = options || {};
        source_text = source_text || '';
        // HACK: newline parsing inconsistent. This brute force normalizes the input.
        source_text = source_text.replace(/\r\n|[\r\u2028\u2029]/g, '\n');

        var indentSize = options.indent_size || 4;
        var indentCharacter = options.indent_char || ' ';
        var selectorSeparatorNewline = (options.selector_separator_newline === undefined) ? true : options.selector_separator_newline;
        var end_with_newline = (options.end_with_newline === undefined) ? false : options.end_with_newline;
        var newline_between_rules = (options.newline_between_rules === undefined) ? true : options.newline_between_rules;
        var spaceAroundSelectorSeparator = (options.space_around_selector_separator === undefined) ? false : options.space_around_selector_separator;
        var eol = options.eol ? options.eol : '\n';

        // compatibility
        if (typeof indentSize === "string") {
            indentSize = parseInt(indentSize, 10);
        }

        if (options.indent_with_tabs) {
            indentCharacter = '\t';
            indentSize = 1;
        }

        eol = eol.replace(/\\r/, '\r').replace(/\\n/, '\n');


        // tokenizer
        var whiteRe = /^\s+$/;

        var pos = -1,
            ch;
        var parenLevel = 0;

        function next() {
            ch = source_text.charAt(++pos);
            return ch || '';
        }

        function peek(skipWhitespace) {
            var result = '';
            var prev_pos = pos;
            if (skipWhitespace) {
                eatWhitespace();
            }
            result = source_text.charAt(pos + 1) || '';
            pos = prev_pos - 1;
            next();
            return result;
        }

        function eatString(endChars) {
            var start = pos;
            while (next()) {
                if (ch === "\\") {
                    next();
                } else if (endChars.indexOf(ch) !== -1) {
                    break;
                } else if (ch === "\n") {
                    break;
                }
            }
            return source_text.substring(start, pos + 1);
        }

        function peekString(endChar) {
            var prev_pos = pos;
            var str = eatString(endChar);
            pos = prev_pos - 1;
            next();
            return str;
        }

        function eatWhitespace() {
            var result = '';
            while (whiteRe.test(peek())) {
                next();
                result += ch;
            }
            return result;
        }

        function skipWhitespace() {
            var result = '';
            if (ch && whiteRe.test(ch)) {
                result = ch;
            }
            while (whiteRe.test(next())) {
                result += ch;
            }
            return result;
        }

        function eatComment(singleLine) {
            var start = pos;
            singleLine = peek() === "/";
            next();
            while (next()) {
                if (!singleLine && ch === "*" && peek() === "/") {
                    next();
                    break;
                } else if (singleLine && ch === "\n") {
                    return source_text.substring(start, pos);
                }
            }

            return source_text.substring(start, pos) + ch;
        }


        function lookBack(str) {
            return source_text.substring(pos - str.length, pos).toLowerCase() ===
                str;
        }

        // Nested pseudo-class if we are insideRule
        // and the next special character found opens
        // a new block
        function foundNestedPseudoClass() {
            var openParen = 0;
            for (var i = pos + 1; i < source_text.length; i++) {
                var ch = source_text.charAt(i);
                if (ch === "{") {
                    return true;
                } else if (ch === '(') {
                    // pseudoclasses can contain ()
                    openParen += 1;
                } else if (ch === ')') {
                    if (openParen === 0) {
                        return false;
                    }
                    openParen -= 1;
                } else if (ch === ";" || ch === "}") {
                    return false;
                }
            }
            return false;
        }

        // printer
        var basebaseIndentString = source_text.match(/^[\t ]*/)[0];
        var singleIndent = new Array(indentSize + 1).join(indentCharacter);
        var indentLevel = 0;
        var nestedLevel = 0;

        function indent() {
            indentLevel++;
            basebaseIndentString += singleIndent;
        }

        function outdent() {
            indentLevel--;
            basebaseIndentString = basebaseIndentString.slice(0, -indentSize);
        }

        var print = {};
        print["{"] = function(ch) {
            print.singleSpace();
            output.push(ch);
            print.newLine();
        };
        print["}"] = function(ch) {
            print.newLine();
            output.push(ch);
            print.newLine();
        };

        print._lastCharWhitespace = function() {
            return whiteRe.test(output[output.length - 1]);
        };

        print.newLine = function(keepWhitespace) {
            if (output.length) {
                if (!keepWhitespace && output[output.length - 1] !== '\n') {
                    print.trim();
                }

                output.push('\n');

                if (basebaseIndentString) {
                    output.push(basebaseIndentString);
                }
            }
        };
        print.singleSpace = function() {
            if (output.length && !print._lastCharWhitespace()) {
                output.push(' ');
            }
        };

        print.preserveSingleSpace = function() {
            if (isAfterSpace) {
                print.singleSpace();
            }
        };

        print.trim = function() {
            while (print._lastCharWhitespace()) {
                output.pop();
            }
        };


        var output = [];
        /*_____________________--------------------_____________________*/

        var insideRule = false;
        var insidePropertyValue = false;
        var enteringConditionalGroup = false;
        var top_ch = '';
        var last_top_ch = '';

        while (true) {
            var whitespace = skipWhitespace();
            var isAfterSpace = whitespace !== '';
            var isAfterNewline = whitespace.indexOf('\n') !== -1;
            last_top_ch = top_ch;
            top_ch = ch;

            if (!ch) {
                break;
            } else if (ch === '/' && peek() === '*') { /* css comment */
                var header = indentLevel === 0;

                if (isAfterNewline || header) {
                    print.newLine();
                }

                output.push(eatComment());
                print.newLine();
                if (header) {
                    print.newLine(true);
                }
            } else if (ch === '/' && peek() === '/') { // single line comment
                if (!isAfterNewline && last_top_ch !== '{') {
                    print.trim();
                }
                print.singleSpace();
                output.push(eatComment());
                print.newLine();
            } else if (ch === '@') {
                print.preserveSingleSpace();

                // deal with less propery mixins @{...}
                if (peek() === '{') {
                    output.push(eatString('}'));
                } else {
                    output.push(ch);

                    // strip trailing space, if present, for hash property checks
                    var variableOrRule = peekString(": ,;{}()[]/='\"");

                    if (variableOrRule.match(/[ :]$/)) {
                        // we have a variable or pseudo-class, add it and insert one space before continuing
                        next();
                        variableOrRule = eatString(": ").replace(/\s$/, '');
                        output.push(variableOrRule);
                        print.singleSpace();
                    }

                    variableOrRule = variableOrRule.replace(/\s$/, '');

                    // might be a nesting at-rule
                    if (variableOrRule in css_beautify.NESTED_AT_RULE) {
                        nestedLevel += 1;
                        if (variableOrRule in css_beautify.CONDITIONAL_GROUP_RULE) {
                            enteringConditionalGroup = true;
                        }
                    }
                }
            } else if (ch === '#' && peek() === '{') {
                print.preserveSingleSpace();
                output.push(eatString('}'));
            } else if (ch === '{') {
                if (peek(true) === '}') {
                    eatWhitespace();
                    next();
                    print.singleSpace();
                    output.push("{}");
                    print.newLine();
                    if (newline_between_rules && indentLevel === 0) {
                        print.newLine(true);
                    }
                } else {
                    indent();
                    print["{"](ch);
                    // when entering conditional groups, only rulesets are allowed
                    if (enteringConditionalGroup) {
                        enteringConditionalGroup = false;
                        insideRule = (indentLevel > nestedLevel);
                    } else {
                        // otherwise, declarations are also allowed
                        insideRule = (indentLevel >= nestedLevel);
                    }
                }
            } else if (ch === '}') {
                outdent();
                print["}"](ch);
                insideRule = false;
                insidePropertyValue = false;
                if (nestedLevel) {
                    nestedLevel--;
                }
                if (newline_between_rules && indentLevel === 0) {
                    print.newLine(true);
                }
            } else if (ch === ":") {
                eatWhitespace();
                if ((insideRule || enteringConditionalGroup) &&
                    !(lookBack("&") || foundNestedPseudoClass())) {
                    // 'property: value' delimiter
                    // which could be in a conditional group query
                    insidePropertyValue = true;
                    output.push(':');
                    print.singleSpace();
                } else {
                    // sass/less parent reference don't use a space
                    // sass nested pseudo-class don't use a space
                    if (peek() === ":") {
                        // pseudo-element
                        next();
                        output.push("::");
                    } else {
                        // pseudo-class
                        output.push(':');
                    }
                }
            } else if (ch === '"' || ch === '\'') {
                print.preserveSingleSpace();
                output.push(eatString(ch));
            } else if (ch === ';') {
                insidePropertyValue = false;
                output.push(ch);
                print.newLine();
            } else if (ch === '(') { // may be a url
                if (lookBack("url")) {
                    output.push(ch);
                    eatWhitespace();
                    if (next()) {
                        if (ch !== ')' && ch !== '"' && ch !== '\'') {
                            output.push(eatString(')'));
                        } else {
                            pos--;
                        }
                    }
                } else {
                    parenLevel++;
                    print.preserveSingleSpace();
                    output.push(ch);
                    eatWhitespace();
                }
            } else if (ch === ')') {
                output.push(ch);
                parenLevel--;
            } else if (ch === ',') {
                output.push(ch);
                eatWhitespace();
                if (selectorSeparatorNewline && !insidePropertyValue && parenLevel < 1) {
                    print.newLine();
                } else {
                    print.singleSpace();
                }
            } else if (ch === '>' || ch === '+' || ch === '~') {
                //handl selector separator spacing
                if (spaceAroundSelectorSeparator && !insidePropertyValue && parenLevel < 1) {
                    print.singleSpace();
                    output.push(ch);
                    print.singleSpace();
                } else {
                    output.push(ch);
                }
            } else if (ch === ']') {
                output.push(ch);
            } else if (ch === '[') {
                print.preserveSingleSpace();
                output.push(ch);
            } else if (ch === '=') { // no whitespace before or after
                eatWhitespace();
                ch = '=';
                output.push(ch);
            } else {
                print.preserveSingleSpace();
                output.push(ch);
            }
        }


        var sweetCode = '';
        if (basebaseIndentString) {
            sweetCode += basebaseIndentString;
        }

        sweetCode += output.join('').replace(/[\r\n\t ]+$/, '');

        // establish end_with_newline
        if (end_with_newline) {
            sweetCode += '\n';
        }

        if (eol !== '\n') {
            sweetCode = sweetCode.replace(/[\n]/g, eol);
        }

        return sweetCode;
    }

    // https://developer.mozilla.org/en-US/docs/Web/CSS/At-rule
    css_beautify.NESTED_AT_RULE = {
        "@page": true,
        "@font-face": true,
        "@keyframes": true,
        // also in CONDITIONAL_GROUP_RULE below
        "@media": true,
        "@supports": true,
        "@document": true
    };
    css_beautify.CONDITIONAL_GROUP_RULE = {
        "@media": true,
        "@supports": true,
        "@document": true
    };
    return {
        css_beautify: css_beautify
    };
});




/*******************************************************************************
 * @license
 * Copyright (c) 2016 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials are made 
 * available under the terms of the Eclipse Public License v1.0 
 * (http://www.eclipse.org/legal/epl-v10.html), and the Eclipse Distribution 
 * License v1.0 (http://www.eclipse.org/org/documents/edl-v10.html). 
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
/*eslint-env amd */
define("webtools/cssFormatter", [
'orion/objects',
'orion/Deferred',
'beautifier/beautifier'
], function(Objects, Deferred, Beautifier) {
	var config = {
		// 0:off, 1:warning, 2:error
		/*
		 *     The options are (default in brackets):
        indent_size (4)                         - indentation size,
        indent_char (space)                     - character to indent with,
        selector_separator_newline (true)       - separate selectors with newline or
                                                  not (e.g. "a,\nbr" or "a, br")
        end_with_newline (false)                - end with a newline
        newline_between_rules (true)            - add a new line after every css rule
        space_around_selector_separator (false) - ensure space around selector separators:
                                                  '>', '+', '~' (e.g. "a>b" -> "a > b")
		 * 
		 */
		defaults: {
			"indent_size": 4,
			"indent_char": " ",
			"eol": "\n",
			"end_with_newline": false,
			"newline_between_rules" : true,
			"space_around_selector_separator" : false
		},
		
		setOption: function(ruleId, value, key) {
			if(Array.isArray(this.rules[ruleId])) {
				var ruleConfig = this.rules[ruleId];
				if (key) {
					ruleConfig[1] = ruleConfig[1] || {};
					ruleConfig[1][key] = value;
				} else {
					ruleConfig[0] = value;
				}
			}
			else {
				this.rules[ruleId] = value;
			}
		},
		
		/**
		 * @description Resets the rules to their default values
		 * @function
		 */
		setDefaults: function setDefaults() {
			this.rules = Object.create(null);
			var keys = Object.keys(this.defaults);
			for(var i = 0; i < keys.length; i++) {
				var key = keys[i];
				this.rules[key] = this.defaults[key];
			}
		}
	};

	/**
	 * @name javascript.CssFormatter
	 * @description creates a new instance of the javascript formatter
	 * @constructor
	 * @public
	 * @param {Worker} ternWorker
	 */
	function CssFormatter() {
		config.setDefaults();
	}
	
	Objects.mixin(CssFormatter.prototype, /** @lends javascript.CssFormatter.prototype*/ {
		
		/**
		 * @description Callback from the editor to format the source code
		 * @function
		 * @public 
		 * @memberof javascript.CssFormatter.prototype
		 * @param {orion.edit.EditorContext} editorContext The current editor context
		 * @param {Object} context The current selection context
		 */
		format: function(editorContext, context) {
			var deferred = new Deferred();
			this._format(editorContext, deferred, config.rules);
			return deferred;
		},
	
		/**
		 * @description Format the given editor
		 * @function
		 * @private
		 * @param {orion.edit.EditorContext} editorContext The given editor context
		 * @param {Deferred} deferred the given deferred object
		 * @param {Object} configuration the given configuration
		 * @since 6.0
		 */
		_format: function(editorContext, deferred, configuration) {
			return editorContext.getSelection().then(function(selection) {
				var start = selection.start;
				var end = selection.end;
				if (end !== start) {
					return editorContext.getText(start, end).then(function(text) {
						var formatted = Beautifier.css_beautify(text, configuration);
						if (formatted) {
							deferred.resolve(editorContext.setText(formatted.text, start, end));
						} else {
							deferred.reject();
						}
						return deferred;
					}.bind(this));
				}
				return editorContext.getText().then(function(text) {
					var formatted = Beautifier.css_beautify(text, configuration);
					if (formatted) {
						deferred.resolve(editorContext.setText(formatted));
					} else {
						deferred.reject();
					}
					return deferred;
				}.bind(this));
			}.bind(this));
		},
		
		/**
		 * @description Callback from orion.cm.managedservice
		 * @function
		 * @public
		 * @param {Object} properties The properties that have been changed
		 */
		updated: function(properties) {
			if (!properties) {
				return;
			}
			var oldconfig = properties.pid === 'jsbeautify.config.css';
			var keys = Object.keys(properties);
			for(var i = 0; i < keys.length; i++) {
				var key = keys[i];
				var originalKey = key;
				/*
				 * Do the key mapping for common options between css, js and html formatters
				 */
				key = key.replace(/^css_/, "");
				var ruleId = key;
				if(oldconfig && config.rules[key] !== config.defaults[key]) {
					//don't overwrite a new setting with an old one
					continue;
				}
				config.setOption(ruleId, properties[originalKey]);
			}
		},
	});
	
	return {
		CssFormatter: CssFormatter
	};
});




	'csslintValidator' : 'CSS Validator',   
	'pluginName': 'Orion Web Tools Support',   
	'pluginDescription': 'This plug-in provides web language tools support for Orion, including HTML and CSS.',   
	'fontHoverExampleText': 'Lorem ipsum dolor...',
	'cssFormatter' : 'CSS Formatter',
	'htmlFormatter' : 'HTML Formatter',

	// CSS and HTML formatting options names
	'indentation_space' : 'space',
	'indentation_tab' : 'tab',
	'indentation_unix' : 'Unix',
	'indentation_mac' : 'Mac',
	'indentation_windows' : 'Windows',
	'collapse_preserve_inline' : 'Collapse Preserve inline',
	'collapse' : 'Collapse',
	'expand' : 'Expand',
	'end_expand' : 'End expand',
	'none' : 'None',
	'normal' : 'Normal',
	'keep' : 'Keep',
	'separate' : 'Separate',
	'auto' : 'Auto',
	'force' : 'Force',
	
	// CSS Formatter Settings
	'cssFormattingSettings' : 'Formatting Settings for CSS',
	'cssFormatting' : 'CSS Formatting',
	'css_indent_size' : 'Indentation size:' ,
	'css_indent_char' : 'Indentation character:',
	'css_eol' : 'Charater(s) to use as line terminators:',
	'css_end_with_newline' : 'End ouput with newline:',
	'selector_separator_newline' : 'Add a newline between multiple selectors:',
	'newline_between_rules' : 'Add a newline between CSS rules:',
	'space_around_selector_separator' : 'Ensure space around selector separators:',

	// HTML Formatter Settings
	'htmlFormattingOptions' : 'Formatting Settings for HTML',
	'htmlFormatting' : 'HTML Formatting',
	'html_indent_size' : 'Indentation size:',
	'html_indent_char' : 'Indentation character:',
	'html_eol' : 'Charater(s) to use as line terminators:',
	'html_end_with_newline' : 'End ouput with newline:',
	'html_preserve_new_lines' : 'Preserve line-breaks:',
	'html_max_preserve_new_lines' : 'Number of line-breaks to be preserved in one chunk:',
	'html_brace_style' : 'Brace Style:',
	'html_wrap_line_length' : 'Wrap lines at next opportunity after N characters: (0 for unlimited)',
	'indent_inner_html' : 'Indent <head> and <body> sections:',
	'indent_handlebars' : 'Format and indent {{#foo}} and {{/foo}}:',
	'wrap_attributes' : 'Wrap attributes to new lines:',
	'wrap_attributes_indent_size' : 'Indent wrapped attributes to after N characters:',
	'extra_liners' : 'List of tags that should have an extra newline before them (separate with commas):',
	'indent_scripts' : 'Indent scripts:',

	
	// Validator Severities
	'ignore' : 'Ignore',
	'warning' : 'Warning',
	'error' : 'Error',
	
	// CSS Validator Settings
	'adjoining-classes': 'Disallow adjoining classes:',   




/*******************************************************************************
 * @license
 * Copyright (c) 2016 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials are made 
 * available under the terms of the Eclipse Public License v1.0 
 * (http://www.eclipse.org/legal/epl-v10.html), and the Eclipse Distribution 
 * License v1.0 (http://www.eclipse.org/org/documents/edl-v10.html). 
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
/*eslint-env amd */
define("webtools/htmlFormatter", [
'orion/objects',
'orion/Deferred',
'beautifier/beautifier'
], function(Objects, Deferred, Beautifier) {
	var config = {
		// 0:off, 1:warning, 2:error
		/*
		 *     The options are (default in brackets):
    indent_inner_html (default false)  - indent <head> and <body> sections,
    indent_size (default 4)            - indentation size,
    indent_char (default space)        - character to indent with,
    wrap_line_length (default 250)            -  maximum amount of characters per line (0 = disable)
    brace_style (default "collapse") - "collapse" | "expand" | "end-expand" | "none"
            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.
    unformatted (defaults to inline tags) - list of tags, that shouldn't be reformatted
    indent_scripts (default normal)  - "keep"|"separate"|"normal"
    preserve_newlines (default true) - whether existing line breaks before elements should be preserved
                                        Only works before elements, not inside tags or for text.
    max_preserve_newlines (default unlimited) - maximum number of line breaks to be preserved in one chunk
    indent_handlebars (default false) - format and indent {{#foo}} and {{/foo}}
    end_with_newline (false)          - end with a newline
    extra_liners (default [head,body,/html]) -List of tags that should have an extra newline before them.
    eol
		 * 
		 */
		defaults: {
			"indent_size": 4,
			"indent_char": " ",
			"indent_inner_html" : false,
			"eol": "\n",
			"end_with_newline": false,
			"wrap_line_length" : 250,
			"brace_style" : "collapse",
			"indent_scripts" : "normal",
			"preserve_newlines" : true,
			"max_preserve_newlines" : 10,
			"indent_handlebars" : false,
			"extra_liners" : "head,body,html",
			"newline_between_rules" : true,
			"space_around_selector_separator" : false,
			"indent_level": 0,
			"space_after_anon_function": false,
			"keep_array_indentation": false,
			"keep_function_indentation": false,
			"space_before_conditional": true,
			"break_chained_methods": false,
			"eval_code": false,
			"unescape_strings": false,
			"wrap_attributes": "auto",
			"wrap_attributes_indent_size": 4,
		},
		
		setOption: function(ruleId, value, key) {
			if(Array.isArray(this.rules[ruleId])) {
				var ruleConfig = this.rules[ruleId];
				if (key) {
					ruleConfig[1] = ruleConfig[1] || {};
					ruleConfig[1][key] = value;
				} else {
					ruleConfig[0] = value;
				}
			}
			else {
				this.rules[ruleId] = value;
			}
		},
		
		/**
		 * @description Resets the rules to their default values
		 * @function
		 */
		setDefaults: function setDefaults() {
			this.rules = Object.create(null);
			var keys = Object.keys(this.defaults);
			for(var i = 0; i < keys.length; i++) {
				var key = keys[i];
				this.rules[key] = this.defaults[key];
			}
		}
	};

	/**
	 * @name javascript.HtmlFormatter
	 * @description creates a new instance of the html formatter
	 * @constructor
	 * @public
	 */
	function HtmlFormatter() {
		config.setDefaults();
	}
	
	Objects.mixin(HtmlFormatter.prototype, /** @lends javascript.HtmlFormatter.prototype*/ {
		
		/**
		 * @description Callback from the editor to format the source code
		 * @function
		 * @public 
		 * @memberof javascript.HtmlFormatter.prototype
		 * @param {orion.edit.EditorContext} editorContext The current editor context
		 * @param {Object} context The current selection context
		 */
		format: function(editorContext, context) {
			var deferred = new Deferred();
			this._format(editorContext, deferred, config.rules);
			return deferred;
		},
	
		/**
		 * @description Format the given editor
		 * @function
		 * @private
		 * @param {orion.edit.EditorContext} editorContext The given editor context
		 * @param {Deferred} deferred the given deferred object
		 * @param {Object} configuration the given configuration
		 * @since 6.0
		 */
		_format: function(editorContext, deferred, configuration) {
			return editorContext.getSelection().then(function(selection) {
				var start = selection.start;
				var end = selection.end;
				if (end !== start) {
					return editorContext.getText(start, end).then(function(text) {
						var formatted = Beautifier.html_beautify(text, configuration);
						if (formatted) {
							deferred.resolve(editorContext.setText(formatted.text, start, end));
						} else {
							deferred.reject();
						}
						return deferred;
					}.bind(this));
				}
				return editorContext.getText().then(function(text) {
					var formatted = Beautifier.html_beautify(text, configuration);
					if (formatted) {
						deferred.resolve(editorContext.setText(formatted));
					} else {
						deferred.reject();
					}
					return deferred;
				}.bind(this));
			}.bind(this));
		},
		
		/**
		 * @description Callback from orion.cm.managedservice
		 * @function
		 * @public
		 * @param {Object} properties The properties that have been changed
		 */
		updated: function(properties) {
			if (!properties) {
				return;
			}
			var oldconfig = properties.pid === 'jsbeautify.config.css';
			var keys = Object.keys(properties);
			var i, key, ruleId, originalKey;
			for(i = 0; i < keys.length; i++) {
				key = keys[i];
				originalKey = key;
				/*
				 * Do the key mapping for common options between css, js and html formatters
				 */
				key = key.replace(/^css_/, "");
				ruleId = key;
				if(oldconfig && config.rules[key] !== config.defaults[key]) {
					//don't overwrite a new setting with an old one
					continue;
				}
				config.setOption(ruleId, properties[originalKey]);
			}
			
			oldconfig = properties.pid === 'jsbeautify.config.js';
			keys = Object.keys(properties);
			for(i = 0; i < keys.length; i++) {
				key = keys[i];
				originalKey = key;
				/*
				 * Do the key mapping for common options between css, js and html formatters
				 */
				key = key.replace(/^js_/, "");
				ruleId = key;
				if(oldconfig && config.rules[key] !== config.defaults[key]) {
					//don't overwrite a new setting with an old one
					continue;
				}
				config.setOption(ruleId, properties[originalKey]);
			}

			oldconfig = properties.pid === 'jsbeautify.config.html';
			keys = Object.keys(properties);
			for(i = 0; i < keys.length; i++) {
				key = keys[i];
				originalKey = key;
				/*
				 * Do the key mapping for common options between css, js and html formatters
				 */
				key = key.replace(/^html_/, "");
				ruleId = key;
				if(oldconfig && config.rules[key] !== config.defaults[key]) {
					//don't overwrite a new setting with an old one
					continue;
				}
				config.setOption(ruleId, properties[originalKey]);
			}
		},
	});
	
	return {
		HtmlFormatter: HtmlFormatter
	};
});




/*jshint curly:true, eqeqeq:true, laxbreak:true, noempty:false */
/*

  The MIT License (MIT)

  Copyright (c) 2007-2013 Einar Lielmanis 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.


 Style HTML
---------------

  Written by Nochum Sossonko, (nsossonko@hotmail.com)

  Based on code initially developed by: Einar Lielmanis, <einar@jsbeautifier.org>
    http://jsbeautifier.org/

  Usage:
    style_html(html_source);

    style_html(html_source, options);

  The options are:
    indent_inner_html (default false)  - indent <head> and <body> sections,
    indent_size (default 4)            - indentation size,
    indent_char (default space)        - character to indent with,
    wrap_line_length (default 250)            -  maximum amount of characters per line (0 = disable)
    brace_style (default "collapse") - "collapse" | "expand" | "end-expand" | "none"
            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.
    unformatted (defaults to inline tags) - list of tags, that shouldn't be reformatted
    indent_scripts (default normal)  - "keep"|"separate"|"normal"
    preserve_newlines (default true) - whether existing line breaks before elements should be preserved
                                        Only works before elements, not inside tags or for text.
    max_preserve_newlines (default unlimited) - maximum number of line breaks to be preserved in one chunk
    indent_handlebars (default false) - format and indent {{#foo}} and {{/foo}}
    end_with_newline (false)          - end with a newline
    extra_liners (default [head,body,/html]) -List of tags that should have an extra newline before them.

    e.g.

    style_html(html_source, {
      'indent_inner_html': false,
      'indent_size': 2,
      'indent_char': ' ',
      'wrap_line_length': 78,
      'brace_style': 'expand',
      'preserve_newlines': true,
      'max_preserve_newlines': 5,
      'indent_handlebars': false,
      'extra_liners': ['/html']
    });
*/
/*eslint-env amd */
define([
	"beautifier/beautify-js", // reference the javascript beautifier inside javascript tooling
	"./beautify-css"
], function(js_beautify, css_beautify) {

    // function trim(s) {
    //     return s.replace(/^\s+|\s+$/g, '');
    // }

    function ltrim(s) {
        return s.replace(/^\s+/g, '');
    }

    function rtrim(s) {
        return s.replace(/\s+$/g, '');
    }

    function style_html(html_source, options, js_beautify, css_beautify) {
        //Wrapper function to invoke all the necessary constructors and deal with the output.

        var multi_parser,
            indent_inner_html,
            indent_size,
            indent_character,
            wrap_line_length,
            brace_style,
            unformatted,
            preserve_newlines,
            max_preserve_newlines,
            indent_handlebars,
            wrap_attributes,
            wrap_attributes_indent_size,
            end_with_newline,
            extra_liners,
            eol;

        options = options || {};

        // backwards compatibility to 1.3.4
        if ((options.wrap_line_length === undefined || parseInt(options.wrap_line_length, 10) === 0) &&
            (options.max_char !== undefined && parseInt(options.max_char, 10) !== 0)) {
            options.wrap_line_length = options.max_char;
        }

        indent_inner_html = (options.indent_inner_html === undefined) ? false : options.indent_inner_html;
        indent_size = (options.indent_size === undefined) ? 4 : parseInt(options.indent_size, 10);
        indent_character = (options.indent_char === undefined) ? ' ' : options.indent_char;
        brace_style = (options.brace_style === undefined) ? 'collapse' : options.brace_style;
        wrap_line_length = parseInt(options.wrap_line_length, 10) === 0 ? 32786 : parseInt(options.wrap_line_length || 250, 10);
        unformatted = options.unformatted || [
            // https://www.w3.org/TR/html5/dom.html#phrasing-content
            'a', 'abbr', 'area', 'audio', 'b', 'bdi', 'bdo', 'br', 'button', 'canvas', 'cite',
            'code', 'data', 'datalist', 'del', 'dfn', 'em', 'embed', 'i', 'iframe', 'img',
            'input', 'ins', 'kbd', 'keygen', 'label', 'map', 'mark', 'math', 'meter', 'noscript',
            'object', 'output', 'progress', 'q', 'ruby', 's', 'samp', /* 'script', */ 'select', 'small',
            'span', 'strong', 'sub', 'sup', 'svg', 'template', 'textarea', 'time', 'u', 'var',
            'video', 'wbr', 'text',
            // prexisting - not sure of full effect of removing, leaving in
            'acronym', 'address', 'big', 'dt', 'ins', 'small', 'strike', 'tt',
            'pre',
            'h1', 'h2', 'h3', 'h4', 'h5', 'h6'
        ];
        preserve_newlines = (options.preserve_newlines === undefined) ? true : options.preserve_newlines;
        max_preserve_newlines = preserve_newlines ?
            (isNaN(parseInt(options.max_preserve_newlines, 10)) ? 32786 : parseInt(options.max_preserve_newlines, 10)) :
            0;
        indent_handlebars = (options.indent_handlebars === undefined) ? false : options.indent_handlebars;
        wrap_attributes = (options.wrap_attributes === undefined) ? 'auto' : options.wrap_attributes;
        wrap_attributes_indent_size = (isNaN(parseInt(options.wrap_attributes_indent_size, 10))) ? indent_size : parseInt(options.wrap_attributes_indent_size, 10);
        end_with_newline = (options.end_with_newline === undefined) ? false : options.end_with_newline;
        extra_liners = (typeof options.extra_liners === 'object') && options.extra_liners ?
            options.extra_liners.concat() : (typeof options.extra_liners === 'string') ?
            options.extra_liners.split(',') : 'head,body,/html'.split(',');
        eol = options.eol ? options.eol : '\n';

        if (options.indent_with_tabs) {
            indent_character = '\t';
            indent_size = 1;
        }

        eol = eol.replace(/\\r/, '\r').replace(/\\n/, '\n');

        function Parser() {

            this.pos = 0; //Parser position
            this.token = '';
            this.current_mode = 'CONTENT'; //reflects the current Parser mode: TAG/CONTENT
            this.tags = { //An object to hold tags, their position, and their parent-tags, initiated with default values
                parent: 'parent1',
                parentcount: 1,
                parent1: ''
            };
            this.tag_type = '';
            this.token_text = this.last_token = this.last_text = this.token_type = '';
            this.newlines = 0;
            this.indent_content = indent_inner_html;

            this.Utils = { //Uilities made available to the various functions
                whitespace: "\n\r\t ".split(''),

                single_token: [
                    // HTLM void elements - aka self-closing tags - aka singletons
                    // https://www.w3.org/html/wg/drafts/html/master/syntax.html#void-elements
                    'area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'keygen',
                    'link', 'menuitem', 'meta', 'param', 'source', 'track', 'wbr',
                    // NOTE: Optional tags - are not understood.
                    // https://www.w3.org/TR/html5/syntax.html#optional-tags
                    // The rules for optional tags are too complex for a simple list
                    // Also, the content of these tags should still be indented in many cases.
                    // 'li' is a good exmple.

                    // Doctype and xml elements
                    '!doctype', '?xml',
                    // ?php tag
                    '?php',
                    // other tags that were in this list, keeping just in case
                    'basefont', 'isindex'
                ],
                extra_liners: extra_liners, //for tags that need a line of whitespace before them
                in_array: function(what, arr) {
                    for (var i = 0; i < arr.length; i++) {
                        if (what === arr[i]) {
                            return true;
                        }
                    }
                    return false;
                }
            };

            // Return true if the given text is composed entirely of whitespace.
            this.is_whitespace = function(text) {
                for (var n = 0; n < text.length; n++) {
                    if (!this.Utils.in_array(text.charAt(n), this.Utils.whitespace)) {
                        return false;
                    }
                }
                return true;
            };

            this.traverse_whitespace = function() {
                var input_char = '';

                input_char = this.input.charAt(this.pos);
                if (this.Utils.in_array(input_char, this.Utils.whitespace)) {
                    this.newlines = 0;
                    while (this.Utils.in_array(input_char, this.Utils.whitespace)) {
                        if (preserve_newlines && input_char === '\n' && this.newlines <= max_preserve_newlines) {
                            this.newlines += 1;
                        }

                        this.pos++;
                        input_char = this.input.charAt(this.pos);
                    }
                    return true;
                }
                return false;
            };

            // Append a space to the given content (string array) or, if we are
            // at the wrap_line_length, append a newline/indentation.
            // return true if a newline was added, false if a space was added
            this.space_or_wrap = function(content) {
                if (this.line_char_count >= this.wrap_line_length) { //insert a line when the wrap_line_length is reached
                    this.print_newline(false, content);
                    this.print_indentation(content);
                    return true;
                } else {
                    this.line_char_count++;
                    content.push(' ');
                    return false;
                }
            };

            this.get_content = function() { //function to capture regular content between tags
                var input_char = '',
                    content = [];

                while (this.input.charAt(this.pos) !== '<') {
                    if (this.pos >= this.input.length) {
                        return content.length ? content.join('') : ['', 'TK_EOF'];
                    }

                    if (this.traverse_whitespace()) {
                        this.space_or_wrap(content);
                        continue;
                    }

                    if (indent_handlebars) {
                        // Handlebars parsing is complicated.
                        // {{#foo}} and {{/foo}} are formatted tags.
                        // {{something}} should get treated as content, except:
                        // {{else}} specifically behaves like {{#if}} and {{/if}}
                        var peek3 = this.input.substr(this.pos, 3);
                        if (peek3 === '{{#' || peek3 === '{{/') {
                            // These are tags and not content.
                            break;
                        } else if (peek3 === '{{!') {
                            return [this.get_tag(), 'TK_TAG_HANDLEBARS_COMMENT'];
                        } else if (this.input.substr(this.pos, 2) === '{{') {
                            if (this.get_tag(true) === '{{else}}') {
                                break;
                            }
                        }
                    }

                    input_char = this.input.charAt(this.pos);
                    this.pos++;
                    this.line_char_count++;
                    content.push(input_char); //letter at-a-time (or string) inserted to an array
                }
                return content.length ? content.join('') : '';
            };

            this.get_contents_to = function(name) { //get the full content of a script or style to pass to js_beautify
                if (this.pos === this.input.length) {
                    return ['', 'TK_EOF'];
                }
                var content = '';
                var reg_match = new RegExp('</' + name + '\\s*>', 'igm');
                reg_match.lastIndex = this.pos;
                var reg_array = reg_match.exec(this.input);
                var end_script = reg_array ? reg_array.index : this.input.length; //absolute end of script
                if (this.pos < end_script) { //get everything in between the script tags
                    content = this.input.substring(this.pos, end_script);
                    this.pos = end_script;
                }
                return content;
            };

            this.record_tag = function(tag) { //function to record a tag and its parent in this.tags Object
                if (this.tags[tag + 'count']) { //check for the existence of this tag type
                    this.tags[tag + 'count']++;
                    this.tags[tag + this.tags[tag + 'count']] = this.indent_level; //and record the present indent level
                } else { //otherwise initialize this tag type
                    this.tags[tag + 'count'] = 1;
                    this.tags[tag + this.tags[tag + 'count']] = this.indent_level; //and record the present indent level
                }
                this.tags[tag + this.tags[tag + 'count'] + 'parent'] = this.tags.parent; //set the parent (i.e. in the case of a div this.tags.div1parent)
                this.tags.parent = tag + this.tags[tag + 'count']; //and make this the current parent (i.e. in the case of a div 'div1')
            };

            this.retrieve_tag = function(tag) { //function to retrieve the opening tag to the corresponding closer
                if (this.tags[tag + 'count']) { //if the openener is not in the Object we ignore it
                    var temp_parent = this.tags.parent; //check to see if it's a closable tag.
                    while (temp_parent) { //till we reach '' (the initial value);
                        if (tag + this.tags[tag + 'count'] === temp_parent) { //if this is it use it
                            break;
                        }
                        temp_parent = this.tags[temp_parent + 'parent']; //otherwise keep on climbing up the DOM Tree
                    }
                    if (temp_parent) { //if we caught something
                        this.indent_level = this.tags[tag + this.tags[tag + 'count']]; //set the indent_level accordingly
                        this.tags.parent = this.tags[temp_parent + 'parent']; //and set the current parent
                    }
                    delete this.tags[tag + this.tags[tag + 'count'] + 'parent']; //delete the closed tags parent reference...
                    delete this.tags[tag + this.tags[tag + 'count']]; //...and the tag itself
                    if (this.tags[tag + 'count'] === 1) {
                        delete this.tags[tag + 'count'];
                    } else {
                        this.tags[tag + 'count']--;
                    }
                }
            };

            this.indent_to_tag = function(tag) {
                // Match the indentation level to the last use of this tag, but don't remove it.
                if (!this.tags[tag + 'count']) {
                    return;
                }
                var temp_parent = this.tags.parent;
                while (temp_parent) {
                    if (tag + this.tags[tag + 'count'] === temp_parent) {
                        break;
                    }
                    temp_parent = this.tags[temp_parent + 'parent'];
                }
                if (temp_parent) {
                    this.indent_level = this.tags[tag + this.tags[tag + 'count']];
                }
            };

            this.get_tag = function(peek) { //function to get a full tag and parse its type
                var input_char = '',
                    content = [],
                    comment = '',
                    space = false,
                    first_attr = true,
                    tag_start, tag_end,
                    tag_start_char,
                    orig_pos = this.pos,
                    orig_line_char_count = this.line_char_count;

                peek = peek !== undefined ? peek : false;

                do {
                    if (this.pos >= this.input.length) {
                        if (peek) {
                            this.pos = orig_pos;
                            this.line_char_count = orig_line_char_count;
                        }
                        return content.length ? content.join('') : ['', 'TK_EOF'];
                    }

                    input_char = this.input.charAt(this.pos);
                    this.pos++;

                    if (this.Utils.in_array(input_char, this.Utils.whitespace)) { //don't want to insert unnecessary space
                        space = true;
                        continue;
                    }

                    if (input_char === "'" || input_char === '"') {
                        input_char += this.get_unformatted(input_char);
                        space = true;

                    }

                    if (input_char === '=') { //no space before =
                        space = false;
                    }

                    if (content.length && content[content.length - 1] !== '=' && input_char !== '>' && space) {
                        //no space after = or before >
                        var wrapped = this.space_or_wrap(content);
                        var indentAttrs = wrapped && input_char !== '/' && wrap_attributes !== 'force';
                        space = false;
                        if (!first_attr && wrap_attributes === 'force' && input_char !== '/') {
                            this.print_newline(false, content);
                            this.print_indentation(content);
                            indentAttrs = true;
                        }
                        if (indentAttrs) {
                            //indent attributes an auto or forced line-wrap
                            for (var count = 0; count < wrap_attributes_indent_size; count++) {
                                content.push(indent_character);
                            }
                        }
                        for (var i = 0; i < content.length; i++) {
                            if (content[i] === ' ') {
                                first_attr = false;
                                break;
                            }
                        }
                    }

                    if (indent_handlebars && tag_start_char === '<') {
                        // When inside an angle-bracket tag, put spaces around
                        // handlebars not inside of strings.
                        if ((input_char + this.input.charAt(this.pos)) === '{{') {
                            input_char += this.get_unformatted('}}');
                            if (content.length && content[content.length - 1] !== ' ' && content[content.length - 1] !== '<') {
                                input_char = ' ' + input_char;
                            }
                            space = true;
                        }
                    }

                    if (input_char === '<' && !tag_start_char) {
                        tag_start = this.pos - 1;
                        tag_start_char = '<';
                    }

                    if (indent_handlebars && !tag_start_char) {
                        if (content.length >= 2 && content[content.length - 1] === '{' && content[content.length - 2] === '{') {
                            if (input_char === '#' || input_char === '/' || input_char === '!') {
                                tag_start = this.pos - 3;
                            } else {
                                tag_start = this.pos - 2;
                            }
                            tag_start_char = '{';
                        }
                    }

                    this.line_char_count++;
                    content.push(input_char); //inserts character at-a-time (or string)

                    if (content[1] && (content[1] === '!' || content[1] === '?' || content[1] === '%')) { //if we're in a comment, do something special
                        // We treat all comments as literals, even more than preformatted tags
                        // we just look for the appropriate close tag
                        content = [this.get_comment(tag_start)];
                        break;
                    }

                    if (indent_handlebars && content[1] && content[1] === '{' && content[2] && content[2] === '!') { //if we're in a comment, do something special
                        // We treat all comments as literals, even more than preformatted tags
                        // we just look for the appropriate close tag
                        content = [this.get_comment(tag_start)];
                        break;
                    }

                    if (indent_handlebars && tag_start_char === '{' && content.length > 2 && content[content.length - 2] === '}' && content[content.length - 1] === '}') {
                        break;
                    }
                } while (input_char !== '>');

                var tag_complete = content.join('');
                var tag_index;
                var tag_offset;

                if (tag_complete.indexOf(' ') !== -1) { //if there's whitespace, thats where the tag name ends
                    tag_index = tag_complete.indexOf(' ');
                } else if (tag_complete.charAt(0) === '{') {
                    tag_index = tag_complete.indexOf('}');
                } else { //otherwise go with the tag ending
                    tag_index = tag_complete.indexOf('>');
                }
                if (tag_complete.charAt(0) === '<' || !indent_handlebars) {
                    tag_offset = 1;
                } else {
                    tag_offset = tag_complete.charAt(2) === '#' ? 3 : 2;
                }
                var tag_check = tag_complete.substring(tag_offset, tag_index).toLowerCase();
                if (tag_complete.charAt(tag_complete.length - 2) === '/' ||
                    this.Utils.in_array(tag_check, this.Utils.single_token)) { //if this tag name is a single tag type (either in the list or has a closing /)
                    if (!peek) {
                        this.tag_type = 'SINGLE';
                    }
                } else if (indent_handlebars && tag_complete.charAt(0) === '{' && tag_check === 'else') {
                    if (!peek) {
                        this.indent_to_tag('if');
                        this.tag_type = 'HANDLEBARS_ELSE';
                        this.indent_content = true;
                        this.traverse_whitespace();
                    }
                } else if (this.is_unformatted(tag_check, unformatted)) { // do not reformat the "unformatted" tags
                    comment = this.get_unformatted('</' + tag_check + '>', tag_complete); //...delegate to get_unformatted function
                    content.push(comment);
                    tag_end = this.pos - 1;
                    this.tag_type = 'SINGLE';
                } else if (tag_check === 'script' &&
                    (tag_complete.search('type') === -1 ||
                        (tag_complete.search('type') > -1 &&
                            tag_complete.search(/\b(text|application)\/(x-)?(javascript|ecmascript|jscript|livescript|(ld\+)?json)/) > -1))) {
                    if (!peek) {
                        this.record_tag(tag_check);
                        this.tag_type = 'SCRIPT';
                    }
                } else if (tag_check === 'style' &&
                    (tag_complete.search('type') === -1 ||
                        (tag_complete.search('type') > -1 && tag_complete.search('text/css') > -1))) {
                    if (!peek) {
                        this.record_tag(tag_check);
                        this.tag_type = 'STYLE';
                    }
                } else if (tag_check.charAt(0) === '!') { //peek for <! comment
                    // for comments content is already correct.
                    if (!peek) {
                        this.tag_type = 'SINGLE';
                        this.traverse_whitespace();
                    }
                } else if (!peek) {
                    if (tag_check.charAt(0) === '/') { //this tag is a double tag so check for tag-ending
                        this.retrieve_tag(tag_check.substring(1)); //remove it and all ancestors
                        this.tag_type = 'END';
                    } else { //otherwise it's a start-tag
                        this.record_tag(tag_check); //push it on the tag stack
                        if (tag_check.toLowerCase() !== 'html') {
                            this.indent_content = true;
                        }
                        this.tag_type = 'START';
                    }

                    // Allow preserving of newlines after a start or end tag
                    if (this.traverse_whitespace()) {
                        this.space_or_wrap(content);
                    }

                    if (this.Utils.in_array(tag_check, this.Utils.extra_liners)) { //check if this double needs an extra line
                        this.print_newline(false, this.output);
                        if (this.output.length && this.output[this.output.length - 2] !== '\n') {
                            this.print_newline(true, this.output);
                        }
                    }
                }

                if (peek) {
                    this.pos = orig_pos;
                    this.line_char_count = orig_line_char_count;
                }

                return content.join(''); //returns fully formatted tag
            };

            this.get_comment = function(start_pos) { //function to return comment content in its entirety
                // this is will have very poor perf, but will work for now.
                var comment = '',
                    delimiter = '>',
                    matched = false;

                this.pos = start_pos;
                var input_char = this.input.charAt(this.pos);
                this.pos++;

                while (this.pos <= this.input.length) {
                    comment += input_char;

                    // only need to check for the delimiter if the last chars match
                    if (comment.charAt(comment.length - 1) === delimiter.charAt(delimiter.length - 1) &&
                        comment.indexOf(delimiter) !== -1) {
                        break;
                    }

                    // only need to search for custom delimiter for the first few characters
                    if (!matched && comment.length < 10) {
                        if (comment.indexOf('<![if') === 0) { //peek for <![if conditional comment
                            delimiter = '<![endif]>';
                            matched = true;
                        } else if (comment.indexOf('<![cdata[') === 0) { //if it's a <[cdata[ comment...
                            delimiter = ']]>';
                            matched = true;
                        } else if (comment.indexOf('<![') === 0) { // some other ![ comment? ...
                            delimiter = ']>';
                            matched = true;
                        } else if (comment.indexOf('<!--') === 0) { // <!-- comment ...
                            delimiter = '-->';
                            matched = true;
                        } else if (comment.indexOf('{{!') === 0) { // {{! handlebars comment
                            delimiter = '}}';
                            matched = true;
                        } else if (comment.indexOf('<?') === 0) { // {{! handlebars comment
                            delimiter = '?>';
                            matched = true;
                        } else if (comment.indexOf('<%') === 0) { // {{! handlebars comment
                            delimiter = '%>';
                            matched = true;
                        }
                    }

                    input_char = this.input.charAt(this.pos);
                    this.pos++;
                }

                return comment;
            };

            function tokenMatcher(delimiter) {
                var token = '';

                var add = function(str) {
                    var newToken = token + str.toLowerCase();
                    token = newToken.length <= delimiter.length ? newToken : newToken.substr(newToken.length - delimiter.length, delimiter.length);
                };

                var doesNotMatch = function() {
                    return token.indexOf(delimiter) === -1;
                };

                return {
                    add: add,
                    doesNotMatch: doesNotMatch
                };
            }

            this.get_unformatted = function(delimiter, orig_tag) { //function to return unformatted content in its entirety
                if (orig_tag && orig_tag.toLowerCase().indexOf(delimiter) !== -1) {
                    return '';
                }
                var input_char = '';
                var content = '';
                var space = true;

                var delimiterMatcher = tokenMatcher(delimiter);

                do {

                    if (this.pos >= this.input.length) {
                        return content;
                    }

                    input_char = this.input.charAt(this.pos);
                    this.pos++;

                    if (this.Utils.in_array(input_char, this.Utils.whitespace)) {
                        if (!space) {
                            this.line_char_count--;
                            continue;
                        }
                        if (input_char === '\n' || input_char === '\r') {
                            content += '\n';
                            /*  Don't change tab indention for unformatted blocks.  If using code for html editing, this will greatly affect <pre> tags if they are specified in the 'unformatted array'
                for (var i=0; i<this.indent_level; i++) {
                  content += this.indent_string;
                }
                space = false; //...and make sure other indentation is erased
                */
                            this.line_char_count = 0;
                            continue;
                        }
                    }
                    content += input_char;
                    delimiterMatcher.add(input_char);
                    this.line_char_count++;
                    space = true;

                    if (indent_handlebars && input_char === '{' && content.length && content.charAt(content.length - 2) === '{') {
                        // Handlebars expressions in strings should also be unformatted.
                        content += this.get_unformatted('}}');
                        // Don't consider when stopping for delimiters.
                    }
                } while (delimiterMatcher.doesNotMatch());

                return content;
            };

            this.get_token = function() { //initial handler for token-retrieval
                var token;

                if (this.last_token === 'TK_TAG_SCRIPT' || this.last_token === 'TK_TAG_STYLE') { //check if we need to format javascript
                    var type = this.last_token.substr(7);
                    token = this.get_contents_to(type);
                    if (typeof token !== 'string') {
                        return token;
                    }
                    return [token, 'TK_' + type];
                }
                if (this.current_mode === 'CONTENT') {
                    token = this.get_content();
                    if (typeof token !== 'string') {
                        return token;
                    } else {
                        return [token, 'TK_CONTENT'];
                    }
                }

                if (this.current_mode === 'TAG') {
                    token = this.get_tag();
                    if (typeof token !== 'string') {
                        return token;
                    } else {
                        var tag_name_type = 'TK_TAG_' + this.tag_type;
                        return [token, tag_name_type];
                    }
                }
            };

            this.get_full_indent = function(level) {
                level = this.indent_level + level || 0;
                if (level < 1) {
                    return '';
                }

                return Array(level + 1).join(this.indent_string);
            };

            this.is_unformatted = function(tag_check, unformatted) {
                //is this an HTML5 block-level link?
                if (!this.Utils.in_array(tag_check, unformatted)) {
                    return false;
                }

                if (tag_check.toLowerCase() !== 'a' || !this.Utils.in_array('a', unformatted)) {
                    return true;
                }

                //at this point we have an  tag; is its first child something we want to remain
                //unformatted?
                var next_tag = this.get_tag(true /* peek. */ );

                // test next_tag to see if it is just html tag (no external content)
                var tag = (next_tag || "").match(/^\s*<\s*\/?([a-z]*)\s*[^>]*>\s*$/);

                // if next_tag comes back but is not an isolated tag, then
                // let's treat the 'a' tag as having content
                // and respect the unformatted option
                if (!tag || this.Utils.in_array(tag, unformatted)) {
                    return true;
                } else {
                    return false;
                }
            };

            this.printer = function(js_source, indent_character, indent_size, wrap_line_length, brace_style) { //handles input/output and some other printing functions

                this.input = js_source || ''; //gets the input for the Parser

                // HACK: newline parsing inconsistent. This brute force normalizes the input.
                this.input = this.input.replace(/\r\n|[\r\u2028\u2029]/g, '\n');

                this.output = [];
                this.indent_character = indent_character;
                this.indent_string = '';
                this.indent_size = indent_size;
                this.brace_style = brace_style;
                this.indent_level = 0;
                this.wrap_line_length = wrap_line_length;
                this.line_char_count = 0; //count to see if wrap_line_length was exceeded

                for (var i = 0; i < this.indent_size; i++) {
                    this.indent_string += this.indent_character;
                }

                this.print_newline = function(force, arr) {
                    this.line_char_count = 0;
                    if (!arr || !arr.length) {
                        return;
                    }
                    if (force || (arr[arr.length - 1] !== '\n')) { //we might want the extra line
                        if ((arr[arr.length - 1] !== '\n')) {
                            arr[arr.length - 1] = rtrim(arr[arr.length - 1]);
                        }
                        arr.push('\n');
                    }
                };

                this.print_indentation = function(arr) {
                    for (var i = 0; i < this.indent_level; i++) {
                        arr.push(this.indent_string);
                        this.line_char_count += this.indent_string.length;
                    }
                };

                this.print_token = function(text) {
                    // Avoid printing initial whitespace.
                    if (this.is_whitespace(text) && !this.output.length) {
                        return;
                    }
                    if (text || text !== '') {
                        if (this.output.length && this.output[this.output.length - 1] === '\n') {
                            this.print_indentation(this.output);
                            text = ltrim(text);
                        }
                    }
                    this.print_token_raw(text);
                };

                this.print_token_raw = function(text) {
                    // If we are going to print newlines, truncate trailing
                    // whitespace, as the newlines will represent the space.
                    if (this.newlines > 0) {
                        text = rtrim(text);
                    }

                    if (text && text !== '') {
                        if (text.length > 1 && text.charAt(text.length - 1) === '\n') {
                            // unformatted tags can grab newlines as their last character
                            this.output.push(text.slice(0, -1));
                            this.print_newline(false, this.output);
                        } else {
                            this.output.push(text);
                        }
                    }

                    for (var n = 0; n < this.newlines; n++) {
                        this.print_newline(n > 0, this.output);
                    }
                    this.newlines = 0;
                };

                this.indent = function() {
                    this.indent_level++;
                };

                this.unindent = function() {
                    if (this.indent_level > 0) {
                        this.indent_level--;
                    }
                };
            };
            return this;
        }

        /*_____________________--------------------_____________________*/

        multi_parser = new Parser(); //wrapping functions Parser
        multi_parser.printer(html_source, indent_character, indent_size, wrap_line_length, brace_style); //initialize starting values

        while (true) {
            var t = multi_parser.get_token();
            multi_parser.token_text = t[0];
            multi_parser.token_type = t[1];

            if (multi_parser.token_type === 'TK_EOF') {
                break;
            }

            switch (multi_parser.token_type) {
                case 'TK_TAG_START':
                    multi_parser.print_newline(false, multi_parser.output);
                    multi_parser.print_token(multi_parser.token_text);
                    if (multi_parser.indent_content) {
                        multi_parser.indent();
                        multi_parser.indent_content = false;
                    }
                    multi_parser.current_mode = 'CONTENT';
                    break;
                case 'TK_TAG_STYLE':
                case 'TK_TAG_SCRIPT':
                    multi_parser.print_newline(false, multi_parser.output);
                    multi_parser.print_token(multi_parser.token_text);
                    multi_parser.current_mode = 'CONTENT';
                    break;
                case 'TK_TAG_END':
                    //Print new line only if the tag has no content and has child
                    if (multi_parser.last_token === 'TK_CONTENT' && multi_parser.last_text === '') {
                        var tag_name = multi_parser.token_text.match(/\w+/)[0];
                        var tag_extracted_from_last_output = null;
                        if (multi_parser.output.length) {
                            tag_extracted_from_last_output = multi_parser.output[multi_parser.output.length - 1].match(/(?:<|{{#)\s*(\w+)/);
                        }
                        if (tag_extracted_from_last_output === null ||
                            (tag_extracted_from_last_output[1] !== tag_name && !multi_parser.Utils.in_array(tag_extracted_from_last_output[1], unformatted))) {
                            multi_parser.print_newline(false, multi_parser.output);
                        }
                    }
                    multi_parser.print_token(multi_parser.token_text);
                    multi_parser.current_mode = 'CONTENT';
                    break;
                case 'TK_TAG_SINGLE':
                    // Don't add a newline before elements that should remain unformatted.
                    var tag_check = multi_parser.token_text.match(/^\s*<([a-z-]+)/i);
                    if (!tag_check || !multi_parser.Utils.in_array(tag_check[1], unformatted)) {
                        multi_parser.print_newline(false, multi_parser.output);
                    }
                    multi_parser.print_token(multi_parser.token_text);
                    multi_parser.current_mode = 'CONTENT';
                    break;
                case 'TK_TAG_HANDLEBARS_ELSE':
                    // Don't add a newline if opening {{#if}} tag is on the current line
                    var foundIfOnCurrentLine = false;
                    for (var lastCheckedOutput = multi_parser.output.length - 1; lastCheckedOutput >= 0; lastCheckedOutput--) {
                        if (multi_parser.output[lastCheckedOutput] === '\n') {
                            break;
                        } else {
                            if (multi_parser.output[lastCheckedOutput].match(/{{#if/)) {
                                foundIfOnCurrentLine = true;
                                break;
                            }
                        }
                    }
                    if (!foundIfOnCurrentLine) {
                        multi_parser.print_newline(false, multi_parser.output);
                    }
                    multi_parser.print_token(multi_parser.token_text);
                    if (multi_parser.indent_content) {
                        multi_parser.indent();
                        multi_parser.indent_content = false;
                    }
                    multi_parser.current_mode = 'CONTENT';
                    break;
                case 'TK_TAG_HANDLEBARS_COMMENT':
                    multi_parser.print_token(multi_parser.token_text);
                    multi_parser.current_mode = 'TAG';
                    break;
                case 'TK_CONTENT':
                    multi_parser.print_token(multi_parser.token_text);
                    multi_parser.current_mode = 'TAG';
                    break;
                case 'TK_STYLE':
                case 'TK_SCRIPT':
                    if (multi_parser.token_text !== '') {
                        multi_parser.print_newline(false, multi_parser.output);
                        var text = multi_parser.token_text,
                            _beautifier,
                            script_indent_level = 1;
                        if (multi_parser.token_type === 'TK_SCRIPT') {
                            _beautifier = typeof js_beautify === 'function' && js_beautify;
                        } else if (multi_parser.token_type === 'TK_STYLE') {
                            _beautifier = typeof css_beautify === 'function' && css_beautify;
                        }

                        if (options.indent_scripts === "keep") {
                            script_indent_level = 0;
                        } else if (options.indent_scripts === "separate") {
                            script_indent_level = -multi_parser.indent_level;
                        }

                        var indentation = multi_parser.get_full_indent(script_indent_level);
                        if (_beautifier) {

                            // call the Beautifier if avaliable
                            var Child_options = function() {
                                this.eol = '\n';
                            };
                            Child_options.prototype = options;
                            var child_options = new Child_options();
                            text = _beautifier(text.replace(/^\s*/, indentation), child_options);
                        } else {
                            // simply indent the string otherwise
                            var white = text.match(/^\s*/)[0];
                            var _level = white.match(/[^\n\r]*$/)[0].split(multi_parser.indent_string).length - 1;
                            var reindent = multi_parser.get_full_indent(script_indent_level - _level);
                            text = text.replace(/^\s*/, indentation)
                                .replace(/\r\n|\r|\n/g, '\n' + reindent)
                                .replace(/\s+$/, '');
                        }
                        if (text) {
                            multi_parser.print_token_raw(text);
                            multi_parser.print_newline(true, multi_parser.output);
                        }
                    }
                    multi_parser.current_mode = 'TAG';
                    break;
                default:
                    // We should not be getting here but we don't want to drop input on the floor
                    // Just output the text and move on
                    if (multi_parser.token_text !== '') {
                        multi_parser.print_token(multi_parser.token_text);
                    }
                    break;
            }
            multi_parser.last_token = multi_parser.token_type;
            multi_parser.last_text = multi_parser.token_text;
        }
        var sweet_code = multi_parser.output.join('').replace(/[\r\n\t ]+$/, '');

        // establish end_with_newline
        if (end_with_newline) {
            sweet_code += '\n';
        }

        if (eol !== '\n') {
            sweet_code = sweet_code.replace(/[\n]/g, eol);
        }

        return sweet_code;
    }

	return {
		html_beautify: function(html_source, options) {
			return style_html(html_source, options, js_beautify.js_beautify, css_beautify.css_beautify);
		}
	};
});




/*eslint-env amd, node*/
/*

  The MIT License (MIT)

  Copyright (c) 2007-2013 Einar Lielmanis 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.

 JS Beautifier
---------------


  Written by Einar Lielmanis, <einar@jsbeautifier.org>
      http://jsbeautifier.org/

  Originally converted to javascript by Vital, <vital76@gmail.com>
  "End braces on own line" added by Chris J. Shull, <chrisjshull@gmail.com>
  Parsing improvements for brace-less statements by Liam Newman <bitwiseman@gmail.com>


  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-preserve-inline" | "collapse" | "expand" | "end-expand" | "none"
            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.

    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'
    });

*/
define([
	"acorn/dist/acorn"
], function(acorn) {


	// Object.values polyfill found here:
	// http://tokenposts.blogspot.com.au/2012/04/javascript-objectkeys-browser.html
	if (!Object.values) {
	    Object.values = function(o) {
	        if (o !== Object(o)) {
	            throw new TypeError('Object.values called on a non-object');
	        }
	        var k = [],
	            p;
	        for (p in o) {
	            if (Object.prototype.hasOwnProperty.call(o, p)) {
	                k.push(o[p]);
	            }
	        }
	        return k;
	    };
	}

	function js_beautify(js_source_text, options) {

        function in_array(what, arr) {
            for (var i = 0; i < arr.length; i += 1) {
                if (arr[i] === what) {
                    return true;
                }
            }
            return false;
        }

        function trim(s) {
            return s.replace(/^\s+|\s+$/g, '');
        }

        function ltrim(s) {
            return s.replace(/^\s+/g, '');
        }

        // function rtrim(s) {
        //     return s.replace(/\s+$/g, '');
        // }

        function sanitizeOperatorPosition(opPosition) {
            opPosition = opPosition || OPERATOR_POSITION.before_newline;

            var validPositionValues = Object.values(OPERATOR_POSITION);

            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 + "'");
            }

            return opPosition;
        }

        var OPERATOR_POSITION = {
            before_newline: 'before-newline',
            after_newline: 'after-newline',
            preserve_newline: 'preserve-newline',
        };

        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 : {};
            opt = {};

            // compatibility
            if (options.braces_on_own_line !== undefined) { //graceful handling of deprecated option
                opt.brace_style = options.braces_on_own_line ? "expand" : "collapse";
            }
            opt.brace_style = options.brace_style ? options.brace_style : (opt.brace_style ? opt.brace_style : "collapse");

            // graceful handling of deprecated option
            if (opt.brace_style === "expand-strict") {
                opt.brace_style = "expand";
            }

            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.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;
            }

            if (options.indent_with_tabs) {
                opt.indent_char = '\t';
                opt.indent_size = 1;
            }

            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];
                }
            }

            opt.eol = opt.eol.replace(/\\r/, '\r').replace(/\\n/, '\n');

            //----------------------------------
            indent_string = '';
            while (opt.indent_size > 0) {
                indent_string += opt.indent_char;
                opt.indent_size -= 1;
            }

            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')) {
                    baseIndentString += js_source_text.charAt(preindent_index);
                    preindent_index += 1;
                }
                js_source_text = js_source_text.substring(preindent_index);
            }

            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 local_token, sweet_code;
                Tokenizer = new tokenizer(js_source_text, opt, indent_string);
                tokens = Tokenizer.tokenize();
                token_pos = 0;

                function get_local_token() {
                    local_token = get_token();
                    return local_token;
                }

                while (get_local_token()) {
                    for (var i = 0; i < local_token.comments_before.length; i++) {
                        // 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.
                        handle_token(local_token.comments_before[i]);
                    }
                    handle_token(local_token);

                    last_last_text = flags.last_text;
                    last_type = local_token.type;
                    flags.last_text = local_token.text;

                    token_pos += 1;
                }

                sweet_code = output.get_code();
                if (opt.end_with_newline) {
                    sweet_code += '\n';
                }

                if (opt.eol !== '\n') {
                    sweet_code = sweet_code.replace(/[\n]/g, opt.eol);
                }

                return sweet_code;
            };

            function handle_token(local_token) {
                var newlines = local_token.newlines;
                var keep_whitespace = opt.keep_array_indentation && is_array(flags.mode);

                if (keep_whitespace) {
                    for (var i = 0; i < newlines; i += 1) {
                        print_newline(i > 0);
                    }
                } 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();
                            for (var j = 1; j < newlines; j += 1) {
                                print_newline(true);
                            }
                        }
                    }
                }

                current_token = local_token;
                handlers[current_token.type]();
            }

            // we could use just string.split, but
            // IE doesn't like returning empty strings
            function split_linebreaks(s) {
                //return s.split(/\x0d\x0a|\x0a/);

                s = s.replace(acorn.allLineBreaks, '\n');
                var out = [],
                    idx = s.indexOf("\n");
                while (idx !== -1) {
                    out.push(s.substring(0, idx));
                    s = s.substring(idx + 1);
                    idx = s.indexOf("\n");
                }
                if (s.length) {
                    out.push(s);
                }
                return out;
            }

            var newline_restricted_tokens = ['break', 'contiue', 'return', 'throw'];

            function allow_wrap_or_preserved_newline(force_linewrap) {
                force_linewrap = (force_linewrap === undefined) ? false : force_linewrap;

                // Never wrap the first token on a line
                if (output.just_added_newline()) {
                    return;
                }

                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 (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;
                }

                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);
                    }
                }
            }

            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') {
                        while (flags.mode === MODE.Statement && !flags.if_block && !flags.do_block) {
                            restore_mode();
                        }
                    }
                }

                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_token(printable_token) {
                if (output.raw) {
                    output.add_raw_token(current_token);
                    return;
                }

                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();
                        }

                        // add the comma in front of the next token
                        print_token_line_indentation();
                        output.add_token(',');
                        output.space_before_token = true;
                    }
                }

                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 set_mode(mode) {
                if (flags) {
                    flag_store.push(flags);
                    previous_flags = flags;
                } else {
                    previous_flags = create_flags(null, mode);
                }

                flags = create_flags(previous_flags, mode);
            }

            function is_array(mode) {
                return mode === MODE.ArrayLiteral;
            }

            function is_expression(mode) {
                return in_array(mode, [MODE.Expression, MODE.ForInitializer, MODE.Conditional]);
            }

            function restore_mode() {
                if (flag_store.length > 0) {
                    previous_flags = flags;
                    flags = flag_store.pop();
                    if (previous_flags.mode === MODE.Statement) {
                        output.remove_redundant_indentation(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, ['return', 'throw']) && !current_token.wanted_newline) ||
                    (last_type === 'TK_RESERVED' && flags.last_text === 'else' && !(current_token.type === 'TK_RESERVED' && current_token.text === 'if')) ||
                    (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);
                    indent();

                    if (last_type === 'TK_RESERVED' && in_array(flags.last_text, ['var', 'let', 'const']) && current_token.type === 'TK_WORD') {
                        flags.declaration_statement = 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) {
                for (var i = 0; i < lines.length; i++) {
                    var line = trim(lines[i]);
                    if (line.charAt(0) !== c) {
                        return false;
                    }
                }
                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 get_token(offset) {
                var index = token_pos + (offset || 0);
                return (index < 0 || index >= tokens.length) ? null : tokens[index];
            }

            function handle_start_expr() {
                if (start_of_statement()) {
                    // The conditional starts the statement if appropriate.
                }

                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;
                        }
                        set_mode(next_mode);
                        print_token();
                        indent();
                        if (opt.space_in_paren) {
                            output.space_before_token = true;
                        }
                        return;
                    }

                    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();
                            }
                        }
                    }

                } 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 {
                        // next_mode = MODE.Expression;
                    }
                }

                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 === '*' && last_last_text === 'function')) {
                    // 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;
                    }
                }

                // Should be a space between await and an IIFE
                if (current_token.text === '(' && last_type === 'TK_RESERVED' && flags.last_word === 'await') {
                    output.space_before_token = true;
                }

                // 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();
                        }
                    }
                }

                // 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();
                }

                set_mode(next_mode);
                print_token();
                if (opt.space_in_paren) {
                    output.space_before_token = true;
                }

                // 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();
                }

                if (flags.multiline_frame) {
                    allow_wrap_or_preserved_newline(current_token.text === ']' && is_array(flags.mode) && !opt.keep_array_indentation);
                }

                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();
                }
                output.remove_redundant_indentation(previous_flags);

                // 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;

                }
            }

            function handle_start_block() {
                // 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']))
                ) {
                    // Detecting shorthand function syntax is difficult by scanning forward,
                    //     so check the surrounding context.
                    // If the block is being returned, imported, passed as arg,
                    //     assigned with = or assigned in a nested object, treat as an ObjectLiteral.
                    set_mode(MODE.ObjectLiteral);
                } else {
                    set_mode(MODE.BlockStatement);
                }

                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_style === "expand" ||
                    (opt.brace_style === "none" && current_token.wanted_newline)) {
                    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
                    if (opt.brace_style === 'collapse-preserve-inline') {
                        // 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 (is_array(previous_flags.mode) && (last_type === 'TK_START_EXPR' || last_type === 'TK_COMMA')) {
                        // if we're preserving inline,
                        // allow newline between comma and next brace.
                        if (last_type === 'TK_COMMA' || opt.space_in_paren) {
                            output.space_before_token = true;
                        }

                        if (opt.brace_style === 'collapse-preserve-inline' &&
                            (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 if (last_type !== 'TK_OPERATOR' && last_type !== 'TK_START_EXPR') {
                        if (last_type === 'TK_START_BLOCK') {
                            print_newline();
                        } else {
                            output.space_before_token = true;
                        }
                    }
                }
                print_token();
                indent();
            }

            function handle_end_block() {
                // statements must all be closed when their container closes
                while (flags.mode === MODE.Statement) {
                    restore_mode();
                }
                var empty_braces = last_type === 'TK_START_BLOCK';

                if (opt.brace_style === "expand") {
                    if (!empty_braces) {
                        print_newline();
                    }
                } else {
                    // skip {}
                    if (!empty_braces) {
                        if (flags.inline_frame) {
                            output.space_before_token = true;
                        } 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();
                        }
                    }
                }
                restore_mode();
                print_token();
            }

            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';
                        }
                    }
                }

                if (start_of_statement()) {
                    // The conditional starts the statement if appropriate.
                } 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'])))) {

                    print_newline();
                }

                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;
                    }
                }

                // 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 (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 (current_token.type === 'TK_RESERVED' && current_token.text === 'function') {
                    if (in_array(flags.last_text, ['}', ';']) || (output.just_added_newline() && !in_array(flags.last_text, ['[', '{', ':', '=', ',']))) {
                        // 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);
                        }
                    }
                    if (last_type === 'TK_RESERVED' || last_type === 'TK_WORD') {
                        if (last_type === 'TK_RESERVED' && in_array(flags.last_text, ['get', 'set', 'new', 'return', 'export', 'async'])) {
                            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();
                        }
                    } 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();
                    }
                }

                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 (current_token.type === 'TK_RESERVED' && in_array(current_token.text, ['function', 'get', 'set'])) {
                    print_token();
                    flags.last_word = current_token.text;
                    return;
                }

                prefix = 'NONE';

                if (last_type === 'TK_END_BLOCK') {

                    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 {
                            prefix = 'SPACE';
                            output.space_before_token = true;
                        }
                    }
                } 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 === '*' && last_last_text === 'function')) {
                    prefix = 'SPACE';
                } else if (last_type === 'TK_START_BLOCK') {
                    if (flags.inline_frame) {
                        prefix = 'SPACE';
                    } else {
                        prefix = 'NEWLINE';
                    }
                } else if (last_type === 'TK_END_EXPR') {
                    output.space_before_token = true;
                    prefix = 'NEWLINE';
                }

                if (current_token.type === 'TK_RESERVED' && in_array(current_token.text, Tokenizer.line_starters) && flags.last_text !== ')') {
                    if (flags.last_text === 'else' || flags.last_text === 'export') {
                        prefix = 'SPACE';
                    } else {
                        prefix = 'NEWLINE';
                    }

                }

                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)) {
                        print_newline();
                    } 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;
                    }
                } 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();
                            }
                        }
                    } 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;
                }
                print_token();
                flags.last_word = current_token.text;

                if (current_token.type === 'TK_RESERVED') {
                    if (current_token.text === 'do') {
                        flags.do_block = true;
                    } else if (current_token.text === 'if') {
                        flags.if_block = true;
                    } else if (current_token.text === 'import') {
                        flags.import_block = true;
                    } else if (flags.import_block && current_token.type === 'TK_RESERVED' && current_token.text === 'from') {
                        flags.import_block = false;
                    }
                }
            }

            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;
                }
                while (flags.mode === MODE.Statement && !flags.if_block && !flags.do_block) {
                    restore_mode();
                }

                // hacky but effective for the moment
                if (flags.import_block) {
                    flags.import_block = false;
                }
                print_token();
            }

            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 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 {
                    print_newline();
                }
                print_token();
            }

            function handle_equals() {
                if (start_of_statement()) {
                    // The conditional starts the statement if appropriate.
                }

                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;
            }

            function handle_comma() {
                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;
                    }

                    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();
                    }

                    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();
                }
            }

            function handle_operator() {
                if (start_of_statement()) {
                    // The conditional starts the statement if appropriate.
                }

                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;
                }

                // hack for actionscript's import .*;
                if (current_token.text === '*' && last_type === 'TK_DOT') {
                    print_token();
                    return;
                }

                if (current_token.text === '::') {
                    // no spaces around exotic namespacing syntax operator
                    print_token();
                    return;
                }

                // 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 (current_token.text === ':' && flags.in_case) {
                    flags.case_body = true;
                    indent();
                    print_token();
                    print_newline();
                    flags.in_case = false;
                    return;
                }

                var space_before = true;
                var space_after = true;
                var in_ternary = false;
                var isGeneratorAsterisk = current_token.text === '*' && last_type === 'TK_RESERVED' && flags.last_text === 'function';
                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 (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;
                }

                // 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;

                            print_token();

                            if (!isColon || isTernaryColon) {
                                allow_wrap_or_preserved_newline();
                            }

                            output.space_before_token = true;
                            return;

                        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.

                            output.space_before_token = true;

                            if (!isColon || isTernaryColon) {
                                if (get_token(1).wanted_newline) {
                                    print_newline(false, true);
                                } else {
                                    allow_wrap_or_preserved_newline();
                                }
                            } else {
                                output.space_before_token = false;
                            }

                            print_token();

                            output.space_before_token = true;
                            return;

                        case OPERATOR_POSITION.preserve_newline:
                            if (!isOtherColon) {
                                allow_wrap_or_preserved_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();
                            output.space_before_token = true;
                            return;
                    }
                }

                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);
                    }

                    if (flags.last_text === ';' && is_expression(flags.mode)) {
                        // for (;; ++i)
                        //        ^^^
                        space_before = true;
                    }

                    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;
                        }
                    }


                    if (((flags.mode === MODE.BlockStatement && !flags.inline_frame) || flags.mode === MODE.Statement) &&
                        (flags.last_text === '{' || flags.last_text === ';')) {
                        // { foo; --i }
                        // foo(); --bar;
                        print_newline();
                    }
                } else if (isGeneratorAsterisk) {
                    space_before = false;
                    space_after = false;
                }
                output.space_before_token = output.space_before_token || space_before;
                print_token();
                output.space_before_token = space_after;
            }

            function handle_block_comment() {
                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 (current_token.directives) {
                    print_newline(false, true);
                    print_token();
                    if (current_token.directives.preserve === 'start') {
                        output.raw = true;
                    }
                    print_newline(false, true);
                    return;
                }

                // inline block
                if (!acorn.isNewLine(current_token.text.charCodeAt(0)) && !current_token.wanted_newline) {
                    output.space_before_token = true;
                    print_token();
                    output.space_before_token = true;
                    return;
                }

                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, true);
                if (lines.length > 1) {
                    javadoc = all_lines_start_with(lines.slice(1), '*');
                    starless = each_line_matches_indent(lines.slice(1), lastIndent);
                }

                // 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, true);
            }

            function handle_comment() {
                if (current_token.wanted_newline) {
                    print_newline(false, true);
                } else {
                    output.trim(true);
                }

                output.space_before_token = true;
                print_token();
                print_newline(false, true);
            }

            function handle_dot() {
                if (start_of_statement()) {
                    // The conditional starts the statement if appropriate.
                }

                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);
                }

                print_token();
            }

            function handle_unknown() {
                print_token();

                if (current_token.text[current_token.text.length - 1] === '\n') {
                    print_newline();
                }
            }

            function handle_eof() {
                // Unwind any open statements
                while (flags.mode === MODE.Statement) {
                    restore_mode();
                }
            }
        }


        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() {
                var sweet_code = lines.join('\n').replace(/[\r\n\t ]+$/, '');
                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_redundant_indentation = function(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;
                }

                // remove one indent from each line inside this section
                var index = frame.start_line_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;
            };
        }


        var Token = function(type, text, newlines, whitespace_before, parent) {
            this.type = type;
            this.text = text;
            this.comments_before = [];
            this.newlines = newlines || 0;
            this.wanted_newline = newlines > 0;
            this.whitespace_before = whitespace_before || '';
            this.parent = parent || null;
            this.opened = null;
            this.directives = null;
        };

        function tokenizer(input, 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', '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, parser_pos;
            var input_length;

            this.tokenize = function() {
                // cache the source's length.
                input_length = input.length;
                parser_pos = 0;
                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 (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 = '';

                if (parser_pos >= input_length) {
                    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', '{');
                }


                var c = input.charAt(parser_pos);
                parser_pos += 1;

                while (in_array(c, whitespace)) {

                    if (acorn.isNewLine(c.charCodeAt(0))) {
                        if (!(c === '\n' && input.charAt(parser_pos - 2) === '\r')) {
                            n_newlines += 1;
                            whitespace_on_this_line = [];
                        }
                    } else {
                        whitespace_on_this_line.push(c);
                    }

                    if (parser_pos >= input_length) {
                        return ['', 'TK_EOF'];
                    }

                    c = input.charAt(parser_pos);
                    parser_pos += 1;
                }

                if (whitespace_on_this_line.length) {
                    whitespace_before_token = whitespace_on_this_line.join('');
                }

                if (digit.test(c) || (c === '.' && digit.test(input.charAt(parser_pos)))) {
                    var allow_decimal = true;
                    var allow_e = true;
                    var local_digit = digit;

                    if (c === '0' && parser_pos < input_length && /[XxOoBb]/.test(input.charAt(parser_pos))) {
                        // switch to hex/oct/bin number, no decimal or e, just hex/oct/bin digits
                        allow_decimal = false;
                        allow_e = false;
                        if (/[Bb]/.test(input.charAt(parser_pos))) {
                            local_digit = digit_bin;
                        } else if (/[Oo]/.test(input.charAt(parser_pos))) {
                            local_digit = digit_oct;
                        } else {
                            local_digit = digit_hex;
                        }
                        c += input.charAt(parser_pos);
                        parser_pos += 1;
                    } 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 = '';
                        parser_pos -= 1;
                    }

                    // Add the digits
                    while (parser_pos < input_length && local_digit.test(input.charAt(parser_pos))) {
                        c += input.charAt(parser_pos);
                        parser_pos += 1;

                        if (allow_decimal && parser_pos < input_length && input.charAt(parser_pos) === '.') {
                            c += input.charAt(parser_pos);
                            parser_pos += 1;
                            allow_decimal = false;
                        } else if (allow_e && parser_pos < input_length && /[Ee]/.test(input.charAt(parser_pos))) {
                            c += input.charAt(parser_pos);
                            parser_pos += 1;

                            if (parser_pos < input_length && /[+-]/.test(input.charAt(parser_pos))) {
                                c += input.charAt(parser_pos);
                                parser_pos += 1;
                            }

                            allow_e = false;
                            allow_decimal = false;
                        }
                    }

                    return [c, 'TK_WORD'];
                }

                if (acorn.isIdentifierStart(input.charCodeAt(parser_pos - 1))) {
                    if (parser_pos < input_length) {
                        while (acorn.isIdentifierChar(input.charCodeAt(parser_pos))) {
                            c += input.charAt(parser_pos);
                            parser_pos += 1;
                            if (parser_pos === input_length) {
                                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') { // hack for 'in' operator
                            return [c, 'TK_OPERATOR'];
                        }
                        return [c, 'TK_RESERVED'];
                    }

                    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.charAt(parser_pos) === '*') {
                        parser_pos += 1;
                        block_comment_pattern.lastIndex = parser_pos;
                        comment_match = block_comment_pattern.exec(input);
                        comment = '/*' + comment_match[0];
                        parser_pos += comment_match[0].length;
                        var directives = get_directives(comment);
                        if (directives && directives.ignore === 'start') {
                            directives_end_ignore_pattern.lastIndex = parser_pos;
                            comment_match = directives_end_ignore_pattern.exec(input);
                            comment += comment_match[0];
                            parser_pos += comment_match[0].length;
                        }
                        comment = comment.replace(acorn.allLineBreaks, '\n');
                        return [comment, 'TK_BLOCK_COMMENT', directives];
                    }
                    // peek for comment // ...
                    if (input.charAt(parser_pos) === '/') {
                        parser_pos += 1;
                        comment_pattern.lastIndex = parser_pos;
                        comment_match = comment_pattern.exec(input);
                        comment = '//' + comment_match[0];
                        parser_pos += comment_match[0].length;
                        return [comment, 'TK_COMMENT'];
                    }

                }

                var startXmlRegExp = /^<([-a-zA-Z:0-9_.]+|{.+?}|!\[CDATA\[[\s\S]*?\]\])(\s+{.+?}|\s+[-a-zA-Z:0-9_.]+|\s+[-a-zA-Z:0-9_.]+\s*=\s*('[^']*'|"[^"]*"|{.+?}))*\s*(\/?)\s*>/;

                if (c === '`' || c === "'" || c === '"' || // string
                    (
                        (c === '/') || // regexp
                        (opts.e4x && c === "<" && input.slice(parser_pos - 1).match(startXmlRegExp)) // 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;

                    resulting_string = c;

                    if (sep === '/') {
                        //
                        // handle regexp
                        //
                        var in_char_class = false;
                        while (parser_pos < input_length &&
                            ((esc || in_char_class || input.charAt(parser_pos) !== sep) &&
                                !acorn.isNewLine(input.charCodeAt(parser_pos)))) {
                            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;
                        }
                    } else if (opts.e4x && sep === '<') {
                        //
                        // handle e4x xml literals
                        //

                        var xmlRegExp = /<(\/?)([-a-zA-Z:0-9_.]+|{.+?}|!\[CDATA\[[\s\S]*?\]\])(\s+{.+?}|\s+[-a-zA-Z:0-9_.]+|\s+[-a-zA-Z:0-9_.]+\s*=\s*('[^']*'|"[^"]*"|{.+?}))*\s*(\/?)\s*>/g;
                        var xmlStr = input.slice(parser_pos - 1);
                        var match = xmlRegExp.exec(xmlStr);
                        if (match && match.index === 0) {
                            var rootTag = match[2];
                            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 (tagName === rootTag && !isSingletonTag) {
                                    if (isEndTag) {
                                        --depth;
                                    } else {
                                        ++depth;
                                    }
                                }
                                if (depth <= 0) {
                                    break;
                                }
                                match = xmlRegExp.exec(xmlStr);
                            }
                            var xmlLength = match ? match.index + match[0].length : xmlStr.length;
                            xmlStr = xmlStr.slice(0, xmlLength);
                            parser_pos += xmlLength - 1;
                            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 (parser_pos < input_length) {
                                current_char = input.charAt(parser_pos);
                                if (!(esc || (current_char !== delimiter &&
                                        (allow_unescaped_newlines || !acorn.isNewLine(current_char.charCodeAt(0)))))) {
                                    break;
                                }

                                // Handle \r\n linebreaks after escapes or in template strings
                                if ((esc || allow_unescaped_newlines) && acorn.isNewLine(current_char.charCodeAt(0))) {
                                    if (current_char === '\r' && input.charAt(parser_pos + 1) === '\n') {
                                        parser_pos += 1;
                                        current_char = input.charAt(parser_pos);
                                    }
                                    resulting_string += '\n';
                                } else {
                                    resulting_string += current_char;
                                }
                                if (esc) {
                                    if (current_char === 'x' || current_char === 'u') {
                                        has_char_escapes = true;
                                    }
                                    esc = false;
                                } else {
                                    esc = current_char === '\\';
                                }

                                parser_pos += 1;

                                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 (sep === '`') {
                            parse_string('`', true, '${');
                        } else {
                            parse_string(sep);
                        }
                    }

                    if (has_char_escapes && opts.unescape_strings) {
                        resulting_string = unescape_string(resulting_string);
                    }

                    if (parser_pos < input_length && input.charAt(parser_pos) === sep) {
                        resulting_string += sep;
                        parser_pos += 1;

                        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 (parser_pos < input_length && acorn.isIdentifierStart(input.charCodeAt(parser_pos))) {
                                resulting_string += input.charAt(parser_pos);
                                parser_pos += 1;
                            }
                        }
                    }
                    return [resulting_string, 'TK_STRING'];
                }

                if (c === '#') {

                    if (tokens.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;
                        }
                        return [trim(resulting_string) + '\n', 'TK_UNKNOWN'];
                    }



                    // 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 && digit.test(input.charAt(parser_pos))) {
                        do {
                            c = input.charAt(parser_pos);
                            sharp += c;
                            parser_pos += 1;
                        } while (parser_pos < input_length && c !== '#' && c !== '=');
                        if (c === '#') {
                            //
                        } else if (input.charAt(parser_pos) === '[' && input.charAt(parser_pos + 1) === ']') {
                            sharp += '[]';
                            parser_pos += 2;
                        } else if (input.charAt(parser_pos) === '{' && input.charAt(parser_pos + 1) === '}') {
                            sharp += '{}';
                            parser_pos += 2;
                        }
                        return [sharp, 'TK_WORD'];
                    }
                }

                if (c === '<' && (input.charAt(parser_pos) === '?' || input.charAt(parser_pos) === '%')) {
                    template_pattern.lastIndex = parser_pos - 1;
                    var template_match = template_pattern.exec(input);
                    if (template_match) {
                        c = template_match[0];
                        parser_pos += c.length - 1;
                        c = c.replace(acorn.allLineBreaks, '\n');
                        return [c, 'TK_STRING'];
                    }
                }

                if (c === '<' && input.substring(parser_pos - 1, parser_pos + 3) === '<!--') {
                    parser_pos += 3;
                    c = '<!--';
                    while (!acorn.isNewLine(input.charCodeAt(parser_pos)) && parser_pos < input_length) {
                        c += input.charAt(parser_pos);
                        parser_pos++;
                    }
                    in_html_comment = true;
                    return [c, 'TK_COMMENT'];
                }

                if (c === '-' && in_html_comment && input.substring(parser_pos - 1, parser_pos + 2) === '-->') {
                    in_html_comment = false;
                    parser_pos += 2;
                    return ['-->', 'TK_COMMENT'];
                }

                if (c === '.') {
                    return [c, 'TK_DOT'];
                }

                if (in_array(c, punct)) {
                    while (parser_pos < input_length && in_array(c + input.charAt(parser_pos), punct)) {
                        c += input.charAt(parser_pos);
                        parser_pos += 1;
                        if (parser_pos >= input_length) {
                            break;
                        }
                    }

                    if (c === ',') {
                        return [c, 'TK_COMMA'];
                    } else if (c === '=') {
                        return [c, 'TK_EQUALS'];
                    } else {
                        return [c, 'TK_OPERATOR'];
                    }
                }

                return [c, 'TK_UNKNOWN'];
            }


            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;
                        }
                        if (!s_hex.match(/^[0123456789abcdefABCDEF]+$/)) {
                            // some weird escaping, bail out,
                            // leaving whole string intact
                            return s;
                        }

                        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;
                            }
                            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 {
                        out += c;
                    }
                }
                return out;
            }
        }

        var beautifier = new Beautifier(js_source_text, options);
        return beautifier.beautify();

    }

	return {
		js_beautify: js_beautify
	};
});




	'jsDocAnyTypeDesc': ' - No type information',
	'jsDocAnyTypeDoc': 'Represents that no type information is known. The type is described as the \'any\' type.',
	
	'beautifierPluginName' : 'JSBeautify plugin for Tern',
	'beautifierPluginDescription' : 'Provides JS formatting for Tern',
	'javascriptFormatter' : 'Javascript Formatter',

	// JS formatting settings
	'javascriptFormattingSettings' : 'Formatting Settings for Javascript',
	'javascriptFormatting' : 'Javascript Formatting',
	'js_indent_size' : 'Indention size:',
	'js_indent_char' : 'Indentation character:',
	'js_eol' : 'Charater(s) to use as line terminators:',
	'js_end_with_newline' : 'End ouput with newline:',
	'indentation_unix' : 'Unix',
	'indentation_mac' : 'Mac',
	'indentation_windows' : 'Windows',
	'indentation_space' : 'space',
	'indentation_tab' : 'tab',
	'jsFormattingSettings' : 'Formatting Settings for Javascript',
	'indent_level': 'Initial indentation level:',
	'before_newline' : 'Before new line',
	'after_newline' : 'After new line',
	'preserve_newline' : 'Preserve new line',
	'collapse_preserve_inline' : 'Collapse Preserve inline',
	'collapse' : 'Collapse',
	'expand' : 'Expand',
	'end_expand' : 'End expand',
	'none' : 'None',
	'js_preserve_newlines' : 'Preserve line-breaks:',
	'js_max_preserve_newlines' : 'Number of line-breaks to be preserved in one chunk:',
	'space_in_paren' : 'Add padding space within paren:',
	'space_in_empty_paren' : 'Add padding space in empty paren:',
	'space_after_anon_function' : "Add a space before an anonymous function's parens",
	'js_brace_style' : 'Brace Style:',
	'break_chained_methods' : 'Break chained method calls across subsequent lines:',
	'keep_array_indentation' : 'Preserve array indentation:',
	'space_before_conditional' : 'Space before condition:',
	'unescape_strings' : 'Decode printable characters encoded in xNN notation:',
	'js_wrap_line_length' : 'Wrap lines at next opportunity after N characters: (0 for unlimited)',
	'e4x' : 'Pass E4X xml literal through untouched:',
	'comma_first' : 'Put commas at the beginning of new line instead of end:',
	'operator_position' : 'Position for operator:',

	// Other messages
	'unknownError': 'An unknown error occurred.',
	'failedDeleteRequest': 'Failed to delete file from Tern: ${0}',

	'serverNotStarted': 'The server has not been started. Request: \'${0}\'',
	'failedToComputeProblems': 'Failed to compute ESLint problems/markers',
	'failedToComputeOutline': 'Failed to compute outline',
	'failedToFormat' : 'Failed to format',
	'failedToFormatNoServer' : 'Failed to format, server not started',
	
	//Templates
	'eslintRuleEnableDisable': 'Enable or disable ESLint rule using the ```ruleid:0/1/2``` form.\n\nExample use:\n\n>```/* eslint semi:1, no-console:0, no-redeclare:2 */```',




	"javascript/ternPlugins/redis",
	"javascript/ternPlugins/refs",
	"javascript/ternPlugins/templates",
	"javascript/ternPlugins/quickfixes",
	"javascript/ternPlugins/beautifier"
], function(Messages, ecma5, ecma6, ecma7, browser, chai) {
	
	var defs = [ecma5, ecma6, ecma7, browser, chai];
	var defNames = ["ecma5", "ecma6", "ecma7", "browser", "chai"]; //these are in the same order to avoid a walk of the array
	

				"name": Messages["templatesPlugin"],
				"description": Messages["templatesPluginDescription"],
				"version": "1.0"
			},
			"beautifier": {
				"name": Messages["beautifierPluginName"],
				"description": Messages["beautifierPluginDescription"],
				"version": "1.0"
			},
		},
		optional: {
			"amqp": {

Lines 1-6 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/settings/nls/root/messages.js (-2 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* @license	2	* @license
3	* Copyright (c) 2012 IBM Corporation and others.	3	* Copyright (c) 2012, 2016 IBM Corporation and others.
4	* All rights reserved. This program and the accompanying materials are made	4	* All rights reserved. This program and the accompanying materials are made
5	* available under the terms of the Eclipse Public License v1.0	5	* available under the terms of the Eclipse Public License v1.0
6	* (http://www.eclipse.org/legal/epl-v10.html), and the Eclipse Distribution	6	* (http://www.eclipse.org/legal/epl-v10.html), and the Eclipse Distribution
Lines 283-287 define({//Default message bundle Link Here
283	"editorTheme selection background": "Selection background",	283	"editorTheme selection background": "Selection background",
284	'customizeTheme': 'Custom Style...',	284	'customizeTheme': 'Custom Style...',
285	'moreEditorSettings': 'Editor Settings...',	285	'moreEditorSettings': 'Editor Settings...',
286	'JavascriptSettingWarning' : '${0} Warning: Global settings for ${2} are overriden by the settings defined in: ${1}'	286	'SettingWarning' : '${0} Warning: Global settings for \'${2}\' are overriden by the settings defined in: ${1}'
287	});	287	});

Lines 26-34 define(['orion/plugin', Link Here

(-)a/bundles/org.eclipse.orion.client.webtools/web/webtools/plugins/webToolsPlugin.js (-2 / +238 lines)
26	'webtools/cssQuickFixes',	26	'webtools/cssQuickFixes',
27	'webtools/cssResultManager',	27	'webtools/cssResultManager',
28	'orion/editor/stylers/text_css/syntax',	28	'orion/editor/stylers/text_css/syntax',
29	'i18n!webtools/nls/messages'	29	'i18n!webtools/nls/messages',
		30	'webtools/htmlFormatter',
		31	'webtools/cssFormatter',
30	], function(PluginProvider, mServiceRegistry, ScriptResolver, HtmlAstManager, htmlHover, htmlContentAssist, htmlOccurrences, htmlOutliner,	32	], function(PluginProvider, mServiceRegistry, ScriptResolver, HtmlAstManager, htmlHover, htmlContentAssist, htmlOccurrences, htmlOutliner,
31	mHTML, cssContentAssist, mCssValidator, mCssOutliner, cssHover, cssQuickFixes, cssResultManager, mCSS, messages) {	33	mHTML, cssContentAssist, mCssValidator, mCssOutliner, cssHover, cssQuickFixes, cssResultManager, mCSS, messages, HtmlFormatter, CssFormatter) {
32		34
33	/**	35	/**
34	* Plug-in headers	36	* Plug-in headers
Lines 220-225 define(['orion/plugin', Link Here
220	}	222	}
221	);	223	);
222		224
		225	var htmlFormatter = new HtmlFormatter.HtmlFormatter();
		226	provider.registerServiceProvider("orion.edit.format",
		227	htmlFormatter,
		228	{
		229	contentType: ["text/html"], //$NON-NLS-1$
		230	id: "orion.format.html.formatter", //$NON-NLS-1$
		231	name: messages["htmlFormatter"],//$NON-NLS-1$
		232	}
		233	);
		234
		235	var cssFormatter = new CssFormatter.CssFormatter();
		236	provider.registerServiceProvider("orion.edit.format",
		237	cssFormatter,
		238	{
		239	contentType: ["text/css"],//$NON-NLS-1$
		240	id: "orion.format.css.formatter", //$NON-NLS-1$
		241	name: messages["cssFormatter"],//$NON-NLS-1$
		242	}
		243	);
		244
		245	provider.registerService("orion.cm.managedservice", cssFormatter, {pid: 'jsbeautify.config.css'}); //$NON-NLS-1$ //$NON-NLS-2$
		246
		247	// html formatter needs to listen to all formatting preference changes because html source can contain css and javascript
		248	provider.registerService("orion.cm.managedservice", htmlFormatter, {pid: 'jsbeautify.config.html'}); //$NON-NLS-1$ //$NON-NLS-2$
		249	provider.registerService("orion.cm.managedservice", htmlFormatter, {pid: 'jsbeautify.config.css'}); //$NON-NLS-1$ //$NON-NLS-2$
		250	provider.registerService("orion.cm.managedservice", htmlFormatter, {pid: 'jsbeautify.config.js'}); //$NON-NLS-1$ //$NON-NLS-2$
		251
		252	/**
		253	* CSS formatting settings
		254	*/
		255	var unix = "\n";
		256	var mac = "\r";
		257	var windows = "\n\r";
		258	var eof_characters = [
		259	{label: messages.indentation_unix, value: unix},
		260	{label: messages.indentation_mac, value: mac},
		261	{label: messages.indentation_windows, value: windows}
		262	];
		263
		264	var space = ' ';
		265	var tab= '\t';
		266	var indentation_characters = [
		267	{label: messages.indentation_space, value: space},
		268	{label: messages.indentation_tab, value: tab},
		269	];
		270	var collapse_preserve_inline = 'collapse-preserve-inline';
		271	var collapse = 'collapse';
		272	var expand = 'expand';
		273	var end_expand = 'end-expand';
		274	var none = 'none';
		275	var brace_styles = [
		276	{ label: messages.collapse_preserve_inline , value: collapse_preserve_inline},
		277	{ label: messages.collapse , value: collapse},
		278	{ label: messages.expand , value: expand},
		279	{ label: messages.end_expand , value: end_expand},
		280	{ label: messages.none , value: none},
		281	];
		282
		283	provider.registerServiceProvider("orion.core.setting", {}, {
		284	settings: [
		285	{
		286	pid: 'jsbeautify.config.css',
		287	name: messages['cssFormattingSettings'],
		288	tags: 'beautify css formatting'.split(' '),
289	category: 'cssFormatting',
290	categoryLabel: messages['cssFormatting'],
291	properties: [
292	{
293	id: 'css_indent_size', //$NON-NLS-1$
294	name: messages['css_indent_size'],
295	type: 'number', //$NON-NLS-1$
296	defaultValue: 4
297	},
298	{
299	id: 'css_indent_char', //$NON-NLS-1$
300	name: messages['css_indent_char'],
301	type: 'string', //$NON-NLS-1$
302	defaultValue: space,
303	options: indentation_characters
304	},
305	{
306	id: 'css_eol', //$NON-NLS-1$
307	name: messages['css_eol'],
308	type: 'string', //$NON-NLS-1$
309	defaultValue: unix,
310	options: eof_characters
311	},
312	{
313	id: 'css_end_with_newline', //$NON-NLS-1$
314	name: messages['css_end_with_newline'],
315	type: 'boolean', //$NON-NLS-1$
316	defaultValue: false
317	},
318	{
319	id: 'selector_separator_newline', //$NON-NLS-1$
320	name: messages['selector_separator_newline'],
321	type: 'boolean', //$NON-NLS-1$
322	defaultValue: true
323	},
324	{
325	id: 'newline_between_rules', //$NON-NLS-1$
326	name: messages['newline_between_rules'],
327	type: 'boolean', //$NON-NLS-1$
328	defaultValue: true
329	},
330	{
331	id: 'space_around_selector_separator', //$NON-NLS-1$
332	name: messages['space_around_selector_separator'],
333	type: 'boolean', //$NON-NLS-1$
334	defaultValue: false
335	}
336	]
337	}]
338	});
339
340	/**
341	* Html formatting settings
342	*/
343	var keep = 'keep';
344	var separate = 'separate';
345	var normal = 'normal';
346	var indent_scripts_values = [
347	{ label: messages.normal, value: normal},
348	{ label: messages.keep, value: keep},
349	{ label: messages.separate, value: separate},
350	];
351	var auto = 'auto';
352	var force = 'force';
353	var wrap_attributes_values = [
354	{ label: messages.auto, value: auto},
355	{ label: messages.force, value: force},
356	];
357	provider.registerServiceProvider("orion.core.setting", {}, {
358	settings: [
359	{
360	pid: 'jsbeautify.config.html',
361	name: messages['htmlFormattingOptions'],
362	tags: 'beautify html formatting'.split(' '),
363	category: 'htmlFormatting',
364	categoryLabel: messages['htmlFormatting'],
365	properties: [
366	{
367	id: 'html_indent_size', //$NON-NLS-1$
368	name: messages['html_indent_size'],
369	type: 'number', //$NON-NLS-1$
370	defaultValue: 4
371	},
372	{
373	id: 'html_indent_char', //$NON-NLS-1$
374	name: messages['html_indent_char'],
375	type: 'string', //$NON-NLS-1$
376	defaultValue: space,
377	options: indentation_characters
378	},
379	{
380	id: 'html_eol', //$NON-NLS-1$
381	name: messages['html_eol'],
382	type: 'string', //$NON-NLS-1$
383	defaultValue: unix,
384	options: eof_characters
385	},
386	{
387	id: 'html_end_with_newline', //$NON-NLS-1$
388	name: messages['html_end_with_newline'],
389	type: 'boolean', //$NON-NLS-1$
390	defaultValue: false
391	},
392	{
393	id: 'html_preserve_new_lines', //$NON-NLS-1$
394	name: messages['html_preserve_new_lines'],
395	type: 'boolean', //$NON-NLS-1$
396	defaultValue: true
397	},
398	{
399	id: 'html_max_preserve_new_lines', //$NON-NLS-1$
400	name: messages['html_max_preserve_new_lines'],
401	type: 'number', //$NON-NLS-1$
402	defaultValue: 32786
403	},
404	{
405	id: 'html_brace_style', //$NON-NLS-1$
406	name: messages['html_brace_style'],
407	type: 'boolean', //$NON-NLS-1$
408	defaultValue: collapse,
409	options: brace_styles
410	},
411	{
412	id: 'html_wrap_line_length', //$NON-NLS-1$
413	name: messages['html_wrap_line_length'],
414	type: 'number', //$NON-NLS-1$
415	defaultValue: 0
416	},
417	{
418	id: 'indent_inner_html', //$NON-NLS-1$
419	name: messages['indent_inner_html'],
420	type: 'boolean', //$NON-NLS-1$
421	defaultValue: false
422	},
423	{
424	id: 'indent_handlebars', //$NON-NLS-1$
425	name: messages['indent_handlebars'],
426	type: 'boolean', //$NON-NLS-1$
427	defaultValue: false
428	},
429	{
430	id: 'wrap_attributes', //$NON-NLS-1$
431	name: messages['wrap_attributes'],
432	type: 'string', //$NON-NLS-1$
433	defaultValue: 'auto',
434	options: wrap_attributes_values
435	},
436	{
437	id: 'wrap_attributes_indent_size', //$NON-NLS-1$
438	name: messages['wrap_attributes_indent_size'],
439	type: 'number', //$NON-NLS-1$
440	defaultValue: 1
441	},
442	{
443	id: 'extra_liners', //$NON-NLS-1$
444	name: messages['extra_liners'],
445	type: 'string', //$NON-NLS-1$
446	defaultValue: 'head,body,html'
447	},
448	{
449	id: 'indent-scripts', //$NON-NLS-1$
450	name: messages['indent_scripts'],
451	type: 'string', //$NON-NLS-1$
452	defaultValue: normal,
453	options: indent_scripts_values
454	}
455	]
456	}]
457	});
458
223	/**	459	/**
224	* CSSLint settings	460	* CSSLint settings
225	*/	461	*/




	'orion/metrics',
	'orion/commonPreferences',
	'embeddedEditor/helper/memoryFileSysConst',
	'orion/objects',
	'orion/formatter'	
], function(
	messages,
	mEditor, mEventTarget, mTextView, mTextModelFactory, mEditorFeatures, mHoverFactory, mContentAssist,

	mDispatcher, EditorContext, Highlight,
	mMarkOccurrences, mSyntaxchecker, LiveEditSession,
	mProblems, mBlamer, mDiffer,
	mKeyBinding, util, Deferred, mContextMenu, mMetrics, mCommonPreferences, memoryFileSysConst, objects, mFormatter
) {
	var inMemoryFilePattern = memoryFileSysConst.MEMORY_FILE_PATTERN;
	var Dispatcher = mDispatcher.Dispatcher;


			this.blamer = new mBlamer.Blamer(serviceRegistry, inputManager, editor);
			this.differ = new mDiffer.Differ(serviceRegistry, inputManager, editor);
			this.formatter = new mFormatter.Formatter(serviceRegistry, inputManager, editor);

			this.problemService = new mProblems.ProblemService(serviceRegistry, this.problemsServiceID);
			var markerService = serviceRegistry.getService(this.problemsServiceID);

Lines 449-454 define([ Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/settings/ui/PluginSettings.js (-2 / +49 lines)
449	}.bind(this));	449	}.bind(this));
450	}.bind(this));	450	}.bind(this));
451	}	451	}
		452
		453	function getFormattingSettings(fileClient, projectPath, callback) {
		454	var jsbeautifyrc = projectPath + SettingsList.prototype.JSBEAUTIFYRC;
		455	return fileClient.read(jsbeautifyrc, false, false, {readIfExists: true}).then(function(contents) {
		456	if (contents !== null) {
		457	callback({contents: contents, name: SettingsList.prototype.JSBEAUTIFYRC, location: jsbeautifyrc});
		458	return;
		459	}
		460	}.bind(this));
		461	}
452		462
453	SettingsList.prototype = {	463	SettingsList.prototype = {
454	/**	464	/**
Lines 480-485 define([ Link Here
480	* The package.json file name	490	* The package.json file name
481	*/	491	*/
482	PACKAGE_JSON : 'package.json',	492	PACKAGE_JSON : 'package.json',
		493	/**
		494	* The .jsbeautifyrc file name
		495	* @see https://github.com/beautify-web/js-beautify/blob/master/README.md
		496	*/
		497	JSBEAUTIFYRC : '.jsbeautifyrc',
483		498
484	_makeSection: function(parent, sectionId, title, hasMultipleSections) {	499	_makeSection: function(parent, sectionId, title, hasMultipleSections) {
485	var that = this;	500	var that = this;
Lines 537-543 define([ Link Here
537	if (!this.destroyed) {	552	if (!this.destroyed) {
538	var infoText = document.createElement("div"); //$NON-NLS-0$	553	var infoText = document.createElement("div"); //$NON-NLS-0$
539	infoText.classList.add("setting-info"); //$NON-NLS-0$	554	infoText.classList.add("setting-info"); //$NON-NLS-0$
540	infoText.textContent = messages.JavascriptSettingWarning;	555	infoText.textContent = messages.SettingWarning;
541	var icon = document.createElement("span"); //$NON-NLS-0$	556	var icon = document.createElement("span"); //$NON-NLS-0$
542	icon.classList.add("core-sprite-warning"); //$NON-NLS-0$	557	icon.classList.add("core-sprite-warning"); //$NON-NLS-0$
543	icon.classList.add("icon-inline"); //$NON-NLS-0$	558	icon.classList.add("icon-inline"); //$NON-NLS-0$
Lines 559-565 define([ Link Here
559	}	574	}
560	break;	575	break;
561	}	576	}
562	}	577	case "javascriptFormatting" : {
		578	if (pageParams.resource && pageParams.resource.length !== 0) {
		579	// resource name starts with /file/ and ends with '/'
		580	projectName = pageParams.resource.substring(6, pageParams.resource.length - 1);
		581	getFormattingSettings(
		582	this.fileClient,
		583	pageParams.resource,
		584	function(file) {
		585	if (!this.destroyed) {
		586	var infoText = document.createElement("div"); //$NON-NLS-0$
		587	infoText.classList.add("setting-info"); //$NON-NLS-0$
		588	infoText.textContent = messages.SettingWarning;
		589	var icon = document.createElement("span"); //$NON-NLS-0$
		590	icon.classList.add("core-sprite-warning"); //$NON-NLS-0$
		591	icon.classList.add("icon-inline"); //$NON-NLS-0$
		592	icon.classList.add("imageSprite"); //$NON-NLS-0$
		593	var link = document.createElement("a"); //$NON-NLS-0$
		594	link.href = editTemplate.expand({resource: file.location});
		595	link.appendChild(document.createTextNode(file.name));
		596	var projectText = document.createElement("span"); //$NON-NLS-0$
		597	projectText.textContent = projectName;
		598	lib.processDOMNodes(infoText, [icon, link, projectText]);
		599	if (parent.firstChild) {
		600	parent.insertBefore(infoText, parent.firstChild);
		601	} else {
		602	parent.appendChild(infoText);
		603	}
		604	return true;
		605	}
		606	}.bind(this));
		607	}
		608	}
		609	}
563	for (var i=0; i<settings.length; i++) {	610	for (var i=0; i<settings.length; i++) {
564	var setting = settings[i];	611	var setting = settings[i];
565	var sectionId = 'settings.section.'; //$NON-NLS-1$	612	var sectionId = 'settings.section.'; //$NON-NLS-1$




				fileName === project.ESLINTRC_JSON || fileName === project.PACKAGE_JSON) {
				delete project.map.eslint;
			}
			if (fileName === project.JSBEAUTIFYRC) {
				delete project.map.formatting;
			}
		},
		/**
		 * @callback
		 */
		onModified: function onModified(project, qualifiedName, fileName) {
			this._update(project, fileName);
		},
		/**
		 * @callback
		 */
		onDeleted: function onDeleted(project, qualifiedName, fileName) {
			this._update(project, fileName);
		},
		/**
		 * @callback
		 */
		onCreated: function onCreated(project, qualifiedName, fileName) {
			this._update(project, fileName);
		},
		/**
		 * @callback
		 */
		onMoved: function onMoved(project, qualifiedName, fileName, toQualified, toName) {
			this._update(project, fileName);
		},
		/**
		 * @callback
		 */
		onProjectChanged: function onProjectChanged(project, evnt, projectName) {
			delete project.map.eslint;
			delete project.map.formatting;
		}
	};
	

	 * The node_modules folder name
	 */
	JavaScriptProject.prototype.NODE_MODULES = 'node_modules';
	/**
	 * The .jsbeautifyrc file name
	 * @see https://github.com/beautify-web/js-beautify/blob/master/README.md
	 */
	JavaScriptProject.prototype.JSBEAUTIFYRC = '.jsbeautifyrc';

	/**
	 * @description Adds a handler for the given file name to the mapping of handlers
	 * @function

						this.ecma = v.ecmaVersion;
					}
				} catch(err) {
					this.ecma = 6;
				}
			}
			return this.ecma;

		//TODO support loading YML and YAML files
		var vals;
		return this.getFile(this.ESLINTRC_JS).then(function(file) {
			vals = readAndMap(this.map, file, "eslint");
			if(vals) {
				return vals;
			} 
			return this.getFile(this.ESLINTRC_JSON).then(function(file) {
				vals = readAndMap(this.map, file, "eslint");
				if(vals) {
					return vals;
				}
				return this.getFile(this.ESLINTRC).then(function(file) {
					vals = readAndMap(this.map, file, "eslint");
					if(vals) {
						return vals;
					}

		}.bind(this));
	};
	
	/**
	 * @name JavaScriptProject.prototype.getFormattingOptions
	 * @description Returns project-specific formatting options (if any)
	 * @function
	 * @returns {Deferred} A deferred that will resolve to the project-specific formatting options or null
	 * @see https://github.com/beautify-web/js-beautify
	 */
	JavaScriptProject.prototype.getFormattingOptions = function getESlintOptions() {
		if(this.map.formatting) {
			return new Deferred().resolve(this.map.formatting);
		}
		return this.getFile(this.JSBEAUTIFYRC).then(function(file) {
			return readAndMap(this.map, file, "formatting");
		}.bind(this));
	};

	function readAndMap(map, file, key) {
		if(file && file.contents) {
			try {
				var vals = JSON.parse(file.contents);
				if(Object.keys(vals).length > 0) {
					map[key]= vals;
					return map[key];
				}
			} catch(e) {
				//fall through and return null




		this.editorPreferences = options.editorPreferences;
		this.differ = options.differ;
		this.blamer = options.blamer;
		this.formatter = options.formatter;
		var that = this;
		this.listener = {
			onServiceAdded: function(event) {

			this._createClipboardCommands();
			this._createDelimiterCommands();
			this._createEncodingCommand();
			this._createFormatterCommand();
			this._createSaveCommand();
			this._createOpenFolderCommand();
			this._createOpenRecentCommand();

			this.localSettings = target.localSettings;
			this.differ = target.differ;
			this.blamer = target.blamer;
			this.formatter = target.formatter;
			this.textSearcher = target.textSearcher;
			
			if (this._recreateEditCommands) {

			commandRegistry.registerCommandContribution(this.saveToolbarId || this.toolbarId, "orion.edit.save", 2, this.saveToolbarId ? "orion.menuBarFileGroup/orion.edit.saveGroup" : null, false, new mKeyBinding.KeyBinding('s', true), null, this); //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-3$
			commandRegistry.registerCommandContribution(this.editToolbarId || this.pageNavId, "orion.edit.gotoLine", 3, this.editToolbarId ? "orion.menuBarEditGroup/orion.findGroup" : null, !this.editToolbarId, new mKeyBinding.KeyBinding('l', !util.isMac, false, false, util.isMac), new mCommandRegistry.URLBinding("gotoLine", "line"), this); //$NON-NLS-4$ //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-5$
			commandRegistry.registerCommandContribution(this.editToolbarId || this.pageNavId, "orion.edit.find", 0, this.editToolbarId ? "orion.menuBarEditGroup/orion.findGroup" : null, !this.editToolbarId, new mKeyBinding.KeyBinding('f', true), new mCommandRegistry.URLBinding("find", "find"), this); //$NON-NLS-4$ //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-5$
			commandRegistry.registerCommandContribution(this.editToolbarId || this.pageNavId , "orion.edit.format", 1, this.editToolbarId ? "orion.menuBarEditGroup/orion.edit.formatGroup" : null, !this.editToolbarId, new mKeyBinding.KeyBinding('f', false, true, true), new mCommandRegistry.URLBinding("format", "format"), this); //$NON-NLS-4$ //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-5$
			commandRegistry.registerCommandContribution(this.toolbarId, "orion.keyAssist", 0, "orion.menuBarToolsGroup", false, new mKeyBinding.KeyBinding(191, false, true, true)); //$NON-NLS-1$ //$NON-NLS-0$ //$NON-NLS-2$
			commandRegistry.registerCommandContribution(this.toolbarId , "orion.edit.showTooltip", 1, "orion.menuBarToolsGroup", false, new mKeyBinding.KeyBinding(113), null, this);//$NON-NLS-1$ //$NON-NLS-2$ 
			commandRegistry.registerCommandContribution(this.toolbarId , "orion.edit.blame", 2, "orion.menuBarToolsGroup", false, new mKeyBinding.KeyBinding('b', true, true), new mCommandRegistry.URLBinding("blame", "blame"), this); //$NON-NLS-4$ //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-5$

			commandRegistry.registerCommandContribution(this.editorContextMenuId, "orion.edit.gotoLine", index++, "orion.editorContextMenuGroup/orion.findGroup", false); //$NON-NLS-1$ //$NON-NLS-2$
			commandRegistry.registerCommandContribution(this.editorContextMenuId, "orion.quickSearch", index++, "orion.editorContextMenuGroup/orion.findGroup", false); //$NON-NLS-1$ //$NON-NLS-2$
			commandRegistry.registerCommandContribution(this.editorContextMenuId, "orion.openSearch", index++, "orion.editorContextMenuGroup/orion.findGroup", false); //$NON-NLS-1$ //$NON-NLS-2$
			commandRegistry.registerCommandContribution(this.editorContextMenuId , "orion.edit.format", index++, "orion.editorContextMenuGroup/orion.edit.formatGroup", false); //$NON-NLS-4$ //$NON-NLS-3$ //$NON-NLS-2$

			// 'Tools' cascade
			commandRegistry.addCommandGroup(this.editorContextMenuId, "orion.editorContextMenuToolsGroup", 400, messages["Tools"], "orion.editorContextMenuGroup"); //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-0$

			this.commandService.addCommand(blameCommand);
		},

		_createFormatterCommand: function(){
			var that = this;
			var formatterCommand = new mCommands.Command({
				name: messages.Format,
				tooltip: messages.FormatTooltip,
				id: "orion.edit.format", //$NON-NLS-0$
				parameters: new mCommandRegistry.ParametersDescription([new mCommandRegistry.CommandParameter('formatter', 'boolean')], {clientCollect: true}), //$NON-NLS-1$ //$NON-NLS-0$
				visibleWhen: /** @callback */ function(items, data) {
					var editor = data.handler.editor || that.editor;
					var formatter = data.handler.formatter || that.formatter;
					return editor && editor.installed && formatter && formatter.isVisible();
				},
				callback: function(data) {
					var editor = this.editor || that.editor;
					var formatter = this.formatter || that.formatter;
					formatter.doFormat();
					editor.focus();
				}
			});
			this.commandService.addCommand(formatterCommand);
		},

		_createDiffCommand: function(){
			var that = this;
			var diffCommand = new mCommands.Command({




'javascript/scriptResolver',
'javascript/astManager',
'javascript/quickFixes',
'javascript/javascriptFormatter',
'javascript/javascriptProject',
'javascript/contentAssist/ternAssist',
'javascript/contentAssist/ternProjectAssist',

'i18n!javascript/nls/messages',
'orion/i18nUtil',
'orion/URL-shim'
], function(PluginProvider, mServiceRegistry, Deferred, ScriptResolver, ASTManager, QuickFixes, JavaScriptFormatter, JavaScriptProject, TernAssist, TernProjectAssist,
			EslintValidator, TernProjectValidator, Occurrences, Hover, Outliner, CUProvider, TernProjectManager, Util, Logger, GenerateDocCommand, OpenDeclCommand, OpenImplCommand,
			RenameCommand, RefsCommand, mJS, mJSON, mJSONSchema, mEJS, javascriptMessages, i18nUtil) {


    		               }, {id: "application/json", //$NON-NLS-1$
    		            	   "extends": "text/plain", //$NON-NLS-1$ //$NON-NLS-1$
    		            	   name: "JSON", //$NON-NLS-1$
    		            	   extension: ["json", "pref", "tern-project", "eslintrc", "jsbeautifyrc"], //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
    		            	   imageClass: "file-sprite-javascript modelDecorationSprite" //$NON-NLS-1$
    		               }, {id: "application/x-ejs", //$NON-NLS-1$
    		            	   "extends": "text/plain", //$NON-NLS-1$ //$NON-NLS-1$

                    ]
    			}
    	);

    	provider.registerServiceProvider("orion.edit.command",  //$NON-NLS-1$
    			quickFixComputer,
    			{

				 	        	   name: javascriptMessages['prefBestPractices'],
				 	        	   tags: "validation javascript js eslint".split(" "),  //$NON-NLS-1$  //$NON-NLS-1$
				 	        	   category: 'javascript', //$NON-NLS-1$
				 	        	   categoryLabel: javascriptMessages['javascriptValidation'],
				 	        	   properties: [
				 	        	   				{
			 	        	                		id: "no-eq-null",  //$NON-NLS-1$

				 	        	                	defaultValue: warning,
				 	        	                	options: severities
				 	        	                }
										]
				 	        	}]
			});

		var jsFormatter = new JavaScriptFormatter.JavaScriptFormatter(ternWorker, jsProject);
		provider.registerServiceProvider("orion.edit.format",
			jsFormatter,
			{
				name: javascriptMessages["javascriptFormatter"],
				contentType: ["application/javascript"],
				id: "orion.format.js.formatter",
			}
		);
		// register preferences for formatting when modified (updated call)
		provider.registerService("orion.cm.managedservice", jsFormatter, {pid: 'jsbeautify.config.js'}); //$NON-NLS-1$ //$NON-NLS-2$

		var unix = "\n";
		var mac = "\r";
		var windows = "\n\r";
		var eof_characters = [
			{label: javascriptMessages.indentation_unix,  value: unix},
			{label: javascriptMessages.indentation_mac, value: mac},
			{label: javascriptMessages.indentation_windows, value: windows}
		];

		var space = ' ';
		var tab= '\t';
		var indentation_characters = [
			{label: javascriptMessages.indentation_space,  value: space},
			{label: javascriptMessages.indentation_tab,  value: tab},
		];
		
		var before_newline = 'before-newline';
		var after_newline = 'after-newline';
		var preserve_newline = 'preserve-newline';
		var operator_positions = [
			{ label: javascriptMessages.before_newline, value: before_newline},
			{ label: javascriptMessages.after_newline, value: after_newline},
			{ label: javascriptMessages.preserve_newline, value: preserve_newline},
		];
		
		var collapse_preserve_inline = 'collapse-preserve-inline';
		var collapse = 'collapse';
		var expand = 'expand';
		var end_expand = 'end-expand';
		var none = 'none';
		var brace_styles = [
			{ label: javascriptMessages.collapse_preserve_inline , value: collapse_preserve_inline},
			{ label: javascriptMessages.collapse , value: collapse},
			{ label: javascriptMessages.expand , value: expand},
			{ label: javascriptMessages.end_expand , value: end_expand},
			{ label: javascriptMessages.none , value: none},
		];
		provider.registerServiceProvider("orion.core.setting", {}, {
			settings: [
				{
					pid: 'jsbeautify.config.js',//$NON-NLS-1$
					name: javascriptMessages['javascriptFormattingSettings'],//$NON-NLS-1$
					tags: 'beautify javascript js formatting'.split(' '),//$NON-NLS-1$//$NON-NLS-2$
					category: 'javascriptFormatting',//$NON-NLS-1$
					categoryLabel: javascriptMessages['javascriptFormatting'],//$NON-NLS-1$
					properties: [
						{
							id: 'js_indent_size',  //$NON-NLS-1$
							name: javascriptMessages['js_indent_size'],//$NON-NLS-1$
							type: 'number', //$NON-NLS-1$
							defaultValue: 4
						},
						{
							id: 'js_indent_char',  //$NON-NLS-1$
							name: javascriptMessages['js_indent_char'],//$NON-NLS-1$
							type: 'string', //$NON-NLS-1$
							defaultValue: space,
							options: indentation_characters
						},
						{
							id: 'js_eol',  //$NON-NLS-1$
							name: javascriptMessages['js_eol'],//$NON-NLS-1$
							type: 'string', //$NON-NLS-1$
							defaultValue: unix,
							options: eof_characters
						},
						{
							id: 'js_end_with_newline',  //$NON-NLS-1$
							name: javascriptMessages['js_end_with_newline'],//$NON-NLS-1$
							type: 'boolean', //$NON-NLS-1$
							defaultValue: false
						},
						{
							id: 'js_preserve_newlines',  //$NON-NLS-1$
							name: javascriptMessages['js_preserve_newlines'],//$NON-NLS-1$
							type: 'boolean', //$NON-NLS-1$
							defaultValue: true
						},
						{
							id: 'js_max_preserve_newlines',  //$NON-NLS-1$
							name: javascriptMessages['js_max_preserve_newlines'],//$NON-NLS-1$
							type: 'number', //$NON-NLS-1$
							defaultValue: 10
						},
						{
							id: 'js_brace_style',  //$NON-NLS-1$
							name: javascriptMessages['js_brace_style'],//$NON-NLS-1$
							type: 'boolean', //$NON-NLS-1$
							defaultValue: collapse,
							options: brace_styles
						},
						{
							id: 'js_wrap_line_length',  //$NON-NLS-1$
							name: javascriptMessages['js_wrap_line_length'],//$NON-NLS-1$
							type: 'number', //$NON-NLS-1$
							defaultValue: 0
						},
						{
							id: 'indent_level',  //$NON-NLS-1$
							name: javascriptMessages['indent_level'],//$NON-NLS-1$
							type: 'number', //$NON-NLS-1$
							defaultValue: 0
						},
						{
							id: 'space_in_paren',  //$NON-NLS-1$
							name: javascriptMessages['space_in_paren'],//$NON-NLS-1$
							type: 'boolean', //$NON-NLS-1$
							defaultValue: false
						},
						{
							id: 'space_in_empty_paren',  //$NON-NLS-1$
							name: javascriptMessages['space_in_empty_paren'],//$NON-NLS-1$
							type: 'boolean', //$NON-NLS-1$
							defaultValue: false
						},
						{
							id: 'space_after_anon_function',  //$NON-NLS-1$
							name: javascriptMessages['space_after_anon_function'],//$NON-NLS-1$
							type: 'boolean', //$NON-NLS-1$
							defaultValue: false
						},
						{
							id: 'break_chained_methods',  //$NON-NLS-1$
							name: javascriptMessages['break_chained_methods'],//$NON-NLS-1$
							type: 'boolean', //$NON-NLS-1$
							defaultValue: false
						},
						{
							id: 'keep_array_indentation',  //$NON-NLS-1$
							name: javascriptMessages['keep_array_indentation'],//$NON-NLS-1$
							type: 'boolean', //$NON-NLS-1$
							defaultValue: false
						},
						{
							id: 'space_before_conditional',  //$NON-NLS-1$
							name: javascriptMessages['space_before_conditional'],//$NON-NLS-1$
							type: 'boolean', //$NON-NLS-1$
							defaultValue: true
						},
						{
							id: 'unescape_strings',  //$NON-NLS-1$
							name: javascriptMessages['unescape_strings'],//$NON-NLS-1$
							type: 'boolean', //$NON-NLS-1$
							defaultValue: false
						},
						{
							id: 'e4x',  //$NON-NLS-1$
							name: javascriptMessages['e4x'],//$NON-NLS-1$
							type: 'boolean', //$NON-NLS-1$
							defaultValue: false
						},
						{
							id: 'comma_first',  //$NON-NLS-1$
							name: javascriptMessages['comma_first'],//$NON-NLS-1$
							type: 'boolean', //$NON-NLS-1$
							defaultValue: false
						},
						{
							id: 'operator_position',  //$NON-NLS-1$
							name: javascriptMessages['operator_position'],//$NON-NLS-1$
							type: 'string', //$NON-NLS-1$
							defaultValue: before_newline,
							options: operator_positions
						},
					]
				}]
		});

    	/**
    	 * Register syntax styling for js, json and json schema content

Return to bug 496437

Added Link Here

(-)a/bundles/org.eclipse.orion.client.javascript/web/javascript/javascriptFormatter.js (+195 lines)
1	/*******************************************************************************
2	* @license
3	* Copyright (c) 2016 IBM Corporation and others.
4	* All rights reserved. This program and the accompanying materials are made
5	* available under the terms of the Eclipse Public License v1.0
6	* (http://www.eclipse.org/legal/epl-v10.html), and the Eclipse Distribution
7	* License v1.0 (http://www.eclipse.org/org/documents/edl-v10.html).
8	*
9	* Contributors:
10	* IBM Corporation - initial API and implementation
11	*******************************************************************************/
12	/eslint-env amd, browser/
13	define([
14	'orion/objects',
15	'orion/Deferred'
16	], function(Objects, Deferred) {
17	var config = {
18	// 0:off, 1:warning, 2:error
19	defaults: {
20	"indent_size": 4,
21	"indent_char": " ",
22	"eol": "\n",
23	"indent_level": 0,
24	"indent_with_tabs": false,
25	"preserve_newlines": true,
26	"max_preserve_newlines": 10,
27	"jslint_happy": false,
28	"space_after_anon_function": false,
29	"brace_style": "collapse",
30	"keep_array_indentation": false,
31	"keep_function_indentation": false,
32	"space_before_conditional": true,
33	"break_chained_methods": false,
34	"eval_code": false,
35	"unescape_strings": false,
36	"wrap_line_length": 0,
37	"wrap_attributes": "auto",
38	"wrap_attributes_indent_size": 4,
39	"end_with_newline": false
40	},
41
42	setOption: function(ruleId, value, key) {
43	if(Array.isArray(this.rules[ruleId])) {
44	var ruleConfig = this.rules[ruleId];
45	if (key) {
46	ruleConfig[1] = ruleConfig[1] \|\| {};
47	ruleConfig[1][key] = value;
48	} else {
49	ruleConfig[0] = value;
50	}
51	}
52	else {
53	this.rules[ruleId] = value;
54	}
55	},
56
57	/**
58	* @description Resets the rules to their default values
59	* @function
60	*/
61	setDefaults: function setDefaults() {
62	this.rules = Object.create(null);
63	var keys = Object.keys(this.defaults);
64	for(var i = 0; i < keys.length; i++) {
65	var key = keys[i];
66	this.rules[key] = this.defaults[key];
67	}
68	}
69	};
70
71	/**
72	* @name javascript.JavaScriptFormatter
73	* @description creates a new instance of the javascript formatter
74	* @constructor
75	* @public
76	* @param {Worker} ternWorker
77	*/
78	function JavaScriptFormatter(ternWorker, jsProject) {
79	this.ternworker = ternWorker;
80	this.project = jsProject;
81	config.setDefaults();
82	}
83
84	Objects.mixin(JavaScriptFormatter.prototype, /** @lends javascript.JavaScriptFormatter.prototype*/ {
85
86	/**
87	* @description Callback from the editor to format the source code
88	* @function
89	* @public
90	* @memberof javascript.JavaScriptFormatter.prototype
91	* @param {orion.edit.EditorContext} editorContext The current editor context
92	* @param {Object} context The current selection context
93	*/
94	format: function(editorContext, context) {
95	var deferred = new Deferred();
96	if(this.project) {
97	//TODO make sure we can get the options as set in the formatting preference page Right now only the indent character is customizable
98	// We should expose all existing options - see defaults above
99	this.project.getFormattingOptions().then(function(cfg) {
100	this._format(editorContext, deferred, cfg ? cfg : config.rules);
101	}.bind(this));
102	} else {
103	this._format(editorContext, deferred, config.rules);
104	}
105	return deferred;
106	},
107
108	/**
109	* @description Format the given editor
110	* @function
111	* @private
112	* @param {orion.edit.EditorContext} editorContext The given editor context
113	* @param {Deferred} deferred the given deferred object
114	* @param {Object} configuration the given configuration
115	* @since 6.0
116	*/
117	_format: function(editorContext, deferred, configuration) {
118	return editorContext.getFileMetadata().then(function(meta) {
119	return editorContext.getSelection().then(function(selection) {
120	var start = selection.start;
121	var end = selection.end;
122	var files, request;
123	if (end !== start) {
124	return editorContext.getText(start, end).then(function(text) {
125	files = [{type: 'full', name: meta.location, text: text}]; //$NON-NLS-1$
126	request = {request: 'beautify', args: {meta: {location: meta.location}, files: files, config: configuration, start: start, end: end, contentType: meta.contentType.id}}; //$NON-NLS-1$
127	this.ternworker.postMessage(
128	request,
129	function(formatted, err) {
130	if(err) {
131	deferred.reject();
132	}
133	if(formatted && formatted.text) {
134	deferred.resolve(editorContext.setText(formatted.text, start, end));
135	} else {
136	deferred.reject();
137	}
138	});
139	return deferred;
140	}.bind(this));
141	}
142	return editorContext.getText().then(function(text) {
143	files = [{type: 'full', name: meta.location, text: text}]; //$NON-NLS-1$
144	request = {request: 'beautify', args: {meta: {location: meta.location}, files: files, config: configuration, contentType: meta.contentType.id}}; //$NON-NLS-1$
145	this.ternworker.postMessage(
146	request,
147	function(formatted, err) {
148	if(err) {
149	deferred.reject();
150	}
151	if(formatted && formatted.text) {
152	deferred.resolve(editorContext.setText(formatted.text));
153	} else {
154	deferred.reject();
155	}
156	});
157	return deferred;
158	}.bind(this));
159	}.bind(this));
160	}.bind(this));
161	},
162
163	/**
164	* @description Callback from orion.cm.managedservice
165	* @function
166	* @public
167	* @param {Object} properties The properties that have been changed
168	*/
169	updated: function(properties) {
170	if (!properties) {
171	return;
172	}
173	var oldconfig = properties.pid === 'jsbeautify.config.js';
174	var keys = Object.keys(properties);
175	for(var i = 0; i < keys.length; i++) {
176	var key = keys[i];
177	var originalKey = key;
178	/*
179	* Do the key mapping for common options between css, js and html formatters
180	*/
181	key = key.replace(/^js_/, "");
182	var ruleId = key;
183	if(oldconfig && config.rules[key] !== config.defaults[key]) {
184	//don't overwrite a new setting with an old one
185	continue;
186	}
187	config.setOption(ruleId, properties[originalKey]);
188	}
189	},
190	});
191
192	return {
193	JavaScriptFormatter: JavaScriptFormatter
194	};
195	});

Added Link Here

(-)a/bundles/org.eclipse.orion.client.webtools/web/beautifier/beautifier.js (+20 lines)
1	/eslint-env amd, node/
2	define([
3	"./lib/beautify-css",
4	"./lib/beautify-html"
5	], function(css_beautify, html_beautify) {
6
7	function get_beautify(css_beautify, html_beautify) {
8	var beautify = Object.create(null);
9	// short aliases
10	beautify.css = css_beautify.css_beautify;
11	beautify.html = html_beautify.html_beautify;
12
13	// legacy aliases
14	beautify.css_beautify = css_beautify.css_beautify;
15	beautify.html_beautify = html_beautify.html_beautify;
16
17	return beautify;
18	}
19	return get_beautify(css_beautify, html_beautify);
20	});

Added Link Here

(-)a/bundles/org.eclipse.orion.client.webtools/web/beautifier/lib/beautify-css.js (+490 lines)
1	/*
2
3	The MIT License (MIT)
4
5	Copyright (c) 2007-2013 Einar Lielmanis and contributors.
6
7	Permission is hereby granted, free of charge, to any person
8	obtaining a copy of this software and associated documentation files
9	(the "Software"), to deal in the Software without restriction,
10	including without limitation the rights to use, copy, modify, merge,
11	publish, distribute, sublicense, and/or sell copies of the Software,
12	and to permit persons to whom the Software is furnished to do so,
13	subject to the following conditions:
14
15	The above copyright notice and this permission notice shall be
16	included in all copies or substantial portions of the Software.
17
18	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
19	EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
20	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
21	NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
22	BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
23	ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
24	CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
25	SOFTWARE.
26
27
28	CSS Beautifier
29	---------------
30
31	Written by Harutyun Amirjanyan, (amirjanyan@gmail.com)
32
33	Based on code initially developed by: Einar Lielmanis, <einar@jsbeautifier.org>
34	http://jsbeautifier.org/
35
36	Usage:
37	css_beautify(source_text);
38	css_beautify(source_text, options);
39
40	The options are (default in brackets):
41	indent_size (4) - indentation size,
42	indent_char (space) - character to indent with,
43	selector_separator_newline (true) - separate selectors with newline or
44	not (e.g. "a,\nbr" or "a, br")
45	end_with_newline (false) - end with a newline
46	newline_between_rules (true) - add a new line after every css rule
47	space_around_selector_separator (false) - ensure space around selector separators:
48	'>', '+', '~' (e.g. "a>b" -> "a > b")
49	e.g
50
51	css_beautify(css_source_text, {
52	'indent_size': 1,
53	'indent_char': '\t',
54	'selector_separator': ' ',
55	'end_with_newline': false,
56	'newline_between_rules': true,
57	'space_around_selector_separator': true
58	});
59	*/
60
61	// http://www.w3.org/TR/CSS21/syndata.html#tokenization
62	// http://www.w3.org/TR/css3-syntax/
63	/eslint-env amd /
64	define([], function() {
65
66	function css_beautify(source_text, options) {
67	options = options \|\| {};
68	source_text = source_text \|\| '';
69	// HACK: newline parsing inconsistent. This brute force normalizes the input.
70	source_text = source_text.replace(/\r\n\|[\r\u2028\u2029]/g, '\n');
71
72	var indentSize = options.indent_size \|\| 4;
73	var indentCharacter = options.indent_char \|\| ' ';
74	var selectorSeparatorNewline = (options.selector_separator_newline === undefined) ? true : options.selector_separator_newline;
75	var end_with_newline = (options.end_with_newline === undefined) ? false : options.end_with_newline;
76	var newline_between_rules = (options.newline_between_rules === undefined) ? true : options.newline_between_rules;
77	var spaceAroundSelectorSeparator = (options.space_around_selector_separator === undefined) ? false : options.space_around_selector_separator;
78	var eol = options.eol ? options.eol : '\n';
79
80	// compatibility
81	if (typeof indentSize === "string") {
82	indentSize = parseInt(indentSize, 10);
83	}
84
85	if (options.indent_with_tabs) {
86	indentCharacter = '\t';
87	indentSize = 1;
88	}
89
90	eol = eol.replace(/\\r/, '\r').replace(/\\n/, '\n');
91
92
93	// tokenizer
94	var whiteRe = /^\s+$/;
95
96	var pos = -1,
97	ch;
98	var parenLevel = 0;
99
100	function next() {
101	ch = source_text.charAt(++pos);
102	return ch \|\| '';
103	}
104
105	function peek(skipWhitespace) {
106	var result = '';
107	var prev_pos = pos;
108	if (skipWhitespace) {
109	eatWhitespace();
110	}
111	result = source_text.charAt(pos + 1) \|\| '';
112	pos = prev_pos - 1;
113	next();
114	return result;
115	}
116
117	function eatString(endChars) {
118	var start = pos;
119	while (next()) {
120	if (ch === "\\") {
121	next();
122	} else if (endChars.indexOf(ch) !== -1) {
123	break;
124	} else if (ch === "\n") {
125	break;
126	}
127	}
128	return source_text.substring(start, pos + 1);
129	}
130
131	function peekString(endChar) {
132	var prev_pos = pos;
133	var str = eatString(endChar);
134	pos = prev_pos - 1;
135	next();
136	return str;
137	}
138
139	function eatWhitespace() {
140	var result = '';
141	while (whiteRe.test(peek())) {
142	next();
143	result += ch;
144	}
145	return result;
146	}
147
148	function skipWhitespace() {
149	var result = '';
150	if (ch && whiteRe.test(ch)) {
151	result = ch;
152	}
153	while (whiteRe.test(next())) {
154	result += ch;
155	}
156	return result;
157	}
158
159	function eatComment(singleLine) {
160	var start = pos;
161	singleLine = peek() === "/";
162	next();
163	while (next()) {
164	if (!singleLine && ch === "*" && peek() === "/") {
165	next();
166	break;
167	} else if (singleLine && ch === "\n") {
168	return source_text.substring(start, pos);
169	}
170	}
171
172	return source_text.substring(start, pos) + ch;
173	}
174
175
176	function lookBack(str) {
177	return source_text.substring(pos - str.length, pos).toLowerCase() ===
178	str;
179	}
180
181	// Nested pseudo-class if we are insideRule
182	// and the next special character found opens
183	// a new block
184	function foundNestedPseudoClass() {
185	var openParen = 0;
186	for (var i = pos + 1; i < source_text.length; i++) {
187	var ch = source_text.charAt(i);
188	if (ch === "{") {
189	return true;
190	} else if (ch === '(') {
191	// pseudoclasses can contain ()
192	openParen += 1;
193	} else if (ch === ')') {
194	if (openParen === 0) {
195	return false;
196	}
197	openParen -= 1;
198	} else if (ch === ";" \|\| ch === "}") {
199	return false;
200	}
201	}
202	return false;
203	}
204
205	// printer
206	var basebaseIndentString = source_text.match(/^[\t ]*/)[0];
207	var singleIndent = new Array(indentSize + 1).join(indentCharacter);
208	var indentLevel = 0;
209	var nestedLevel = 0;
210
211	function indent() {
212	indentLevel++;
213	basebaseIndentString += singleIndent;
214	}
215
216	function outdent() {
217	indentLevel--;
218	basebaseIndentString = basebaseIndentString.slice(0, -indentSize);
219	}
220
221	var print = {};
222	print["{"] = function(ch) {
223	print.singleSpace();
224	output.push(ch);
225	print.newLine();
226	};
227	print["}"] = function(ch) {
228	print.newLine();
229	output.push(ch);
230	print.newLine();
231	};
232
233	print._lastCharWhitespace = function() {
234	return whiteRe.test(output[output.length - 1]);
235	};
236
237	print.newLine = function(keepWhitespace) {
238	if (output.length) {
239	if (!keepWhitespace && output[output.length - 1] !== '\n') {
240	print.trim();
241	}
242
243	output.push('\n');
244
245	if (basebaseIndentString) {
246	output.push(basebaseIndentString);
247	}
248	}
249	};
250	print.singleSpace = function() {
251	if (output.length && !print._lastCharWhitespace()) {
252	output.push(' ');
253	}
254	};
255
256	print.preserveSingleSpace = function() {
257	if (isAfterSpace) {
258	print.singleSpace();
259	}
260	};
261
262	print.trim = function() {
263	while (print._lastCharWhitespace()) {
264	output.pop();
265	}
266	};
267
268
269	var output = [];
270	/_____________________--------------------_____________________/
271
272	var insideRule = false;
273	var insidePropertyValue = false;
274	var enteringConditionalGroup = false;
275	var top_ch = '';
276	var last_top_ch = '';
277
278	while (true) {
279	var whitespace = skipWhitespace();
280	var isAfterSpace = whitespace !== '';
281	var isAfterNewline = whitespace.indexOf('\n') !== -1;
282	last_top_ch = top_ch;
283	top_ch = ch;
284
285	if (!ch) {
286	break;
287	} else if (ch === '/' && peek() === '') { / css comment */
288	var header = indentLevel === 0;
289
290	if (isAfterNewline \|\| header) {
291	print.newLine();
292	}
293
294	output.push(eatComment());
295	print.newLine();
296	if (header) {
297	print.newLine(true);
298	}
299	} else if (ch === '/' && peek() === '/') { // single line comment
300	if (!isAfterNewline && last_top_ch !== '{') {
301	print.trim();
302	}
303	print.singleSpace();
304	output.push(eatComment());
305	print.newLine();
306	} else if (ch === '@') {
307	print.preserveSingleSpace();
308
309	// deal with less propery mixins @{...}
310	if (peek() === '{') {
311	output.push(eatString('}'));
312	} else {
313	output.push(ch);
314
315	// strip trailing space, if present, for hash property checks
316	var variableOrRule = peekString(": ,;{}()[]/='\"");
317
318	if (variableOrRule.match(/[ :]$/)) {
319	// we have a variable or pseudo-class, add it and insert one space before continuing
320	next();
321	variableOrRule = eatString(": ").replace(/\s$/, '');
322	output.push(variableOrRule);
323	print.singleSpace();
324	}
325
326	variableOrRule = variableOrRule.replace(/\s$/, '');
327
328	// might be a nesting at-rule
329	if (variableOrRule in css_beautify.NESTED_AT_RULE) {
330	nestedLevel += 1;
331	if (variableOrRule in css_beautify.CONDITIONAL_GROUP_RULE) {
332	enteringConditionalGroup = true;
333	}
334	}
335	}
336	} else if (ch === '#' && peek() === '{') {
337	print.preserveSingleSpace();
338	output.push(eatString('}'));
339	} else if (ch === '{') {
340	if (peek(true) === '}') {
341	eatWhitespace();
342	next();
343	print.singleSpace();
344	output.push("{}");
345	print.newLine();
346	if (newline_between_rules && indentLevel === 0) {
347	print.newLine(true);
348	}
349	} else {
350	indent();
351	print["{"](ch);
352	// when entering conditional groups, only rulesets are allowed
353	if (enteringConditionalGroup) {
354	enteringConditionalGroup = false;
355	insideRule = (indentLevel > nestedLevel);
356	} else {
357	// otherwise, declarations are also allowed
358	insideRule = (indentLevel >= nestedLevel);
359	}
360	}
361	} else if (ch === '}') {
362	outdent();
363	print["}"](ch);
364	insideRule = false;
365	insidePropertyValue = false;
366	if (nestedLevel) {
367	nestedLevel--;
368	}
369	if (newline_between_rules && indentLevel === 0) {
370	print.newLine(true);
371	}
372	} else if (ch === ":") {
373	eatWhitespace();
374	if ((insideRule \|\| enteringConditionalGroup) &&
375	!(lookBack("&") \|\| foundNestedPseudoClass())) {
376	// 'property: value' delimiter
377	// which could be in a conditional group query
378	insidePropertyValue = true;
379	output.push(':');
380	print.singleSpace();
381	} else {
382	// sass/less parent reference don't use a space
383	// sass nested pseudo-class don't use a space
384	if (peek() === ":") {
385	// pseudo-element
386	next();
387	output.push("::");
388	} else {
389	// pseudo-class
390	output.push(':');
391	}
392	}
393	} else if (ch === '"' \|\| ch === '\'') {
394	print.preserveSingleSpace();
395	output.push(eatString(ch));
396	} else if (ch === ';') {
397	insidePropertyValue = false;
398	output.push(ch);
399	print.newLine();
400	} else if (ch === '(') { // may be a url
401	if (lookBack("url")) {
402	output.push(ch);
403	eatWhitespace();
404	if (next()) {
405	if (ch !== ')' && ch !== '"' && ch !== '\'') {
406	output.push(eatString(')'));
407	} else {
408	pos--;
409	}
410	}
411	} else {
412	parenLevel++;
413	print.preserveSingleSpace();
414	output.push(ch);
415	eatWhitespace();
416	}
417	} else if (ch === ')') {
418	output.push(ch);
419	parenLevel--;
420	} else if (ch === ',') {
421	output.push(ch);
422	eatWhitespace();
423	if (selectorSeparatorNewline && !insidePropertyValue && parenLevel < 1) {
424	print.newLine();
425	} else {
426	print.singleSpace();
427	}
428	} else if (ch === '>' \|\| ch === '+' \|\| ch === '~') {
429	//handl selector separator spacing
430	if (spaceAroundSelectorSeparator && !insidePropertyValue && parenLevel < 1) {
431	print.singleSpace();
432	output.push(ch);
433	print.singleSpace();
434	} else {
435	output.push(ch);
436	}
437	} else if (ch === ']') {
438	output.push(ch);
439	} else if (ch === '[') {
440	print.preserveSingleSpace();
441	output.push(ch);
442	} else if (ch === '=') { // no whitespace before or after
443	eatWhitespace();
444	ch = '=';
445	output.push(ch);
446	} else {
447	print.preserveSingleSpace();
448	output.push(ch);
449	}
450	}
451
452
453	var sweetCode = '';
454	if (basebaseIndentString) {
455	sweetCode += basebaseIndentString;
456	}
457
458	sweetCode += output.join('').replace(/[\r\n\t ]+$/, '');
459
460	// establish end_with_newline
461	if (end_with_newline) {
462	sweetCode += '\n';
463	}
464
465	if (eol !== '\n') {
466	sweetCode = sweetCode.replace(/[\n]/g, eol);
467	}
468
469	return sweetCode;
470	}
471
472	// https://developer.mozilla.org/en-US/docs/Web/CSS/At-rule
473	css_beautify.NESTED_AT_RULE = {
474	"@page": true,
475	"@font-face": true,
476	"@keyframes": true,
477	// also in CONDITIONAL_GROUP_RULE below
478	"@media": true,
479	"@supports": true,
480	"@document": true
481	};
482	css_beautify.CONDITIONAL_GROUP_RULE = {
483	"@media": true,
484	"@supports": true,
485	"@document": true
486	};
487	return {
488	css_beautify: css_beautify
489	};
490	});

Lines 19-30 define({//Default message bundle Link Here

(-)a/bundles/org.eclipse.orion.client.webtools/web/webtools/nls/root/messages.js (-4 / +53 lines)
19	'csslintValidator' : 'CSS Validator',	19	'csslintValidator' : 'CSS Validator',
20	'pluginName': 'Orion Web Tools Support',	20	'pluginName': 'Orion Web Tools Support',
21	'pluginDescription': 'This plug-in provides web language tools support for Orion, including HTML and CSS.',	21	'pluginDescription': 'This plug-in provides web language tools support for Orion, including HTML and CSS.',
22	'fontHoverExampleText': 'Lorem ipsum dolor...',	22	'fontHoverExampleText': 'Lorem ipsum dolor...',
		23	'cssFormatter' : 'CSS Formatter',
		24	'htmlFormatter' : 'HTML Formatter',
		25
		26	// CSS and HTML formatting options names
		27	'indentation_space' : 'space',
		28	'indentation_tab' : 'tab',
		29	'indentation_unix' : 'Unix',
		30	'indentation_mac' : 'Mac',
		31	'indentation_windows' : 'Windows',
		32	'collapse_preserve_inline' : 'Collapse Preserve inline',
		33	'collapse' : 'Collapse',
		34	'expand' : 'Expand',
		35	'end_expand' : 'End expand',
		36	'none' : 'None',
		37	'normal' : 'Normal',
		38	'keep' : 'Keep',
		39	'separate' : 'Separate',
		40	'auto' : 'Auto',
		41	'force' : 'Force',
		42
		43	// CSS Formatter Settings
		44	'cssFormattingSettings' : 'Formatting Settings for CSS',
		45	'cssFormatting' : 'CSS Formatting',
		46	'css_indent_size' : 'Indentation size:' ,
		47	'css_indent_char' : 'Indentation character:',
		48	'css_eol' : 'Charater(s) to use as line terminators:',
		49	'css_end_with_newline' : 'End ouput with newline:',
		50	'selector_separator_newline' : 'Add a newline between multiple selectors:',
		51	'newline_between_rules' : 'Add a newline between CSS rules:',
		52	'space_around_selector_separator' : 'Ensure space around selector separators:',
		53
		54	// HTML Formatter Settings
		55	'htmlFormattingOptions' : 'Formatting Settings for HTML',
		56	'htmlFormatting' : 'HTML Formatting',
		57	'html_indent_size' : 'Indentation size:',
		58	'html_indent_char' : 'Indentation character:',
		59	'html_eol' : 'Charater(s) to use as line terminators:',
		60	'html_end_with_newline' : 'End ouput with newline:',
		61	'html_preserve_new_lines' : 'Preserve line-breaks:',
		62	'html_max_preserve_new_lines' : 'Number of line-breaks to be preserved in one chunk:',
		63	'html_brace_style' : 'Brace Style:',
		64	'html_wrap_line_length' : 'Wrap lines at next opportunity after N characters: (0 for unlimited)',
		65	'indent_inner_html' : 'Indent <head> and <body> sections:',
		66	'indent_handlebars' : 'Format and indent {{#foo}} and {{/foo}}:',
		67	'wrap_attributes' : 'Wrap attributes to new lines:',
		68	'wrap_attributes_indent_size' : 'Indent wrapped attributes to after N characters:',
		69	'extra_liners' : 'List of tags that should have an extra newline before them (separate with commas):',
		70	'indent_scripts' : 'Indent scripts:',
		71
23		72
24	// Validator Severities	73	// Validator Severities
25	'ignore' : 'Ignore',	74	'ignore' : 'Ignore',
26	'warning' : 'Warning',	75	'warning' : 'Warning',
27	'error' : 'Error',	76	'error' : 'Error',
28		77
29	// CSS Validator Settings	78	// CSS Validator Settings
30	'adjoining-classes': 'Disallow adjoining classes:',	79	'adjoining-classes': 'Disallow adjoining classes:',

Lines 290-295 define({ Link Here

(-)a/bundles/org.eclipse.orion.client.javascript/web/javascript/nls/root/messages.js (+43 lines)
290	'jsDocAnyTypeDesc': ' - No type information',	290	'jsDocAnyTypeDesc': ' - No type information',
291	'jsDocAnyTypeDoc': 'Represents that no type information is known. The type is described as the \'any\' type.',	291	'jsDocAnyTypeDoc': 'Represents that no type information is known. The type is described as the \'any\' type.',
292		292
		293	'beautifierPluginName' : 'JSBeautify plugin for Tern',
		294	'beautifierPluginDescription' : 'Provides JS formatting for Tern',
		295	'javascriptFormatter' : 'Javascript Formatter',
		296
		297	// JS formatting settings
		298	'javascriptFormattingSettings' : 'Formatting Settings for Javascript',
		299	'javascriptFormatting' : 'Javascript Formatting',
		300	'js_indent_size' : 'Indention size:',
		301	'js_indent_char' : 'Indentation character:',
		302	'js_eol' : 'Charater(s) to use as line terminators:',
		303	'js_end_with_newline' : 'End ouput with newline:',
		304	'indentation_unix' : 'Unix',
		305	'indentation_mac' : 'Mac',
		306	'indentation_windows' : 'Windows',
		307	'indentation_space' : 'space',
		308	'indentation_tab' : 'tab',
		309	'jsFormattingSettings' : 'Formatting Settings for Javascript',
		310	'indent_level': 'Initial indentation level:',
		311	'before_newline' : 'Before new line',
		312	'after_newline' : 'After new line',
		313	'preserve_newline' : 'Preserve new line',
		314	'collapse_preserve_inline' : 'Collapse Preserve inline',
		315	'collapse' : 'Collapse',
		316	'expand' : 'Expand',
		317	'end_expand' : 'End expand',
		318	'none' : 'None',
		319	'js_preserve_newlines' : 'Preserve line-breaks:',
		320	'js_max_preserve_newlines' : 'Number of line-breaks to be preserved in one chunk:',
		321	'space_in_paren' : 'Add padding space within paren:',
		322	'space_in_empty_paren' : 'Add padding space in empty paren:',
		323	'space_after_anon_function' : "Add a space before an anonymous function's parens",
		324	'js_brace_style' : 'Brace Style:',
		325	'break_chained_methods' : 'Break chained method calls across subsequent lines:',
		326	'keep_array_indentation' : 'Preserve array indentation:',
		327	'space_before_conditional' : 'Space before condition:',
		328	'unescape_strings' : 'Decode printable characters encoded in xNN notation:',
		329	'js_wrap_line_length' : 'Wrap lines at next opportunity after N characters: (0 for unlimited)',
		330	'e4x' : 'Pass E4X xml literal through untouched:',
		331	'comma_first' : 'Put commas at the beginning of new line instead of end:',
		332	'operator_position' : 'Position for operator:',
		333
293	// Other messages	334	// Other messages
294	'unknownError': 'An unknown error occurred.',	335	'unknownError': 'An unknown error occurred.',
295	'failedDeleteRequest': 'Failed to delete file from Tern: ${0}',	336	'failedDeleteRequest': 'Failed to delete file from Tern: ${0}',
Lines 326-331 define({ Link Here
326	'serverNotStarted': 'The server has not been started. Request: \'${0}\'',	367	'serverNotStarted': 'The server has not been started. Request: \'${0}\'',
327	'failedToComputeProblems': 'Failed to compute ESLint problems/markers',	368	'failedToComputeProblems': 'Failed to compute ESLint problems/markers',
328	'failedToComputeOutline': 'Failed to compute outline',	369	'failedToComputeOutline': 'Failed to compute outline',
		370	'failedToFormat' : 'Failed to format',
		371	'failedToFormatNoServer' : 'Failed to format, server not started',
329		372
330	//Templates	373	//Templates
331	'eslintRuleEnableDisable': 'Enable or disable ESLint rule using the ```ruleid:0/1/2``` form.\n\nExample use:\n\n>```/* eslint semi:1, no-console:0, no-redeclare:2 */```',	374	'eslintRuleEnableDisable': 'Enable or disable ESLint rule using the ```ruleid:0/1/2``` form.\n\nExample use:\n\n>```/* eslint semi:1, no-console:0, no-redeclare:2 */```',

Lines 44-52 define([ Link Here

(-)a/bundles/org.eclipse.orion.client.javascript/web/javascript/plugins/ternDefaults.js (-3 / +8 lines)
44	"javascript/ternPlugins/redis",	44	"javascript/ternPlugins/redis",
45	"javascript/ternPlugins/refs",	45	"javascript/ternPlugins/refs",
46	"javascript/ternPlugins/templates",	46	"javascript/ternPlugins/templates",
47	"javascript/ternPlugins/quickfixes"	47	"javascript/ternPlugins/quickfixes",
		48	"javascript/ternPlugins/beautifier"
48	], function(Messages, ecma5, ecma6, ecma7, browser, chai) {	49	], function(Messages, ecma5, ecma6, ecma7, browser, chai) {
49
50	var defs = [ecma5, ecma6, ecma7, browser, chai];	50	var defs = [ecma5, ecma6, ecma7, browser, chai];
51	var defNames = ["ecma5", "ecma6", "ecma7", "browser", "chai"]; //these are in the same order to avoid a walk of the array	51	var defNames = ["ecma5", "ecma6", "ecma7", "browser", "chai"]; //these are in the same order to avoid a walk of the array
52		52
Lines 112-118 define([ Link Here
112	"name": Messages["templatesPlugin"],	112	"name": Messages["templatesPlugin"],
113	"description": Messages["templatesPluginDescription"],	113	"description": Messages["templatesPluginDescription"],
114	"version": "1.0"	114	"version": "1.0"
115	}	115	},
		116	"beautifier": {
		117	"name": Messages["beautifierPluginName"],
		118	"description": Messages["beautifierPluginDescription"],
		119	"version": "1.0"
		120	},
116	},	121	},
117	optional: {	122	optional: {
118	"amqp": {	123	"amqp": {

Lines 45-51 define([ Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/editorView.js (-2 / +4 lines)
45	'orion/metrics',	45	'orion/metrics',
46	'orion/commonPreferences',	46	'orion/commonPreferences',
47	'embeddedEditor/helper/memoryFileSysConst',	47	'embeddedEditor/helper/memoryFileSysConst',
48	'orion/objects'	48	'orion/objects',
		49	'orion/formatter'
49	], function(	50	], function(
50	messages,	51	messages,
51	mEditor, mEventTarget, mTextView, mTextModelFactory, mEditorFeatures, mHoverFactory, mContentAssist,	52	mEditor, mEventTarget, mTextView, mTextModelFactory, mEditorFeatures, mHoverFactory, mContentAssist,
Lines 54-60 define([ Link Here
54	mDispatcher, EditorContext, Highlight,	55	mDispatcher, EditorContext, Highlight,
55	mMarkOccurrences, mSyntaxchecker, LiveEditSession,	56	mMarkOccurrences, mSyntaxchecker, LiveEditSession,
56	mProblems, mBlamer, mDiffer,	57	mProblems, mBlamer, mDiffer,
57	mKeyBinding, util, Deferred, mContextMenu, mMetrics, mCommonPreferences, memoryFileSysConst, objects	58	mKeyBinding, util, Deferred, mContextMenu, mMetrics, mCommonPreferences, memoryFileSysConst, objects, mFormatter
58	) {	59	) {
59	var inMemoryFilePattern = memoryFileSysConst.MEMORY_FILE_PATTERN;	60	var inMemoryFilePattern = memoryFileSysConst.MEMORY_FILE_PATTERN;
60	var Dispatcher = mDispatcher.Dispatcher;	61	var Dispatcher = mDispatcher.Dispatcher;
Lines 511-516 define([ Link Here
511		512
512	this.blamer = new mBlamer.Blamer(serviceRegistry, inputManager, editor);	513	this.blamer = new mBlamer.Blamer(serviceRegistry, inputManager, editor);
513	this.differ = new mDiffer.Differ(serviceRegistry, inputManager, editor);	514	this.differ = new mDiffer.Differ(serviceRegistry, inputManager, editor);
		515	this.formatter = new mFormatter.Formatter(serviceRegistry, inputManager, editor);
514		516
515	this.problemService = new mProblems.ProblemService(serviceRegistry, this.problemsServiceID);	517	this.problemService = new mProblems.ProblemService(serviceRegistry, this.problemsServiceID);
516	var markerService = serviceRegistry.getService(this.problemsServiceID);	518	var markerService = serviceRegistry.getService(this.problemsServiceID);

Lines 20-55 define([ Link Here

(-)a/bundles/org.eclipse.orion.client.javascript/web/javascript/javascriptProject.js (-12 / +37 lines)
20	fileName === project.ESLINTRC_JSON \|\| fileName === project.PACKAGE_JSON) {	20	fileName === project.ESLINTRC_JSON \|\| fileName === project.PACKAGE_JSON) {
21	delete project.map.eslint;	21	delete project.map.eslint;
22	}	22	}
		23	if (fileName === project.JSBEAUTIFYRC) {
		24	delete project.map.formatting;
		25	}
23	},	26	},
24	/**	27	/**
25	* @callback	28	* @callback
26	*/	29	*/
27	onModified: function onModified(project, qualifiedName, fileName) {	30	onModified: function onModified(project, qualifiedName, fileName) {
28	this._update(project, fileName);	31	this._update(project, fileName);
29	},	32	},
30	/**	33	/**
31	* @callback	34	* @callback
32	*/	35	*/
33	onDeleted: function onDeleted(project, qualifiedName, fileName) {	36	onDeleted: function onDeleted(project, qualifiedName, fileName) {
34	this._update(project, fileName);	37	this._update(project, fileName);
35	},	38	},
36	/**	39	/**
37	* @callback	40	* @callback
38	*/	41	*/
39	onCreated: function onCreated(project, qualifiedName, fileName) {	42	onCreated: function onCreated(project, qualifiedName, fileName) {
40	this._update(project, fileName);	43	this._update(project, fileName);
41	},	44	},
42	/**	45	/**
43	* @callback	46	* @callback
44	*/	47	*/
45	onMoved: function onMoved(project, qualifiedName, fileName, toQualified, toName) {	48	onMoved: function onMoved(project, qualifiedName, fileName, toQualified, toName) {
46	this._update(project, fileName);	49	this._update(project, fileName);
47	},	50	},
48	/**	51	/**
49	* @callback	52	* @callback
50	*/	53	*/
51	onProjectChanged: function onProjectChanged(project, evnt, projectName) {	54	onProjectChanged: function onProjectChanged(project, evnt, projectName) {
52	delete project.map.eslint;	55	delete project.map.eslint;
		56	delete project.map.formatting;
53	}	57	}
54	};	58	};
55		59
Lines 114-120 define([ Link Here
114	* The node_modules folder name	118	* The node_modules folder name
115	*/	119	*/
116	JavaScriptProject.prototype.NODE_MODULES = 'node_modules';	120	JavaScriptProject.prototype.NODE_MODULES = 'node_modules';
117		121	/**
		122	* The .jsbeautifyrc file name
		123	* @see https://github.com/beautify-web/js-beautify/blob/master/README.md
		124	*/
		125	JavaScriptProject.prototype.JSBEAUTIFYRC = '.jsbeautifyrc';
		126
118	/**	127	/**
119	* @description Adds a handler for the given file name to the mapping of handlers	128	* @description Adds a handler for the given file name to the mapping of handlers
120	* @function	129	* @function
Lines 154-160 define([ Link Here
154	this.ecma = v.ecmaVersion;	163	this.ecma = v.ecmaVersion;
155	}	164	}
156	} catch(err) {	165	} catch(err) {
157	this.ecma = 6;	166	this.ecma = 6;
158	}	167	}
159	}	168	}
160	return this.ecma;	169	return this.ecma;
Lines 269-285 define([ Link Here
269	//TODO support loading YML and YAML files	278	//TODO support loading YML and YAML files
270	var vals;	279	var vals;
271	return this.getFile(this.ESLINTRC_JS).then(function(file) {	280	return this.getFile(this.ESLINTRC_JS).then(function(file) {
272	vals = readAndMap(this.map, file);	281	vals = readAndMap(this.map, file, "eslint");
273	if(vals) {	282	if(vals) {
274	return vals;	283	return vals;
275	}	284	}
276	return this.getFile(this.ESLINTRC_JSON).then(function(file) {	285	return this.getFile(this.ESLINTRC_JSON).then(function(file) {
277	vals = readAndMap(this.map, file);	286	vals = readAndMap(this.map, file, "eslint");
278	if(vals) {	287	if(vals) {
279	return vals;	288	return vals;
280	}	289	}
281	return this.getFile(this.ESLINTRC).then(function(file) {	290	return this.getFile(this.ESLINTRC).then(function(file) {
282	vals = readAndMap(this.map, file);	291	vals = readAndMap(this.map, file, "eslint");
283	if(vals) {	292	if(vals) {
284	return vals;	293	return vals;
285	}	294	}
Lines 298-310 define([ Link Here
298	}.bind(this));	307	}.bind(this));
299	};	308	};
300		309
301	function readAndMap(map, file) {	310	/**
		311	* @name JavaScriptProject.prototype.getFormattingOptions
		312	* @description Returns project-specific formatting options (if any)
		313	* @function
		314	* @returns {Deferred} A deferred that will resolve to the project-specific formatting options or null
		315	* @see https://github.com/beautify-web/js-beautify
		316	*/
		317	JavaScriptProject.prototype.getFormattingOptions = function getESlintOptions() {
		318	if(this.map.formatting) {
		319	return new Deferred().resolve(this.map.formatting);
		320	}
		321	return this.getFile(this.JSBEAUTIFYRC).then(function(file) {
		322	return readAndMap(this.map, file, "formatting");
		323	}.bind(this));
		324	};
		325
		326	function readAndMap(map, file, key) {
302	if(file && file.contents) {	327	if(file && file.contents) {
303	try {	328	try {
304	var vals = JSON.parse(file.contents);	329	var vals = JSON.parse(file.contents);
305	if(Object.keys(vals).length > 0) {	330	if(Object.keys(vals).length > 0) {
306	map.eslint = vals;	331	map[key]= vals;
307	return map.eslint;	332	return map[key];
308	}	333	}
309	} catch(e) {	334	} catch(e) {
310	//fall through and return null	335	//fall through and return null

Lines 149-154 define([ Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/editorCommands.js (+27 lines)
149	this.editorPreferences = options.editorPreferences;	149	this.editorPreferences = options.editorPreferences;
150	this.differ = options.differ;	150	this.differ = options.differ;
151	this.blamer = options.blamer;	151	this.blamer = options.blamer;
		152	this.formatter = options.formatter;
152	var that = this;	153	var that = this;
153	this.listener = {	154	this.listener = {
154	onServiceAdded: function(event) {	155	onServiceAdded: function(event) {
Lines 177-182 define([ Link Here
177	this._createClipboardCommands();	178	this._createClipboardCommands();
178	this._createDelimiterCommands();	179	this._createDelimiterCommands();
179	this._createEncodingCommand();	180	this._createEncodingCommand();
		181	this._createFormatterCommand();
180	this._createSaveCommand();	182	this._createSaveCommand();
181	this._createOpenFolderCommand();	183	this._createOpenFolderCommand();
182	this._createOpenRecentCommand();	184	this._createOpenRecentCommand();
Lines 223-228 define([ Link Here
223	this.localSettings = target.localSettings;	225	this.localSettings = target.localSettings;
224	this.differ = target.differ;	226	this.differ = target.differ;
225	this.blamer = target.blamer;	227	this.blamer = target.blamer;
		228	this.formatter = target.formatter;
226	this.textSearcher = target.textSearcher;	229	this.textSearcher = target.textSearcher;
227		230
228	if (this._recreateEditCommands) {	231	if (this._recreateEditCommands) {
Lines 264-269 define([ Link Here
264	commandRegistry.registerCommandContribution(this.saveToolbarId \|\| this.toolbarId, "orion.edit.save", 2, this.saveToolbarId ? "orion.menuBarFileGroup/orion.edit.saveGroup" : null, false, new mKeyBinding.KeyBinding('s', true), null, this); //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-3$	267	commandRegistry.registerCommandContribution(this.saveToolbarId \|\| this.toolbarId, "orion.edit.save", 2, this.saveToolbarId ? "orion.menuBarFileGroup/orion.edit.saveGroup" : null, false, new mKeyBinding.KeyBinding('s', true), null, this); //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-3$
265	commandRegistry.registerCommandContribution(this.editToolbarId \|\| this.pageNavId, "orion.edit.gotoLine", 3, this.editToolbarId ? "orion.menuBarEditGroup/orion.findGroup" : null, !this.editToolbarId, new mKeyBinding.KeyBinding('l', !util.isMac, false, false, util.isMac), new mCommandRegistry.URLBinding("gotoLine", "line"), this); //$NON-NLS-4$ //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-5$	268	commandRegistry.registerCommandContribution(this.editToolbarId \|\| this.pageNavId, "orion.edit.gotoLine", 3, this.editToolbarId ? "orion.menuBarEditGroup/orion.findGroup" : null, !this.editToolbarId, new mKeyBinding.KeyBinding('l', !util.isMac, false, false, util.isMac), new mCommandRegistry.URLBinding("gotoLine", "line"), this); //$NON-NLS-4$ //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-5$
266	commandRegistry.registerCommandContribution(this.editToolbarId \|\| this.pageNavId, "orion.edit.find", 0, this.editToolbarId ? "orion.menuBarEditGroup/orion.findGroup" : null, !this.editToolbarId, new mKeyBinding.KeyBinding('f', true), new mCommandRegistry.URLBinding("find", "find"), this); //$NON-NLS-4$ //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-5$	269	commandRegistry.registerCommandContribution(this.editToolbarId \|\| this.pageNavId, "orion.edit.find", 0, this.editToolbarId ? "orion.menuBarEditGroup/orion.findGroup" : null, !this.editToolbarId, new mKeyBinding.KeyBinding('f', true), new mCommandRegistry.URLBinding("find", "find"), this); //$NON-NLS-4$ //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-5$
		270	commandRegistry.registerCommandContribution(this.editToolbarId \|\| this.pageNavId , "orion.edit.format", 1, this.editToolbarId ? "orion.menuBarEditGroup/orion.edit.formatGroup" : null, !this.editToolbarId, new mKeyBinding.KeyBinding('f', false, true, true), new mCommandRegistry.URLBinding("format", "format"), this); //$NON-NLS-4$ //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-5$
267	commandRegistry.registerCommandContribution(this.toolbarId, "orion.keyAssist", 0, "orion.menuBarToolsGroup", false, new mKeyBinding.KeyBinding(191, false, true, true)); //$NON-NLS-1$ //$NON-NLS-0$ //$NON-NLS-2$	271	commandRegistry.registerCommandContribution(this.toolbarId, "orion.keyAssist", 0, "orion.menuBarToolsGroup", false, new mKeyBinding.KeyBinding(191, false, true, true)); //$NON-NLS-1$ //$NON-NLS-0$ //$NON-NLS-2$
268	commandRegistry.registerCommandContribution(this.toolbarId , "orion.edit.showTooltip", 1, "orion.menuBarToolsGroup", false, new mKeyBinding.KeyBinding(113), null, this);//$NON-NLS-1$ //$NON-NLS-2$	272	commandRegistry.registerCommandContribution(this.toolbarId , "orion.edit.showTooltip", 1, "orion.menuBarToolsGroup", false, new mKeyBinding.KeyBinding(113), null, this);//$NON-NLS-1$ //$NON-NLS-2$
269	commandRegistry.registerCommandContribution(this.toolbarId , "orion.edit.blame", 2, "orion.menuBarToolsGroup", false, new mKeyBinding.KeyBinding('b', true, true), new mCommandRegistry.URLBinding("blame", "blame"), this); //$NON-NLS-4$ //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-5$	273	commandRegistry.registerCommandContribution(this.toolbarId , "orion.edit.blame", 2, "orion.menuBarToolsGroup", false, new mKeyBinding.KeyBinding('b', true, true), new mCommandRegistry.URLBinding("blame", "blame"), this); //$NON-NLS-4$ //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-5$
Lines 318-323 define([ Link Here
318	commandRegistry.registerCommandContribution(this.editorContextMenuId, "orion.edit.gotoLine", index++, "orion.editorContextMenuGroup/orion.findGroup", false); //$NON-NLS-1$ //$NON-NLS-2$	322	commandRegistry.registerCommandContribution(this.editorContextMenuId, "orion.edit.gotoLine", index++, "orion.editorContextMenuGroup/orion.findGroup", false); //$NON-NLS-1$ //$NON-NLS-2$
319	commandRegistry.registerCommandContribution(this.editorContextMenuId, "orion.quickSearch", index++, "orion.editorContextMenuGroup/orion.findGroup", false); //$NON-NLS-1$ //$NON-NLS-2$	323	commandRegistry.registerCommandContribution(this.editorContextMenuId, "orion.quickSearch", index++, "orion.editorContextMenuGroup/orion.findGroup", false); //$NON-NLS-1$ //$NON-NLS-2$
320	commandRegistry.registerCommandContribution(this.editorContextMenuId, "orion.openSearch", index++, "orion.editorContextMenuGroup/orion.findGroup", false); //$NON-NLS-1$ //$NON-NLS-2$	324	commandRegistry.registerCommandContribution(this.editorContextMenuId, "orion.openSearch", index++, "orion.editorContextMenuGroup/orion.findGroup", false); //$NON-NLS-1$ //$NON-NLS-2$
		325	commandRegistry.registerCommandContribution(this.editorContextMenuId , "orion.edit.format", index++, "orion.editorContextMenuGroup/orion.edit.formatGroup", false); //$NON-NLS-4$ //$NON-NLS-3$ //$NON-NLS-2$
321		326
322	// 'Tools' cascade	327	// 'Tools' cascade
323	commandRegistry.addCommandGroup(this.editorContextMenuId, "orion.editorContextMenuToolsGroup", 400, messages["Tools"], "orion.editorContextMenuGroup"); //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-0$	328	commandRegistry.addCommandGroup(this.editorContextMenuId, "orion.editorContextMenuToolsGroup", 400, messages["Tools"], "orion.editorContextMenuGroup"); //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-0$
Lines 910-915 define([ Link Here
910	this.commandService.addCommand(blameCommand);	915	this.commandService.addCommand(blameCommand);
911	},	916	},
912		917
		918	_createFormatterCommand: function(){
		919	var that = this;
		920	var formatterCommand = new mCommands.Command({
		921	name: messages.Format,
		922	tooltip: messages.FormatTooltip,
		923	id: "orion.edit.format", //$NON-NLS-0$
		924	parameters: new mCommandRegistry.ParametersDescription([new mCommandRegistry.CommandParameter('formatter', 'boolean')], {clientCollect: true}), //$NON-NLS-1$ //$NON-NLS-0$
		925	visibleWhen: /** @callback */ function(items, data) {
		926	var editor = data.handler.editor \|\| that.editor;
		927	var formatter = data.handler.formatter \|\| that.formatter;
		928	return editor && editor.installed && formatter && formatter.isVisible();
		929	},
		930	callback: function(data) {
		931	var editor = this.editor \|\| that.editor;
		932	var formatter = this.formatter \|\| that.formatter;
		933	formatter.doFormat();
		934	editor.focus();
		935	}
		936	});
		937	this.commandService.addCommand(formatterCommand);
		938	},
		939
913	_createDiffCommand: function(){	940	_createDiffCommand: function(){
914	var that = this;	941	var that = this;
915	var diffCommand = new mCommands.Command({	942	var diffCommand = new mCommands.Command({

Lines 21-26 define([ Link Here

(-)a/bundles/org.eclipse.orion.client.javascript/web/javascript/plugins/javascriptPlugin.js (-6 / +187 lines)
21	'javascript/scriptResolver',	21	'javascript/scriptResolver',
22	'javascript/astManager',	22	'javascript/astManager',
23	'javascript/quickFixes',	23	'javascript/quickFixes',
		24	'javascript/javascriptFormatter',
24	'javascript/javascriptProject',	25	'javascript/javascriptProject',
25	'javascript/contentAssist/ternAssist',	26	'javascript/contentAssist/ternAssist',
26	'javascript/contentAssist/ternProjectAssist',	27	'javascript/contentAssist/ternProjectAssist',
Lines 45-51 define([ Link Here
45	'i18n!javascript/nls/messages',	46	'i18n!javascript/nls/messages',
46	'orion/i18nUtil',	47	'orion/i18nUtil',
47	'orion/URL-shim'	48	'orion/URL-shim'
48	], function(PluginProvider, mServiceRegistry, Deferred, ScriptResolver, ASTManager, QuickFixes, JavaScriptProject, TernAssist, TernProjectAssist,	49	], function(PluginProvider, mServiceRegistry, Deferred, ScriptResolver, ASTManager, QuickFixes, JavaScriptFormatter, JavaScriptProject, TernAssist, TernProjectAssist,
49	EslintValidator, TernProjectValidator, Occurrences, Hover, Outliner, CUProvider, TernProjectManager, Util, Logger, GenerateDocCommand, OpenDeclCommand, OpenImplCommand,	50	EslintValidator, TernProjectValidator, Occurrences, Hover, Outliner, CUProvider, TernProjectManager, Util, Logger, GenerateDocCommand, OpenDeclCommand, OpenImplCommand,
50	RenameCommand, RefsCommand, mJS, mJSON, mJSONSchema, mEJS, javascriptMessages, i18nUtil) {	51	RenameCommand, RefsCommand, mJS, mJSON, mJSONSchema, mEJS, javascriptMessages, i18nUtil) {
51		52
Lines 69-75 define([ Link Here
69	}, {id: "application/json", //$NON-NLS-1$	70	}, {id: "application/json", //$NON-NLS-1$
70	"extends": "text/plain", //$NON-NLS-1$ //$NON-NLS-1$	71	"extends": "text/plain", //$NON-NLS-1$ //$NON-NLS-1$
71	name: "JSON", //$NON-NLS-1$	72	name: "JSON", //$NON-NLS-1$
72	extension: ["json", "pref", "tern-project", "eslintrc"], //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$	73	extension: ["json", "pref", "tern-project", "eslintrc", "jsbeautifyrc"], //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
73	imageClass: "file-sprite-javascript modelDecorationSprite" //$NON-NLS-1$	74	imageClass: "file-sprite-javascript modelDecorationSprite" //$NON-NLS-1$
74	}, {id: "application/x-ejs", //$NON-NLS-1$	75	}, {id: "application/x-ejs", //$NON-NLS-1$
75	"extends": "text/plain", //$NON-NLS-1$ //$NON-NLS-1$	76	"extends": "text/plain", //$NON-NLS-1$ //$NON-NLS-1$
Lines 680-686 define([ Link Here
680	]	681	]
681	}	682	}
682	);	683	);
683		684
684	provider.registerServiceProvider("orion.edit.command", //$NON-NLS-1$	685	provider.registerServiceProvider("orion.edit.command", //$NON-NLS-1$
685	quickFixComputer,	686	quickFixComputer,
686	{	687	{
Lines 1496-1502 define([ Link Here
1496	name: javascriptMessages['prefBestPractices'],	1497	name: javascriptMessages['prefBestPractices'],
1497	tags: "validation javascript js eslint".split(" "), //$NON-NLS-1$ //$NON-NLS-1$	1498	tags: "validation javascript js eslint".split(" "), //$NON-NLS-1$ //$NON-NLS-1$
1498	category: 'javascript', //$NON-NLS-1$	1499	category: 'javascript', //$NON-NLS-1$
1499	categoryLabel: javascriptMessages['javascriptValidation'],	1500	categoryLabel: javascriptMessages['javascriptValidation'],
1500	properties: [	1501	properties: [
1501	{	1502	{
1502	id: "no-eq-null", //$NON-NLS-1$	1503	id: "no-eq-null", //$NON-NLS-1$
Lines 1753-1761 define([ Link Here
1753	defaultValue: warning,	1754	defaultValue: warning,
1754	options: severities	1755	options: severities
1755	}	1756	}
1756	]	1757	]
1757	}]	1758	}]
1758	});	1759	});
		1760
		1761	var jsFormatter = new JavaScriptFormatter.JavaScriptFormatter(ternWorker, jsProject);
		1762	provider.registerServiceProvider("orion.edit.format",
		1763	jsFormatter,
		1764	{
		1765	name: javascriptMessages["javascriptFormatter"],
		1766	contentType: ["application/javascript"],
		1767	id: "orion.format.js.formatter",
		1768	}
		1769	);
		1770	// register preferences for formatting when modified (updated call)
		1771	provider.registerService("orion.cm.managedservice", jsFormatter, {pid: 'jsbeautify.config.js'}); //$NON-NLS-1$ //$NON-NLS-2$
		1772
		1773	var unix = "\n";
		1774	var mac = "\r";
		1775	var windows = "\n\r";
		1776	var eof_characters = [
		1777	{label: javascriptMessages.indentation_unix, value: unix},
		1778	{label: javascriptMessages.indentation_mac, value: mac},
		1779	{label: javascriptMessages.indentation_windows, value: windows}
		1780	];
		1781
		1782	var space = ' ';
		1783	var tab= '\t';
		1784	var indentation_characters = [
		1785	{label: javascriptMessages.indentation_space, value: space},
		1786	{label: javascriptMessages.indentation_tab, value: tab},
		1787	];
		1788
		1789	var before_newline = 'before-newline';
		1790	var after_newline = 'after-newline';
		1791	var preserve_newline = 'preserve-newline';
		1792	var operator_positions = [
		1793	{ label: javascriptMessages.before_newline, value: before_newline},
		1794	{ label: javascriptMessages.after_newline, value: after_newline},
		1795	{ label: javascriptMessages.preserve_newline, value: preserve_newline},
		1796	];
		1797
		1798	var collapse_preserve_inline = 'collapse-preserve-inline';
		1799	var collapse = 'collapse';
		1800	var expand = 'expand';
		1801	var end_expand = 'end-expand';
		1802	var none = 'none';
		1803	var brace_styles = [
		1804	{ label: javascriptMessages.collapse_preserve_inline , value: collapse_preserve_inline},
		1805	{ label: javascriptMessages.collapse , value: collapse},
		1806	{ label: javascriptMessages.expand , value: expand},
		1807	{ label: javascriptMessages.end_expand , value: end_expand},
		1808	{ label: javascriptMessages.none , value: none},
		1809	];
		1810	provider.registerServiceProvider("orion.core.setting", {}, {
		1811	settings: [
		1812	{
		1813	pid: 'jsbeautify.config.js',//$NON-NLS-1$
		1814	name: javascriptMessages['javascriptFormattingSettings'],//$NON-NLS-1$
		1815	tags: 'beautify javascript js formatting'.split(' '),//$NON-NLS-1$//$NON-NLS-2$
		1816	category: 'javascriptFormatting',//$NON-NLS-1$
		1817	categoryLabel: javascriptMessages['javascriptFormatting'],//$NON-NLS-1$
		1818	properties: [
		1819	{
		1820	id: 'js_indent_size', //$NON-NLS-1$
		1821	name: javascriptMessages['js_indent_size'],//$NON-NLS-1$
		1822	type: 'number', //$NON-NLS-1$
		1823	defaultValue: 4
1824	},
1825	{
1826	id: 'js_indent_char', //$NON-NLS-1$
1827	name: javascriptMessages['js_indent_char'],//$NON-NLS-1$
1828	type: 'string', //$NON-NLS-1$
1829	defaultValue: space,
1830	options: indentation_characters
1831	},
1832	{
1833	id: 'js_eol', //$NON-NLS-1$
1834	name: javascriptMessages['js_eol'],//$NON-NLS-1$
1835	type: 'string', //$NON-NLS-1$
1836	defaultValue: unix,
1837	options: eof_characters
1838	},
1839	{
1840	id: 'js_end_with_newline', //$NON-NLS-1$
1841	name: javascriptMessages['js_end_with_newline'],//$NON-NLS-1$
1842	type: 'boolean', //$NON-NLS-1$
1843	defaultValue: false
1844	},
1845	{
1846	id: 'js_preserve_newlines', //$NON-NLS-1$
1847	name: javascriptMessages['js_preserve_newlines'],//$NON-NLS-1$
1848	type: 'boolean', //$NON-NLS-1$
1849	defaultValue: true
1850	},
1851	{
1852	id: 'js_max_preserve_newlines', //$NON-NLS-1$
1853	name: javascriptMessages['js_max_preserve_newlines'],//$NON-NLS-1$
1854	type: 'number', //$NON-NLS-1$
1855	defaultValue: 10
1856	},
1857	{
1858	id: 'js_brace_style', //$NON-NLS-1$
1859	name: javascriptMessages['js_brace_style'],//$NON-NLS-1$
1860	type: 'boolean', //$NON-NLS-1$
1861	defaultValue: collapse,
1862	options: brace_styles
1863	},
1864	{
1865	id: 'js_wrap_line_length', //$NON-NLS-1$
1866	name: javascriptMessages['js_wrap_line_length'],//$NON-NLS-1$
1867	type: 'number', //$NON-NLS-1$
1868	defaultValue: 0
1869	},
1870	{
1871	id: 'indent_level', //$NON-NLS-1$
1872	name: javascriptMessages['indent_level'],//$NON-NLS-1$
1873	type: 'number', //$NON-NLS-1$
1874	defaultValue: 0
1875	},
1876	{
1877	id: 'space_in_paren', //$NON-NLS-1$
1878	name: javascriptMessages['space_in_paren'],//$NON-NLS-1$
1879	type: 'boolean', //$NON-NLS-1$
1880	defaultValue: false
1881	},
1882	{
1883	id: 'space_in_empty_paren', //$NON-NLS-1$
1884	name: javascriptMessages['space_in_empty_paren'],//$NON-NLS-1$
1885	type: 'boolean', //$NON-NLS-1$
1886	defaultValue: false
1887	},
1888	{
1889	id: 'space_after_anon_function', //$NON-NLS-1$
1890	name: javascriptMessages['space_after_anon_function'],//$NON-NLS-1$
1891	type: 'boolean', //$NON-NLS-1$
1892	defaultValue: false
1893	},
1894	{
1895	id: 'break_chained_methods', //$NON-NLS-1$
1896	name: javascriptMessages['break_chained_methods'],//$NON-NLS-1$
1897	type: 'boolean', //$NON-NLS-1$
1898	defaultValue: false
1899	},
1900	{
1901	id: 'keep_array_indentation', //$NON-NLS-1$
1902	name: javascriptMessages['keep_array_indentation'],//$NON-NLS-1$
1903	type: 'boolean', //$NON-NLS-1$
1904	defaultValue: false
1905	},
1906	{
1907	id: 'space_before_conditional', //$NON-NLS-1$
1908	name: javascriptMessages['space_before_conditional'],//$NON-NLS-1$
1909	type: 'boolean', //$NON-NLS-1$
1910	defaultValue: true
1911	},
1912	{
1913	id: 'unescape_strings', //$NON-NLS-1$
1914	name: javascriptMessages['unescape_strings'],//$NON-NLS-1$
1915	type: 'boolean', //$NON-NLS-1$
1916	defaultValue: false
1917	},
1918	{
1919	id: 'e4x', //$NON-NLS-1$
1920	name: javascriptMessages['e4x'],//$NON-NLS-1$
1921	type: 'boolean', //$NON-NLS-1$
1922	defaultValue: false
1923	},
1924	{
1925	id: 'comma_first', //$NON-NLS-1$
1926	name: javascriptMessages['comma_first'],//$NON-NLS-1$
1927	type: 'boolean', //$NON-NLS-1$
1928	defaultValue: false
1929	},
1930	{
1931	id: 'operator_position', //$NON-NLS-1$
1932	name: javascriptMessages['operator_position'],//$NON-NLS-1$
1933	type: 'string', //$NON-NLS-1$
1934	defaultValue: before_newline,
1935	options: operator_positions
1936	},
1937	]
1938	}]
1939	});
1759		1940
1760	/**	1941	/**
1761	* Register syntax styling for js, json and json schema content	1942	* Register syntax styling for js, json and json schema content