diff --git a/core/org.eclipse.cdt.core.tests/ChangeLog b/core/org.eclipse.cdt.core.tests/ChangeLog
index b68b61bab50..4b4c9541a71 100644
--- a/core/org.eclipse.cdt.core.tests/ChangeLog
+++ b/core/org.eclipse.cdt.core.tests/ChangeLog
@@ -1,3 +1,10 @@
+2004-02-13 Bogdan Gheorghe
+    -Modified CompletionProposalsTest to reset the indexer thread at the
+     beginning of the test case - this means that the project will be indexed
+     as soon as it is created. Since completions now use FORCE_IMMEDIATE_SEARCH,
+     we have to give a bit of time to ensure that the project is indexed before
+     we try a query.
+     
 2004-01-29 John Camelon
 	Added ScannerTestCase::testBug50821().  
 
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/codeassist/tests/CompletionProposalsTest.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/codeassist/tests/CompletionProposalsTest.java
index 365e04d6d2e..93c167c00b3 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/codeassist/tests/CompletionProposalsTest.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/codeassist/tests/CompletionProposalsTest.java
@@ -58,6 +58,7 @@ public class CompletionProposalsTest  extends TestCase{
 	}
 		
 	protected void setUp() throws Exception {
+		(CCorePlugin.getDefault().getCoreModel().getIndexManager()).reset();
 		monitor = new NullProgressMonitor();
 		String pluginRoot=org.eclipse.core.runtime.Platform.getPlugin("org.eclipse.cdt.core.tests").find(new Path("/")).getFile();
 	
@@ -79,8 +80,8 @@ public class CompletionProposalsTest  extends TestCase{
 		}
 
 		// use the new indexer
-		IndexManager indexManager = CCorePlugin.getDefault().getCoreModel().getIndexManager();
-		indexManager.reset();
+//		IndexManager indexManager = CCorePlugin.getDefault().getCoreModel().getIndexManager();
+//		indexManager.reset();
 		
 	}
 
