Merge branch 'next' into next

Author: retailcoder

RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerViewModel.cs

@@ -37,7 +37,9 @@ public CodeExplorerViewModel(FolderHelper folderHelper, RubberduckParserState st
 
             _clipboard = new ClipboardWriter();
 
-            _refreshCommand = commands.OfType<CodeExplorer_RefreshCommand>().FirstOrDefault();
+            _refreshCommand = new DelegateCommand(param => _state.OnParseRequested(this),
+                param => !IsBusy && _state.IsDirty());
+
             _refreshComponentCommand = commands.OfType<CodeExplorer_RefreshComponentCommand>().FirstOrDefault();
             _navigateCommand = commands.OfType<CodeExplorer_NavigateCommand>().FirstOrDefault();
 
@@ -210,18 +212,6 @@ public bool IsBusy
             {
                 _isBusy = value;
                 OnPropertyChanged();
-                CanRefresh = !_isBusy;
-            }
-        }
-
-        private bool _canRefresh = true;
-        public bool CanRefresh
-        {
-            get { return _canRefresh; }
-            private set
-            {
-                _canRefresh = value;
-                OnPropertyChanged();
             }
         }
 

RetailCoder.VBE/Rubberduck.csproj

@@ -410,7 +410,6 @@
     <Compile Include="UI\CodeExplorer\Commands\CodeExplorer_FindAllImplementationsCommand.cs" />
     <Compile Include="UI\CodeExplorer\Commands\CodeExplorer_IndentCommand.cs" />
     <Compile Include="UI\CodeExplorer\Commands\CodeExplorer_NavigateCommand.cs" />
-    <Compile Include="UI\CodeExplorer\Commands\CodeExplorer_RefreshCommand.cs" />
     <Compile Include="UI\CodeExplorer\Commands\CodeExplorer_RemoveCommand.cs" />
     <Compile Include="UI\CodeExplorer\Commands\CodeExplorer_ExportCommand.cs" />
     <Compile Include="UI\CodeExplorer\Commands\CodeExplorer_ImportCommand.cs" />

RetailCoder.VBE/UI/CodeExplorer/CodeExplorerControl.xaml

@@ -628,7 +628,7 @@
         <ToolBarTray Grid.Row="0" IsLocked="True">
             <ToolBar Style="{DynamicResource ToolBarWithOverflowOnlyShowingWhenNeededStyle}">
 
-                <Button Command="{Binding RefreshCommand}" IsEnabled="{Binding CanRefresh}">
+                <Button Command="{Binding RefreshCommand}">
                     <Image Height="16" Source="../../Resources/arrow-circle-double.png" />
                     <Button.ToolTip>
                         <TextBlock Text="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=Refresh}" />

RetailCoder.VBE/UI/CodeExplorer/Commands/CodeExplorer_RefreshCommand.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -216,7 +215,7 @@ private async void ExecuteRefreshCommandAsync(object parameter)
 
         private bool CanExecuteRefreshCommand(object parameter)
         {
-            return !IsBusy;
+            return !IsBusy && _state.IsDirty();
         }
 
         private async void _state_StateChanged(object sender, EventArgs e)

RetailCoder.VBE/UI/Inspections/InspectionResultsViewModel.cs

@@ -100,7 +100,8 @@ public ICommand RefreshCommand
                 return _refreshCommand = new DelegateCommand(_ =>
                 {
                     _state.OnParseRequested(this);
-                });
+                },
+                _ => _state.IsDirty());
             }
         }
 

RetailCoder.VBE/UI/ToDoItems/ToDoExplorerViewModel.cs

@@ -18,6 +18,7 @@ namespace Rubberduck.UI.UnitTesting
 {
     public class TestExplorerViewModel : ViewModelBase, INavigateSelection, IDisposable
     {
+        private readonly RubberduckParserState _state;
         private readonly ITestEngine _testEngine;
         private readonly TestExplorerModel _model;
         private readonly IClipboardWriter _clipboard;
@@ -34,6 +35,7 @@ public TestExplorerViewModel(VBE vbe,
              IGeneralConfigService configService,
              IOperatingSystem operatingSystem)
         {
+            _state = state;
             _testEngine = testEngine;
             _testEngine.TestCompleted += TestEngineTestCompleted;
             _model = model;
@@ -220,7 +222,7 @@ private void ExecuteRefreshCommand(object parameter)
 
         private bool CanExecuteRefreshCommand(object parameter)
         {
-            return !Model.IsBusy;
+            return !Model.IsBusy && _state.IsDirty();
         }
 
         private void ExecuteRepeatLastRunCommand(object parameter)