Fixed bad tests for #1858, closes #2233. Added ToString overrides for easier use of locals window.

Author: comintern

Rubberduck.SmartIndenter/AbsoluteCodeLine.cs

@@ -19,13 +19,12 @@ 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(@"^(Else)?If\s.*\sThen$|^(Else)?If\s.*\sThen\s.*\sElse$|^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.*(?<!\sElse)$|^Else$|ElseIf\s.*\sThen$|^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(@"^Else(If)?|^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 SingleLineIfRegex = new Regex(@"^If\s.*\sThen\s.*(?<!\sElse)$");
-        private static readonly Regex SingleLineElseIfRegex = new Regex(@"^ElseIf\s.*\sThen\s.*(?<!\sElse)$");
+        private static readonly Regex SingleLineElseIfRegex = new Regex(@"^ElseIf\s.*\sThen\s.*");
 
         private readonly IIndenterSettings _settings;
         private uint _lineNumber;
@@ -181,7 +180,6 @@ public int Outdents
                 var outs = _segments.Count(s => InProcedureOutRegex.IsMatch(s.Trim())) + (IsProcedureEnd && _settings.IndentEntireProcedureBody ? 1 : 0) + adjust;
 
                 outs -= MultipleCaseAdjustment();
-                outs -= _segments.Count(s => SingleLineIfRegex.IsMatch(s));
 
                 if (_settings.IndentCompilerDirectives && PrecompilerOutRegex.IsMatch(_segments[0].Trim()))
                 {
@@ -246,6 +244,11 @@ public string Indent(int indents, bool atProcStart, bool absolute = false)
             }
         }
 
+        public override string ToString()
+        {
+            return Original;
+        }
+
         private void AlignDims(int postition)
         {
             if (!DeclarationRegex.IsMatch(_segments[0]) || IsProcedureStart) return;

Rubberduck.SmartIndenter/LogicalCodeLine.cs

@@ -145,6 +145,11 @@ public string Indented()
             return string.Join(Environment.NewLine, output);
         }
 
+        public override string ToString()
+        {
+            return _lines.Aggregate(string.Empty, (x, y) => x + y.ToString());
+        }
+
         private static readonly Regex StartIgnoreRegex = new Regex(@"^(\d*\s)?\s*[LR]?Set\s|^(\d*\s)?\s*Let\s|^(\d*\s)?\s*(Public|Private)\sDeclare\s(Function|Sub)|^(\d*\s+)");
         private readonly Stack<AlignmentToken> _alignment = new Stack<AlignmentToken>();
 

RubberduckTests/SmartIndenter/MiscAndCornerCaseTests.cs

@@ -122,25 +122,24 @@ public void MultipleElseIfStatementWorks()
         }
 
         //https://github.com/rubberduck-vba/Rubberduck/issues/1858
+        //https://github.com/rubberduck-vba/Rubberduck/issues/2233
         [TestMethod]
         [TestCategory("Indenter")]
-        public void IfThenElseStatementWorks()
+        public void IfThenBareElseStatementWorks()
         {
             var code = new[]
             {
                 "Public Sub Test()",
                 "If Foo And Bar Then Foobar Else",
                 "Baz",
-                "End If",
                 "End Sub"
             };
 
             var expected = new[]
             {
                 "Public Sub Test()",
                 "    If Foo And Bar Then Foobar Else",
-                "        Baz",
-                "    End If",
+                "    Baz",
                 "End Sub"
             };
 
@@ -152,13 +151,15 @@ public void IfThenElseStatementWorks()
         //https://github.com/rubberduck-vba/Rubberduck/issues/1858
         [TestMethod]
         [TestCategory("Indenter")]
-        public void ElseIfThenElseStatementWorks()
+        public void SingleLineElseIfElseStatementWorks()
         {
             var code = new[]
             {
                 "Public Sub Test()",
-                "If Foo Then NotFoobar",
-                "ElseIf Foo And Bar Then Foobar Else",
+                "If x Then",
+                "NotFoobar",
+                "ElseIf Foo And Bar Then Foobar",
+                "Else",
                 "Baz",
                 "End If",
                 "End Sub"
@@ -167,8 +168,10 @@ public void ElseIfThenElseStatementWorks()
             var expected = new[]
             {
                 "Public Sub Test()",
-                "    If Foo Then NotFoobar",
-                "    ElseIf Foo And Bar Then Foobar Else",
+                "    If x Then",
+                "        NotFoobar",
+                "    ElseIf Foo And Bar Then Foobar",
+                "    Else",
                 "        Baz",
                 "    End If",
                 "End Sub"