@@ -110,13 +111,15 @@ public class CompletionProposalsTest  extends TestCase{
 			Document document = new Document(buffer);
 			int pos = buffer.indexOf(" a ") + 2;
 			int length = 0;
-			CCompletionProcessor completionProcessor = new CCompletionProcessor(null);
-			ICompletionProposal[] results = completionProcessor.evalProposals(document, pos, length, tu);
 			try {
 				Thread.sleep(MAGIC_NUMBER);
 			} catch (InterruptedException e1) {
 				fail( "Bogdan's hack did not suffice");
 			}
+					
+			CCompletionProcessor completionProcessor = new CCompletionProcessor(null);
+			ICompletionProposal[] results = completionProcessor.evalProposals(document, pos, length, tu);
+		
 			assertEquals(results.length, 7);
 			for (int i = 0; i<results.length; i++){
 				ICompletionProposal proposal = results[i];
diff --git a/core/org.eclipse.cdt.core/search/ChangeLog b/core/org.eclipse.cdt.core/search/ChangeLog
index ebad85b4db3..e6749ff461f 100644
--- a/core/org.eclipse.cdt.core/search/ChangeLog
+++ b/core/org.eclipse.cdt.core/search/ChangeLog
@@ -1,3 +1,7 @@
+2004-02-13 Bogdan Gheorghe
+	- From Thomas: Modified SearchEngine.search to allow for the passing of
+	a waiting policy
+	
 2004-02-13 Bogdan Gheorghe
 	- Added error handling to MatchLocator.locateMatches to handle possible
 	  parser failures.
diff --git a/core/org.eclipse.cdt.core/search/org/eclipse/cdt/core/search/SearchEngine.java b/core/org.eclipse.cdt.core/search/org/eclipse/cdt/core/search/SearchEngine.java
index 23f7a3c6c48..2ce269dfe1e 100644
--- a/core/org.eclipse.cdt.core/search/org/eclipse/cdt/core/search/SearchEngine.java
+++ b/core/org.eclipse.cdt.core/search/org/eclipse/cdt/core/search/SearchEngine.java
@@ -156,6 +156,10 @@ public class SearchEngine implements ICSearchConstants{
 	 * @param _collector
 	 */
 	public void search(IWorkspace workspace, ICSearchPattern pattern, ICSearchScope scope, ICSearchResultCollector collector, boolean excludeLocalDeclarations) {
+		 		 search(workspace, pattern, scope, collector, excludeLocalDeclarations, ICSearchConstants.WAIT_UNTIL_READY_TO_SEARCH);
+		 }
+		 
+		 public void search(IWorkspace workspace, ICSearchPattern pattern, ICSearchScope scope, ICSearchResultCollector collector, boolean excludeLocalDeclarations, int waitingPolicy) {
 		if( VERBOSE ) {
 			System.out.println("Searching for " + pattern + " in " + scope); //$NON-NLS-1$//$NON-NLS-2$
 		}
@@ -189,7 +193,7 @@ public class SearchEngine implements ICSearchConstants{
 					pathCollector,
 					indexManager
 				),
-			    ICSearchConstants.WAIT_UNTIL_READY_TO_SEARCH,
+		 		 		     waitingPolicy,
 				subMonitor,
 				null );
 			
diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index 5f77120c0d6..3f7574ad189 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,10 @@
+2004-02-13 Bogdan Gheorghe
+	Thomas' patch: Modified CCompletionProcessor to use FORCE_IMMEDIATE_SEARCH
+	when requesting a dependency query/search.
+	
+	* src/org/eclipse/cdt/internal/ui/text/CCompletionProcessor.java
+	
+	
 2004-02-05 Alain Magloire
 	PR 51221
 	Reformat Patch from Bogdan base on Thomas Fletcher original patch
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CCompletionProcessor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CCompletionProcessor.java
index 118362f3d0a..ecb488cd301 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CCompletionProcessor.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CCompletionProcessor.java
@@ -513,7 +513,7 @@ public class CCompletionProcessor implements IContentAssistProcessor {
 				//Get file's dependencies
 				try {
 					IndexManager indexMan = CCorePlugin.getDefault().getCoreModel().getIndexManager();
-					indexMan.performConcurrentJob(new DependencyQueryJob(project, (IFile)actualFile, indexMan, dependencies), ICSearchConstants.WAIT_UNTIL_READY_TO_SEARCH, null, null);
+		 		 		 		 		 indexMan.performConcurrentJob(new DependencyQueryJob(project, (IFile)actualFile, indexMan, dependencies), ICSearchConstants.FORCE_IMMEDIATE_SEARCH, null, null);
 				} catch (Exception e) {
 				}
 			}
@@ -529,8 +529,13 @@ public class CCompletionProcessor implements IContentAssistProcessor {
 		orPattern.addPattern(SearchEngine.createSearchPattern( prefix, ICSearchConstants.TYPE, ICSearchConstants.DECLARATIONS, false ));
 		orPattern.addPattern(SearchEngine.createSearchPattern( prefix, ICSearchConstants.ENUM, ICSearchConstants.DECLARATIONS, false ));
 		orPattern.addPattern(SearchEngine.createSearchPattern( prefix, ICSearchConstants.MACRO, ICSearchConstants.DECLARATIONS, false ));
-		searchEngine.search(CUIPlugin.getWorkspace(), orPattern, scope, resultCollector, true);
-		elementsFound.addAll(resultCollector.getSearchResults());
+		 		 
+		 		 try {
+		 		 		 searchEngine.search(CUIPlugin.getWorkspace(), orPattern, scope, resultCollector, true, ICSearchConstants.FORCE_IMMEDIATE_SEARCH);
+		 		 		 elementsFound.addAll(resultCollector.getSearchResults());
+		 		 } catch(Exception ex) {
+		 		 		 /* Ignore exception, there may be partial results collected */
+		 		 }
 
 		if((currentScope instanceof IMethod) || (currentScope instanceof IMethodDeclaration) ){
 			// add the methods and fields of the parent class