Clean up Extract Interface and Move Closer To Usage

Author: Hosch250

RetailCoder.VBE/Refactorings/ExtractInterface/ExtractInterfaceModel.cs

@@ -24,28 +24,40 @@ public class ExtractInterfaceModel
         public string InterfaceName { get; set; }
         public List<InterfaceMember> Members { get; set; }
 
-        private readonly static DeclarationType[] DeclarationTypes =
+        private static DeclarationType[] DeclarationTypes
         {
-            DeclarationType.Class,
-            DeclarationType.Document,
-            DeclarationType.UserForm
-        };
+            get
+            {
+                return new[]
+                {
+                    DeclarationType.Class,
+                    DeclarationType.Document,
+                    DeclarationType.UserForm
+                };
+            }
+        }
 
-        public readonly string[] PrimitiveTypes =
+        public static string[] PrimitiveTypes
         {
-            Tokens.Boolean,
-            Tokens.Byte,
-            Tokens.Date,
-            Tokens.Decimal,
-            Tokens.Double,
-            Tokens.Long,
-            Tokens.LongLong,
-            Tokens.LongPtr,
-            Tokens.Integer,
-            Tokens.Single,
-            Tokens.String,
-            Tokens.StrPtr
-        };
+            get
+            {
+                return new[]
+                {
+                    Tokens.Boolean,
+                    Tokens.Byte,
+                    Tokens.Date,
+                    Tokens.Decimal,
+                    Tokens.Double,
+                    Tokens.Long,
+                    Tokens.LongLong,
+                    Tokens.LongPtr,
+                    Tokens.Integer,
+                    Tokens.Single,
+                    Tokens.String,
+                    Tokens.StrPtr
+                };
+            }
+        }
 
         public ExtractInterfaceModel(RubberduckParserState parseResult, QualifiedSelection selection)
         {

RetailCoder.VBE/Refactorings/MoveCloserToUsage/MoveCloserToUsageRefactoring.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Windows.Forms;
 using Rubberduck.Common;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
@@ -31,8 +32,8 @@ public void Refactor()
             }
             else
             {
-                _messageBox.Show("Invalid Selection.", "Rubberduck - Move Closer To Usage", System.Windows.Forms.MessageBoxButtons.OK,
-                    System.Windows.Forms.MessageBoxIcon.Exclamation);
+                _messageBox.Show(RubberduckUI.MoveCloserToUsage_InvalidSelection, RubberduckUI.MoveCloserToUsage_Caption, MessageBoxButtons.OK,
+                    MessageBoxIcon.Exclamation);
             }
         }
 
@@ -45,24 +46,25 @@ public void Refactor(Declaration target)
         {
             if (target.DeclarationType != DeclarationType.Variable)
             {
-                throw new ArgumentException(@"Invalid Argument", "target");
+                // ReSharper disable once LocalizableElement
+                throw new ArgumentException("Invalid Argument. DeclarationType must be 'Variable'", "target");
             }
 
             if (!target.References.Any())
             {
                 var message = string.Format(RubberduckUI.MoveCloserToUsage_TargetHasNoReferences, target.IdentifierName);
 
-                _messageBox.Show(message, RubberduckUI.MoveCloserToUsage_Caption, System.Windows.Forms.MessageBoxButtons.OK,
-                    System.Windows.Forms.MessageBoxIcon.Exclamation);
+                _messageBox.Show(message, RubberduckUI.MoveCloserToUsage_Caption, MessageBoxButtons.OK,
+                    MessageBoxIcon.Exclamation);
 
                 return;
             }
 
             if (TargetIsReferencedFromMultipleMethods(target))
             {
                 var message = string.Format(RubberduckUI.MoveCloserToUsage_TargetIsUsedInMultipleMethods, target.IdentifierName);
-                _messageBox.Show(message, RubberduckUI.MoveCloserToUsage_Caption, System.Windows.Forms.MessageBoxButtons.OK,
-                    System.Windows.Forms.MessageBoxIcon.Exclamation);
+                _messageBox.Show(message, RubberduckUI.MoveCloserToUsage_Caption, MessageBoxButtons.OK,
+                    MessageBoxIcon.Exclamation);
 
                 return;
             }
@@ -140,35 +142,36 @@ private void RemoveVariable(Declaration target)
 
         private string RemoveExtraComma(string str, int numParams, int indexRemoved)
         {
-            // Example use cases for this method (fields and variables):
-            // Dim fizz as Boolean, dizz as Double
-            // Private fizz as Boolean, dizz as Double
-            // Public fizz as Boolean, _
-            //        dizz as Double
-            // Private fizz as Boolean _
-            //         , dizz as Double _
-            //         , iizz as Integer
-
-            // Before this method is called, the parameter to be removed has 
-            // already been removed.  This means 'str' will look like:
-            // Dim fizz as Boolean, 
-            // Private , dizz as Double
-            // Public fizz as Boolean, _
-            //        
-            // Private  _
-            //         , dizz as Double _
-            //         , iizz as Integer
-
-            // This method is responsible for removing the redundant comma
-            // and returning a string similar to:
-            // Dim fizz as Boolean
-            // Private dizz as Double
-            // Public fizz as Boolean _
-            //        
-            // Private  _
-            //          dizz as Double _
-            //         , iizz as Integer
-
+            /* Example use cases for this method (fields and variables):
+             * Dim fizz as Boolean, dizz as Double
+             * Private fizz as Boolean, dizz as Double
+             * Public fizz as Boolean, _
+             *        dizz as Double
+             * Private fizz as Boolean _
+             *         , dizz as Double _
+             *         , iizz as Integer
+
+             * Before this method is called, the parameter to be removed has 
+             * already been removed.  This means 'str' will look like:
+             * Dim fizz as Boolean, 
+             * Private , dizz as Double
+             * Public fizz as Boolean, _
+             *        
+             * Private  _
+             *         , dizz as Double _
+             *         , iizz as Integer
+
+             * This method is responsible for removing the redundant comma
+             * and returning a string similar to:
+             * Dim fizz as Boolean
+             * Private dizz as Double
+             * Public fizz as Boolean _
+             *        
+             * Private  _
+             *          dizz as Double _
+             *         , iizz as Integer
+             */
+            
             var commaToRemove = numParams == indexRemoved ? indexRemoved - 1 : indexRemoved;
 
             return str.Remove(str.NthIndexOf(',', commaToRemove), 1);

RetailCoder.VBE/UI/RubberduckUI.Designer.cs

@@ -1297,4 +1297,7 @@ Are you sure you want to proceed with this rename?</value>
   <data name="ImplementInterface_InvalidSelectionMessage" xml:space="preserve">
     <value>The current selection is not valid.</value>
   </data>
+  <data name="MoveCloserToUsage_InvalidSelection" xml:space="preserve">
+    <value>Invalid Selection.</value>
+  </data>
 </root>