Merge pull request #1789 from comintern/next

Check window focus before executing hotkeys.  Closes #1765

Author: retailcoder

RetailCoder.VBE/Common/RubberduckHooks.cs

@@ -188,6 +188,12 @@ public void Detach()
 
         private void hook_MessageReceived(object sender, HookEventArgs e)
         {
+            var active = User32.GetForegroundWindow();
+            if (active != _mainWindowHandle)
+            {
+                return;
+            }
+
             var hotkey = sender as IHotkey;
             if (hotkey != null)
             {

RetailCoder.VBE/UI/Command/MenuItems/ParentMenus/ParentMenuItemBase.cs

@@ -86,15 +86,13 @@ public void RemoveChildren()
         {
             foreach (var child in _items.Keys.Select(item => item as IParentMenuItem).Where(child => child != null))
             {
-                Debug.WriteLine("Deleting menu item {0}.", child.Caption);
                 child.RemoveChildren();
                 Debug.Assert(_items[child] is CommandBarPopup);
                 (_items[child] as CommandBarPopup).Delete();
             }
             foreach (var child in _items.Values.Select(item => item as CommandBarButton).Where(child => child != null))
             {
                 child.Click -= child_Click;
-                Debug.WriteLine("Deleting child menu item {0}.", child.Caption);
                 child.Delete();
             }
         }

Rubberduck.SmartIndenter/AbsoluteCodeLine.cs

@@ -19,11 +19,11 @@ internal class AbsoluteCodeLine
         private static readonly Regex ProcedureEndRegex = new Regex(@"^End\s(Sub|Function|Property)");
         private static readonly Regex TypeEnumStartRegex = new Regex(@"^(Public\s|Private\s)?(Enum\s|Type\s)");
         private static readonly Regex TypeEnumEndRegex = new Regex(@"^End\s(Enum|Type)");
-        private static readonly Regex InProcedureInRegex = new Regex(@"^If\s.*\sThen|^ElseIf\s.+\sThen$|^Else$|^Case\s|^With|^For\s|^Do$|^Do\s|^While$|^While\s|^Select Case");
-        private static readonly Regex InProcedureOutRegex = new Regex(@"^(Else)?If\s.*\sThen\s|^Else$|^Case\s|^End With|^Next\s|^Next$|^Loop$|^Loop\s|^Wend$|^End If$|^End Select");
+        private static readonly Regex InProcedureInRegex = new Regex(@"^(Else)?If\s.*\sThen|^Else$|^Case\s|^With|^For\s|^Do$|^Do\s|^While$|^While\s|^Select Case");
+        private static readonly Regex InProcedureOutRegex = new Regex(@"^If\s.*\sThen\s|^Else$|^ElseIf\s.*\sThen|^Case\s|^End With|^Next\s|^Next$|^Loop$|^Loop\s|^Wend$|^End If$|^End Select");
         private static readonly Regex DeclarationRegex = new Regex(@"^(Dim|Const|Static|Public|Private)\s.*\sAs\s");
         private static readonly Regex PrecompilerInRegex = new Regex(@"^#(Else)?If\s.+Then$|^#Else$");
-        private static readonly Regex PrecompilerOutRegex = new Regex(@"^#ElseIf\s.+Then$|^#Else$|#End\sIf$");
+        private static readonly Regex PrecompilerOutRegex = new Regex(@"^#ElseIf\s.+Then|^#Else$|#End\sIf$");
         private static readonly Regex SingleLineIfRegex = new Regex(@"^If\s.*\sThen\s.*$");
 
         private readonly IIndenterSettings _settings;

RubberduckTests/SmartIndenter/MiscAndCornerCaseTests.cs

@@ -48,6 +48,39 @@ public void SingleLineIfStatementWorks()
             Assert.IsTrue(expected.SequenceEqual(actual));
         }
 
+        [TestMethod]
+        [TestCategory("Indenter")]
+        public void ElseIfStatementWorks()
+        {
+            var code = new[]
+            {
+                "Public Function Test() As Integer",
+                "If Foo = 1 Then",
+                "Bar = 3",
+                "ElseIf Foo = 3 Then",
+                "Bar = 1",
+                "End If",
+                "Test = Bar",
+                "End Function"
+            };
+
+            var expected = new[]
+            {
+                "Public Function Test() As Integer",
+                "    If Foo = 1 Then",
+                "        Bar = 3",
+                "    ElseIf Foo = 3 Then",
+                "        Bar = 1",
+                "    End If",
+                "    Test = Bar",
+                "End Function"
+            };
+
+            var indenter = new Indenter(null, () => IndenterSettingsTests.GetMockIndenterSettings());
+            var actual = indenter.Indent(code, string.Empty);
+            Assert.IsTrue(expected.SequenceEqual(actual));
+        }
+
         [TestMethod]
         [TestCategory("Indenter")]
         public void SingleLineElseIfStatementWorks()