Extract components from QMNs (second try)

RetailCoder.VBE/API/VBA/ParserState.cs

@@ -10,6 +10,7 @@
 using Rubberduck.Parsing.VBA;
 using Rubberduck.UI.Command.MenuItems;
 using Rubberduck.Parsing.Symbols;
+using Rubberduck.VBEditor.ComManagement;
 using Rubberduck.VBEditor.SafeComWrappers.VBA;
 
 namespace Rubberduck.API.VBA
@@ -64,14 +65,15 @@ public void Initialize(Microsoft.Vbe.Interop.VBE vbe)
 
             _vbe = new VBE(vbe);
             var declarationFinderFactory = new ConcurrentlyConstructedDeclarationFinderFactory();
-            _state = new RubberduckParserState(null, declarationFinderFactory);
+            var projectRepository = new ProjectsRepository(_vbe);
+            _state = new RubberduckParserState(null, projectRepository, declarationFinderFactory);
             _state.StateChanged += _state_StateChanged;
 
             var exporter = new ModuleExporter();
 
             Func<IVBAPreprocessor> preprocessorFactory = () => new VBAPreprocessor(double.Parse(_vbe.Version, CultureInfo.InvariantCulture));
-            _attributeParser = new AttributeParser(exporter, preprocessorFactory);
-            var projectManager = new ProjectManager(_state, _vbe);
+            _attributeParser = new AttributeParser(exporter, preprocessorFactory, _state.ProjectsProvider);
+            var projectManager = new RepositoryProjectManager(projectRepository);
             var moduleToModuleReferenceManager = new ModuleToModuleReferenceManager();
             var parserStateManager = new ParserStateManager(_state);
             var referenceRemover = new ReferenceRemover(_state, moduleToModuleReferenceManager);

RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerComponentViewModel.cs

@@ -7,6 +7,7 @@
 using Rubberduck.VBEditor;
 using resx = Rubberduck.UI.CodeExplorer.CodeExplorer;
 using Rubberduck.Parsing.Annotations;
+using Rubberduck.VBEditor.ComManagement;
 using Rubberduck.VBEditor.SafeComWrappers;
 
 namespace Rubberduck.Navigation.CodeExplorer
@@ -33,10 +34,13 @@ public class CodeExplorerComponentViewModel : CodeExplorerItemViewModel, ICodeEx
             DeclarationType.Variable, 
         };
 
