Removal of un-ref'd model parameter

BZngr · BZngr · commit 9e44ec413634 · 2020-01-13T19:15:02.000-08:00
diff --git a/Rubberduck.Refactorings/EncapsulateField/EncapsulateFieldRefactoring.cs b/Rubberduck.Refactorings/EncapsulateField/EncapsulateFieldRefactoring.cs
@@ -126,7 +126,7 @@ private IEncapsulateFieldRewriteSession RefactorRewrite(EncapsulateFieldModel mo
                 ? new ConvertFieldsToUDTMembers(_declarationFinderProvider, model, _indenter) as IEncapsulateStrategy
                 : new UseBackingFields(_declarationFinderProvider, model, _indenter) as IEncapsulateStrategy;
 
-            return strategy.RefactorRewrite(model, refactorRewriteSession, asPreview);
+            return strategy.RefactorRewrite(refactorRewriteSession, asPreview);
         }
     }
 }
diff --git a/Rubberduck.Refactorings/EncapsulateField/EncapsulationStrategies/ConvertFieldsToUDTMembers.cs b/Rubberduck.Refactorings/EncapsulateField/EncapsulationStrategies/ConvertFieldsToUDTMembers.cs
@@ -23,48 +23,48 @@ public ConvertFieldsToUDTMembers(IDeclarationFinderProvider declarationFinderPro
             _stateUDTField = model.StateUDTField;
         }
 
-        protected override void ModifyFields(EncapsulateFieldModel model, IEncapsulateFieldRewriteSession refactorRewriteSession)
+        protected override void ModifyFields(IEncapsulateFieldRewriteSession refactorRewriteSession)
         {
             var rewriter = refactorRewriteSession.CheckOutModuleRewriter(_targetQMN);
 
-            foreach (var field in model.SelectedFieldCandidates)
+            foreach (var field in SelectedFields)
             {
                 refactorRewriteSession.Remove(field.Declaration, rewriter);
             }
 
             if (_stateUDTField.IsExistingDeclaration)
             {
-                _stateUDTField.AddMembers(model.SelectedFieldCandidates.Cast<IConvertToUDTMember>());
+                _stateUDTField.AddMembers(SelectedFields.Cast<IConvertToUDTMember>());
 
                 rewriter.Replace(_stateUDTField.AsTypeDeclaration, _stateUDTField.TypeDeclarationBlock(_indenter));
             }
         }
 
-        protected override void ModifyReferences(EncapsulateFieldModel model, IEncapsulateFieldRewriteSession refactorRewriteSession)
+        protected override void ModifyReferences(IEncapsulateFieldRewriteSession refactorRewriteSession)
         {
-            foreach (var field in model.SelectedFieldCandidates)
+            foreach (var field in SelectedFields)
             {
                 LoadFieldReferenceContextReplacements(field);
             }
 
-            RewriteReferences(model, refactorRewriteSession);
+            RewriteReferences(refactorRewriteSession);
         }
 
-        protected override void LoadNewDeclarationBlocks(EncapsulateFieldModel model)
+        protected override void LoadNewDeclarationBlocks()
         {
             if (_stateUDTField.IsExistingDeclaration) { return; }
 
-            _stateUDTField.AddMembers(model.SelectedFieldCandidates.Cast<IConvertToUDTMember>());
+            _stateUDTField.AddMembers(SelectedFields.Cast<IConvertToUDTMember>());
 
             AddContentBlock(NewContentTypes.TypeDeclarationBlock, _stateUDTField.TypeDeclarationBlock(_indenter));
 
             AddContentBlock(NewContentTypes.DeclarationBlock, _stateUDTField.FieldDeclarationBlock);
             return;
         }
 
