Restore modified UI accessors

Restored EncapsulateFieldModel and IObjectStateUDT accessors used by the UI to keep all changes for this PR within the RefactoringActions.
rubberduck-vba · Sep 21, 2020 · 3a74f8d · 3a74f8d
1 parent dd5f544
commit 3a74f8d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/Rubberduck.Core/UI/Refactorings/EncapsulateField/EncapsulateFieldViewModel.cs b/Rubberduck.Core/UI/Refactorings/EncapsulateField/EncapsulateFieldViewModel.cs
@@ -198,7 +198,7 @@ public bool ConvertFieldsToUDTMembers
         private bool _selectionHasValidEncapsulationAttributes;
         public bool SelectionHasValidEncapsulationAttributes => _selectionHasValidEncapsulationAttributes;
 
-        public string PropertiesPreview => Model.PreviewProvider?.Preview(Model) ?? string.Empty;
+        public string PropertiesPreview => Model.PreviewRefactoring();
 
         public CommandBase SelectAllCommand { get; }
 

diff --git a/Rubberduck.Refactorings/EncapsulateField/EncapsulateFieldModel.cs b/Rubberduck.Refactorings/EncapsulateField/EncapsulateFieldModel.cs
@@ -29,6 +29,8 @@ public class EncapsulateFieldModel : IRefactoringModel
 
         public EncapsulateFieldUseBackingFieldModel EncapsulateFieldUseBackingFieldModel { get; }
 
+        public string PreviewRefactoring() => PreviewProvider?.Preview(this) ?? string.Empty;
+
         public IRefactoringPreviewProvider<EncapsulateFieldModel> PreviewProvider { set; get; }
 
         public Action<EncapsulateFieldModel> StrategyChangedAction { set; get; } = (m) => { };

diff --git a/Rubberduck.Refactorings/EncapsulateField/ObjectStateUDT/ObjectStateUDT.cs b/Rubberduck.Refactorings/EncapsulateField/ObjectStateUDT/ObjectStateUDT.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Rubberduck.Parsing.Grammar;
 
 namespace Rubberduck.Refactorings.EncapsulateField
 {
@@ -12,6 +13,7 @@ public interface IObjectStateUDT : IEncapsulateFieldRefactoringElement
         Declaration Declaration { get; }
         string TypeIdentifier { set; get; }
         string FieldIdentifier { set; get; }
+        string FieldDeclarationBlock { get; }
         bool IsExistingDeclaration { get; }
         Declaration AsTypeDeclaration { get; }
         bool IsSelected { set; get; }
@@ -61,6 +63,9 @@ private ObjectStateUDT(string fieldIdentifier, string typeIdentifier)
 
         public string AsTypeName => _wrappedUDTField?.AsTypeName ?? TypeIdentifier;
 
+        public string FieldDeclarationBlock
+            => $"{Accessibility.Private} {IdentifierName} {Tokens.As} {AsTypeName}";
+
         private bool _isSelected;
         public bool IsSelected
         {