Remove renamed component correctly

Author: Hosch250

RetailCoder.VBE/App.cs

@@ -274,7 +274,7 @@ async void sink_ComponentRenamed(object sender, DispatcherRenamedEventArgs<VBCom
 
             Debug.WriteLine(string.Format("Component '{0}' was renamed.", e.Item.Name));
 
-            _parser.State.OnParseRequested(sender, e.Item);
+            _parser.State.RemoveRenamedComponent(e.Item, e.OldName);
         }
 
         async void sink_ComponentRemoved(object sender, DispatcherEventArgs<VBComponent> e)

Rubberduck.Parsing/VBA/RubberduckParserState.cs

@@ -517,6 +517,47 @@ public bool ClearStateCache(VBComponent component, bool setStateChanged = false)
             return success;
         }
 
+        public bool RemoveRenamedComponent(VBComponent component, string oldComponentName)
+        {
+            var match = new QualifiedModuleName(component, oldComponentName);
+            var keys = _declarations.Keys.Where(kvp => kvp.ComponentName == oldComponentName && kvp.ProjectId == match.ProjectId);
+
+            var success = true;
+            var declarationsRemoved = 0;
+            foreach (var key in keys)
+            {
+                ConcurrentDictionary<Declaration, byte> declarations = null;
+                success = success && (!_declarations.ContainsKey(key) || _declarations.TryRemove(key, out declarations));
+                declarationsRemoved = declarations == null ? 0 : declarations.Count;
+
+                IParseTree tree;
+                success = success && (!_parseTrees.ContainsKey(key) || _parseTrees.TryRemove(key, out tree));
+
+                int contentHash;
+                success = success && (!_moduleContentHashCodes.ContainsKey(key) || _moduleContentHashCodes.TryRemove(key, out contentHash));
+
+                IList<IAnnotation> annotations;
+                success = success && (!_annotations.ContainsKey(key) || _annotations.TryRemove(key, out annotations));
+
+                ITokenStream stream;
+                success = success && (!_tokenStreams.ContainsKey(key) || _tokenStreams.TryRemove(key, out stream));
+
+                ParserState state;
+                success = success && (!_moduleStates.ContainsKey(key) || _moduleStates.TryRemove(key, out state));
+
+                SyntaxErrorException exception;
+                success = success && (!_moduleExceptions.ContainsKey(key) || _moduleExceptions.TryRemove(key, out exception));
+
+                IList<CommentNode> nodes;
+                success = success && (!_comments.ContainsKey(key) || _comments.TryRemove(key, out nodes));
+            }
+
+            OnStateChanged();
+
+            Debug.WriteLine("RemoveRenamedComponent({0}): {1} - {2} declarations removed", oldComponentName, success ? "succeeded" : "failed", declarationsRemoved);
+            return success;
+        }
+
         public void AddTokenStream(VBComponent component, ITokenStream stream)
         {
             _tokenStreams[new QualifiedModuleName(component)] = stream;

Rubberduck.VBEEditor/QualifiedModuleName.cs

@@ -59,6 +59,34 @@ public QualifiedModuleName(VBComponent component)
                 : 0;
         }
 
+        /// <summary>
+        /// Creates a QualifiedModuleName for removing renamed declarations.
+        /// Do not use this overload.
+        /// </summary>
+        public QualifiedModuleName(VBComponent component, string oldComponentName)
+        {
+            _project = null; // field is only assigned when the instance refers to a VBProject.
+
+            _component = component;
+            _componentName = oldComponentName;
+            _project = component == null ? null : component.Collection.Parent;
+            _projectName = _project == null ? string.Empty : _project.Name;
+            _projectPath = string.Empty;
+            _projectId = GetProjectId(_project);
+
+            _contentHashCode = 0;
+            if (component == null)
+            {
+                return;
+            }
+
+            var module = component.CodeModule;
+            _contentHashCode = module.CountOfLines > 0
+                // ReSharper disable once UseIndexedProperty
+                ? module.get_Lines(1, module.CountOfLines).GetHashCode()
+                : 0;
+        }
+
         /// <summary>
         /// Creates a QualifiedModuleName for a built-in declaration.
         /// Do not use this overload for user declarations.