Merge pull request #649 from Hosch250/next

rubberduck203 · rubberduck203 · commit 21d6add8ba8d · 2015-06-18T19:06:54.000-04:00
Misc. Fixes in prep for 1.4
diff --git a/RetailCoder.VBE/Inspections/VariableTypeNotDeclaredInspectionResult.cs b/RetailCoder.VBE/Inspections/VariableTypeNotDeclaredInspectionResult.cs
@@ -26,20 +26,20 @@ public override IDictionary<string, Action> GetQuickFixes()
         private void DeclareAsExplicitVariant()
         {
             var codeModule = QualifiedSelection.QualifiedName.Component.CodeModule;
-            var codeLine = codeModule.get_Lines(QualifiedSelection.Selection.StartLine, QualifiedSelection.Selection.LineCount);
+            var codeLine = codeModule.Lines[QualifiedSelection.Selection.StartLine, QualifiedSelection.Selection.LineCount];
 
             // methods return empty string if soft-cast context is null - just concat results:
             string originalInstruction;
-            var fix = DeclareExplicitVariant(Context as VBAParser.VariableSubStmtContext, out originalInstruction);
+            var fix = DeclareExplicitVariant(Context.Parent as VBAParser.VariableSubStmtContext, out originalInstruction);
 
             if (string.IsNullOrEmpty(originalInstruction))
             {
-                fix = DeclareExplicitVariant(Context as VBAParser.ConstSubStmtContext, out originalInstruction);
+                fix = DeclareExplicitVariant(Context.Parent as VBAParser.ConstSubStmtContext, out originalInstruction);
             }
 
             if (string.IsNullOrEmpty(originalInstruction))
             {
-                fix = DeclareExplicitVariant(Context as VBAParser.ArgContext, out originalInstruction);
+                fix = DeclareExplicitVariant(Context.Parent as VBAParser.ArgContext, out originalInstruction);
             }
             
             var fixedCodeLine = codeLine.Replace(originalInstruction, fix);
diff --git a/RetailCoder.VBE/Settings/ConfigurationLoader.cs b/RetailCoder.VBE/Settings/ConfigurationLoader.cs
@@ -70,7 +70,7 @@ protected override Configuration HandleIOException(IOException ex)
         protected override Configuration HandleInvalidOperationException(InvalidOperationException ex)
         {
             var message = string.Format(RubberduckUI.PromptLoadDefaultConfig, ex.Message, ex.InnerException.Message, ConfigFile);
-            var result = MessageBox.Show(message, RubberduckUI.LoadConfigError, MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation);
+            var result = MessageBox.Show(message, RubberduckUI.LoadConfigError, MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation, MessageBoxDefaultButton.Button1, MessageBoxOptions.ServiceNotification);
 
             if (result == DialogResult.Yes)
             {
diff --git a/RetailCoder.VBE/UI/CodeInspections/CodeInspectionsWindow.cs b/RetailCoder.VBE/UI/CodeInspections/CodeInspectionsWindow.cs
@@ -89,7 +89,9 @@ public void SetIssuesStatus(int issueCount, bool completed = false)
         {
             _issueCount = issueCount;
 
-            RefreshButton.Image = completed
+            RefreshButton.Enabled = completed;  // remove this when uncommenting below lines
+
+            /*RefreshButton.Image = completed
                 ? Resources.arrow_circle_double
                 : Resources.cross_circle;
 
@@ -102,7 +104,7 @@ public void SetIssuesStatus(int issueCount, bool completed = false)
             {
                 RefreshButton.Click -= CancelButton_Click;
                 RefreshButton.Click += RefreshButtonClicked;
-            }
+            }*/
 
 
             if (issueCount == 0)
diff --git a/RetailCoder.VBE/UI/ToDoItems/IToDoExplorerWindow.cs b/RetailCoder.VBE/UI/ToDoItems/IToDoExplorerWindow.cs
@@ -10,6 +10,7 @@ public interface IToDoExplorerWindow : IDockableUserControl
         DataGridView GridView { get; }
         event EventHandler<ToDoItemClickEventArgs> NavigateToDoItem;
         event EventHandler RefreshToDoItems;
+        event EventHandler RemoveToDoMarker;
         event EventHandler<DataGridViewCellMouseEventArgs> SortColumn;
         IEnumerable<ToDoItem> TodoItems { get; set; }
     }
diff --git a/RetailCoder.VBE/UI/ToDoItems/ToDoExplorerDockablePresenter.cs b/RetailCoder.VBE/UI/ToDoItems/ToDoExplorerDockablePresenter.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Forms;
@@ -33,6 +34,7 @@ public ToDoExplorerDockablePresenter(IRubberduckParser parser, IEnumerable<ToDoM
             _view = window;
             _view.NavigateToDoItem += NavigateToDoItem;
             _view.RefreshToDoItems += RefreshToDoList;
+            _view.RemoveToDoMarker += RemoveMarker;
             _view.SortColumn += SortColumn;
         }
 
@@ -60,6 +62,23 @@ private void RefreshToDoList(object sender, EventArgs e)
             Refresh();
         }
 
+        private void RemoveMarker(object sender, EventArgs e)
+        {
+            var selectedIndex = _view.GridView.SelectedRows[0].Index;
+            var dataSource = ((BindingList<ToDoItem>)_view.GridView.DataSource).ToList();
+            var selectedItem = dataSource[selectedIndex];
+
+            var module = selectedItem.GetSelection().QualifiedName.Component.CodeModule;
+
+            var oldContent = module.Lines[selectedItem.LineNumber, 1];
+            var newContent =
+                oldContent.Remove(selectedItem.GetSelection().Selection.StartColumn - 1);
+
+            module.ReplaceLine(selectedItem.LineNumber, newContent);
+
+            Refresh();
+        }
+
         private void SortColumn(object sender, DataGridViewCellMouseEventArgs e)
         {
             var columnName = _view.GridView.Columns[e.ColumnIndex].Name;
@@ -84,12 +103,12 @@ private async Task<IOrderedEnumerable<ToDoItem>> GetItems()
                         items.Add(marker);
                     }
                 }
-            };
+            }
 
