Removed unneccessary accesses to the Project on a declaration.

Author: MDoerner

RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerViewModel.cs

@@ -422,7 +422,7 @@ private Declaration CreateDeclaration(QualifiedModuleName module)
         {
             var projectDeclaration =
                 _state.DeclarationFinder.UserDeclarations(DeclarationType.Project)
-                    .FirstOrDefault(item => item.Project.ProjectId == module.ProjectId);
+                    .FirstOrDefault(item => item.ProjectId == module.ProjectId);
 
             if (module.ComponentType == ComponentType.StandardModule)
             {

Rubberduck.Inspections/QuickFixes/EncapsulateFieldQuickFix.cs

@@ -6,29 +6,30 @@
 using Rubberduck.Refactorings.EncapsulateField;
 using Rubberduck.SmartIndenter;
 using Rubberduck.UI.Refactorings.EncapsulateField;
+using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.Inspections.QuickFixes
 {
     public sealed class EncapsulateFieldQuickFix : QuickFixBase
     {
+        private readonly IVBE _vbe;
         private readonly RubberduckParserState _state;
         private readonly IIndenter _indenter;
 
-        public EncapsulateFieldQuickFix(RubberduckParserState state, IIndenter indenter)
+        public EncapsulateFieldQuickFix(IVBE vbe, RubberduckParserState state, IIndenter indenter)
             : base(typeof(EncapsulatePublicFieldInspection))
         {
+            _vbe = vbe;
             _state = state;
             _indenter = indenter;
         }
 
         public override void Fix(IInspectionResult result)
         {
-            var vbe = result.Target.Project.VBE;
-
             using (var view = new EncapsulateFieldDialog(new EncapsulateFieldViewModel(_state, _indenter)))
             {
-                var factory = new EncapsulateFieldPresenterFactory(vbe, _state, view);
-                var refactoring = new EncapsulateFieldRefactoring(vbe, _indenter, factory);
+                var factory = new EncapsulateFieldPresenterFactory(_vbe, _state, view);
+                var refactoring = new EncapsulateFieldRefactoring(_vbe, _indenter, factory);
                 refactoring.Refactor(result.Target);
             }
         }

Rubberduck.Inspections/QuickFixes/MoveFieldCloserToUsageQuickFix.cs

@@ -5,26 +5,27 @@
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.MoveCloserToUsage;
 using Rubberduck.UI;
+using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.Inspections.QuickFixes
 {
     public sealed class MoveFieldCloserToUsageQuickFix : QuickFixBase
     {
+        private readonly IVBE _vbe;
         private readonly RubberduckParserState _state;
         private readonly IMessageBox _messageBox;
 
-        public MoveFieldCloserToUsageQuickFix(RubberduckParserState state, IMessageBox messageBox)
+        public MoveFieldCloserToUsageQuickFix(IVBE vbe, RubberduckParserState state, IMessageBox messageBox)
             : base(typeof(MoveFieldCloserToUsageInspection))
         {
+            _vbe = vbe;
             _state = state;
             _messageBox = messageBox;
         }
 
         public override void Fix(IInspectionResult result)
         {
-            var vbe = result.Target.Project.VBE;
-
-            var refactoring = new MoveCloserToUsageRefactoring(vbe, _state, _messageBox);
+            var refactoring = new MoveCloserToUsageRefactoring(_vbe, _state, _messageBox);
             refactoring.Refactor(result.Target);
         }
 

Rubberduck.Inspections/QuickFixes/RenameDeclarationQuickFix.cs

@@ -6,29 +6,30 @@
 using Rubberduck.Refactorings.Rename;
 using Rubberduck.UI;
 using Rubberduck.UI.Refactorings.Rename;
+using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.Inspections.QuickFixes
 {
     public sealed class RenameDeclarationQuickFix : QuickFixBase
     {
+        private readonly IVBE _vbe;
         private readonly RubberduckParserState _state;
         private readonly IMessageBox _messageBox;
 
-        public RenameDeclarationQuickFix(RubberduckParserState state, IMessageBox messageBox)
+        public RenameDeclarationQuickFix(IVBE vbe, RubberduckParserState state, IMessageBox messageBox)
             : base(typeof(HungarianNotationInspection), typeof(UseMeaningfulNameInspection), typeof(DefaultProjectNameInspection))
         {
+            _vbe = vbe;
             _state = state;
             _messageBox = messageBox;
         }
 
         public override void Fix(IInspectionResult result)
         {
-            var vbe = result.Target.Project.VBE;
-
             using (var view = new RenameDialog(new RenameViewModel(_state)))
             {
-                var factory = new RenamePresenterFactory(vbe, view, _state);
-                var refactoring = new RenameRefactoring(vbe, factory, _messageBox, _state);
+                var factory = new RenamePresenterFactory(_vbe, view, _state);
+                var refactoring = new RenameRefactoring(_vbe, factory, _messageBox, _state);
                 refactoring.Refactor(result.Target);
             }
         }

RubberduckTests/QuickFixes/MoveFieldCloserToUsageQuickFixTests.cs

@@ -33,7 +33,7 @@ Dim bar As String
                 var inspection = new MoveFieldCloserToUsageInspection(state);
                 var inspectionResults = inspection.GetInspectionResults();
 
-                new MoveFieldCloserToUsageQuickFix(state, new Mock<IMessageBox>().Object).Fix(inspectionResults.First());
+                new MoveFieldCloserToUsageQuickFix(vbe.Object, state, new Mock<IMessageBox>().Object).Fix(inspectionResults.First());
                 Assert.AreEqual(expectedCode, component.CodeModule.Content());
             }
         }