From dfa9e3618cd89e5b8c38d338afd0fbad65f3d1a4 Mon Sep 17 00:00:00 2001 From: Markus Schorn Date: Wed, 21 May 2008 08:57:37 +0000 Subject: [PATCH] Rename local variables in macro-bodies, bug 232091. --- .../ui/refactoring/rename/CRenameLocalProcessor.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameLocalProcessor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameLocalProcessor.java index 03169ebbfc4..5fbe1b01e44 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameLocalProcessor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameLocalProcessor.java @@ -52,6 +52,8 @@ public class CRenameLocalProcessor extends CRenameProcessorDelegate { @Override protected void analyzeTextMatches(ArrayList matches, IProgressMonitor monitor, RefactoringStatus status) { + + super.analyzeTextMatches(matches, monitor, status); if (fScope != null) { CRefactoringArgument argument = getArgument(); ASTManager r = getAstManager(); @@ -76,12 +78,13 @@ public class CRenameLocalProcessor extends CRenameProcessorDelegate { int[] range= result; for (Iterator iter = matches.iterator(); iter.hasNext();) { CRefactoringMatch m = iter.next(); - int off= m.getOffset(); - if (off < range[0] || off > range[1]) { - iter.remove(); + if (m.getAstInformation() != CRefactoringMatch.AST_REFERENCE) { + int off= m.getOffset(); + if (off < range[0] || off > range[1]) { + iter.remove(); + } } } } - super.analyzeTextMatches(matches, monitor, status); } }