-            var sortedItems = items.OrderBy(item => item.ProjectName)
-                                    .ThenBy(item => item.ModuleName)
-                                    .ThenByDescending(item => item.Priority)
-                                    .ThenBy(item => item.LineNumber);
+            var sortedItems = items.OrderByDescending(item => item.Priority)
+                                   .ThenBy(item => item.ProjectName)
+                                   .ThenBy(item => item.ModuleName)
+                                   .ThenBy(item => item.LineNumber);
 
             return sortedItems;
         }
@@ -115,8 +134,11 @@ private void NavigateToDoItem(object sender, ToDoItemClickEventArgs e)
                 return;
             }
 
-            var component = projects.FirstOrDefault().VBComponents.Cast<VBComponent>()
-                                    .First(c => c.Name == e.SelectedItem.ModuleName);
+            var firstOrDefault = projects.FirstOrDefault();
+            if (firstOrDefault == null) { return; }
+
+            var component = firstOrDefault.VBComponents.Cast<VBComponent>()
+                .First(c => c.Name == e.SelectedItem.ModuleName);
 
             if (component == null)
             {
diff --git a/RetailCoder.VBE/UI/ToDoItems/ToDoExplorerWindow.Designer.cs b/RetailCoder.VBE/UI/ToDoItems/ToDoExplorerWindow.Designer.cs
diff --git a/RetailCoder.VBE/UI/ToDoItems/ToDoExplorerWindow.cs b/RetailCoder.VBE/UI/ToDoItems/ToDoExplorerWindow.cs
@@ -87,6 +87,16 @@ private void RefreshButtonClicked(object sender, EventArgs e)
             } 
         }
 
