Merge pull request #2366 from comintern/next

Fix variables starting w. Sub or Function in indenter.

Author: retailcoder

Rubberduck.SmartIndenter/AbsoluteCodeLine.cs

@@ -14,7 +14,7 @@ internal class AbsoluteCodeLine
         private static readonly Regex StringReplaceRegex = new Regex(StringPlaceholder);
         private static readonly Regex LineNumberRegex = new Regex(@"^(?<number>\d+)\s+(?<code>.*)", RegexOptions.ExplicitCapture);
         private static readonly Regex EndOfLineCommentRegex = new Regex(@"^(?!(Rem\s)|('))(?<code>.*)(\s(?<comment>'.*))$", RegexOptions.ExplicitCapture);
-        private static readonly Regex ProcedureStartRegex = new Regex(@"^(Public\s|Private\s|Friend\s)?(Static\s)?(Sub|Function|Property\s(Let|Get|Set))");
+        private static readonly Regex ProcedureStartRegex = new Regex(@"^(Public\s|Private\s|Friend\s)?(Static\s)?(Sub|Function|Property\s(Let|Get|Set))\s");
         private static readonly Regex ProcedureStartIgnoreRegex = new Regex(@"^[LR]?Set\s|^Let\s|^(Public|Private)\sDeclare\s(Function|Sub)");
         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)");

RubberduckTests/SmartIndenter/MiscAndCornerCaseTests.cs

@@ -435,5 +435,33 @@ public void OverIndentationLeftAligns()
             var actual = indenter.Indent(code, string.Empty);
             Assert.IsTrue(expected.SequenceEqual(actual));
         }
+
+        //http://chat.stackexchange.com/transcript/message/33575758#33575758
+        [TestMethod]
+        [TestCategory("Indenter")]
+        public void SubFooTokenIsNotInterpretedAsProcedureStart()
+        {
+            var code = new[]
+            {
+                "Public Sub Test()",
+                "If Subject = 0 Then",
+                "Subject = 1",
+                "End If",
+                "End Sub"
+            };
+
+            var expected = new[]
+            {
+                "Public Sub Test()",
+                "    If Subject = 0 Then",
+                "        Subject = 1",
+                "    End If",
+                "End Sub"
+            };
+
+            var indenter = new Indenter(null, () => IndenterSettingsTests.GetMockIndenterSettings());
+            var actual = indenter.Indent(code, string.Empty);
+            Assert.IsTrue(expected.SequenceEqual(actual));
+        }
     }
 }