mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 09:46:02 +02:00
Code Issues Wiki Activity

Bug 306670: Add include for template specializations.

Browse source
This commit is contained in:
Markus Schorn 2010-03-31 12:56:53 +00:00
parent 38da7f7ebd
commit d7c1b4bf22
5 changed files with 36 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/org.eclipse.cdt.ui.tests/resources/addInclude/Template_306670.cpp Normal file
View file

@ -0,0 +1,3 @@
void test() {
func306670(1);
}

4
core/org.eclipse.cdt.ui.tests/resources/addInclude/Template_306670.cpp.expected Normal file
View file

@ -0,0 +1,4 @@
#include "Template_306670.h"
void test() {
func306670(1);
}

4
core/org.eclipse.cdt.ui.tests/resources/addInclude/Template_306670.h Normal file
View file

@ -0,0 +1,4 @@
template <typename T> void func306670(T) {}
void bla() {
func306670(1); // make sure the instance is in the index.
}

5
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/AddIncludeTest.java
View file

@ -144,4 +144,9 @@ public class AddIncludeTest extends TestCase {
select("XXX");
assertAddIncludeResult();
}
public void testTemplate_306670() throws Exception {
select("func306670");
assertAddIncludeResult();
}
}

26
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AddIncludeOnSelectionAction.java
View file

@ -22,6 +22,7 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import org.eclipse.core.resources.IProject;
@ -55,7 +56,6 @@ import org.eclipse.cdt.core.dom.ast.IBinding;
import org.eclipse.cdt.core.dom.ast.ICompositeType;
import org.eclipse.cdt.core.dom.ast.IEnumeration;
import org.eclipse.cdt.core.dom.ast.IFunction;
import org.eclipse.cdt.core.dom.ast.IProblemBinding;
import org.eclipse.cdt.core.dom.ast.IType;
import org.eclipse.cdt.core.dom.ast.ITypedef;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTQualifiedName;
@ -64,6 +64,7 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTUsingDirective;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPBinding;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPConstructor;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPNamespace;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPSpecialization;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPVariable;
import org.eclipse.cdt.core.index.IIndex;
import org.eclipse.cdt.core.index.IIndexBinding;
@ -231,12 +232,23 @@ public class AddIncludeOnSelectionAction extends TextEditorAction {
}
final Map<String, IncludeCandidate> candidatesMap= new HashMap<String, IncludeCandidate>();
IIndex index = ast.getIndex();
final IIndex index = ast.getIndex();
final IndexFilter filter = IndexFilter.getDeclaredBindingFilter(ast.getLinkage().getLinkageID(), false);
IIndexBinding[] bindings =
binding instanceof IIndexBinding && !(binding instanceof IProblemBinding) ?
new IIndexBinding[] { (IIndexBinding) binding } :
index.findBindings(nameChars, false, filter, new NullProgressMonitor());
List<IIndexBinding> bindings = new ArrayList<IIndexBinding>();
IIndexBinding adaptedBinding= index.adaptBinding(binding);
if (adaptedBinding == null) {
bindings.addAll(Arrays.asList(index.findBindings(nameChars, false, filter, new NullProgressMonitor())));
} else {
bindings.add(adaptedBinding);
while (adaptedBinding instanceof ICPPSpecialization) {
adaptedBinding= index.adaptBinding(((ICPPSpecialization) adaptedBinding).getSpecializedBinding());
if (adaptedBinding != null) {
bindings.add(adaptedBinding);
}
}
}
for (IIndexBinding indexBinding : bindings) {
// Replace ctor with the class itself.
@ -258,6 +270,8 @@ public class AddIncludeOnSelectionAction extends TextEditorAction {
for (IIndexName definition : definitions) {
considerForInclusion(definition, indexBinding, index, candidatesMap);
}
if (definitions.length > 0 && adaptedBinding != null)
break;
}
}
IIndexMacro[] macros = index.findMacros(nameChars, filter, new NullProgressMonitor());