Merge pull request #2128 from PierceLBrooks/plb_fix-minor-crash

Fix minor crash for certain oddly formed *.js files

Author: bitwiseman

js/src/javascript/tokenizer.js

@@ -371,7 +371,7 @@ Tokenizer.prototype._allow_regexp_or_xml = function(previous_token) {
   // regex and xml can only appear in specific locations during parsing
   return (previous_token.type === TOKEN.RESERVED && in_array(previous_token.text, ['return', 'case', 'throw', 'else', 'do', 'typeof', 'yield'])) ||
     (previous_token.type === TOKEN.END_EXPR && previous_token.text === ')' &&
-      previous_token.opened.previous.type === TOKEN.RESERVED && in_array(previous_token.opened.previous.text, ['if', 'while', 'for'])) ||
+      previous_token.opened && previous_token.opened.previous.type === TOKEN.RESERVED && in_array(previous_token.opened.previous.text, ['if', 'while', 'for'])) ||
     (in_array(previous_token.type, [TOKEN.COMMENT, TOKEN.START_EXPR, TOKEN.START_BLOCK, TOKEN.START,
       TOKEN.END_BLOCK, TOKEN.OPERATOR, TOKEN.EQUALS, TOKEN.EOF, TOKEN.SEMICOLON, TOKEN.COMMA
     ]));

python/jsbeautifier/javascript/tokenizer.py

@@ -523,6 +523,7 @@ def allowRegExOrXML(self, previous_token):
             or (
                 previous_token.type == TOKEN.END_EXPR
                 and previous_token.text == ")"
+                and previous_token.opened != None
                 and previous_token.opened.previous.type == TOKEN.RESERVED
                 and previous_token.opened.previous.text in {"if", "while", "for"}
             )

test/data/javascript/tests.js

@@ -5890,6 +5890,14 @@ exports.test_data = {
           comment: 'Issue #1896: Handle newlines with bitwise ~ operator',
           input: 'if (foo) {\nvar bar = 1;\n~bar ? 0 : 1\n }',
           output: 'if (foo) {\n    var bar = 1;\n    ~bar ? 0 : 1\n}'
+        },
+
+        {
+          comment: 'Issue #2128 - NPE in python implementation',
+          fragment: true,
+          unchanged: [
+            ') / a / g'
+          ]
         }
       ]
     }