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

Merge pull request #757 from rvanvelzen/semicolon-fix

Browse Source 
Fix semicolon printing when restricting max line length
This commit is contained in:
Mihai Bazon
2015-07-30 17:25:13 +03:00
parent 3afad58a93 66761d7ecf
commit ab15d676d7
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/output.js
View File

@@ -161,6 +161,8 @@ function OutputStream(options) {
str = String(str); str = String(str);
var ch = str.charAt(0); var ch = str.charAt(0);
if (might_need_semicolon) { if (might_need_semicolon) {
might_need_semicolon = false;
if ((!ch || ";}".indexOf(ch) < 0) && !/[;]$/.test(last)) { if ((!ch || ";}".indexOf(ch) < 0) && !/[;]$/.test(last)) {
if (options.semicolons || requireSemicolonChars(ch)) { if (options.semicolons || requireSemicolonChars(ch)) {
OUTPUT += ";"; OUTPUT += ";";
@@ -171,11 +173,17 @@ function OutputStream(options) {
current_pos++; current_pos++;
current_line++; current_line++;
current_col = 0; current_col = 0;
if (/^\s+$/.test(str)) {
// reset the semicolon flag, since we didn't print one
// now and might still have to later
might_need_semicolon = true;
}
} }
if (!options.beautify) if (!options.beautify)
might_need_space = false; might_need_space = false;
} }
might_need_semicolon = false;
} }
if (!options.beautify && options.preserve_line && stack[stack.length - 1]) { if (!options.beautify && options.preserve_line && stack[stack.length - 1]) {