Addressed comments to PR #3735.

Author: MDoerner

RetailCoder.VBE/UI/Command/AddTestMethodCommand.cs

@@ -84,16 +84,18 @@ protected override void OnExecute(object parameter)
                     var declaration = _state.GetTestModules()
                         .FirstOrDefault(f => _state.ProjectsProvider.Component(f.QualifiedModuleName).HasEqualCodeModule(module));
 
-                    if (declaration != null)
+                    if (declaration == null)
                     {
-                        string name;
-                        using (var component = module.Parent)
-                        {
-                            name = GetNextTestMethodName(component);
-                        }
-                        var body = TestMethodTemplate.Replace(NamePlaceholder, name);
-                        module.InsertLines(module.CountOfLines, body);
+                        return;
                     }
+
+                    string name;
+                    using (var component = module.Parent)
+                    {
+                        name = GetNextTestMethodName(component);
+                    }
+                    var body = TestMethodTemplate.Replace(NamePlaceholder, name);
+                    module.InsertLines(module.CountOfLines, body);
                 }
             }
             _state.OnParseRequested(this);

Rubberduck.Parsing/Symbols/DeclarationSymbolsListener.cs

@@ -94,7 +94,6 @@ private IEnumerable<IAnnotation> FindAnnotations()
             }
 
             int lastDeclarationsSectionLine;
-
             using (var codeModule = _state.ProjectsProvider.Component(_qualifiedModuleName).CodeModule)
             {
                 lastDeclarationsSectionLine = codeModule.CountOfDeclarationLines;

Rubberduck.Parsing/VBA/ParseRunnerBase.cs

@@ -104,7 +104,10 @@ private void ProcessComponentParseResults(QualifiedModuleName module, Task<Compo
                 lock (_state)
                 {
                     token.ThrowIfCancellationRequested();
-                    _state.SetModuleAttributes(module, result.Attributes);  //This has to come first because it creates the module state if not present.
+
+                    //This has to come first because it creates the module state if not present.
+                    _state.SetModuleAttributes(module, result.Attributes);
+
                     _state.AddTokenStream(module, result.Tokens);
                     _state.AddParseTree(module, result.ParseTree);
                     _state.AddParseTree(module, result.AttributesTree, ParsePass.AttributesPass);

Rubberduck.Parsing/VBA/ReferenceResolveRunnerBase.cs

@@ -173,7 +173,7 @@ private Declaration SupertypeForDocument(QualifiedModuleName module, RubberduckP
                         var allNamesMatch = true;
                         for (var i = 0; i < coclass.Key.Count; i++)
                         {
-                            using(var property = properties[i+1])
+                            using (var property = properties[i+1])
                             {
                                 if (coclass.Key[i] != property?.Name)
                                 {

Rubberduck.VBEEditor/ComManagement/ProjectsRepository.cs

@@ -86,7 +86,7 @@ private void ExecuteWithinWriteLock(Action action)
         {
             if (_disposed)
             {
-                return; //The lock has already been diposed.
+                return; //The lock has already been disposed.
             }
 
             var writeLockTaken = false;
@@ -113,11 +113,16 @@ private void RefreshCollections()
             var componentCollections = ClearComWrapperDictionary(_componentsCollections);
             var components = ClearComWrapperDictionary(_components);
 
-            LoadCollections();
-
-            DisposeWrapperEnumerable(projects);
-            DisposeWrapperEnumerable(componentCollections);
-            DisposeWrapperEnumerable(components);
+            try
+            {
+                LoadCollections();
+            }
+            finally
+            {
+                DisposeWrapperEnumerable(projects);
+                DisposeWrapperEnumerable(componentCollections);
+                DisposeWrapperEnumerable(components);
+            }
         }
 
         private IEnumerable<TWrapper> ClearComWrapperDictionary<TKey, TWrapper>(IDictionary<TKey, TWrapper> dictionary)
@@ -152,11 +157,16 @@ private void RefreshCollections(string projectId)
                 _components.Remove(qmn);
             }
 
-            _componentsCollections[projectId] = project.VBComponents;
-            LoadComponents(_componentsCollections[projectId]);
-
-            componentsCollection.Dispose();
-            DisposeWrapperEnumerable(components.Select(kvp => kvp.Value));
+            try
+            {
+                _componentsCollections[projectId] = project.VBComponents;
+                LoadComponents(_componentsCollections[projectId]);
+            }
+            finally
+            {
+                componentsCollection.Dispose();
+                DisposeWrapperEnumerable(components.Select(kvp => kvp.Value));
+            } 
         }
 
         public void Refresh(string projectId)
@@ -178,7 +188,7 @@ private T EvaluateWithinReadLock<T>(Func<T> function) where T: class
         {
             if (_disposed)
             {
-                return default(T); //The lock has already been diposed.
+                return default(T); //The lock has already been disposed.
             }
 
             var readLockTaken = false;