Merge pull request #705 from Hosch250/next

retailcoder · retailcoder · commit c976b25a05a1 · 2015-07-11T15:32:43.000-04:00
Closes issue #698
diff --git a/RetailCoder.VBE/Inspections/DefaultProjectNameInspectionResult.cs b/RetailCoder.VBE/Inspections/DefaultProjectNameInspectionResult.cs
@@ -33,7 +33,7 @@ private void RenameProject()
 
             using (var view = new RenameDialog())
             {
-                var factory = new RenamePresenterFactory(vbe, view, _parseResult);
+                var factory = new RenamePresenterFactory(vbe, view, _parseResult, new RubberduckMessageBox());
                 var refactoring = new RenameRefactoring(factory);
                 refactoring.Refactor(Target);
             }
diff --git a/RetailCoder.VBE/Refactorings/Rename/RenameModel.cs b/RetailCoder.VBE/Refactorings/Rename/RenameModel.cs
@@ -31,12 +31,15 @@ public Declaration Target
 
         public string NewName { get; set; }
 
-        public RenameModel(VBE vbe, VBProjectParseResult parseResult, QualifiedSelection selection)
+        private readonly IMessageBox _messageBox;
+
+        public RenameModel(VBE vbe, VBProjectParseResult parseResult, QualifiedSelection selection, IMessageBox messageBox)
         {
             _vbe = vbe;
             _parseResult = parseResult;
             _declarations = parseResult.Declarations;
             _selection = selection;
+            _messageBox = messageBox;
 
             AcquireTarget(out _target, Selection);
         }
@@ -63,7 +66,7 @@ public void PromptIfTargetImplementsInterface(ref Declaration target)
             var interfaceMember = _declarations.FindInterfaceMember(interfaceImplementation);
             var message = string.Format(RubberduckUI.RenamePresenter_TargetIsInterfaceMemberImplementation, target.IdentifierName, interfaceMember.ComponentName, interfaceMember.IdentifierName);
 
-            var confirm = MessageBox.Show(message, RubberduckUI.RenameDialog_TitleText, MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation);
+            var confirm = _messageBox.Show(message, RubberduckUI.RenameDialog_TitleText, MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation);
             if (confirm == DialogResult.No)
             {
                 target = null;
diff --git a/RetailCoder.VBE/Refactorings/Rename/RenamePresenterFactory.cs b/RetailCoder.VBE/Refactorings/Rename/RenamePresenterFactory.cs
@@ -1,5 +1,6 @@
 using Microsoft.Vbe.Interop;
 using Rubberduck.Parsing;
+using Rubberduck.UI;
 using Rubberduck.VBEditor.Extensions;
 
 namespace Rubberduck.Refactorings.Rename
@@ -9,17 +10,19 @@ public class RenamePresenterFactory : IRefactoringPresenterFactory<RenamePresent
         private readonly VBE _vbe;
         private readonly IRenameView _view;
         private readonly VBProjectParseResult _parseResult;
+        private readonly IMessageBox _messageBox;
 
-        public RenamePresenterFactory(VBE vbe, IRenameView view, VBProjectParseResult parseResult)
+        public RenamePresenterFactory(VBE vbe, IRenameView view, VBProjectParseResult parseResult, IMessageBox messageBox)
         {
             _vbe = vbe;
             _view = view;
             _parseResult = parseResult;
+            _messageBox = messageBox;
         }
 
         public RenamePresenter Create()
         {
-            return new RenamePresenter(_view, new RenameModel(_vbe, _parseResult, _vbe.ActiveCodePane.GetSelection()));
+            return new RenamePresenter(_view, new RenameModel(_vbe, _parseResult, _vbe.ActiveCodePane.GetSelection(), _messageBox));
         }
     }
 }
