Merge pull request #2126 from Hosch250/Issue2101

Hosch250 · web-flow · commit f2d2d6749fdc · 2016-07-22T17:48:03.000-05:00
Encapsulate Field hotkey
diff --git a/RetailCoder.VBE/Settings/HotkeySettings.cs b/RetailCoder.VBE/Settings/HotkeySettings.cs
@@ -24,7 +24,8 @@ public class HotkeySettings : IHotkeySettings
             new HotkeySetting{Name=RubberduckHotkey.RefactorMoveCloserToUsage.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="C" },
             new HotkeySetting{Name=RubberduckHotkey.RefactorRename.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="R" },
             new HotkeySetting{Name=RubberduckHotkey.RefactorExtractMethod.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="M" },
-            new HotkeySetting{Name=RubberduckHotkey.SourceControl.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="D6" }
+            new HotkeySetting{Name=RubberduckHotkey.SourceControl.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="D6" },
+            new HotkeySetting{Name=RubberduckHotkey.RefactorEncapsulateField.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="E" }
         };
 
         private HashSet<HotkeySetting> _settings;
diff --git a/RetailCoder.VBE/Settings/RubberduckHotkey.cs b/RetailCoder.VBE/Settings/RubberduckHotkey.cs
@@ -13,6 +13,7 @@ public enum RubberduckHotkey
         RefactorMoveCloserToUsage,
         RefactorRename,
         RefactorExtractMethod,
+        RefactorEncapsulateField,
         SourceControl
     }
 }
diff --git a/RetailCoder.VBE/UI/Command/Refactorings/RefactorEncapsulateFieldCommand.cs b/RetailCoder.VBE/UI/Command/Refactorings/RefactorEncapsulateFieldCommand.cs
@@ -4,11 +4,11 @@
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.EncapsulateField;
 using Rubberduck.UI.Refactorings;
+using Rubberduck.SmartIndenter;
+using Rubberduck.Settings;
 
 namespace Rubberduck.UI.Command.Refactorings
 {
-    using SmartIndenter;
-
     [ComVisible(false)]
     public class RefactorEncapsulateFieldCommand : RefactorCommandBase
     {
@@ -53,5 +53,10 @@ protected override void ExecuteImpl(object parameter)
                 refactoring.Refactor();
             }
         }
+
+        public override RubberduckHotkey Hotkey
+        {
+            get { return RubberduckHotkey.RefactorEncapsulateField; }
+        }
     }
 }
diff --git a/RetailCoder.VBE/UI/RubberduckUI.Designer.cs b/RetailCoder.VBE/UI/RubberduckUI.Designer.cs
diff --git a/RetailCoder.VBE/UI/RubberduckUI.resx b/RetailCoder.VBE/UI/RubberduckUI.resx
@@ -1485,7 +1485,7 @@ All our stargazers, likers &amp; followers, for the warm fuzzies
     <value>Find symbol</value>
   </data>
   <data name="HotkeyDescription_RefactorMoveCloserToUsage" xml:space="preserve">
-    <value>Move declaration closer to usage</value>
+    <value>Refactor / Move declaration closer to usage</value>
   </data>
   <data name="RubberduckMenu_RegexSearchReplace" xml:space="preserve">
     <value>Rege&amp;x Search/Replace</value>
@@ -1772,4 +1772,7 @@ All our stargazers, likers &amp; followers, for the warm fuzzies
   <data name="CodeInspectionSettings_WhitelistedIdentifiersDescription" xml:space="preserve">
     <value>These identifiers will be ignored by the 'Use meaningful names' inspection</value>
   </data>
+  <data name="HotkeyDescription_RefactorEncapsulateField" xml:space="preserve">
+    <value>Refactor / Encapsulate Field</value>
+  </data>
 </root>
diff --git a/RubberduckTests/Settings/HotkeySettingsTests.cs b/RubberduckTests/Settings/HotkeySettingsTests.cs
@@ -22,7 +22,8 @@ public void DefaultsSetInCtor()
                 new HotkeySetting{Name=RubberduckHotkey.RefactorMoveCloserToUsage.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="C" },
                 new HotkeySetting{Name=RubberduckHotkey.RefactorRename.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="R" },
                 new HotkeySetting{Name=RubberduckHotkey.RefactorExtractMethod.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="M" },
-                new HotkeySetting{Name=RubberduckHotkey.SourceControl.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="D6" }
+                new HotkeySetting{Name=RubberduckHotkey.SourceControl.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="D6" },
+                new HotkeySetting{Name=RubberduckHotkey.RefactorEncapsulateField.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="E" }
             };
 
             var settings = new HotkeySettings();

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ public enum RubberduckHotkey`
`13`	`13`	`RefactorMoveCloserToUsage,`
`14`	`14`	`RefactorRename,`
`15`	`15`	`RefactorExtractMethod,`
	`16`	`+ RefactorEncapsulateField,`
`16`	`17`	`SourceControl`
`17`	`18`	`}`
`18`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,11 @@`
`4`	`4`	`using Rubberduck.Parsing.VBA;`
`5`	`5`	`using Rubberduck.Refactorings.EncapsulateField;`
`6`	`6`	`using Rubberduck.UI.Refactorings;`
	`7`	`+using Rubberduck.SmartIndenter;`
	`8`	`+using Rubberduck.Settings;`
`7`	`9`
`8`	`10`	`namespace Rubberduck.UI.Command.Refactorings`
`9`	`11`	`{`
`10`		`- using SmartIndenter;`
`11`		`-`
`12`	`12`	`[ComVisible(false)]`
`13`	`13`	`public class RefactorEncapsulateFieldCommand : RefactorCommandBase`
`14`	`14`	`{`
`@@ -53,5 +53,10 @@ protected override void ExecuteImpl(object parameter)`
`53`	`53`	`refactoring.Refactor();`
`54`	`54`	`}`
`55`	`55`	`}`
	`56`	`+`
	`57`	`+ public override RubberduckHotkey Hotkey`
	`58`	`+ {`
	`59`	`+ get { return RubberduckHotkey.RefactorEncapsulateField; }`
	`60`	`+ }`
`56`	`61`	`}`
`57`	`62`	`}`