+        public event EventHandler RemoveToDoMarker;
+        private void RemoveButtonClicked(object sender, EventArgs e)
+        {
+            var handler = RemoveToDoMarker;
+            if (handler != null)
+            {
+                handler(this, EventArgs.Empty);
+            }
+        }
+
         public event EventHandler<DataGridViewCellMouseEventArgs> SortColumn;
         private void ColumnHeaderMouseClicked(object sender, DataGridViewCellMouseEventArgs e)
         {
diff --git a/RetailCoder.VBE/UI/ToDoItems/ToDoExplorerWindow.resx b/RetailCoder.VBE/UI/ToDoItems/ToDoExplorerWindow.resx
@@ -124,20 +124,20 @@
   <data name="refreshButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALgSURBVDhPY6AKsJ/3cqbd3Bdn0DFI3H7+cwW7ea9UbWe8
-        ktRadYUNqgUV2Mx+FmM74/GZKQ/+/++9+Q+MJ975/x8k1nvrn33N6R8hcdvf+TnOe+5kO+OBJFQbKrCc
-        9qDFctrDM303/vxvOvPzf9fVP/9B/PbLvx1az//Kbj37K7fn+p9c53lP4m2mPVSCaoMAw8nXpSwn3tnf
-        evb7/6pDn/53Xf75H8Q26bt5xmjiHWO/pY8rKo99mlh75MuEjkvfJlhOuVuh339fAKqdgUG/40pO2Ion
-        j8v2vP1fd+zjf/3OK2e6Ln8H0yB5o85rRgYdlztK973ZVLrnzZbw5Y+X6bVf9gVrBgGthjPLc7a9+Fqw
-        9cV/19nX7mg2np2i1XT2DAhDlTBoNp3zcp19azdQzbWcbc/PA9X0QKUYGFSrjp7J3/Hif86WZ/9BbJCY
-        WuWRGLXqYzPBCqBAqfLwwfT1jz/m73j8EcSGCjMwyBXuO5gClEhc+/gjiA0VBgOZwj0z5Qr3xIDY8sX7
-        ziRuePo/bcvz/yA2WAEISGZv6wlc/uC874rH14xaT+yWyNrmBZUCyZ0B46xtU0zaTtzxW/H4f+DS218l
-        MrcuhyphYBBOXu9r1HVmmfWKF1uclz/aJJK8rkMkYa0RSE4kZf2ZmL0f/oNoj41v/gPV/DfqPfNYKHld
-        DlgzCPDHrxcQTl5T4bzj0wSt1e8nmK14NlG+cn8Ff/wqY56Y5WcsN3/677zz83+VFe/+g9gCiWv3Cyct
-        k4JqhwD2qKVKAsmr4413f8+VWf81V27D92z1zd8duMIXndHa9uO/yJpv/013/fgP4nOGLWqBakMDtlWS
-        7BGLnMTqj/hJL3gcorDrlz1r4JwzGnv+/pfd8QeMjQ/8/Q8SYw2YDQ5YZMANxAoMXPzGDDKWdgyawc7M
-        ys4OjFbFy5h8Z5xBx4wWxYuB6uXBOqEAlNNAyROUWUD+w4dBakQZGBgEAEFwfwAEGQnfAAAAAElFTkSu
-        QmCC
+        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAALeSURBVDhPrZNtSFNRHMaPhUkWOHKFmqlYWu5D1mbRyjlz
+        CCFMkkQjRmazIN0wEcPZu7icQ22jIZPVCsNt+DbzZZkuzTIROiY0mymLZtd0iVmudGrqaed6P6Qf+tQP
+        Hu5z/v/n+XAv94D/Alf7tTLmgQOuF55zH06ExGgnwzjqSX9GzeAmqrKWaM24gKMmoMqOUNnwCimlDSE8
+        KxtZ4V57M5989ul04nHtRBxHbfenamthV9iL2BWjsPzDEiqEC0j+fgnhc7Hld6x0YDFL2r8oLh1aEvO0
+        Y2nRFaOhVG2Vg/eGAthKW5e034UKXjqR3LKAsI8qH4ZMpY2VWE3kS3qdyus9vxSyd3MKtupjfuTdTzSq
+        DkCkbFCUYhgjrpi/oRu9MyiyZBDKLS7yiffMEivzgMwiy+ucasozT7Wk6gnd/mILnyxjGLegXmRyzF5u
+        daB4jdUWcbtfxSjsh1hUBEQUvk2I14x0uDNWkWliwJ0ppVYAhBW8htltDiRqGUfY41m4pEcQfrW3kgxQ
+        hEpedV+oJ2ay24gZ7KkxAEE5nd0Z7kW6W9hTY5LAHHNlUI5ZgH1wbidMb/yCLrZMIOzJAMY/y1SapLcP
+        8A2ElSnt6/DLNCVQK7yDpDJNqqg7fbZEA4GSqodn/S616qkIAL5CI58ph7pjBkcLT/+5iS5skNHP1TPx
+        jp5hhILnPxB+nngyhdwZxCyDxDZhg4gsY3zSjDRfYV0+r82pYNR+Vxw2jCuDJV35Pmk1rK0CPWQ3OxHv
+        2U+0xzCNsKel13f5ntcFUPVVvM5Uh9KEtWmsDpc40DgrDmp0Ze1tdsV6p1ZBhmke0evm0KH2eYTPm1Oq
+        iqjaOjgF/l6nq+J23OxJ3PmISA5pX+R6Jt2H+8zLaFfbEinWi2WEZ54nNeSH/ZstboUAbx8WCGTHgIhT
+        vI27ebEeR3N1G/hquF4eR3Ifu/PBZJMC3zT8e+LLgt/vX8KZ7QAA2h8x9n74W7p/MgAAAABJRU5ErkJg
+        gg==
 </value>
   </data>
 </root>
diff --git a/Rubberduck.Parsing/VBA/RubberduckParser.cs b/Rubberduck.Parsing/VBA/RubberduckParser.cs
@@ -199,7 +199,7 @@ private IEnumerable<CommentNode> ParseComments(QualifiedModuleName qualifiedName
                     if (!continuing)
                     {
                         commentBuilder.Append(line.Substring(index, commentLength).TrimStart());
-                        var selection = new Selection(startLine + 1, startColumn + 1, i + 1, line.Length);
+                        var selection = new Selection(startLine + 1, startColumn + 1, i + 1, line.Length + 1);
 
                         var result = new CommentNode(commentBuilder.ToString(), new QualifiedSelection(qualifiedName, selection));
                         commentBuilder.Clear();

Original file line number	Diff line number	Diff line change
`@@ -26,20 +26,20 @@ public override IDictionary<string, Action> GetQuickFixes()`
`26`	`26`	`private void DeclareAsExplicitVariant()`
`27`	`27`	`{`
`28`	`28`	`var codeModule = QualifiedSelection.QualifiedName.Component.CodeModule;`
`29`		`- var codeLine = codeModule.get_Lines(QualifiedSelection.Selection.StartLine, QualifiedSelection.Selection.LineCount);`
	`29`	`+ var codeLine = codeModule.Lines[QualifiedSelection.Selection.StartLine, QualifiedSelection.Selection.LineCount];`
`30`	`30`
`31`	`31`	`// methods return empty string if soft-cast context is null - just concat results:`
`32`	`32`	`string originalInstruction;`
`33`		`- var fix = DeclareExplicitVariant(Context as VBAParser.VariableSubStmtContext, out originalInstruction);`
	`33`	`+ var fix = DeclareExplicitVariant(Context.Parent as VBAParser.VariableSubStmtContext, out originalInstruction);`
`34`	`34`
`35`	`35`	`if (string.IsNullOrEmpty(originalInstruction))`
`36`	`36`	`{`
`37`		`- fix = DeclareExplicitVariant(Context as VBAParser.ConstSubStmtContext, out originalInstruction);`
	`37`	`+ fix = DeclareExplicitVariant(Context.Parent as VBAParser.ConstSubStmtContext, out originalInstruction);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`if (string.IsNullOrEmpty(originalInstruction))`
`41`	`41`	`{`
`42`		`- fix = DeclareExplicitVariant(Context as VBAParser.ArgContext, out originalInstruction);`
	`42`	`+ fix = DeclareExplicitVariant(Context.Parent as VBAParser.ArgContext, out originalInstruction);`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`var fixedCodeLine = codeLine.Replace(originalInstruction, fix);`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ protected override Configuration HandleIOException(IOException ex)`
`70`	`70`	`protected override Configuration HandleInvalidOperationException(InvalidOperationException ex)`
`71`	`71`	`{`
`72`	`72`	`var message = string.Format(RubberduckUI.PromptLoadDefaultConfig, ex.Message, ex.InnerException.Message, ConfigFile);`
`73`		`- var result = MessageBox.Show(message, RubberduckUI.LoadConfigError, MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation);`
	`73`	`+ var result = MessageBox.Show(message, RubberduckUI.LoadConfigError, MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation, MessageBoxDefaultButton.Button1, MessageBoxOptions.ServiceNotification);`
`74`	`74`
`75`	`75`	`if (result == DialogResult.Yes)`
`76`	`76`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ public interface IToDoExplorerWindow : IDockableUserControl`
`10`	`10`	`DataGridView GridView { get; }`
`11`	`11`	`event EventHandler<ToDoItemClickEventArgs> NavigateToDoItem;`
`12`	`12`	`event EventHandler RefreshToDoItems;`
	`13`	`+ event EventHandler RemoveToDoMarker;`
`13`	`14`	`event EventHandler<DataGridViewCellMouseEventArgs> SortColumn;`
`14`	`15`	`IEnumerable<ToDoItem> TodoItems { get; set; }`
`15`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,16 @@ private void RefreshButtonClicked(object sender, EventArgs e)`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`
	`90`	`+ public event EventHandler RemoveToDoMarker;`
	`91`	`+ private void RemoveButtonClicked(object sender, EventArgs e)`
	`92`	`+ {`
	`93`	`+ var handler = RemoveToDoMarker;`
	`94`	`+ if (handler != null)`
	`95`	`+ {`
	`96`	`+ handler(this, EventArgs.Empty);`
	`97`	`+ }`
	`98`	`+ }`
	`99`	`+`
`90`	`100`	`public event EventHandler<DataGridViewCellMouseEventArgs> SortColumn;`
`91`	`101`	`private void ColumnHeaderMouseClicked(object sender, DataGridViewCellMouseEventArgs e)`
`92`	`102`	`{`
Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ private IEnumerable<CommentNode> ParseComments(QualifiedModuleName qualifiedName`
`199`	`199`	`if (!continuing)`
`200`	`200`	`{`
`201`	`201`	`commentBuilder.Append(line.Substring(index, commentLength).TrimStart());`
`202`		`- var selection = new Selection(startLine + 1, startColumn + 1, i + 1, line.Length);`
	`202`	`+ var selection = new Selection(startLine + 1, startColumn + 1, i + 1, line.Length + 1);`
`203`	`203`
`204`	`204`	`var result = new CommentNode(commentBuilder.ToString(), new QualifiedSelection(qualifiedName, selection));`
`205`	`205`	`commentBuilder.Clear();`