Bug 542560 - [12][completion] Code completion Support for Switch

Expressions

Change-Id: Id0101c52abbeb80bb04e32daaacbb532f9192102
Signed-off-by: Jay Arthanareeswaran <jarthana@in.ibm.com>

2 files changed, 5 insertions, 2 deletions

diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/SwitchExpression.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/SwitchExpression.java
index 88e75f2a52..0b9830cb55 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/SwitchExpression.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/SwitchExpression.java
@@ -54,6 +54,7 @@ public class SwitchExpression extends SwitchStatement implements IPolyExpression
 
 	private int nullStatus = FlowInfo.UNKNOWN;
 	public List<Expression> resultExpressions;
+	public boolean resolveAll;
 	/* package */ List<Integer> resultExpressionNullStatus;
 	private static Map<TypeBinding, TypeBinding[]> type_map;
 
@@ -389,6 +390,10 @@ public class SwitchExpression extends SwitchStatement implements IPolyExpression
 						this.finalValueResultExpressionTypes[i] = this.originalValueResultExpressionTypes[i] = 
 							resultExpr.resolveTypeExpecting(upperScope, this.expectedType);
 					}
+					// This is a kludge and only way completion can tell this node to resolve all
+					// resultExpressions. Ideal solution is to remove all other expressions except
+					// the one that contain the completion node.
+					if (this.resolveAll) continue;
 					if (resultExpr.resolvedType == null || !resultExpr.resolvedType.isValidBinding())
 						return this.resolvedType = null;
 				}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Parser.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Parser.java
index 18ff40132c..02200bb2cc 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Parser.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Parser.java
@@ -9527,10 +9527,8 @@ protected void consumeSwitchExpression() {
 		SwitchExpression s = (SwitchExpression) this.astStack[this.astPtr--];
 
 		if (!this.parsingJava12Plus) {
-//			problemReporter().switchExpressionsNotBelow12(s);
 			problemReporter().previewFeatureNotSupported(s.sourceStart, s.sourceEnd, "Switch Expression", CompilerOptions.VERSION_12); //$NON-NLS-1$
 		} else if (!this.options.enablePreviewFeatures) {
-			//problemReporter().switchExpressionIsPreview(s);
 			problemReporter().previewFeatureNotEnabled(s.sourceStart, s.sourceEnd, "Switch Expression"); //$NON-NLS-1$
 		} else {
 			if (this.options.isAnyEnabled(IrritantSet.PREVIEW)) {