Merge pull request #1472 from Hosch250/CECommit

Close #840

Author: retailcoder

RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerViewModel.cs

@@ -31,6 +31,7 @@ public CodeExplorerViewModel(FolderHelper folderHelper, RubberduckParserState st
             _state.ModuleStateChanged += ParserState_ModuleStateChanged;
 
             _refreshCommand = commands.OfType<CodeExplorer_RefreshCommand>().FirstOrDefault();
+            _refreshComponentCommand = commands.OfType<CodeExplorer_RefreshComponentCommand>().FirstOrDefault();
             _navigateCommand = commands.OfType<CodeExplorer_NavigateCommand>().FirstOrDefault();
 
             _addTestModuleCommand = commands.OfType<CodeExplorer_AddTestModuleCommand>().FirstOrDefault();
@@ -311,6 +312,9 @@ private void RemoveFailingComponent(CodeExplorerItemViewModel itemNode, string c
         private readonly ICommand _refreshCommand;
         public ICommand RefreshCommand { get { return _refreshCommand; } }
 
+        private readonly ICommand _refreshComponentCommand;
+        public ICommand RefreshComponentCommand { get { return _refreshComponentCommand; } }
+
         private readonly ICommand _navigateCommand;
         public ICommand NavigateCommand { get { return _navigateCommand; } }
 

RetailCoder.VBE/Rubberduck.csproj

@@ -385,6 +385,7 @@
     </Compile>
     <Compile Include="UI\CodeExplorer\Commands\CodeExplorer_CommitCommand.cs" />
     <Compile Include="UI\CodeExplorer\Commands\CodeExplorer_AddUserFormCommand.cs" />
+    <Compile Include="UI\CodeExplorer\Commands\CodeExplorer_RefreshComponentCommand.cs" />
     <Compile Include="UI\CodeExplorer\Commands\CodeExplorer_RenameCommand.cs" />
     <Compile Include="UI\CodeExplorer\Commands\CodeExplorer_FindAllReferencesCommand.cs" />
     <Compile Include="UI\CodeExplorer\Commands\CodeExplorer_FindAllImplementationsCommand.cs" />

RetailCoder.VBE/UI/CodeExplorer/CodeExplorerControl.xaml

@@ -145,6 +145,9 @@
             <Setter Property="ContextMenu">
                 <Setter.Value>
                     <ContextMenu DataContext="{Binding DataContext, Source={x:Reference CodeExplorer}}">
+                        <MenuItem Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=CodeExplorer_RefreshComponent}"
+                                  Command="{Binding RefreshComponentCommand}"
+                                  CommandParameter="{Binding SelectedItem}"/>
                         <MenuItem Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=Navigate}"
                                   FontWeight="Bold"
                                   Command="{Binding NavigateCommand}"

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

@@ -0,0 +1,32 @@
+using Rubberduck.Navigation.CodeExplorer;
+using Rubberduck.Parsing.VBA;
+using Rubberduck.UI.Command;
+
+namespace Rubberduck.UI.CodeExplorer.Commands
+{
+    public class CodeExplorer_RefreshComponentCommand : CommandBase
+    {
+        private readonly RubberduckParserState _state;
+
+        public CodeExplorer_RefreshComponentCommand(RubberduckParserState state)
+        {
+            _state = state;
+        }
+
+        public override bool CanExecute(object parameter)
+        {
+            var node = parameter as CodeExplorerComponentViewModel;
+
+            return node != null && node.QualifiedSelection.HasValue &&
+                   _state.GetOrCreateModuleState(node.QualifiedSelection.Value.QualifiedName.Component) == ParserState.Pending;
+        }
+
+        public override void Execute(object parameter)
+        {
+            var node = (CodeExplorerComponentViewModel) parameter;
+
+            // ReSharper disable once PossibleInvalidOperationException - CanExecute ensures it has a value
+            _state.OnParseRequested(this, node.QualifiedSelection.Value.QualifiedName.Component);
+        }
+    }
+}

RetailCoder.VBE/UI/RubberduckUI.Designer.cs

@@ -1566,4 +1566,7 @@ All our stargazers, likers & followers, for the warm fuzzies
   <data name="NoIndentAnnotation" xml:space="preserve">
     <value>Add '@NoIndent</value>
   </data>
+  <data name="CodeExplorer_RefreshComponent" xml:space="preserve">
+    <value>Refresh component</value>
+  </data>
 </root>

RetailCoder.VBE/UI/RubberduckUI.resx

@@ -267,6 +267,25 @@ private ParserState EvaluateParserState()
             return result;
         }
 
+        public ParserState GetOrCreateModuleState(VBComponent component)
+        {
+            var key = new QualifiedModuleName(component);
+            var state = _moduleStates.GetOrAdd(key, ParserState.Pending);
+
+            if (state == ParserState.Pending)
+            {
+                return state;   // we are slated for a reparse already
+            }
+
+            if (!IsNewOrModified(key))
+            {
+                return state;
+            }
+
+            _moduleStates.TryUpdate(key, ParserState.Pending, state);
+            return ParserState.Pending;
+        }
+
         public ParserState GetModuleState(VBComponent component)
         {
             return _moduleStates.GetOrAdd(new QualifiedModuleName(component), ParserState.Pending);