mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-14 03:35:37 +02:00
Code Issues Wiki Activity

Bug 483048 - Navigation to forward declaration of class template

Browse source 
Change-Id: I611b50acf1ed80f02f7ee3edae4f8f80c4dfb313
This commit is contained in:
Nathan Ridge 2016-12-06 02:51:01 -05:00
parent e3017e7656
commit cee87b1757
2 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsNoIndexer.java
View file

@ -35,6 +35,7 @@ import org.eclipse.ui.texteditor.ITextEditor;
import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.dom.IPDOMManager;
import org.eclipse.cdt.core.dom.ast.IASTElaboratedTypeSpecifier;
import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IASTName;
import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.dom.ast.IASTNode;
import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.dom.ast.IBinding;
@ -1279,4 +1280,21 @@ public class CPPSelectionTestsNoIndexer extends BaseSelectionTests {
IBinding targetBinding = ((IASTName) target).resolveBinding(); IBinding targetBinding = ((IASTName) target).resolveBinding();
assertInstance(targetBinding, ICPPConstructor.class); assertInstance(targetBinding, ICPPConstructor.class);
} }
// template <typename = short>
// struct waldo;
//
// template <typename>
// struct waldo {};
public void testNavigationToTemplateForwardDecl_483048() throws Exception {
String code = getAboveComment();
IFile file = importFile("testBug483048.cpp", code);
int offset = code.indexOf("waldo {}");
IASTNode target = testF3(file, offset);
// Check that the result of the navigation is the forward declaration,
// not the definition.
assertInstance(target.getParent(), IASTElaboratedTypeSpecifier.class);
}
} }

6
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsJob.java
View file

@ -64,6 +64,7 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateId;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTranslationUnit; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTranslationUnit;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTUsingDeclaration; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTUsingDeclaration;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPAliasTemplateInstance; import org.eclipse.cdt.core.dom.ast.cpp.ICPPAliasTemplateInstance;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassTemplate;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPFunction; import org.eclipse.cdt.core.dom.ast.cpp.ICPPFunction;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPMethod; import org.eclipse.cdt.core.dom.ast.cpp.ICPPMethod;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPSpecialization; import org.eclipse.cdt.core.dom.ast.cpp.ICPPSpecialization;
@ -267,9 +268,12 @@ class OpenDeclarationsJob extends Job implements ASTRunnable {
if (candidateBindings.length != 0) { if (candidateBindings.length != 0) {
bindings = candidateBindings; bindings = candidateBindings;
} }
} else if (kind == NameKind.DEFINITION && b instanceof IType) { } else if (kind == NameKind.DEFINITION && b instanceof IType && !(b instanceof ICPPClassTemplate)) {
// Don't navigate away from a type definition. // Don't navigate away from a type definition.
// Select the name at the current location instead. // Select the name at the current location instead.
// However, for a class template, it's useful to navigate to
// a forward declaration, as it may contain definitions of
// default arguments, while the definition may not.
navigateToName(sourceName); navigateToName(sourceName);
return Status.OK_STATUS; return Status.OK_STATUS;
} }