Merge pull request #5357 from IvenBach/Issue5346_Extract_interface_creates_private_classes

Issue5346 extract interface creates private classes

Author: MDoerner

Rubberduck.Core/UI/Command/MenuItems/CommandMenuItemBase.cs

@@ -54,7 +54,7 @@ public virtual bool EvaluateCanExecute(RubberduckParserState state)
         public virtual bool HiddenWhenDisabled => false;
         public virtual bool IsVisible => true;
         public virtual bool BeginGroup => false;
-        public virtual int DisplayOrder => default(int);
+        public virtual int DisplayOrder => default;
         public virtual Image Image => null;
         public virtual Image Mask => null;
     }

Rubberduck.Core/UI/Command/MenuItems/ParentMenus/ParentMenuItemBase.cs

@@ -62,7 +62,7 @@ public virtual Func<string> ToolTipText
         }
 
         public virtual bool BeginGroup => false;
-        public virtual int DisplayOrder => default(int);
+        public virtual int DisplayOrder => default;
 
         public void Localize()
         {
@@ -201,8 +201,7 @@ private ICommandBarControl InitializeChildControl(ICommandMenuItem item)
 
         private void child_Click(object sender, CommandBarButtonClickEventArgs e)
         {
-            var item = _items.Select(kvp => kvp.Key).SingleOrDefault(menu => e.Tag.EndsWith(menu.GetType().Name)) as ICommandMenuItem;
-            if (item == null)
+            if (!(_items.Select(kvp => kvp.Key).SingleOrDefault(menu => e.Tag.EndsWith(menu.GetType().Name)) is ICommandMenuItem item))
             {
                 return;
             }

Rubberduck.Core/UI/Refactorings/ExtractInterface/ExtractInterfaceView.xaml

@@ -5,7 +5,6 @@
 using NLog;
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.Parsing.Symbols;
-using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.ExtractInterface;
 using Rubberduck.UI.Command;
 
@@ -62,6 +61,26 @@ public bool IsValidInterfaceName
             }
         }
 
+        public bool CanChooseInterfaceInstancing => Model.ImplementingClassInstancing != ClassInstancing.Public;
+
+        public IEnumerable<ClassInstancing> ClassInstances => Enum.GetValues(typeof(ClassInstancing)).Cast<ClassInstancing>();
+
+        public ClassInstancing InterfaceInstancing
+        {
+            get => Model.InterfaceInstancing;
+
+            set
+            {
+                if (value == Model.InterfaceInstancing)
+                {
+                    return;
+                }
+
+                Model.InterfaceInstancing = value;
+                OnPropertyChanged();
+            }
+        }
+
         private void ToggleSelection(bool value)
         {
             foreach (var item in Members)

Rubberduck.Core/UI/Refactorings/ExtractInterface/ExtractInterfaceViewModel.cs

@@ -603,25 +603,24 @@ public ParserState GetModuleState(QualifiedModuleName module)
             return _moduleStates.GetOrAdd(module, new ModuleState(ParserState.Pending)).State;
         }
 
-        private readonly object _statusLockObject = new object(); 
-        private ParserState _status;
-        public ParserState Status => _status;
+        private readonly object _statusLockObject = new object();
+        public ParserState Status { get; private set; }
 
         private void SetStatusWithCancellation(ParserState value, CancellationToken token)
         {
-            if (_status != value)
+            if (Status != value)
             {
-                var oldStatus = _status;
-                _status = value;
-                OnStateChanged(this, token, _status, oldStatus);
+                var oldStatus = Status;
+                Status = value;
+                OnStateChanged(this, token, Status, oldStatus);
             }
         }
 
         public void SetStatusAndFireStateChanged(object requestor, ParserState status, CancellationToken token)
         {
             if (Status == status)
             {
-                OnStateChanged(requestor, token, status, _status);
+                OnStateChanged(requestor, token, status, Status);
             }
             else
             {

Rubberduck.Parsing/VBA/RubberduckParserState.cs

@@ -1819,6 +1819,20 @@ Import aborted.</value>
     <value>The component '{0}' would have been affected by the refactoring, but its state in Rubberduck's memory is stale. Please refresh Rubberduck and try again.</value>
     <comment>{0} stale module</comment>
   </data>
+  <data name="ExtractInterface_InstancingGroupBox" xml:space="preserve">
+    <value>Instancing</value>
+  </data>
+  <data name="ExtractInterface_Private" xml:space="preserve">
+    <value>Private</value>
+  </data>
+  <data name="ExtractInterface_Public" xml:space="preserve">
+    <value>Public</value>
+  </data>
+  <data name="ExtractInterface_PublicInstancingMandatedByPublicClass" xml:space="preserve">
+    <value>The implementing class is 'Public' mandating the interface be public as well.
+If you require a 'Private' interface, change the classes instancing to private as well.
+A private class can still implement a public interface.</value>
+  </data>
   <data name="AnnotateDeclarationDialog_Caption" xml:space="preserve">
     <value>Rubberduck - Annotate Declaration</value>
   </data>
@@ -1911,8 +1925,7 @@ Do you want to proceed?</value>
   </data>
   <data name="MoveFolders_SameNameSourceFolders" xml:space="preserve">
     <value>Several folders with the same name are being moved. This will merge them.
-Do you want to proceed?</value>
-    
+Do you want to proceed?</value>    
   </data>
   <data name="MoveFolders_EmptyFolderName" xml:space="preserve">
     <value>A folder name cannot be empty.</value>

Rubberduck.Resources/RubberduckUI.Designer.cs

@@ -3,7 +3,6 @@
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 using Microsoft.CSharp.RuntimeBinder;
-using NLog;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using MSO = Microsoft.Office.Core;