Revert to ConcurrentDictionary

Author: Hosch250

Rubberduck.Parsing/Rubberduck.Parsing.csproj

@@ -90,7 +90,6 @@
     <Compile Include="Symbols\MsFormsLib.cs" />
     <Compile Include="Symbols\ValuedDeclaration.cs" />
     <Compile Include="Symbols\VbaStandardLib.cs" />
-    <Compile Include="VBA\ConcurrentHashSet.cs" />
     <Compile Include="VBA\Nodes\INode.cs" />
     <Compile Include="VBA\Nodes\Node.cs" />
     <Compile Include="VBA\Nodes\ProcedureNode.cs" />

Rubberduck.Parsing/VBA/ConcurrentHashSet.cs

@@ -11,11 +11,16 @@
 
 namespace Rubberduck.Parsing.VBA
 {
+    public enum ResolutionState
+    {
+        Unresolved
+    }
+
     public class RubberduckParserState
     {
         // keys are the declarations; values indicate whether a declaration is resolved.
-        private readonly ConcurrentHashSet<Declaration> _declarations =
-            new ConcurrentHashSet<Declaration>();
+        private readonly ConcurrentDictionary<Declaration, ResolutionState> _declarations =
+            new ConcurrentDictionary<Declaration, ResolutionState>();
 
         private readonly ConcurrentDictionary<VBComponent, ITokenStream> _tokenStreams =
             new ConcurrentDictionary<VBComponent, ITokenStream>();
@@ -61,7 +66,7 @@ public ParserState GetModuleState(VBComponent component)
         }
 
         private ParserState _status;
-        public ParserState Status { get { return _status; } private set { if(_status != value) {_status = value; OnStateChanged();} } }
+        public ParserState Status { get { return _status; } private set { if (_status != value) { _status = value; OnStateChanged(); } } }
 
         private IEnumerable<QualifiedContext> _obsoleteCallContexts = new List<QualifiedContext>();
 
@@ -90,7 +95,7 @@ public IEnumerable<QualifiedContext> ObsoleteLetContexts
 
         public IEnumerable<CommentNode> Comments
         {
-            get 
+            get
             {
                 return _comments.Values.SelectMany(comments => comments);
             }
@@ -104,45 +109,34 @@ public void SetModuleComments(VBComponent component, IEnumerable<CommentNode> co
         /// <summary>
         /// Gets a copy of the collected declarations.
         /// </summary>
-        public IEnumerable<Declaration> AllDeclarations { get { return _declarations; } }
+        public IEnumerable<Declaration> AllDeclarations { get { return _declarations.Keys.ToList(); } }
 
         /// <summary>
         /// Adds the specified <see cref="Declaration"/> to the collection (replaces existing).
         /// </summary>
         public void AddDeclaration(Declaration declaration)
         {
-            if (_declarations.Add(declaration))
+            if (_declarations.TryAdd(declaration, ResolutionState.Unresolved))
             {
                 return;
             }
 
             if (RemoveDeclaration(declaration))
             {
-                _declarations.Add(declaration);
+                _declarations.TryAdd(declaration, ResolutionState.Unresolved);
             }
         }
 
         public void ClearDeclarations(VBComponent component)
         {
-            var declarations = _declarations.Where(k =>
+            var declarations = _declarations.Keys.Where(k =>
                 k.QualifiedName.QualifiedModuleName.Project == component.Collection.Parent
                 && k.ComponentName == component.Name);
 
-            while (true)
+            foreach (var declaration in declarations)
             {
-                try
-                {
-                    foreach (var declaration in declarations)
-                    {
-                        _declarations.Remove(declaration);
-                    }
-
-                    return;
-                }
-                catch (InvalidOperationException)
-                {
-                    
-                }
+                ResolutionState state;
+                _declarations.TryRemove(declaration, out state);
             }
         }
 
@@ -170,7 +164,8 @@ public TokenStreamRewriter GetRewriter(VBComponent component)
         /// <returns>Returns true when successful.</returns>
         private bool RemoveDeclaration(Declaration declaration)
         {
-            return _declarations.Remove(declaration);
+            ResolutionState state;
+            return _declarations.TryRemove(declaration, out state);
         }
 
         /// <summary>
@@ -179,15 +174,15 @@ private bool RemoveDeclaration(Declaration declaration)
         /// </summary>
         public void AddBuiltInDeclarations(IHostApplication hostApplication)
         {
-            if (_declarations.Any(declaration => declaration.IsBuiltIn))
+            if (_declarations.Any(declaration => declaration.Key.IsBuiltIn))
             {
                 return;
             }
 
             var builtInDeclarations = VbaStandardLib.Declarations;
 
             // cannot be strongly-typed here because of constraints on COM interop and generics in the inheritance hierarchy. </rant>
-            if (hostApplication /*is ExcelApp*/ .ApplicationName == "Excel") 
+            if (hostApplication /*is ExcelApp*/ .ApplicationName == "Excel")
             {
                 builtInDeclarations = builtInDeclarations.Concat(ExcelObjectModel.Declarations);
             }