Skip to content

sync with main repo #220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 16, 2017
Merged

sync with main repo #220

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f04338
Add isThreadSafe parameter for Lazy<T>s in DeclarationFinder
comintern Feb 14, 2017
8f1041e
Merge branch 'next' into next
comintern Feb 15, 2017
2ff841c
Merge pull request #2692 from comintern/next
retailcoder Feb 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Rubberduck.Parsing/Symbols/DeclarationFinder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ public DeclarationFinder(IReadOnlyList<Declaration> declarations, IEnumerable<IA
_parametersByParent = declarations.Where(declaration => declaration.DeclarationType == DeclarationType.Parameter)
.GroupBy(declaration => declaration.ParentDeclaration).ToConcurrentDictionary();
_userDeclarationsByType = declarations.Where(declaration => !declaration.IsBuiltIn).GroupBy(declaration => declaration.DeclarationType).ToConcurrentDictionary();
_builtinEvents = new Lazy<ConcurrentBag<Declaration>>(() => FindBuiltInEventHandlers(declarations));
_builtinEvents = new Lazy<ConcurrentBag<Declaration>>(() => FindBuiltInEventHandlers(declarations), true);

_projects = _projects = new Lazy<ConcurrentBag<Declaration>>(() => new ConcurrentBag<Declaration>(declarations.Where(d => d.DeclarationType == DeclarationType.Project)));
_classes = new Lazy<ConcurrentBag<Declaration>>(() => new ConcurrentBag<Declaration>(declarations.Where(d => d.DeclarationType == DeclarationType.ClassModule)));
_projects = _projects = new Lazy<ConcurrentBag<Declaration>>(() => new ConcurrentBag<Declaration>(declarations.Where(d => d.DeclarationType == DeclarationType.Project)), true);
_classes = new Lazy<ConcurrentBag<Declaration>>(() => new ConcurrentBag<Declaration>(declarations.Where(d => d.DeclarationType == DeclarationType.ClassModule)), true);

var withEventsFields = UserDeclarations(DeclarationType.Variable).Where(item => item.IsWithEvents).ToArray();
var events = withEventsFields.Select(field =>
Expand All @@ -88,7 +88,7 @@ public DeclarationFinder(IReadOnlyList<Declaration> declarations, IEnumerable<IA
&& member.IdentifierName == item.WithEventsField.IdentifierName + "_" + evnt.IdentifierName))
})
.ToDictionary(item => item.WithEventsField, item => item.Handlers.ToArray())
));
), true);

_undeclared = new ConcurrentDictionary<QualifiedMemberName, ConcurrentBag<Declaration>>(new Dictionary<QualifiedMemberName, ConcurrentBag<Declaration>>());
_unresolved = new ConcurrentBag<UnboundMemberDeclaration>(new List<UnboundMemberDeclaration>());
Expand All @@ -106,12 +106,12 @@ public DeclarationFinder(IReadOnlyList<Declaration> declarations, IEnumerable<IA
});

_interfaceMembers = new Lazy<ConcurrentDictionary<Declaration, Declaration[]>>(() =>
new ConcurrentDictionary<Declaration, Declaration[]>(interfaceMembers.ToDictionary(item => item.InterfaceModule, item => item.InterfaceMembers.ToArray())));
new ConcurrentDictionary<Declaration, Declaration[]>(interfaceMembers.ToDictionary(item => item.InterfaceModule, item => item.InterfaceMembers.ToArray())), true);

var implementingNames = new Lazy<IEnumerable<string>>(() => implementsInstructions.SelectMany(item =>
_declarations[item.IdentifierReference.Declaration.QualifiedName.QualifiedModuleName]
.Where(member => member.DeclarationType.HasFlag(DeclarationType.Member))
.Select(member => item.IdentifierReference.Declaration.IdentifierName + "_" + member.IdentifierName)));
.Select(member => item.IdentifierReference.Declaration.IdentifierName + "_" + member.IdentifierName)), true);

var implementableMembers = implementsInstructions.Select(item =>
new
Expand All @@ -123,7 +123,7 @@ public DeclarationFinder(IReadOnlyList<Declaration> declarations, IEnumerable<IA

_membersByImplementsContext = new Lazy<ConcurrentDictionary<VBAParser.ImplementsStmtContext, Declaration[]>>(() =>
new ConcurrentDictionary<VBAParser.ImplementsStmtContext, Declaration[]>(
implementableMembers.ToDictionary(item => item.Context, item => item.Members)));
implementableMembers.ToDictionary(item => item.Context, item => item.Members)), true);
}

public IEnumerable<Declaration> Undeclared
Expand Down