basic recovery from inability to parse function body

msridhar · Jul 18, 2013 · a18a0d2 · a18a0d2
1 parent 0d1a73b
commit a18a0d2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/bundles/org.eclipse.orion.client.ui/web/esprima/esprima.js b/bundles/org.eclipse.orion.client.ui/web/esprima/esprima.js
@@ -3587,6 +3587,8 @@ parseStatement: true, parseSourceElement: true */
         if (extra.errors) {
             parseStatement = wrapThrowParseStatement(parseStatement);
             parseExpression = wrapThrow(parseExpression);
+            // recover from bad function body
+            parseFunctionSourceElements = wrapThrow(parseFunctionSourceElements);
             // this enables 'foo.<EOF>' to return something
             parseNonComputedProperty = wrapThrow(parseNonComputedProperty);
             consumeSemicolon = wrapThrow(consumeSemicolon);

diff --git a/bundles/org.eclipse.orion.client.ui/web/plugins/esprima/esprimaJsContentAssist.js b/bundles/org.eclipse.orion.client.ui/web/plugins/esprima/esprimaJsContentAssist.js
@@ -781,10 +781,12 @@ define(["plugins/esprima/esprimaVisitor", "plugins/esprima/types", "plugins/espr
 					callArgs[i] = paramTypes[i];
 				}
 			}
-			if (!node.body.extras) {
-				node.body.extras = {};
+			if (node.body) {
+				if (!node.body.extras) {
+					node.body.extras = {};
+				}
+				node.body.extras.isConstructor = isConstructor;
 			}
-			node.body.extras.isConstructor = isConstructor;
 
 			// add parameters to the current scope
 			var paramTypeObjs = [];