implemented ParseComments

Author: retailcoder

RetailCoder.VBE/VBA/StringExtensions.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 using System.Text;
+using System.Text.RegularExpressions;
 
 namespace Rubberduck.VBA.Grammar
 {
@@ -36,9 +37,9 @@ public static string StripTrailingComment(this string line)
         /// <summary>
         /// Returns a value indicating whether line of code is/contains a comment.
         /// </summary>
-        /// <param name="line"></param>
-        /// <param name="index">Returns the start index of the comment string, including the comment marker.</param>
-        /// <returns></returns>
+        /// <param name="line">The extended string.</param>
+        /// <param name="index">The start index of the comment string.</param>
+        /// <returns>Returns <c>true</c> if specified string contains a VBA comment marker.</returns>
         public static bool HasComment(this string line, out int index)
         {
             var instruction = line.StripStringLiterals();
@@ -53,41 +54,46 @@ public static bool HasComment(this string line, out int index)
             return index >= 0;
         }
 
+        public static string StripStringLiterals(this string line)
+        {
+            return Regex.Replace(line, "\"[^\"]*\"", match => new string(' ', match.Length));
+        }
+
         /// <summary>
         /// Strips all string literals from a line of code or instruction.
         /// Replaces string literals with whitespace characters, to maintain original length.
         /// </summary>
         /// <param name="line"></param>
         /// <returns>Returns a new string, stripped of all string literals and string delimiters.</returns>
-        public static string StripStringLiterals(this string line)
-        {
-            var builder = new StringBuilder(line.Length);
-            var isInsideString = false;
-            for (var cursor = 0; cursor < line.Length; cursor++)
-            {
-                if (line[cursor] == StringDelimiter)
-                {
-                    if (isInsideString)
-                    {
-                        isInsideString = cursor + 1 == line.Length || line[cursor + 1] == StringDelimiter || cursor > 0 && (line[cursor - 1] == StringDelimiter);
-                    }
-                    else
-                    {
-                        isInsideString = true;
-                    }
-                }
+        //public static string StripStringLiterals(this string line)
+        //{
+        //    var builder = new StringBuilder(line.Length);
+        //    var isInsideString = false;
+        //    for (var cursor = 0; cursor < line.Length; cursor++)
+        //    {
+        //        if (line[cursor] == StringDelimiter)
+        //        {
+        //            if (isInsideString)
+        //            {
+        //                isInsideString = cursor + 1 == line.Length || line[cursor + 1] == StringDelimiter || cursor > 0 && (line[cursor - 1] == StringDelimiter);
+        //            }
+        //            else
+        //            {
+        //                isInsideString = true;
+        //            }
+        //        }
 
-                if (!isInsideString && line[cursor] != StringDelimiter)
-                {
-                    builder.Append(line[cursor]);
-                }
-                else
-                {
-                    builder.Append(' ');
-                }
-            }
+        //        if (!isInsideString && line[cursor] != StringDelimiter)
+        //        {
+        //            builder.Append(line[cursor]);
+        //        }
+        //        else
+        //        {
+        //            builder.Append(' ');
+        //        }
+        //    }
 
-            return builder.ToString();
-        }
+        //    return builder.ToString();
+        //}
     }
 }

RetailCoder.VBE/VBA/VBParser.cs

@@ -90,20 +90,23 @@ public IEnumerable<CommentNode> ParseComments(VBComponent component)
                 if (continuing || line.HasComment(out index))
                 {
                     startLine = continuing ? startLine : i;
-                    startColumn = index + 1; // VBE positions are 1-based
+                    startColumn = index;
+
+                    var commentLength = line.Length - index;
 
                     continuing = line.EndsWith("_");
                     if (!continuing)
                     {
-                        commentBuilder.Append(line);
-                        var selection = new Selection(startLine, startColumn, i, line.Length);
+                        commentBuilder.Append(line.Substring(startColumn, commentLength).Trim());
+                        var selection = new Selection(startLine + 1, startColumn + 1, i, line.Length);
                         yield return new CommentNode(commentBuilder.ToString(), new QualifiedSelection(qualifiedName, selection));
                         commentBuilder.Clear();
                     }
                     else
                     {
                         // ignore line continuations in comment text:
-                        commentBuilder.Append(line.Remove(line.Length - 1)); 
+
+                        commentBuilder.Append(line.Remove(line.Length - 1).TrimStart()); 
                     }
                 }
             }