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

Bug 442841 - Organize Includes adds an unnecessary include for the base

Browse source 
class of the type of a field
This commit is contained in:
Sergey Prigogin 2014-08-29 22:10:25 -07:00
parent e7cbbb7412
commit 096fae2b3e
3 changed files with 70 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -600,6 +600,23 @@ public class BindingClassifierTest extends OneSourceMultipleHeadersTestCase {
assertDeclared();
}
// struct A {
// void operator()();
// };
// struct B : public A {
// };
// struct C {
// B b;
// };
// void test(C* c) {
// c->b();
// }
public void testFieldAccess_442841() throws Exception {
assertDefined("C", "operator ()");
assertDeclared();
}
// struct A {};
// struct B {};
// struct C {};

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

@ -553,6 +553,34 @@ public class IncludeOrganizerTest extends IncludesTestBase {
assertExpectedResults();
}
//h1.h
//struct A {
// void operator()();
//};
//struct B : public A {
//};
//h2.h
//#include "h1.h"
//
//struct C {
// B b;
//};
//source.cpp
//void test(C* c) {
// c->b();
//}
//====================
//#include "h2.h"
//
//void test(C* c) {
// c->b();
//}
public void testFieldAccess_442841() throws Exception {
assertExpectedResults();
}
//h1.h
//namespace ns3 {
//class C {};

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

@ -142,7 +142,6 @@ public class BindingClassifier {
"unique_ptr", // 20.7.1 //$NON-NLS-1$
"weak_ptr" // 20.7.2.3 //$NON-NLS-1$
};
public enum InclusionType { DECLARATION, DEFINITION }
private class BindingCollector extends ASTVisitor {
BindingCollector() {
@ -399,7 +398,7 @@ public class BindingClassifier {
}
}
} else if (memberBinding instanceof ICPPConstructor) {
// Class construction
// Class construction.
ICPPConstructor constructor = (ICPPConstructor) memberBinding;
// We need to define the owning type of the constructor.
@ -808,9 +807,24 @@ public class BindingClassifier {
} else {
IBinding owner = binding.getOwner();
if (owner instanceof IType) {
defineBinding(owner); // Member access requires definition of the containing type.
defineBinding(owner); // Member access requires definition of the containing type.
if (binding instanceof IProblemBinding)
declareBinding(binding);
if (!isDefinedLocally(owner) &&
(!(binding instanceof ICPPMember) || !((ICPPMember) binding).isStatic())) {
// Record the fact that the header file defining the owner must also
// provide a definition of the type of this member (bug 442841).
IType type = null;
if (binding instanceof IVariable) {
type = ((IVariable) binding).getType();
} else if (binding instanceof IFunction) {
type = ((IFunction) binding).getType().getReturnType();
}
type = getNestedType(type, ALLCVQ);
if (type instanceof IBinding) {
markAsDefined((IBinding) type);
}
}
} else {
declareBinding(binding); // Declare the binding of this name.
}
@ -1051,8 +1065,8 @@ public class BindingClassifier {
}
}
}
// Get the specialized binding - e.g. get the binding for X if the current binding is
// for the template specialization X<Y>.
// Get the specialized binding - e.g. get the binding for X if the current binding
// is for the template specialization X<Y>.
addRequiredBindings(((ICPPSpecialization) binding).getSpecializedBinding(), queue);
} else {
bindings.add(binding);
@ -1217,7 +1231,7 @@ public class BindingClassifier {
private void defineBinding(IBinding binding) {
if (!markAsDefined(binding))
return;
if (binding instanceof CPPClosureType || fAst.getDefinitionsInAST(binding).length != 0)
if (isDefinedLocally(binding))
return; // Defined locally.
Collection<IBinding> requiredBindings = getRequiredBindings(binding);
@ -1226,13 +1240,17 @@ public class BindingClassifier {
if (requiredBinding != binding) {
if (!markAsDefined(requiredBinding))
continue;
if (fAst.getDefinitionsInAST(requiredBinding).length != 0)
if (isDefinedLocally(requiredBinding))
continue; // Defined locally.
}
fBindingsToDefine.add(requiredBinding);
}
}
private boolean isDefinedLocally(IBinding binding) {
return binding instanceof CPPClosureType || fAst.getDefinitionsInAST(binding).length != 0;
}
private void defineBindingForName(IASTName name) {
IBinding binding = name.resolveBinding();
if (!isPartOfExternalMacroDefinition(name))