Skip to content

Commit c6ff48a

Browse files
committed
fixed issue with FindAllReferences, which was only returning references in the same module as selection, of declarations located in the same module too.
1 parent af159bf commit c6ff48a

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

RetailCoder.VBE/UI/RefactorMenu.cs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,9 @@ public void FindAllReferences()
180180
var progress = new ParsingProgressPresenter();
181181
var result = progress.Parse(_parser, IDE.ActiveVBProject);
182182

183-
var declarations = result.Declarations.Items.Where(item => item.DeclarationType != DeclarationType.ModuleOption
184-
&& item.ComponentName == selection.QualifiedName.ComponentName)
185-
.ToList();
183+
var declarations = result.Declarations.Items
184+
.Where(item => item.DeclarationType != DeclarationType.ModuleOption)
185+
.ToList();
186186

187187
var target = declarations.SingleOrDefault(item =>
188188
IsSelectedDeclaration(selection, item)
@@ -368,12 +368,10 @@ private IEnumerable<Declaration> FindAllImplementationsOfMember(Declaration targ
368368

369369
private bool IsSelectedReference(QualifiedSelection selection, Declaration declaration)
370370
{
371-
var isSameProject = declaration.Project == selection.QualifiedName.Project;
372-
var isSameModule = isSameProject && declaration.QualifiedName.QualifiedModuleName.ComponentName == selection.QualifiedName.ComponentName;
373-
374371
return declaration.References.Any(r =>
375-
isSameModule &&
376-
r.Selection.ContainsFirstCharacter(selection.Selection));
372+
r.QualifiedModuleName.Project == selection.QualifiedName.Project
373+
&& r.QualifiedModuleName.ComponentName == selection.QualifiedName.ComponentName
374+
&& r.Selection.ContainsFirstCharacter(selection.Selection));
377375
}
378376

379377
private bool IsSelectedDeclaration(QualifiedSelection selection, Declaration declaration)

0 commit comments

Comments
 (0)