Allow refactoring to find local bindings in headers

Author: i-garrison

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPScope.java

@@ -202,7 +202,9 @@ public IBinding[] getBindings(ScopeLookupData lookup) {
 						IBinding[] bindings = lookup.isPrefixLookup()
 								? index.findBindingsForContentAssist(nchars, true, filter, null)
 								: index.findBindings(nchars, filter, null);
-						if (fileSet != null) {
+						// if using promiscuous binding resolution, allow finding local bindings in index
+						// to help refactoring with typedefs and using declarations which are now local bindings
+						if (fileSet != null && !CPPSemantics.isUsingPromiscuousBindingResolution()) {
 							bindings = fileSet.filterFileLocalBindings(bindings);
 						}
 						result = ArrayUtil.addAll(IBinding.class, result, bindings);

core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/includes/IncludeOrganizerTest.java

@@ -612,6 +612,37 @@ public void testMethodDefinedInHeader() throws Exception {
 		assertExpectedResults();
 	}
 
+	//h1.h
+	//struct A {
+	//  template <typename T>
+	//  void m(const T& p);
+	//};
+
+	//h2.h
+	//#include "h1.h"
+	//template<typename T>
+	//void A::m(const T& p) {
+	//}
+
+	//h3.h
+	//#include "h1.h"
+	//using B = A;
+
+	//source.cpp
+	//void test(B& b) {
+	//  b.m(1);
+	//}
+	//====================
+	//#include "h2.h"
+	//#include "h3.h"
+	//
+	//void test(B& b) {
+	//  b.m(1);
+	//}
+	public void testMethodDefinedInHeaderWithUsingDeclaration() throws Exception {
+		assertExpectedResults();
+	}
+
 	//a.h
 	//struct A {
 	//  void a() const;