-        protected override void LoadNewPropertyBlocks(EncapsulateFieldModel model)
+        protected override void LoadNewPropertyBlocks(/*EncapsulateFieldModel model*/)
         {
-            var propertyGenerationSpecs = model.SelectedFieldCandidates.SelectMany(f => f.PropertyAttributeSets);
+            var propertyGenerationSpecs = /*model.SelectedFieldCandidates*/SelectedFields.SelectMany(f => f.PropertyAttributeSets);
 
             var generator = new PropertyGenerator();
             foreach (var spec in propertyGenerationSpecs)
diff --git a/Rubberduck.Refactorings/EncapsulateField/EncapsulationStrategies/EncapsulateFieldStrategyBase.cs b/Rubberduck.Refactorings/EncapsulateField/EncapsulationStrategies/EncapsulateFieldStrategyBase.cs
@@ -17,7 +17,7 @@ namespace Rubberduck.Refactorings.EncapsulateField
 {
     public interface IEncapsulateStrategy
     {
-        IEncapsulateFieldRewriteSession RefactorRewrite(EncapsulateFieldModel model, IEncapsulateFieldRewriteSession refactorRewriteSession, bool asPreview);
+        IEncapsulateFieldRewriteSession RefactorRewrite(IEncapsulateFieldRewriteSession refactorRewriteSession, bool asPreview);
     }
 
     public abstract class EncapsulateFieldStrategyBase : IEncapsulateStrategy
@@ -46,24 +46,24 @@ public EncapsulateFieldStrategyBase(IDeclarationFinderProvider declarationFinder
                 .FirstOrDefault()?.Context.Start.TokenIndex ?? null;
         }
 
-        public IEncapsulateFieldRewriteSession RefactorRewrite(EncapsulateFieldModel model, IEncapsulateFieldRewriteSession refactorRewriteSession, bool asPreview)
+        public IEncapsulateFieldRewriteSession RefactorRewrite(IEncapsulateFieldRewriteSession refactorRewriteSession, bool asPreview)
         {
-            ModifyFields(model, refactorRewriteSession);
+            ModifyFields(refactorRewriteSession);
 
-            ModifyReferences(model, refactorRewriteSession);
+            ModifyReferences(refactorRewriteSession);
 
-            InsertNewContent(model, refactorRewriteSession, asPreview);
+            InsertNewContent(refactorRewriteSession, asPreview);
 
             return refactorRewriteSession;
         }
 
-        protected abstract void ModifyFields(EncapsulateFieldModel model, IEncapsulateFieldRewriteSession rewriteSession);
+        protected abstract void ModifyFields(IEncapsulateFieldRewriteSession rewriteSession);
 
-        protected abstract void ModifyReferences(EncapsulateFieldModel model, IEncapsulateFieldRewriteSession refactorRewriteSession);
+        protected abstract void ModifyReferences(IEncapsulateFieldRewriteSession refactorRewriteSession);
 
-        protected abstract void LoadNewDeclarationBlocks(EncapsulateFieldModel model);
+        protected abstract void LoadNewDeclarationBlocks();
 
-        protected void RewriteReferences(EncapsulateFieldModel model, IEncapsulateFieldRewriteSession refactorRewriteSession)
+        protected void RewriteReferences(IEncapsulateFieldRewriteSession refactorRewriteSession)
         {
             foreach (var replacement in IdentifierReplacements)
             {
@@ -76,7 +76,7 @@ protected void RewriteReferences(EncapsulateFieldModel model, IEncapsulateFieldR
         protected void AddContentBlock(NewContentTypes contentType, string block)
             => _newContent[contentType].Add(block);
 
-        private void InsertNewContent(EncapsulateFieldModel model, IEncapsulateFieldRewriteSession refactorRewriteSession, bool isPreview = false)
+        private void InsertNewContent(IEncapsulateFieldRewriteSession refactorRewriteSession, bool isPreview = false)
         {
             _newContent = new Dictionary<NewContentTypes, List<string>>
             {
@@ -86,9 +86,9 @@ private void InsertNewContent(EncapsulateFieldModel model, IEncapsulateFieldRewr
                 { NewContentTypes.TypeDeclarationBlock, new List<string>() }
             };
 
-            LoadNewDeclarationBlocks(model);
+            LoadNewDeclarationBlocks();
 
-            LoadNewPropertyBlocks(model);
+            LoadNewPropertyBlocks();
 
             if (isPreview)
             {
@@ -113,7 +113,7 @@ private void InsertNewContent(EncapsulateFieldModel model, IEncapsulateFieldRewr
             }
         }
 
-        protected virtual void LoadNewPropertyBlocks(EncapsulateFieldModel model)
+        protected virtual void LoadNewPropertyBlocks()
         {
             var propertyGenerationSpecs = SelectedFields.SelectMany(f => f.PropertyAttributeSets);
 
diff --git a/Rubberduck.Refactorings/EncapsulateField/EncapsulationStrategies/UseBackingFields.cs b/Rubberduck.Refactorings/EncapsulateField/EncapsulationStrategies/UseBackingFields.cs
@@ -18,7 +18,7 @@ public class UseBackingFields : EncapsulateFieldStrategyBase
         public UseBackingFields(IDeclarationFinderProvider declarationFinderProvider, EncapsulateFieldModel model, IIndenter indenter)
             : base(declarationFinderProvider, model, indenter){ }
 
-        protected override void ModifyFields(EncapsulateFieldModel model, IEncapsulateFieldRewriteSession refactorRewriteSession)
+        protected override void ModifyFields(IEncapsulateFieldRewriteSession refactorRewriteSession)
         {
             var rewriter = refactorRewriteSession.CheckOutModuleRewriter(_targetQMN);
 
@@ -42,17 +42,17 @@ protected override void ModifyFields(EncapsulateFieldModel model, IEncapsulateFi
             }
         }
 
-        protected override void ModifyReferences(EncapsulateFieldModel model, IEncapsulateFieldRewriteSession refactorRewriteSession)
+        protected override void ModifyReferences(IEncapsulateFieldRewriteSession refactorRewriteSession)
         {
             foreach (var field in SelectedFields)
             {
                 LoadFieldReferenceContextReplacements(field);
             }
 
-            RewriteReferences(model, refactorRewriteSession);
+            RewriteReferences(refactorRewriteSession);
         }
 
-        protected override void LoadNewDeclarationBlocks(EncapsulateFieldModel model)
+        protected override void LoadNewDeclarationBlocks()
         {
             //New field declarations created here were removed from their list within ModifyFields(...)
             var fieldsRequiringNewDeclaration = SelectedFields

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ private IEncapsulateFieldRewriteSession RefactorRewrite(EncapsulateFieldModel mo`
`126`	`126`	`? new ConvertFieldsToUDTMembers(_declarationFinderProvider, model, _indenter) as IEncapsulateStrategy`
`127`	`127`	`: new UseBackingFields(_declarationFinderProvider, model, _indenter) as IEncapsulateStrategy;`
`128`	`128`
`129`		`- return strategy.RefactorRewrite(model, refactorRewriteSession, asPreview);`
	`129`	`+ return strategy.RefactorRewrite(refactorRewriteSession, asPreview);`
`130`	`130`	`}`
`131`	`131`	`}`
`132`	`132`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,48 +23,48 @@ public ConvertFieldsToUDTMembers(IDeclarationFinderProvider declarationFinderPro`
`23`	`23`	`_stateUDTField = model.StateUDTField;`
`24`	`24`	`}`
`25`	`25`
`26`		`- protected override void ModifyFields(EncapsulateFieldModel model, IEncapsulateFieldRewriteSession refactorRewriteSession)`
	`26`	`+ protected override void ModifyFields(IEncapsulateFieldRewriteSession refactorRewriteSession)`
`27`	`27`	`{`
`28`	`28`	`var rewriter = refactorRewriteSession.CheckOutModuleRewriter(_targetQMN);`
`29`	`29`
`30`		`- foreach (var field in model.SelectedFieldCandidates)`
	`30`	`+ foreach (var field in SelectedFields)`
`31`	`31`	`{`
`32`	`32`	`refactorRewriteSession.Remove(field.Declaration, rewriter);`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`if (_stateUDTField.IsExistingDeclaration)`
`36`	`36`	`{`
`37`		`- _stateUDTField.AddMembers(model.SelectedFieldCandidates.Cast<IConvertToUDTMember>());`
	`37`	`+ _stateUDTField.AddMembers(SelectedFields.Cast<IConvertToUDTMember>());`
`38`	`38`
`39`	`39`	`rewriter.Replace(_stateUDTField.AsTypeDeclaration, _stateUDTField.TypeDeclarationBlock(_indenter));`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
`43`		`- protected override void ModifyReferences(EncapsulateFieldModel model, IEncapsulateFieldRewriteSession refactorRewriteSession)`
	`43`	`+ protected override void ModifyReferences(IEncapsulateFieldRewriteSession refactorRewriteSession)`
`44`	`44`	`{`
`45`		`- foreach (var field in model.SelectedFieldCandidates)`
	`45`	`+ foreach (var field in SelectedFields)`
`46`	`46`	`{`
`47`	`47`	`LoadFieldReferenceContextReplacements(field);`
`48`	`48`	`}`
`49`	`49`
`50`		`- RewriteReferences(model, refactorRewriteSession);`
	`50`	`+ RewriteReferences(refactorRewriteSession);`
`51`	`51`	`}`
`52`	`52`
`53`		`- protected override void LoadNewDeclarationBlocks(EncapsulateFieldModel model)`
	`53`	`+ protected override void LoadNewDeclarationBlocks()`
`54`	`54`	`{`
`55`	`55`	`if (_stateUDTField.IsExistingDeclaration) { return; }`
`56`	`56`
`57`		`- _stateUDTField.AddMembers(model.SelectedFieldCandidates.Cast<IConvertToUDTMember>());`
	`57`	`+ _stateUDTField.AddMembers(SelectedFields.Cast<IConvertToUDTMember>());`
`58`	`58`
`59`	`59`	`AddContentBlock(NewContentTypes.TypeDeclarationBlock, _stateUDTField.TypeDeclarationBlock(_indenter));`
`60`	`60`
`61`	`61`	`AddContentBlock(NewContentTypes.DeclarationBlock, _stateUDTField.FieldDeclarationBlock);`
`62`	`62`	`return;`
`63`	`63`	`}`
`64`	`64`
`65`		`- protected override void LoadNewPropertyBlocks(EncapsulateFieldModel model)`
	`65`	`+ protected override void LoadNewPropertyBlocks(/EncapsulateFieldModel model/)`
`66`	`66`	`{`
`67`		`- var propertyGenerationSpecs = model.SelectedFieldCandidates.SelectMany(f => f.PropertyAttributeSets);`
	`67`	`+ var propertyGenerationSpecs = /model.SelectedFieldCandidates/SelectedFields.SelectMany(f => f.PropertyAttributeSets);`
`68`	`68`
`69`	`69`	`var generator = new PropertyGenerator();`
`70`	`70`	`foreach (var spec in propertyGenerationSpecs)`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ namespace Rubberduck.Refactorings.EncapsulateField`
`17`	`17`	`{`
`18`	`18`	`public interface IEncapsulateStrategy`
`19`	`19`	`{`
`20`		`- IEncapsulateFieldRewriteSession RefactorRewrite(EncapsulateFieldModel model, IEncapsulateFieldRewriteSession refactorRewriteSession, bool asPreview);`
	`20`	`+ IEncapsulateFieldRewriteSession RefactorRewrite(IEncapsulateFieldRewriteSession refactorRewriteSession, bool asPreview);`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`public abstract class EncapsulateFieldStrategyBase : IEncapsulateStrategy`
`@@ -46,24 +46,24 @@ public EncapsulateFieldStrategyBase(IDeclarationFinderProvider declarationFinder`
`46`	`46`	`.FirstOrDefault()?.Context.Start.TokenIndex ?? null;`
`47`	`47`	`}`
`48`	`48`
`49`		`- public IEncapsulateFieldRewriteSession RefactorRewrite(EncapsulateFieldModel model, IEncapsulateFieldRewriteSession refactorRewriteSession, bool asPreview)`
	`49`	`+ public IEncapsulateFieldRewriteSession RefactorRewrite(IEncapsulateFieldRewriteSession refactorRewriteSession, bool asPreview)`
`50`	`50`	`{`
`51`		`- ModifyFields(model, refactorRewriteSession);`
	`51`	`+ ModifyFields(refactorRewriteSession);`
`52`	`52`
`53`		`- ModifyReferences(model, refactorRewriteSession);`
	`53`	`+ ModifyReferences(refactorRewriteSession);`
`54`	`54`
`55`		`- InsertNewContent(model, refactorRewriteSession, asPreview);`
	`55`	`+ InsertNewContent(refactorRewriteSession, asPreview);`
`56`	`56`
`57`	`57`	`return refactorRewriteSession;`
`58`	`58`	`}`
`59`	`59`
`60`		`- protected abstract void ModifyFields(EncapsulateFieldModel model, IEncapsulateFieldRewriteSession rewriteSession);`
	`60`	`+ protected abstract void ModifyFields(IEncapsulateFieldRewriteSession rewriteSession);`
`61`	`61`
`62`		`- protected abstract void ModifyReferences(EncapsulateFieldModel model, IEncapsulateFieldRewriteSession refactorRewriteSession);`
	`62`	`+ protected abstract void ModifyReferences(IEncapsulateFieldRewriteSession refactorRewriteSession);`
`63`	`63`
`64`		`- protected abstract void LoadNewDeclarationBlocks(EncapsulateFieldModel model);`
	`64`	`+ protected abstract void LoadNewDeclarationBlocks();`
`65`	`65`
`66`		`- protected void RewriteReferences(EncapsulateFieldModel model, IEncapsulateFieldRewriteSession refactorRewriteSession)`
	`66`	`+ protected void RewriteReferences(IEncapsulateFieldRewriteSession refactorRewriteSession)`
`67`	`67`	`{`
`68`	`68`	`foreach (var replacement in IdentifierReplacements)`
`69`	`69`	`{`
`@@ -76,7 +76,7 @@ protected void RewriteReferences(EncapsulateFieldModel model, IEncapsulateFieldR`
`76`	`76`	`protected void AddContentBlock(NewContentTypes contentType, string block)`
`77`	`77`	`=> _newContent[contentType].Add(block);`
`78`	`78`
`79`		`- private void InsertNewContent(EncapsulateFieldModel model, IEncapsulateFieldRewriteSession refactorRewriteSession, bool isPreview = false)`
	`79`	`+ private void InsertNewContent(IEncapsulateFieldRewriteSession refactorRewriteSession, bool isPreview = false)`
`80`	`80`	`{`
`81`	`81`	`_newContent = new Dictionary<NewContentTypes, List<string>>`
`82`	`82`	`{`
`@@ -86,9 +86,9 @@ private void InsertNewContent(EncapsulateFieldModel model, IEncapsulateFieldRewr`
`86`	`86`	`{ NewContentTypes.TypeDeclarationBlock, new List<string>() }`
`87`	`87`	`};`
`88`	`88`
`89`		`- LoadNewDeclarationBlocks(model);`
	`89`	`+ LoadNewDeclarationBlocks();`
`90`	`90`
`91`		`- LoadNewPropertyBlocks(model);`
	`91`	`+ LoadNewPropertyBlocks();`
`92`	`92`
`93`	`93`	`if (isPreview)`
`94`	`94`	`{`
`@@ -113,7 +113,7 @@ private void InsertNewContent(EncapsulateFieldModel model, IEncapsulateFieldRewr`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`
`116`		`- protected virtual void LoadNewPropertyBlocks(EncapsulateFieldModel model)`
	`116`	`+ protected virtual void LoadNewPropertyBlocks()`
`117`	`117`	`{`
`118`	`118`	`var propertyGenerationSpecs = SelectedFields.SelectMany(f => f.PropertyAttributeSets);`
`119`	`119`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public class UseBackingFields : EncapsulateFieldStrategyBase`
`18`	`18`	`public UseBackingFields(IDeclarationFinderProvider declarationFinderProvider, EncapsulateFieldModel model, IIndenter indenter)`
`19`	`19`	`: base(declarationFinderProvider, model, indenter){ }`
`20`	`20`
`21`		`- protected override void ModifyFields(EncapsulateFieldModel model, IEncapsulateFieldRewriteSession refactorRewriteSession)`
	`21`	`+ protected override void ModifyFields(IEncapsulateFieldRewriteSession refactorRewriteSession)`
`22`	`22`	`{`
`23`	`23`	`var rewriter = refactorRewriteSession.CheckOutModuleRewriter(_targetQMN);`
`24`	`24`
`@@ -42,17 +42,17 @@ protected override void ModifyFields(EncapsulateFieldModel model, IEncapsulateFi`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
`45`		`- protected override void ModifyReferences(EncapsulateFieldModel model, IEncapsulateFieldRewriteSession refactorRewriteSession)`
	`45`	`+ protected override void ModifyReferences(IEncapsulateFieldRewriteSession refactorRewriteSession)`
`46`	`46`	`{`
`47`	`47`	`foreach (var field in SelectedFields)`
`48`	`48`	`{`
`49`	`49`	`LoadFieldReferenceContextReplacements(field);`
`50`	`50`	`}`
`51`	`51`
`52`		`- RewriteReferences(model, refactorRewriteSession);`
	`52`	`+ RewriteReferences(refactorRewriteSession);`
`53`	`53`	`}`
`54`	`54`
`55`		`- protected override void LoadNewDeclarationBlocks(EncapsulateFieldModel model)`
	`55`	`+ protected override void LoadNewDeclarationBlocks()`
`56`	`56`	`{`
`57`	`57`	`//New field declarations created here were removed from their list within ModifyFields(...)`
`58`	`58`	`var fieldsRequiringNewDeclaration = SelectedFields`