diff --git a/RetailCoder.VBE/UI/CodeInspections/CodeInspectionsDockablePresenter.cs b/RetailCoder.VBE/UI/CodeInspections/CodeInspectionsDockablePresenter.cs
@@ -178,9 +178,11 @@ private async void Refresh()
                 await Task.Run(() => RefreshAsync(token), token);
                 if (_results != null)
                 {
-                    Control.SetContent(_results.Select(item => new CodeInspectionResultGridViewItem(item))
-                        .OrderBy(item => item.Component)
-                        .ThenBy(item => item.Line));
+                    var results = _results.Select(item => new CodeInspectionResultGridViewItem(item));
+
+                    Control.SetContent(new BindingList<CodeInspectionResultGridViewItem>(
+                    _gridViewSort.Sort(results, _gridViewSort.ColumnName,
+                        _gridViewSort.SortedAscending).ToList()));
                 }
             }
             catch (TaskCanceledException)
diff --git a/RetailCoder.VBE/UI/FormContextMenu.cs b/RetailCoder.VBE/UI/FormContextMenu.cs
@@ -56,7 +56,7 @@ private void Rename()
 
                 using (var view = new RenameDialog())
                 {
-                    var factory = new RenamePresenterFactory(_vbe, view, result);
+                    var factory = new RenamePresenterFactory(_vbe, view, result, new RubberduckMessageBox());
                     var refactoring = new RenameRefactoring(factory);
                     refactoring.Refactor(controlToRename);
                 }
diff --git a/RetailCoder.VBE/UI/GridViewSort.cs b/RetailCoder.VBE/UI/GridViewSort.cs
@@ -5,28 +5,38 @@ namespace Rubberduck.UI
 {
     public class GridViewSort<T>
     {
-        private bool _sortedAscending;
-        private string _columnName;
+        public bool SortedAscending { get; private set; }
+        public string ColumnName { get; private set; }
 
         public GridViewSort(string columnName, bool sortedAscending)
         {
-            _columnName = columnName;
-            _sortedAscending = sortedAscending;
+            ColumnName = columnName;
+            SortedAscending = sortedAscending;
         }
 
         public IEnumerable<T> Sort(IEnumerable<T> items, string columnName)
         {
-            if (columnName == _columnName && _sortedAscending)
+            if (columnName == ColumnName && SortedAscending)
             {
-                _sortedAscending = false;
+                SortedAscending = false;
                 return items.OrderByDescending(x => x.GetType().GetProperty(columnName).GetValue(x));
             }
             else
             {
-                _columnName = columnName;
-                _sortedAscending = true;
+                ColumnName = columnName;
+                SortedAscending = true;
                 return items.OrderBy(x => x.GetType().GetProperty(columnName).GetValue(x));
             }
         }
+
+        public IEnumerable<T> Sort(IEnumerable<T> items, string columnName, bool sortAscending)
+        {
+            SortedAscending = sortAscending;
+            ColumnName = columnName;
+
+            return sortAscending
+                ? items.OrderBy(x => x.GetType().GetProperty(columnName).GetValue(x))
+                : items.OrderByDescending(x => x.GetType().GetProperty(columnName).GetValue(x));
+        }
     }
 }
diff --git a/RetailCoder.VBE/UI/ProjectExplorerContextMenu.cs b/RetailCoder.VBE/UI/ProjectExplorerContextMenu.cs
@@ -147,7 +147,7 @@ private void Rename_Click(CommandBarButton Ctrl, ref bool CancelDefault)
 
             using (var view = new RenameDialog())
             {
-                var factory = new RenamePresenterFactory(_vbe, view, results);
+                var factory = new RenamePresenterFactory(_vbe, view, results, new RubberduckMessageBox());
                 var refactoring = new RenameRefactoring(factory);
                 refactoring.Refactor(declaration);
             }
diff --git a/RetailCoder.VBE/UI/RefactorMenu.cs b/RetailCoder.VBE/UI/RefactorMenu.cs
@@ -434,7 +434,7 @@ public void Rename()
 
             using (var view = new RenameDialog())
             {
-                var factory = new RenamePresenterFactory(IDE, view, result);
+                var factory = new RenamePresenterFactory(IDE, view, result, new RubberduckMessageBox());
                 var refactoring = new RenameRefactoring(factory);
                 refactoring.Refactor();
             }
