fixed ToDoItem selection

Author: retailcoder

RetailCoder.VBE/Extensions/CodeModuleExtensions.cs

@@ -0,0 +1,25 @@
+using System.Linq;
+using Microsoft.Vbe.Interop;
+
+namespace Rubberduck.Extensions
+{
+    /// <summary>
+    /// VBE CodeModule extension methods.
+    /// </summary>
+    public static class CodeModuleExtensions
+    {
+        /// <summary>
+        /// Gets an array of strings where each element is a line of code in the module.
+        /// </summary>
+        public static string[] Code(this CodeModule module)
+        {
+            var lines = module.CountOfLines;
+            if (lines == 0)
+            {
+                return new string[]{};
+            }
+
+            return module.get_Lines(1, lines).Replace("\r", string.Empty).Split('\n');
+        }
+    }
+}

RetailCoder.VBE/Extensions/CodePaneExtensions.cs

@@ -5,7 +5,9 @@
 
 namespace Rubberduck.Extensions
 {
-    /// <summary>   VBE Code Pane extensions. </summary>
+    /// <summary>
+    /// VBE Code Pane extension methods. 
+    /// </summary>
     [ComVisible(false)]
     public static class CodePaneExtensions
     {

RetailCoder.VBE/ToDoItems/ToDoItem.cs

@@ -13,14 +13,8 @@ public struct ToDoItem
         private readonly string _description;
         public string Description { get { return _description; } }
 
-        private readonly string _projectName;
-        public string ProjectName { get { return _projectName; } }
-
-        private readonly string _moduleName;
-        public string ModuleName { get { return _moduleName; } }
-
-        private readonly int _lineNumber;
-        public int LineNumber { get { return _lineNumber; } }
+        private readonly QualifiedSelection _selection;
+        public QualifiedSelection Selection { get { return _selection; } }
 
         public ToDoItem(TaskPriority priority, CommentNode comment)
             : this(priority, comment.Comment, comment.QualifiedSelection)
@@ -31,9 +25,7 @@ public ToDoItem(TaskPriority priority, string description, QualifiedSelection qu
         {
             _priority = priority;
             _description = description;
-            _projectName = qualifiedSelection.QualifiedName.ProjectName;
-            _moduleName = qualifiedSelection.QualifiedName.ModuleName;
-            _lineNumber = qualifiedSelection.Selection.StartLine;
+            _selection = qualifiedSelection;
         }
     }
 }

RetailCoder.VBE/UI/ToDoItems/ToDoExplorerDockablePresenter.cs

@@ -57,15 +57,15 @@ private IEnumerable<ToDoItem> GetToDoMarkers(CommentNode comment)
         private void NavigateToDoItem(object sender, ToDoItemClickEventArgs e)
         {
             var project = VBE.VBProjects.Cast<VBProject>()
-                .FirstOrDefault(p => p.Name == e.Selection.ProjectName);
+                .FirstOrDefault(p => p.Name == e.SelectedItem.Selection.QualifiedName.ProjectName);
 
             if (project == null)
             {
                 return;
             }
 
             var component = project.VBComponents.Cast<VBComponent>()
-                .FirstOrDefault(c => c.Name == e.Selection.ModuleName);
+                .FirstOrDefault(c => c.Name == e.SelectedItem.Selection.QualifiedName.ModuleName);
 
             if (component == null)
             {
@@ -74,7 +74,7 @@ private void NavigateToDoItem(object sender, ToDoItemClickEventArgs e)
 
             var codePane = component.CodeModule.CodePane;
 
-            codePane.SetSelection(e.Selection.LineNumber);
+            codePane.SetSelection(e.SelectedItem.Selection.Selection);
             codePane.ForceFocus();
         }
     }

RetailCoder.VBE/UI/ToDoItems/ToDoItemClickEventArgs.cs

@@ -7,12 +7,12 @@ namespace Rubberduck.UI.ToDoItems
     [ComVisible(false)]
     public class ToDoItemClickEventArgs : EventArgs
     {
-        public ToDoItemClickEventArgs(ToDoItem selection)
+        public ToDoItemClickEventArgs(ToDoItem selectedItem)
         {
-            _selection = selection;
+            _selectedItem = selectedItem;
         }
 
-        private readonly ToDoItem _selection;
-        public ToDoItem Selection { get { return _selection; } }
+        private readonly ToDoItem _selectedItem;
+        public ToDoItem SelectedItem { get { return _selectedItem; } }
     }
 }