From 6132605f031b780de9167287847f4ed7cc4f741f Mon Sep 17 00:00:00 2001 From: Nathan Ridge Date: Tue, 10 Jan 2017 00:52:11 -0500 Subject: [PATCH] Bug 509733 - Follow-up to exclude image locations of kind MACRO_DEFINITION As per bug 344656 comment 5. Change-Id: Ic28a4c9641533b6ee24d5a67cb8e104889ac4055 --- .../cdt/internal/ui/search/actions/OpenDeclarationsJob.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsJob.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsJob.java index 9c51ed38093..19d4b2c2799 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsJob.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsJob.java @@ -520,7 +520,9 @@ class OpenDeclarationsJob extends Job implements ASTRunnable { if (name instanceof IASTName) { IASTName astName = (IASTName) name; IASTImageLocation imageLocation = astName.getImageLocation(); - if (imageLocation != null && astName.getTranslationUnit().getFilePath().equals(fileLocation.getFileName())) { + if (imageLocation != null && + imageLocation.getLocationKind() != IASTImageLocation.MACRO_DEFINITION && + astName.getTranslationUnit().getFilePath().equals(fileLocation.getFileName())) { fileLocation = imageLocation; } }