@@ -19,8 +19,8 @@ private enum ContextAccessorType
19
19
private readonly Declarations _declarations ;
20
20
private readonly QualifiedModuleName _qualifiedModuleName ;
21
21
22
- private readonly HashSet < DeclarationType > _moduleTypes ;
23
- private readonly HashSet < DeclarationType > _memberTypes ;
22
+ private readonly IReadOnlyList < DeclarationType > _moduleTypes ;
23
+ private readonly IReadOnlyList < DeclarationType > _memberTypes ;
24
24
25
25
private readonly Stack < Declaration > _withBlockQualifiers ;
26
26
private readonly HashSet < RuleContext > _alreadyResolved ;
@@ -33,14 +33,14 @@ public IdentifierReferenceResolver(QualifiedModuleName qualifiedModuleName, Decl
33
33
_withBlockQualifiers = new Stack < Declaration > ( ) ;
34
34
_alreadyResolved = new HashSet < RuleContext > ( ) ;
35
35
36
- _moduleTypes = new HashSet < DeclarationType > ( new [ ]
36
+ _moduleTypes = new List < DeclarationType > ( new [ ]
37
37
{
38
38
DeclarationType . Module ,
39
39
DeclarationType . Class ,
40
40
DeclarationType . Project
41
41
} ) ;
42
42
43
- _memberTypes = new HashSet < DeclarationType > ( new [ ]
43
+ _memberTypes = new List < DeclarationType > ( new [ ]
44
44
{
45
45
DeclarationType . Function ,
46
46
DeclarationType . Procedure ,
@@ -665,11 +665,8 @@ private Declaration FindModuleScopeProcedure(string identifierName, Declaration
665
665
localScope = _currentScope ;
666
666
}
667
667
668
- var result = _declarations [ identifierName ] . Where ( item =>
669
- IsProcedure ( item ) || IsPropertyAccessor ( item , accessorType , localScope , isAssignmentTarget ) )
670
- . ToList ( ) ;
671
-
672
- return result . SingleOrDefault ( ) ;
668
+ return _declarations [ identifierName ] . SingleOrDefault ( item =>
669
+ IsProcedure ( item ) || IsPropertyAccessor ( item , accessorType , localScope , isAssignmentTarget ) ) ;
673
670
}
674
671
675
672
private Declaration FindProjectScopeDeclaration ( string identifierName )
0 commit comments