@@ -447,7 +447,7 @@ public void Rename(Declaration target)
 
             using (var view = new RenameDialog())
             {
-                var factory = new RenamePresenterFactory(IDE, view, result);
+                var factory = new RenamePresenterFactory(IDE, view, result, new RubberduckMessageBox());
                 var refactoring = new RenameRefactoring(factory);
                 refactoring.Refactor(target);
             }
diff --git a/RetailCoder.VBE/UI/ToDoItems/ToDoExplorerDockablePresenter.cs b/RetailCoder.VBE/UI/ToDoItems/ToDoExplorerDockablePresenter.cs
@@ -49,7 +49,8 @@ public async void Refresh()
             try
             {
                 Cursor.Current = Cursors.WaitCursor;
-                _view.TodoItems = await GetItems();
+                var results = await GetItems();
+                _view.TodoItems = _gridViewSort.Sort(results, _gridViewSort.ColumnName, _gridViewSort.SortedAscending);
             }
             finally
             {
diff --git a/RetailCoder.VBE/UI/UnitTesting/ITestExplorerWindow.cs b/RetailCoder.VBE/UI/UnitTesting/ITestExplorerWindow.cs
@@ -22,7 +22,6 @@ public interface ITestExplorerWindow : IDockableUserControl
         event EventHandler OnAddTestModuleButtonClick;
         void ClearProgress();
         void ClearResults();
-        void Refresh(IDictionary<TestMethod, TestResult> tests);
         void SetPlayList(IEnumerable<TestMethod> tests);
         void SetPlayList(IDictionary<TestMethod, TestResult> tests);
         event EventHandler OnRefreshListButtonClick;
diff --git a/RetailCoder.VBE/UI/UnitTesting/TestExplorerDockablePresenter.cs b/RetailCoder.VBE/UI/UnitTesting/TestExplorerDockablePresenter.cs
@@ -71,7 +71,11 @@ private void _testEngine_ModuleInitialize(object sender, TestModuleEventArgs e)
         private void Synchronize()
         {
             FindAllTests();
-            _view.Refresh(_testEngine.AllTests);
+            var results = new BindingList<TestExplorerItem>(_testEngine.AllTests.Select(test => new TestExplorerItem(test.Key, test.Value)).ToList());
+            _view.AllTests =
+                new BindingList<TestExplorerItem>(
+                    _gridViewSort.Sort(results, _gridViewSort.ColumnName,
+                        _gridViewSort.SortedAscending).ToList());
         }
 
         public override void Show()
diff --git a/RetailCoder.VBE/UI/UnitTesting/TestExplorerWindow.cs b/RetailCoder.VBE/UI/UnitTesting/TestExplorerWindow.cs
@@ -225,13 +225,6 @@ private TestExplorerItem FindItem(IEnumerable<TestExplorerItem> items, TestMetho
             return items.FirstOrDefault(item => item.QualifiedMemberName == test.QualifiedMemberName.ToString());
         }
 
-        public void Refresh(IDictionary<TestMethod, TestResult> tests)
-        {
-            AllTests = new BindingList<TestExplorerItem>(tests.Select(test => new TestExplorerItem(test.Key, test.Value)).ToList());
-            testOutputGridView.DataSource = AllTests;
-            testOutputGridView.Refresh();
-        }
-
         public void SetPlayList(IEnumerable<TestMethod> tests)
         {
             SetPlayList(tests.ToDictionary(test => test, test => null as TestResult));
diff --git a/RubberduckTests/Refactoring/RemoveParametersTests.cs b/RubberduckTests/Refactoring/RemoveParametersTests.cs
@@ -1307,7 +1307,7 @@ Private Sub IClass1_DoSomething(ByVal a As Integer )
         }
 
         [TestMethod]
-        public void RemoveParametersRefactoring_LastParamRemoved_RejectPrompt()
+        public void RemoveParametersRefactoring_LastInterfaceParamRemoved_RejectPrompt()
         {
             //Input
             const string inputCode1 =
diff --git a/RubberduckTests/Refactoring/RenameTests.cs b/RubberduckTests/Refactoring/RenameTests.cs
diff --git a/RubberduckTests/VbeTestBase.cs b/RubberduckTests/VbeTestBase.cs

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ private void RenameProject()`
`33`	`33`
`34`	`34`	`using (var view = new RenameDialog())`
`35`	`35`	`{`
`36`		`- var factory = new RenamePresenterFactory(vbe, view, _parseResult);`
	`36`	`+ var factory = new RenamePresenterFactory(vbe, view, _parseResult, new RubberduckMessageBox());`
`37`	`37`	`var refactoring = new RenameRefactoring(factory);`
`38`	`38`	`refactoring.Refactor(Target);`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using Microsoft.Vbe.Interop;`
`2`	`2`	`using Rubberduck.Parsing;`
	`3`	`+using Rubberduck.UI;`
`3`	`4`	`using Rubberduck.VBEditor.Extensions;`
`4`	`5`
`5`	`6`	`namespace Rubberduck.Refactorings.Rename`
`@@ -9,17 +10,19 @@ public class RenamePresenterFactory : IRefactoringPresenterFactory<RenamePresent`
`9`	`10`	`private readonly VBE _vbe;`
`10`	`11`	`private readonly IRenameView _view;`
`11`	`12`	`private readonly VBProjectParseResult _parseResult;`
	`13`	`+ private readonly IMessageBox _messageBox;`
`12`	`14`
`13`		`- public RenamePresenterFactory(VBE vbe, IRenameView view, VBProjectParseResult parseResult)`
	`15`	`+ public RenamePresenterFactory(VBE vbe, IRenameView view, VBProjectParseResult parseResult, IMessageBox messageBox)`
`14`	`16`	`{`
`15`	`17`	`_vbe = vbe;`
`16`	`18`	`_view = view;`
`17`	`19`	`_parseResult = parseResult;`
	`20`	`+ _messageBox = messageBox;`
`18`	`21`	`}`
`19`	`22`
`20`	`23`	`public RenamePresenter Create()`
`21`	`24`	`{`
`22`		`- return new RenamePresenter(_view, new RenameModel(_vbe, _parseResult, _vbe.ActiveCodePane.GetSelection()));`
	`25`	`+ return new RenamePresenter(_view, new RenameModel(_vbe, _parseResult, _vbe.ActiveCodePane.GetSelection(), _messageBox));`
`23`	`26`	`}`
`24`	`27`	`}`
`25`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -178,9 +178,11 @@ private async void Refresh()`
`178`	`178`	`await Task.Run(() => RefreshAsync(token), token);`
`179`	`179`	`if (_results != null)`
`180`	`180`	`{`
`181`		`- Control.SetContent(_results.Select(item => new CodeInspectionResultGridViewItem(item))`
`182`		`- .OrderBy(item => item.Component)`
`183`		`- .ThenBy(item => item.Line));`
	`181`	`+ var results = _results.Select(item => new CodeInspectionResultGridViewItem(item));`
	`182`	`+`
	`183`	`+ Control.SetContent(new BindingList<CodeInspectionResultGridViewItem>(`
	`184`	`+ _gridViewSort.Sort(results, _gridViewSort.ColumnName,`
	`185`	`+ _gridViewSort.SortedAscending).ToList()));`
`184`	`186`	`}`
`185`	`187`	`}`
`186`	`188`	`catch (TaskCanceledException)`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ private void Rename()`
`56`	`56`
`57`	`57`	`using (var view = new RenameDialog())`
`58`	`58`	`{`
`59`		`- var factory = new RenamePresenterFactory(_vbe, view, result);`
	`59`	`+ var factory = new RenamePresenterFactory(_vbe, view, result, new RubberduckMessageBox());`
`60`	`60`	`var refactoring = new RenameRefactoring(factory);`
`61`	`61`	`refactoring.Refactor(controlToRename);`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,28 +5,38 @@ namespace Rubberduck.UI`
`5`	`5`	`{`
`6`	`6`	`public class GridViewSort<T>`
`7`	`7`	`{`
`8`		`- private bool _sortedAscending;`
`9`		`- private string _columnName;`
	`8`	`+ public bool SortedAscending { get; private set; }`
	`9`	`+ public string ColumnName { get; private set; }`
`10`	`10`
`11`	`11`	`public GridViewSort(string columnName, bool sortedAscending)`
`12`	`12`	`{`
`13`		`- _columnName = columnName;`
`14`		`- _sortedAscending = sortedAscending;`
	`13`	`+ ColumnName = columnName;`
	`14`	`+ SortedAscending = sortedAscending;`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`public IEnumerable<T> Sort(IEnumerable<T> items, string columnName)`
`18`	`18`	`{`
`19`		`- if (columnName == _columnName && _sortedAscending)`
	`19`	`+ if (columnName == ColumnName && SortedAscending)`
`20`	`20`	`{`
`21`		`- _sortedAscending = false;`
	`21`	`+ SortedAscending = false;`
`22`	`22`	`return items.OrderByDescending(x => x.GetType().GetProperty(columnName).GetValue(x));`
`23`	`23`	`}`
`24`	`24`	`else`
`25`	`25`	`{`
`26`		`- _columnName = columnName;`
`27`		`- _sortedAscending = true;`
	`26`	`+ ColumnName = columnName;`
	`27`	`+ SortedAscending = true;`
`28`	`28`	`return items.OrderBy(x => x.GetType().GetProperty(columnName).GetValue(x));`
`29`	`29`	`}`
`30`	`30`	`}`
	`31`	`+`
	`32`	`+ public IEnumerable<T> Sort(IEnumerable<T> items, string columnName, bool sortAscending)`
	`33`	`+ {`
	`34`	`+ SortedAscending = sortAscending;`
	`35`	`+ ColumnName = columnName;`
	`36`	`+`
	`37`	`+ return sortAscending`
	`38`	`+ ? items.OrderBy(x => x.GetType().GetProperty(columnName).GetValue(x))`
	`39`	`+ : items.OrderByDescending(x => x.GetType().GetProperty(columnName).GetValue(x));`
	`40`	`+ }`
`31`	`41`	`}`
`32`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ private void Rename_Click(CommandBarButton Ctrl, ref bool CancelDefault)`
`147`	`147`
`148`	`148`	`using (var view = new RenameDialog())`
`149`	`149`	`{`
`150`		`- var factory = new RenamePresenterFactory(_vbe, view, results);`
	`150`	`+ var factory = new RenamePresenterFactory(_vbe, view, results, new RubberduckMessageBox());`
`151`	`151`	`var refactoring = new RenameRefactoring(factory);`
`152`	`152`	`refactoring.Refactor(declaration);`
`153`	`153`	`}`
Original file line number	Diff line number	Diff line change
`@@ -434,7 +434,7 @@ public void Rename()`
`434`	`434`
`435`	`435`	`using (var view = new RenameDialog())`
`436`	`436`	`{`
`437`		`- var factory = new RenamePresenterFactory(IDE, view, result);`
	`437`	`+ var factory = new RenamePresenterFactory(IDE, view, result, new RubberduckMessageBox());`
`438`	`438`	`var refactoring = new RenameRefactoring(factory);`
`439`	`439`	`refactoring.Refactor();`
`440`	`440`	`}`
`@@ -447,7 +447,7 @@ public void Rename(Declaration target)`
`447`	`447`
`448`	`448`	`using (var view = new RenameDialog())`
`449`	`449`	`{`
`450`		`- var factory = new RenamePresenterFactory(IDE, view, result);`
	`450`	`+ var factory = new RenamePresenterFactory(IDE, view, result, new RubberduckMessageBox());`
`451`	`451`	`var refactoring = new RenameRefactoring(factory);`
`452`	`452`	`refactoring.Refactor(target);`
`453`	`453`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,8 @@ public async void Refresh()`
`49`	`49`	`try`
`50`	`50`	`{`
`51`	`51`	`Cursor.Current = Cursors.WaitCursor;`
`52`		`- _view.TodoItems = await GetItems();`
	`52`	`+ var results = await GetItems();`
	`53`	`+ _view.TodoItems = _gridViewSort.Sort(results, _gridViewSort.ColumnName, _gridViewSort.SortedAscending);`
`53`	`54`	`}`
`54`	`55`	`finally`
`55`	`56`	`{`