From 817e8b717b76d2a1a343825dd9652b5b72483088 Mon Sep 17 00:00:00 2001
From: Markus Schorn <markus.schorn@windriver.com>
Date: Mon, 26 Apr 2010 13:14:33 +0000
Subject: [PATCH] Bug 308611: Content assist after '?' in conditional
 expression.

---
 .../tests/prefix/BasicCompletionTest.java      | 15 ++++++++++++---
 .../parser/AbstractGNUSourceCodeParser.java    | 18 +++++++++++-------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/prefix/BasicCompletionTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/prefix/BasicCompletionTest.java
index fa9c8ff8934..f4d25885b83 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/prefix/BasicCompletionTest.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/prefix/BasicCompletionTest.java
@@ -205,14 +205,23 @@ public class BasicCompletionTest extends CompletionTestBase {
 		checkCompletion(code, true, expectedCpp);
 	}
 	
-//	typedef int MyType;
-//	void func(){
-//	    static_cast<My
+	//	typedef int MyType;
+	//	void func(){
+	//	    static_cast<My
 	public void testCastExpression_Bug301933() throws Exception {
 		String code = getAboveComment();
 		String[] expectedCpp= {"MyType"};
 		checkCompletion(code, true, expectedCpp);
 	}
 
+	//	int v1, v2;
+	//	void func() {
+	//     v1= 0 ? v
+	public void testConditionalOperator_Bug308611() throws Exception {
+		String code = getAboveComment();
+		String[] expected= {"v1", "v2"};
+		checkCompletion(code, true, expected);
+		checkCompletion(code, false, expected);
+	}
 	
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/AbstractGNUSourceCodeParser.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/AbstractGNUSourceCodeParser.java
index b12752b2384..1d12c106982 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/AbstractGNUSourceCodeParser.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/AbstractGNUSourceCodeParser.java
@@ -968,14 +968,18 @@ public abstract class AbstractGNUSourceCodeParser implements ISourceCodeParser {
 		final IASTInitializerClause right= operator.fExpression;
 		switch(operator.fOperatorToken) {
         case IToken.tQUESTION:
+        	final IASTInitializerClause negative;
         	if (operator.fNext == null || operator.fNext.fOperatorToken != IToken.tCOLON) {
-				assert false;
-	        	ASTNode node= (ASTNode) left;
-	        	throwBacktrack(node.getOffset(), node.getLength());
-	        	return null; // Will never be reached.
-        	} 
-        	IASTInitializerClause negative= operator.fNext.fExpression;
-        	operator.fNext= operator.fNext.fNext;
+        		if (LTcatchEOF(1) != IToken.tEOC || operator.fNext != null) {
+        			assert false;
+    	        	ASTNode node= (ASTNode) left;
+    	        	throwBacktrack(node.getOffset(), node.getLength());
+        		}
+        		negative= null;
+        	} else {
+        		negative= operator.fNext.fExpression;
+            	operator.fNext= operator.fNext.fNext;
+        	}
             IASTConditionalExpression conditionalEx = nodeFactory.newConditionalExpession(left, (IASTExpression) right, (IASTExpression) negative);
             setRange(conditionalEx, left);
             if (negative != null) {