Fix indenting of multi-segment Do...Loop, If...Then...Else

Author: comintern

Rubberduck.SmartIndenter/AbsoluteCodeLine.cs

@@ -87,8 +87,14 @@ private void ExtractEndOfLineComment()
         }
 
         public string Original { get; private set; }
+        
         public string EndOfLineComment { get; private set; }
 
+        public IEnumerable<string> Segments
+        {
+            get { return _segments; }
+        }
+
         public string ContinuationRebuildText
         {
             get

Rubberduck.SmartIndenter/LogicalCodeLine.cs

@@ -35,7 +35,9 @@ public int NextLineIndents
             get
             {
                 RebuildContinuedLine();
-                return _rebuilt.NextLineIndents;
+                return _rebuilt.Segments.Count() < 2
+                    ? _rebuilt.NextLineIndents
+                    : _rebuilt.Segments.Select(s => new AbsoluteCodeLine(s, _settings)).Select(a => a.NextLineIndents).Sum();
             }
         }
 
@@ -44,7 +46,12 @@ public int Outdents
             get
             {
                 RebuildContinuedLine();
-                return _rebuilt.Outdents;
+                if (_rebuilt.Segments.Count() < 2)
+                {
+                    return _rebuilt.Outdents;
+                }
+                var baseSegment = new AbsoluteCodeLine(_rebuilt.Segments.First(), _settings);
+                return baseSegment.Outdents;
             }
         }
 

RubberduckTests/SmartIndenter/LineContinuationTests.cs

@@ -261,7 +261,7 @@ public void RemsWithLineContinuationsWork()
             Assert.IsTrue(code.SequenceEqual(actual));
         }
 
-        [TestMethod, Ignore]    // Broken in VB6 SmartIndenter. Should be same fix as IfThenElseOnSameLineWorks()
+        [TestMethod]        // Broken in VB6 SmartIndenter.
         [TestCategory("Indenter")]
         public void DoWhileOnTwoLinesWorks()
         {
@@ -274,12 +274,11 @@ public void DoWhileOnTwoLinesWorks()
                 "End Sub"
             };
 
-            //TODO: Not sure if this is what should be expected...
             var expected = new[]
             {
                 "Public Sub Test()",
                 "    Do _",
-                "    While X < 10: X = X + 1: Loop",
+                "        While X < 10: X = X + 1: Loop",
                 "    Debug.Print X",
                 "End Sub"
             };
@@ -289,7 +288,7 @@ public void DoWhileOnTwoLinesWorks()
             Assert.IsTrue(expected.SequenceEqual(actual));
         }
 
-        [TestMethod] // Broken in VB6 SmartIndenter.
+        [TestMethod]        // Broken in VB6 SmartIndenter.
         [TestCategory("Indenter")]
         public void ContinuedIfThenWorks()
         {

RubberduckTests/SmartIndenter/MultiSegmentLineTests.cs

@@ -68,7 +68,7 @@ public void UnmatchedEnumsNotIndent()
             Assert.IsTrue(code.SequenceEqual(actual));
         }
 
-        [TestMethod, Ignore]    // Broken in VB6 SmartIndenter. Should be same fix as DoWhileOnTwoLinesWorks()
+        [TestMethod]        // Broken in VB6 SmartIndenter.
         [TestCategory("Indenter")]
         public void IfThenElseOnSameLineWorks()
         {