mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-11 02:05:39 +02:00
Code Issues Wiki Activity

Bug 487971 - Organize Includes removes a necessary include

Browse source 
Change-Id: I74abb929cabcb78733215da552e3ada227aa26e8
This commit is contained in:
Sergey Prigogin 2016-02-17 17:34:53 -08:00
parent e984df3ba0
commit 1a4e98b866
2 changed files with 35 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/includes/BindingClassifierTest.java
View file

@ -16,8 +16,6 @@ import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.TreeSet; import java.util.TreeSet;
import junit.framework.TestSuite;
import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.IPreferenceStore;
import com.ibm.icu.text.MessageFormat; import com.ibm.icu.text.MessageFormat;
@ -40,6 +38,8 @@ import org.eclipse.cdt.ui.testplugin.CTestPlugin;
import org.eclipse.cdt.internal.ui.refactoring.includes.BindingClassifier; import org.eclipse.cdt.internal.ui.refactoring.includes.BindingClassifier;
import org.eclipse.cdt.internal.ui.refactoring.includes.IncludeCreationContext; import org.eclipse.cdt.internal.ui.refactoring.includes.IncludeCreationContext;
import junit.framework.TestSuite;
/** /**
* Tests for {@link BindingClassifier}. * Tests for {@link BindingClassifier}.
*/ */
@ -420,6 +420,24 @@ public class BindingClassifierTest extends OneSourceMultipleHeadersTestCase {
assertDeclared("B"); assertDeclared("B");
} }
// namespace std {
// template<typename T> class shared_ptr {};
// }
//
// struct A {
// int x;
// };
// struct B {
// const std::shared_ptr<A> y;
// };
// int test(B* b) {
// return b->y->x;
// };
public void testFieldReference_487971() throws Exception {
assertDefined("A", "B");
}
// typedef unsigned int size_t; // typedef unsigned int size_t;
// size_t a; // size_t a;

18
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/BindingClassifier.java
View file

@ -77,6 +77,7 @@ import org.eclipse.cdt.core.dom.ast.IFunctionType;
import org.eclipse.cdt.core.dom.ast.IParameter; import org.eclipse.cdt.core.dom.ast.IParameter;
import org.eclipse.cdt.core.dom.ast.IPointerType; import org.eclipse.cdt.core.dom.ast.IPointerType;
import org.eclipse.cdt.core.dom.ast.IProblemBinding; import org.eclipse.cdt.core.dom.ast.IProblemBinding;
import org.eclipse.cdt.core.dom.ast.IQualifierType;
import org.eclipse.cdt.core.dom.ast.IType; import org.eclipse.cdt.core.dom.ast.IType;
import org.eclipse.cdt.core.dom.ast.ITypedef; import org.eclipse.cdt.core.dom.ast.ITypedef;
import org.eclipse.cdt.core.dom.ast.IVariable; import org.eclipse.cdt.core.dom.ast.IVariable;
@ -1377,12 +1378,12 @@ public class BindingClassifier {
* allowing incomplete argument types, defines the argument type. * allowing incomplete argument types, defines the argument type.
*/ */
private void defineIndirectTypes(IType type) { private void defineIndirectTypes(IType type) {
IType resolvedType = resolveTypedef(type); IType resolvedType = removeQualifiers(resolveTypedef(type));
if (resolvedType instanceof IPointerType || resolvedType instanceof ICPPReferenceType) { if (resolvedType instanceof IPointerType || resolvedType instanceof ICPPReferenceType) {
defineTypeExceptTypedefOrNonFixedEnum(resolvedType); defineTypeExceptTypedefOrNonFixedEnum(resolvedType);
} else { } else {
if (type instanceof ICPPTemplateInstance) { if (resolvedType instanceof ICPPTemplateInstance) {
ICPPTemplateInstance instance = (ICPPTemplateInstance) type; ICPPTemplateInstance instance = (ICPPTemplateInstance) resolvedType;
IBinding template = instance.getSpecializedBinding(); IBinding template = instance.getSpecializedBinding();
if (isTemplateAllowingIncompleteArgumentType(template)) { if (isTemplateAllowingIncompleteArgumentType(template)) {
ICPPTemplateArgument[] arguments = instance.getTemplateArguments(); ICPPTemplateArgument[] arguments = instance.getTemplateArguments();
@ -1456,6 +1457,17 @@ public class BindingClassifier {
return type; return type;
} }
/**
* If the given type is a qualified type, returns the corresponding unqualified type.
* Otherwise returns the given type.
*/
private IType removeQualifiers(IType type) {
while (type instanceof IQualifierType) {
type = ((IQualifierType) type).getType();
}
return type;
}
/** /**
* Checks if the given name is part of a template argument. * Checks if the given name is part of a template argument.
*/ */