[WIP] fix lambda recovery in the completion parser

Signed-off-by: David Thompson <[email protected]>

Author: datho7561

org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionParser.java

@@ -6326,6 +6326,12 @@ protected CompilationUnitDeclaration endParse(int act) {
 						}
 						element = element.parent;
 					}
+				} else if (method.statements != null) {
+					// "double" recovery; base parser recovered statements and assist parser recovered the assist node
+					Statement[] newStatements = new Statement[method.statements.length + 1];
+					System.arraycopy(method.statements, 0, newStatements, 0, method.statements.length);
+					newStatements[method.statements.length] = statement;
+					method.statements = newStatements;
 				}
 			}
 		}

org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/impl/AssistParser.java

@@ -2070,6 +2070,8 @@ public void parseBlockStatements(MethodDeclaration md, CompilationUnitDeclaratio
 	if ((md.modifiers & ExtraCompilerModifiers.AccSemicolonBody) != 0)
 		return;
 
+	boolean oldStateRecoveryActivated = this.statementRecoveryActivated;
+	this.statementRecoveryActivated = true;
 	initialize();
 	// set the lastModifiers to reflect the modifiers of the method whose
 	// block statements are being parsed
@@ -2090,6 +2092,7 @@ public void parseBlockStatements(MethodDeclaration md, CompilationUnitDeclaratio
 		this.lastAct = ERROR_ACTION;
 	} finally {
 		this.nestedMethod[this.nestedType]--;
+		this.statementRecoveryActivated = oldStateRecoveryActivated;
 	}
 
 	if (this.lastAct == ERROR_ACTION) {