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

Bug 443356 - Organize Includes adds an unnecessary include for a

Browse source 
function referenced by a macro
This commit is contained in:
Sergey Prigogin 2014-09-04 15:44:59 -07:00
parent a5c99092dd
commit 62f4735f8e
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -648,4 +648,14 @@ public class BindingClassifierTest extends OneSourceMultipleHeadersTestCase {
assertDefined("MACRO"); assertDefined("MACRO");
assertDeclared(); assertDeclared();
} }
// void f(int);
// #define MACRO(name, arg) void name() { f(arg); }
// int bar;
// MACRO(foo, bar);
public void testMacro_4() throws Exception {
assertDefined("MACRO");
assertDeclared();
}
} }

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

@ -692,6 +692,8 @@ public class BindingClassifier {
*/ */
IASTFunctionCallExpression functionCallExpression = (IASTFunctionCallExpression) expression; IASTFunctionCallExpression functionCallExpression = (IASTFunctionCallExpression) expression;
IASTExpression functionNameExpression = functionCallExpression.getFunctionNameExpression(); IASTExpression functionNameExpression = functionCallExpression.getFunctionNameExpression();
if (isPartOfExternalMacroDefinition(functionNameExpression))
return PROCESS_CONTINUE;
IBinding binding = getBindingOfExpression(functionNameExpression); IBinding binding = getBindingOfExpression(functionNameExpression);
if (binding != null) { if (binding != null) {