From 9e60a646fdaaa95fc8a0d799230bd73bc2bd2730 Mon Sep 17 00:00:00 2001
From: Nathan Ridge <zeratul976@hotmail.com>
Date: Wed, 11 Jan 2017 01:13:56 -0500
Subject: [PATCH] Bug 509182 - Completion of class type in using-declaration

Change-Id: Iacd0ab4bfead2df31cddc78840853eb697139b02
---
 .../ui/tests/text/contentassist2/CompletionTests.java | 11 ++++++++++-
 .../contentassist/DOMCompletionProposalComputer.java  |  6 +++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests.java
index d03c40f4aae..4eae9b50d14 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests.java
@@ -1481,7 +1481,16 @@ public class CompletionTests extends AbstractContentAssistTest {
 		final String[] expected= { "foo()" };
 		assertCompletionResults(fCursorOffset, expected, REPLACEMENT);
 	}
-
+	
+	//	namespace N {
+	//		class waldo {};
+	//	}
+	//	using N::w/*cursor*/
+	public void testUsingDeclaration_509182() throws Exception {
+		final String[] expected = { "waldo;" };
+		assertCompletionResults(fCursorOffset, expected, REPLACEMENT);
+	}
+	
 	//	template <typen/*cursor*/
 	public void testTemplateDeclaration_397288() throws Exception {
 		final String[] expected= { "typename" };
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/DOMCompletionProposalComputer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/DOMCompletionProposalComputer.java
index e1177bb8dc3..56ebb345e3a 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/DOMCompletionProposalComputer.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/DOMCompletionProposalComputer.java
@@ -486,7 +486,11 @@ public class DOMCompletionProposalComputer extends ParsingBasedProposalComputer
 							getImage(classType), baseRelevance + relevance, cContext));
 				}
 			}
-			proposals.add(createProposal(classType.getName(), classType.getName(), getImage(classType),
+			StringBuilder repStringBuff = new StringBuilder(classType.getName());
+			if (cContext.isInUsingDirective() && !cContext.isFollowedBySemicolon()) {
+				repStringBuff.append(';');
+			}
+			proposals.add(createProposal(repStringBuff.toString(), classType.getName(), getImage(classType),
 					baseRelevance + RelevanceConstants.CLASS_TYPE_RELEVANCE, cContext));
 		}
 	}