-        public CodeExplorerComponentViewModel(CodeExplorerItemViewModel parent, Declaration declaration, IEnumerable<Declaration> declarations)
+        private readonly IProjectsProvider _projectsProvider;
+
+        public CodeExplorerComponentViewModel(CodeExplorerItemViewModel parent, Declaration declaration, IEnumerable<Declaration> declarations, IProjectsProvider projectsProvider)
         {
             Parent = parent;
             Declaration = declaration;
+            _projectsProvider = projectsProvider;
             _icon = Icons[DeclarationType];
             Items = declarations.GroupBy(item => item.Scope).SelectMany(grouping =>
                             grouping.Where(item => item.ParentDeclaration != null
@@ -48,12 +52,17 @@ public CodeExplorerComponentViewModel(CodeExplorerItemViewModel parent, Declarat
 
             _name = Declaration.IdentifierName;
 
-            var component = declaration.QualifiedName.QualifiedModuleName.Component;
+            var qualifiedModuleName = declaration.QualifiedName.QualifiedModuleName;
             try
             {
-                if (component.Type == ComponentType.Document)
+                if (qualifiedModuleName.ComponentType == ComponentType.Document)
                 {
-                    var parenthesizedName = component.Properties["Name"].Value.ToString();
+                    var component = _projectsProvider.Component(qualifiedModuleName);
+                    string parenthesizedName;
+                    using (var properties = component.Properties)
+                    {
+                        parenthesizedName = properties["Name"].Value.ToString() ?? String.Empty;
+                    }
 
                     if (ContainsBuiltinDocumentPropertiesProperty())
                     {
@@ -79,7 +88,7 @@ public CodeExplorerComponentViewModel(CodeExplorerItemViewModel parent, Declarat
 
         private bool ContainsBuiltinDocumentPropertiesProperty()
         {
-            var properties = Declaration.QualifiedName.QualifiedModuleName.Component.Properties;
+            using (var properties = _projectsProvider.Component(Declaration.QualifiedName.QualifiedModuleName).Properties)
             {
                 return properties.Any(item => item.Name == "BuiltinDocumentProperties");
             }

RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerCustomFolderViewModel.cs

@@ -4,6 +4,7 @@
 using System.Windows.Media.Imaging;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.VBEditor;
+using Rubberduck.VBEditor.ComManagement;
 using resx = Rubberduck.Properties.Resources;
 
 namespace Rubberduck.Navigation.CodeExplorer
@@ -18,9 +19,12 @@ public class CodeExplorerCustomFolderViewModel : CodeExplorerItemViewModel
             DeclarationType.UserForm, 
         };
 
-        public CodeExplorerCustomFolderViewModel(CodeExplorerItemViewModel parent, string name, string fullPath)
+        private readonly IProjectsProvider _projectsProvider;
+
+        public CodeExplorerCustomFolderViewModel(CodeExplorerItemViewModel parent, string name, string fullPath, IProjectsProvider projectsProvider)
         {
             _parent = parent;
+            _projectsProvider = projectsProvider;
             FullPath = fullPath;
             Name = name.Replace("\"", string.Empty);
             FolderAttribute = string.Format("@Folder(\"{0}\")", fullPath.Replace("\"", string.Empty));
@@ -42,7 +46,7 @@ public void AddNodes(List<Declaration> declarations)
                     var members = declarations.Where(item =>
                         !ComponentTypes.Contains(item.DeclarationType) && item.ComponentName == moduleName);
 
-                    AddChild(new CodeExplorerComponentViewModel(this, parent, members));
+                    AddChild(new CodeExplorerComponentViewModel(this, parent, members, _projectsProvider));
                 }
                 catch (InvalidOperationException exception)
                 {

RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerItemViewModel.cs

@@ -85,13 +85,13 @@ public override int Compare(CodeExplorerItemViewModel x, CodeExplorerItemViewMod
 
             if (x.ExpandedIcon != y.ExpandedIcon)
             {
-                // ReSharper disable PossibleInvalidOperationException - this will have a component
-                var xComponent = x.QualifiedSelection.Value.QualifiedName.Component;
-                var yComponent = y.QualifiedSelection.Value.QualifiedName.Component;
+                // ReSharper disable PossibleInvalidOperationException - this will have a QualifiedSelection
+                var xQmn = x.QualifiedSelection.Value.QualifiedName;
+                var yQmn = y.QualifiedSelection.Value.QualifiedName;
 
-                if (xComponent.Type == ComponentType.Document ^ yComponent.Type == ComponentType.Document)
+                if (xQmn.ComponentType == ComponentType.Document ^ yQmn.ComponentType == ComponentType.Document)
                 {
-                    return xComponent.Type == ComponentType.Document ? -1 : 1;
+                    return xQmn.ComponentType == ComponentType.Document ? -1 : 1;
                 }
             }
 

RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerViewModel.cs

@@ -28,7 +28,6 @@ public sealed class CodeExplorerViewModel : ViewModelBase, IDisposable
     {
         private readonly FolderHelper _folderHelper;
         private readonly RubberduckParserState _state;
-        private IConfigProvider<GeneralSettings> _generalSettingsProvider;
         private readonly IConfigProvider<WindowSettings> _windowSettingsProvider;
         private readonly GeneralSettings _generalSettings;
         private readonly WindowSettings _windowSettings;
@@ -42,7 +41,6 @@ public CodeExplorerViewModel(FolderHelper folderHelper, RubberduckParserState st
             _state = state;
             _state.StateChanged += HandleStateChanged;
             _state.ModuleStateChanged += ParserState_ModuleStateChanged;
-            _generalSettingsProvider = generalSettingsProvider;
             _windowSettingsProvider = windowSettingsProvider;
 
             if (generalSettingsProvider != null)
@@ -374,8 +372,7 @@ private void ParserState_ModuleStateChanged(object sender, Parsing.ParseProgress
                 return;
             }
 
-            var components = e.Module.Component.Collection;
-            var componentProject = components.Parent;
+            var componentProject = _state.ProjectsProvider.Project(e.Module.ProjectId);
             {
                 var projectNode = Projects.OfType<CodeExplorerProjectViewModel>()
                     .FirstOrDefault(p => p.Declaration.Project.Equals(componentProject));
@@ -399,13 +396,13 @@ private void ParserState_ModuleStateChanged(object sender, Parsing.ParseProgress
                     {
                         if (folderNode == null)
                         {
-                            folderNode = new CodeExplorerCustomFolderViewModel(projectNode, projectName, projectName);
+                            folderNode = new CodeExplorerCustomFolderViewModel(projectNode, projectName, projectName, _state.ProjectsProvider);
                             projectNode.AddChild(folderNode);
                         }
 
                         var declaration = CreateDeclaration(e.Module);
                         var newNode =
-                            new CodeExplorerComponentViewModel(folderNode, declaration, new List<Declaration>())
+                            new CodeExplorerComponentViewModel(folderNode, declaration, new List<Declaration>(), _state.ProjectsProvider)
                             {
                                 IsErrorState = true
                             };
@@ -427,7 +424,7 @@ private Declaration CreateDeclaration(QualifiedModuleName module)
         {
             var projectDeclaration =
                 _state.DeclarationFinder.UserDeclarations(DeclarationType.Project)
-                    .FirstOrDefault(item => item.Project.VBComponents.Contains(module.Component));
+                    .FirstOrDefault(item => item.Project.ProjectId == module.ProjectId);
 
             if (module.ComponentType == ComponentType.StandardModule)
             {

RetailCoder.VBE/Navigation/Folders/FolderHelper.cs

@@ -23,7 +23,7 @@ public CodeExplorerCustomFolderViewModel GetFolderTree(Declaration declaration =
         {
             var delimiter = GetDelimiter();
 
-            var root = new CodeExplorerCustomFolderViewModel(null, string.Empty, string.Empty);
+            var root = new CodeExplorerCustomFolderViewModel(null, string.Empty, string.Empty, _state.ProjectsProvider);
 
             var items = declaration == null
                 ? _state.AllUserDeclarations.ToList()
@@ -46,7 +46,7 @@ public CodeExplorerCustomFolderViewModel GetFolderTree(Declaration declaration =
                     var node = currentNode.Items.FirstOrDefault(i => i.Name == section);
                     if (node == null)
                     {
-                        node = new CodeExplorerCustomFolderViewModel(currentNode, section, fullPath);
+                        node = new CodeExplorerCustomFolderViewModel(currentNode, section, fullPath, _state.ProjectsProvider);
                         currentNode.AddChild(node);
                     }
 

RetailCoder.VBE/Refactorings/ImplementInterface/ImplementInterfaceRefactoring.cs

@@ -87,7 +87,7 @@ public void Refactor(QualifiedSelection selection)
 
             if (oldSelection.HasValue)
             {
-                using (var module = oldSelection.Value.QualifiedName.Component.CodeModule)
+                using (var module = _state.ProjectsProvider.Component(oldSelection.Value.QualifiedName).CodeModule)
                 {
                     using (var pane = module.CodePane)
                     {

RetailCoder.VBE/Refactorings/IntroduceField/IntroduceFieldRefactoring.cs

@@ -89,10 +89,12 @@ private void PromoteVariable(IModuleRewriter rewriter, Declaration target)
 
             if (oldSelection.HasValue)
             {
-                var module = oldSelection.Value.QualifiedName.Component.CodeModule;
-                var pane = module.CodePane;
+                using (var module = _state.ProjectsProvider.Component(oldSelection.Value.QualifiedName).CodeModule)
                 {
-                    pane.Selection = oldSelection.Value.Selection;
+                    using (var pane = module.CodePane)
+                    {
+                        pane.Selection = oldSelection.Value.Selection;
+                    }
                 }
             }
 

RetailCoder.VBE/Refactorings/RemoveParameters/RemoveParametersRefactoring.cs

@@ -10,6 +10,7 @@
 using Rubberduck.Parsing.VBA;
 using Rubberduck.UI;
 using Rubberduck.VBEditor;
+using Rubberduck.VBEditor.ComManagement;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using Antlr4.Runtime;
 
@@ -21,11 +22,13 @@ public class RemoveParametersRefactoring : IRefactoring
         private readonly IRefactoringPresenterFactory<IRemoveParametersPresenter> _factory;
         private RemoveParametersModel _model;
         private readonly HashSet<IModuleRewriter> _rewriters = new HashSet<IModuleRewriter>();
+        private readonly IProjectsProvider _projectsProvider;
 
-        public RemoveParametersRefactoring(IVBE vbe, IRefactoringPresenterFactory<IRemoveParametersPresenter> factory)
+        public RemoveParametersRefactoring(IVBE vbe, IRefactoringPresenterFactory<IRemoveParametersPresenter> factory, IProjectsProvider projectsProvider)
         {
             _vbe = vbe;
             _factory = factory;
+            _projectsProvider = projectsProvider;
         }
 
         public void Refactor()
@@ -42,16 +45,9 @@ public void Refactor()
                 return;
             }
 
-            QualifiedSelection? oldSelection = null;
             using (var pane = _vbe.ActiveCodePane)
             {
-                using (var module = pane.CodeModule)
-                {
-                    if (!module.IsWrappingNullReference)
-                    {
-                        oldSelection = module.GetQualifiedSelection();
-                    }
-                }
+                var oldSelection = pane.GetQualifiedSelection();
 
                 RemoveParameters();
 
@@ -66,7 +62,7 @@ public void Refactor()
 
         public void Refactor(QualifiedSelection target)
         {
-            var pane = _vbe.ActiveCodePane;
+            using (var pane = _vbe.ActiveCodePane)
             {
                 if (pane.IsWrappingNullReference)
                 {
@@ -84,7 +80,7 @@ public void Refactor(Declaration target)
                 throw new ArgumentException("Invalid declaration type");
             }
 
-            var pane = _vbe.ActiveCodePane;
+            using (var pane = _vbe.ActiveCodePane)
             {
                 if (pane.IsWrappingNullReference)
                 {
@@ -144,7 +140,7 @@ private void AdjustReferences(IEnumerable<IdentifierReference> references, Decla
                     continue;
                 }
 
-                using (var module = reference.QualifiedModuleName.Component.CodeModule)
+                using (var module = _projectsProvider.Component(reference.QualifiedModuleName).CodeModule)
                 {
                     RemoveCallArguments(argumentList, module);
                 }

RetailCoder.VBE/Refactorings/Rename/RenameRefactoring.cs

@@ -211,7 +211,8 @@ private bool IsValidTarget(Declaration target)
 
             if (target.DeclarationType.HasFlag(DeclarationType.Control))
             {
-                using (var controls = target.QualifiedName.QualifiedModuleName.Component.Controls)
+                var component = _state.ProjectsProvider.Component(target.QualifiedName.QualifiedModuleName);
+                using (var controls = component.Controls)
                 {
                     using (var control = controls.FirstOrDefault(item => item.Name == target.IdentifierName))
                     {
@@ -225,7 +226,7 @@ private bool IsValidTarget(Declaration target)
             }
             else if (target.DeclarationType.HasFlag(DeclarationType.Module))
             {
-                using (var module = target.QualifiedName.QualifiedModuleName.Component.CodeModule)
+                using (var module = _state.ProjectsProvider.Component(target.QualifiedName.QualifiedModuleName).CodeModule)
                 {
                     if (module.IsWrappingNullReference)
                     {
@@ -388,7 +389,8 @@ private void RenameVariable()
         {
             if (_model.Target.DeclarationType.HasFlag(DeclarationType.Control))
             {
-                using (var controls = _model.Target.QualifiedName.QualifiedModuleName.Component.Controls)
+                var component = _state.ProjectsProvider.Component(_model.Target.QualifiedName.QualifiedModuleName);
+                using (var controls = component.Controls)
                 {
                     using (var control = controls.SingleOrDefault(item => item.Name == _model.Target.IdentifierName))
                     {
@@ -431,7 +433,7 @@ private void RenameModule()
                 }
             }
 
-            var component = _model.Target.QualifiedName.QualifiedModuleName.Component;
+            var component = _state.ProjectsProvider.Component(_model.Target.QualifiedName.QualifiedModuleName);
             if (component.Type == ComponentType.Document)
             {
                 var properties = component.Properties;
@@ -564,9 +566,15 @@ private IEnumerable<Declaration> FindEventHandlersForControl(Declaration control
 
         private void CacheInitialSelection(QualifiedSelection qSelection)
         {
-            if (!qSelection.QualifiedName.Component.CodeModule.CodePane.IsWrappingNullReference)
+            using (var codeModule = _state.ProjectsProvider.Component(qSelection.QualifiedName).CodeModule)
             {
-                _initialSelection = new Tuple<ICodePane, Selection>(qSelection.QualifiedName.Component.CodeModule.CodePane, qSelection.QualifiedName.Component.CodeModule.CodePane.Selection);
+                using (var codePane = codeModule.CodePane)
+                {
+                    if (!codePane.IsWrappingNullReference)
+                    {
+                        _initialSelection = new Tuple<ICodePane, Selection>(codePane, codePane.Selection);
+                    }
+                }
             }
         }
 

RetailCoder.VBE/Refactorings/ReorderParameters/ReorderParametersRefactoring.cs

@@ -9,6 +9,7 @@
 using System.Linq;
 using System.Windows.Forms;
 using Rubberduck.Parsing.Rewriter;
+using Rubberduck.VBEditor.ComManagement;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.Refactorings.ReorderParameters
@@ -20,12 +21,14 @@ public class ReorderParametersRefactoring : IRefactoring
         private ReorderParametersModel _model;
         private readonly IMessageBox _messageBox;
         private readonly HashSet<IModuleRewriter> _rewriters = new HashSet<IModuleRewriter>();
+        private readonly IProjectsProvider _projectsProvider;
 
-        public ReorderParametersRefactoring(IVBE vbe, IRefactoringPresenterFactory<IReorderParametersPresenter> factory, IMessageBox messageBox)
+        public ReorderParametersRefactoring(IVBE vbe, IRefactoringPresenterFactory<IReorderParametersPresenter> factory, IMessageBox messageBox, IProjectsProvider projectsProvider)
         {
             _vbe = vbe;
             _factory = factory;
             _messageBox = messageBox;
+            _projectsProvider = projectsProvider;
         }
 
         public void Refactor()
@@ -122,7 +125,6 @@ private void AdjustReferences(IEnumerable<IdentifierReference> references)
         {
             foreach (var reference in references.Where(item => item.Context != _model.TargetDeclaration.Context))
             {
-                var module = reference.QualifiedModuleName.Component.CodeModule;
                 VBAParser.ArgumentListContext argumentList = null;
                 var callStmt = reference.Context.GetAncestor<VBAParser.CallStmtContext>();
                 if (callStmt != null)
@@ -139,8 +141,15 @@ private void AdjustReferences(IEnumerable<IdentifierReference> references)
                     }
                 }
 
-                if (argumentList == null) { continue; }
-                RewriteCall(argumentList, module);
+                if (argumentList == null)
+                {
+                    continue; 
+                }
+
+                using (var module = _projectsProvider.Component(reference.QualifiedModuleName).CodeModule)
+                {
+                    RewriteCall(argumentList, module);
+                }
             }
         }