Merge pull request #2410 from comintern/next

Ignore line numbers in continuations when indenting.

Author: retailcoder

Rubberduck.SmartIndenter/AbsoluteCodeLine.cs

@@ -37,9 +37,12 @@ internal class AbsoluteCodeLine
         private List<string> _strings;
         private List<string> _brackets;
 
-        public AbsoluteCodeLine(string code, IIndenterSettings settings)
+        public AbsoluteCodeLine(string code, IIndenterSettings settings) : this(code, settings, null) { }
+
+        public AbsoluteCodeLine(string code, IIndenterSettings settings, AbsoluteCodeLine previous)
         {
             _settings = settings;
+            Previous = previous;
 
             if (code.EndsWith(StupidLineEnding))
             {
@@ -56,6 +59,7 @@ public AbsoluteCodeLine(string code, IIndenterSettings settings)
             ExtractStringLiteralsAndBrackets();
             ExtractLineNumber();
             ExtractEndOfLineComment();
+
             _code = Regex.Replace(_code, StringPlaceholder + "+", StringPlaceholder.ToString(CultureInfo.InvariantCulture));
             _code = Regex.Replace(_code, BracketPlaceholder + "+", BracketPlaceholder.ToString(CultureInfo.InvariantCulture)).Trim();
             _segments = _code.Split(new[] { ": " }, StringSplitOptions.None);
@@ -120,12 +124,15 @@ private void ExtractStringLiteralsAndBrackets()
 
         private void ExtractLineNumber()
         {
-            var match = LineNumberRegex.Match(_code);
-            if (match.Success)
+            if (Previous == null || !Previous.HasContinuation)
             {
-                _numbered = true;
-                _lineNumber = Convert.ToUInt32(match.Groups["number"].Value);
-                _code = match.Groups["code"].Value;
+                var match = LineNumberRegex.Match(_code);
+                if (match.Success)
+                {
+                    _numbered = true;
+                    _lineNumber = Convert.ToUInt32(match.Groups["number"].Value);
+                    _code = match.Groups["code"].Value;
+                }
             }
             _code = _code.Trim();
         }
@@ -142,6 +149,8 @@ private void ExtractEndOfLineComment()
             EndOfLineComment = match.Groups["comment"].Value.Trim();
         }
 
+        public AbsoluteCodeLine Previous { get; private set; }
+
         public string Original { get; private set; }
 
         public string Escaped
@@ -203,7 +212,7 @@ public bool HasDeclarationContinuation
 
         public bool HasContinuation
         {
-            get { return _code.EndsWith(" _") || EndOfLineComment.EndsWith(" _"); }
+            get { return _code.Equals("_") || _code.EndsWith(" _") || EndOfLineComment.EndsWith(" _"); }
         }
 
         public bool IsPrecompilerDirective

Rubberduck.SmartIndenter/Indenter.cs

@@ -107,10 +107,11 @@ private IEnumerable<LogicalCodeLine> BuildLogicalCodeLines(IEnumerable<string> l
             var settings = _settings.Invoke();
             var logical = new List<LogicalCodeLine>();
             LogicalCodeLine current = null;
+            AbsoluteCodeLine previous = null;
 
             foreach (var line in lines)
             {
-                var absolute = new AbsoluteCodeLine(line, settings);
+                var absolute = new AbsoluteCodeLine(line, settings, previous);
                 if (current == null)
                 {
                     current = new LogicalCodeLine(absolute, settings);
@@ -125,6 +126,7 @@ private IEnumerable<LogicalCodeLine> BuildLogicalCodeLines(IEnumerable<string> l
                 {
                     current = null;
                 }
+                previous = absolute;
             }
             return logical;
         }

RubberduckTests/SmartIndenter/MiscAndCornerCaseTests.cs

@@ -641,7 +641,6 @@ public void SingleQuoteInEndOfLineCommentWorks()
         [TestCategory("Indenter")]
         public void BracketedIdentifiersWork()
         {
-            Assert.Inconclusive("Pending fix for line numbers on continuation lines, function aligning of declarations.");
             var code = new[]
             {
                 "Sub test()",