From 3a74f8d043c13c0af931121f00452f2be0646239 Mon Sep 17 00:00:00 2001
From: Brian Zenger <bzngr@outlook.com>
Date: Mon, 21 Sep 2020 12:30:35 -0700
Subject: [PATCH] Restore modified UI accessors

Restored EncapsulateFieldModel and IObjectStateUDT accessors used by the UI to keep all changes for this PR within the RefactoringActions.
---
 .../EncapsulateField/EncapsulateFieldViewModel.cs            | 2 +-
 .../EncapsulateField/EncapsulateFieldModel.cs                | 2 ++
 .../EncapsulateField/ObjectStateUDT/ObjectStateUDT.cs        | 5 +++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Rubberduck.Core/UI/Refactorings/EncapsulateField/EncapsulateFieldViewModel.cs b/Rubberduck.Core/UI/Refactorings/EncapsulateField/EncapsulateFieldViewModel.cs
index 4316fc7550..5275c21590 100644
--- 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
index df9c00474f..283ed2164d 100644
--- 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
index 61c1208049..e4245f104a 100644
--- 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
         {