From 0424024136d08de574b56b68d1030cce0db3e65e Mon Sep 17 00:00:00 2001
From: Markus Schorn <markus.schorn@windriver.com>
Date: Wed, 18 Jun 2008 13:35:53 +0000
Subject: [PATCH] Content assist within function-style initializer, bug 69334.

---
 .../dom/parser/cpp/GNUCPPSourceParser.java    |  4 +-
 .../contentassist/ContentAssistTests.java     | 44 +++++++++++++------
 2 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java
index 933be75beca..bd5a1dbcae6 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java
@@ -3199,7 +3199,7 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
     	}
     	
 		// we have an ambiguity
-		if (LA(1) != end1) {
+		if (end1 != null && LA(1).getEndOffset() != end1.getEndOffset()) {
 			backup(end1);
 			return dtor1;
 		}
@@ -3276,7 +3276,7 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
             IASTExpression astExpression = expression();
             if( astExpression == null )
                 throwBacktrack( t );
-            int l = consume(IToken.tRPAREN).getEndOffset();
+            int l = consumeOrEOC(IToken.tRPAREN).getEndOffset();
             ICPPASTConstructorInitializer result = createConstructorInitializer();
             ((ASTNode) result).setOffsetAndLength(o, l - o);
             result.setExpression(astExpression);
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ContentAssistTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ContentAssistTests.java
index 66a71866e9e..3278015ce2e 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ContentAssistTests.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ContentAssistTests.java
@@ -9,10 +9,6 @@
  *     IBM Corporation - initial API and implementation
  *     Markus Schorn (Wind River Systems)
  *******************************************************************************/
-
-/*
- * Created on Sep 9, 2004
- */
 package org.eclipse.cdt.ui.tests.text.contentassist;
 
 import java.io.ByteArrayInputStream;
@@ -59,7 +55,8 @@ public class ContentAssistTests extends BaseUITestCase {
     static IProject 				project;
     static boolean 					disabledHelpContributions = false;
     
-    public void setUp() {
+    @Override
+	public void setUp() {
 		//(CCorePlugin.getDefault().getCoreModel().getIndexManager()).reset();
     	
     	if (project == null) {
@@ -96,9 +93,9 @@ public class ContentAssistTests extends BaseUITestCase {
 			public ITranslationUnit getTranslationUnit(){return null;}
 			}
 		);
-		for( int i = 0; i < helpBooks.length; i++ ){
-		    if( helpBooks[i] != null )
-		        helpBooks[i].enable( false );
+		for (CHelpBookDescriptor helpBook : helpBooks) {
+		    if( helpBook != null )
+		        helpBook.enable( false );
 		}
     }
     
@@ -118,20 +115,21 @@ public class ContentAssistTests extends BaseUITestCase {
 	    }
     }
     
-    protected void tearDown() throws Exception {
+    @Override
+	protected void tearDown() throws Exception {
         if( project == null || !project.exists() )
             return;
         
         closeAllEditors();
 
         IResource [] members = project.members();
-        for( int i = 0; i < members.length; i++ ){
-            if( members[i].getName().equals( ".project" ) || members[i].getName().equals( ".cproject" ) ) //$NON-NLS-1$ //$NON-NLS-2$
+        for (IResource member : members) {
+            if( member.getName().equals( ".project" ) || member.getName().equals( ".cproject" ) ) //$NON-NLS-1$ //$NON-NLS-2$
                 continue;
-            if (members[i].getName().equals(".settings"))
+            if (member.getName().equals(".settings"))
             	continue;
             try{
-                members[i].delete( false, monitor );
+                member.delete( false, monitor );
             } catch( Throwable e ){
                 /*boo*/
             }
@@ -179,7 +177,7 @@ public class ContentAssistTests extends BaseUITestCase {
 		return processor.computeCompletionProposals(editor.getViewer(), offset);
     }
     
-    public void testBug69334() throws Exception {
+    public void testBug69334a() throws Exception {
         importFile( "test.h", "class Test{ public : Test( int ); }; \n" );  //$NON-NLS-1$//$NON-NLS-2$
         StringWriter writer = new StringWriter();
         writer.write( "#include \"test.h\"                \n"); //$NON-NLS-1$
@@ -197,6 +195,24 @@ public class ContentAssistTests extends BaseUITestCase {
         assertEquals( "veryLongName : int", results[0].getDisplayString() ); //$NON-NLS-1$
     }
 
+    public void testBug69334b() throws Exception {
+        importFile( "test.h", "class Test{ public : Test( int ); }; \n" );  //$NON-NLS-1$//$NON-NLS-2$
+        StringWriter writer = new StringWriter();
+        writer.write( "#include \"test.h\"                \n"); //$NON-NLS-1$
+        writer.write( "Test::Test( int i ) { return; }    \n"); //$NON-NLS-1$
+        writer.write( "int main() {                       \n"); //$NON-NLS-1$
+        writer.write( "   int veryLongName = 1;           \n"); //$NON-NLS-1$
+        writer.write( "   Test test( very   \n"); //$NON-NLS-1$
+        
+        String code = writer.toString();
+        IFile cu = importFile( "test.cpp", code ); //$NON-NLS-1$
+        
+        ICompletionProposal [] results = getResults( cu, code.indexOf( "very " ) + 4 ); //$NON-NLS-1$
+        
+        assertEquals( 1, results.length );
+        assertEquals( "veryLongName : int", results[0].getDisplayString() ); //$NON-NLS-1$
+    }
+
     public void testBug72824() throws Exception {
         StringWriter writer = new StringWriter();
         writer.write( "class Strategy {                             \n"); //$NON-NLS-1$