Skip to content

Commit e2313ef

Browse files
committed
Clarified method names, changed check from HelpFile to ProjectId
1 parent c3c24d3 commit e2313ef

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

RetailCoder.VBE/UI/Command/FindAllReferencesCommand.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -158,11 +158,11 @@ private Declaration FindTarget(object parameter)
158158
{
159159
var component = _vbe.SelectedVBComponent;
160160
return (component != null && component.HasDesigner)
161-
? FindFormTarget()
162-
: FindCodeTarget(parameter);
161+
? FindFormDesignerTarget()
162+
: FindCodePaneTarget(parameter);
163163
}
164164

165-
private Declaration FindCodeTarget(object parameter)
165+
private Declaration FindCodePaneTarget(object parameter)
166166
{
167167
var declaration = parameter as Declaration;
168168
if (declaration != null)
@@ -173,7 +173,7 @@ private Declaration FindCodeTarget(object parameter)
173173
return _state.FindSelectedDeclaration(_vbe.ActiveCodePane);
174174
}
175175

176-
private Declaration FindFormTarget()
176+
private Declaration FindFormDesignerTarget()
177177
{
178178
var project = _vbe.ActiveVBProject;
179179
var component = _vbe.SelectedVBComponent;
@@ -185,11 +185,12 @@ private Declaration FindFormTarget()
185185

186186
if (selectedCount > 1) { return null; }
187187

188+
// Cannot use DeclarationType.UserForm, parser only assigns UserForms the ClassModule flag
188189
var selectedType = selectedCount == 0 ? DeclarationType.ClassModule : DeclarationType.Control;
189190
string selectedName = selectedCount == 0 ? component.Name : designer.Selected[0].Name;
190191

191192
return _state.DeclarationFinder.MatchName(selectedName)
192-
.First(m => m.ProjectId == project.HelpFile
193+
.First(m => m.ProjectId == project.ProjectId
193194
&& m.DeclarationType.HasFlag(selectedType)
194195
&& m.ComponentName == component.Name);
195196
}

0 commit comments

Comments
 (0)