Merge pull request #25 from rubberduck-vba/next

sync with merged PR's in main repo

Author: retailcoder

RetailCoder.VBE/ToDoItems/ToDoItem.cs

@@ -35,7 +35,7 @@ public class ToDoItem
         public QualifiedSelection GetSelection() { return _selection; }
 
         public ToDoItem(TodoPriority priority, CommentNode comment)
-            : this(priority, comment.Comment.Remove(0, 1).Trim(), comment.QualifiedSelection)
+            : this(priority, comment.CommentText, comment.QualifiedSelection)
         {
         }
 

Rubberduck.Parsing/Nodes/CommentNode.cs

@@ -1,3 +1,4 @@
+using System;
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.VBEditor;
 
@@ -35,7 +36,7 @@ public CommentNode(string comment, QualifiedSelection qualifiedSelection)
         /// <summary>
         /// Gets the trimmed comment text, without the comment marker.
         /// </summary>
-        public string CommentText { get { return _comment.Replace(Marker, string.Empty).TrimStart(); } }
+        public string CommentText { get { return _comment.Remove(_comment.IndexOf("'", StringComparison.Ordinal), 1).Trim(); } }
 
         /// <summary>
         /// The token used to indicate a comment.