Fix WSH-related bug: don't use array.indexOf()

Infocatcher · Nov 23, 2015 · f20d1e3 · f20d1e3
1 parent 8a92a0f
commit f20d1e3
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/jsBeautifier.js b/jsBeautifier.js
@@ -997,7 +997,7 @@ function detectXMLType(str) {
             // a.b('c',
             //     () => d.e
             // )
-            if (current_token.text === '(' && ['TK_WORD', 'TK_RESERVED'].indexOf(last_type) === -1) {
+            if (current_token.text === '(' && last_type !== 'TK_WORD' && last_type !== 'TK_RESERVED') {
                 allow_wrap_or_preserved_newline();
             }
 
@@ -8046,6 +8046,13 @@ function convertSource(file, text) {
 				"$&        tl.restore();\r\n"
 			);
 	}
+	else if(file == "js/lib/beautify.js") {
+		text = text
+			.replace(
+				"['TK_WORD', 'TK_RESERVED'].indexOf(last_type) === -1",
+				"last_type !== 'TK_WORD' && last_type !== 'TK_RESERVED'"
+			);
+	}
 	return text;
 }
 function selfUpdate() {