JoBoEVD/UglifyJS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 9703ac3e2b into 81603ecd15

Browse Source
This commit is contained in:
TobbeLino 2018-04-04 16:19:24 +00:00 committed by GitHub
commit 3e89401092
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/output.js
View File

@ -109,6 +109,7 @@ function OutputStream(options) {
var current_line = 1; var current_line = 1;
var current_pos = 0; var current_pos = 0;
var OUTPUT = ""; var OUTPUT = "";
var LAST_OUTPUT_FRAGMENT = "";
var to_utf8 = options.ascii_only ? function(str, identifier) { var to_utf8 = options.ascii_only ? function(str, identifier) {
return str.replace(/[\u0000-\u001f\u007f-\uffff]/g, function(ch) { return str.replace(/[\u0000-\u001f\u007f-\uffff]/g, function(ch) {
@ -233,7 +234,7 @@ function OutputStream(options) {
if (current_col > options.max_line_len) { if (current_col > options.max_line_len) {
if (might_add_newline) { if (might_add_newline) {
var left = OUTPUT.slice(0, might_add_newline); var left = OUTPUT.slice(0, might_add_newline);
var right = OUTPUT.slice(might_add_newline); var right = LAST_OUTPUT_FRAGMENT = OUTPUT.slice(might_add_newline);
if (mappings) { if (mappings) {
var delta = right.length - current_col; var delta = right.length - current_col;
mappings.forEach(function(mapping) { mappings.forEach(function(mapping) {
@ -297,6 +298,7 @@ function OutputStream(options) {
might_need_semicolon = true; might_need_semicolon = true;
} }
} }
LAST_OUTPUT_FRAGMENT = "";
if (!options.beautify) if (!options.beautify)
might_need_space = false; might_need_space = false;
@ -308,6 +310,7 @@ function OutputStream(options) {
while (current_line < target_line) { while (current_line < target_line) {
ensure_line_len(); ensure_line_len();
OUTPUT += "\n"; OUTPUT += "\n";
LAST_OUTPUT_FRAGMENT = "";
current_pos++; current_pos++;
current_line++; current_line++;
current_col = 0; current_col = 0;
@ -322,6 +325,7 @@ function OutputStream(options) {
|| ((ch == "+" || ch == "-") && ch == last)) || ((ch == "+" || ch == "-") && ch == last))
{ {
OUTPUT += " "; OUTPUT += " ";
LAST_OUTPUT_FRAGMENT = "";
current_col++; current_col++;
current_pos++; current_pos++;
} }
@ -339,7 +343,7 @@ function OutputStream(options) {
if (!might_add_newline) do_add_mapping(); if (!might_add_newline) do_add_mapping();
} }
OUTPUT += str; OUTPUT += LAST_OUTPUT_FRAGMENT = str;
current_pos += str.length; current_pos += str.length;
var a = str.split(/\r?\n/), n = a.length - 1; var a = str.split(/\r?\n/), n = a.length - 1;
current_line += n; current_line += n;
@ -375,7 +379,7 @@ function OutputStream(options) {
var newline = options.beautify ? function() { var newline = options.beautify ? function() {
if (newline_insert < 0) return print("\n"); if (newline_insert < 0) return print("\n");
if (OUTPUT[newline_insert] != "\n") { if (OUTPUT[newline_insert] != "\n") {
OUTPUT = OUTPUT.slice(0, newline_insert) + "\n" + OUTPUT.slice(newline_insert); OUTPUT = OUTPUT.slice(0, newline_insert) + "\n" + (LAST_OUTPUT_FRAGMENT = OUTPUT.slice(newline_insert));
current_pos++; current_pos++;
current_line++; current_line++;
} }
@ -576,7 +580,7 @@ function OutputStream(options) {
indentation : function() { return indentation }, indentation : function() { return indentation },
current_width : function() { return current_col - indentation }, current_width : function() { return current_col - indentation },
should_break : function() { return options.width && this.current_width() >= options.width }, should_break : function() { return options.width && this.current_width() >= options.width },
has_parens : function() { return OUTPUT[OUTPUT.length - 1] == "(" }, has_parens : function() { return LAST_OUTPUT_FRAGMENT[LAST_OUTPUT_FRAGMENT.length - 1] == "(" },
newline : newline, newline : newline,
print : print, print : print,
space : space, space : space,