Respond to comments

Author: Hosch250

RetailCoder.VBE/App.cs

@@ -34,7 +34,7 @@ public sealed class App : IDisposable
         private IRubberduckHooks _hooks;
         private bool _handleSinkEvents = true;
         private readonly BranchesViewViewModel _branchesVM;
-        private readonly SourceControlViewViewModel _panelVM;
+        private readonly SourceControlViewViewModel _sourceControlPanelVM;
 
         private readonly Logger _logger;
 
@@ -68,11 +68,11 @@ public App(VBE vbe, IMessageBox messageBox,
             _logger = LogManager.GetCurrentClassLogger();
 
             var sourceControlPanel = (SourceControlPanel) sourceControlPresenter.Window();
-            _panelVM = (SourceControlViewViewModel) sourceControlPanel.ViewModel;
-            _branchesVM = (BranchesViewViewModel) _panelVM.TabItems.Single(t => t.ViewModel.Tab == SourceControlTab.Branches).ViewModel;
+            _sourceControlPanelVM = (SourceControlViewViewModel) sourceControlPanel.ViewModel;
+            _branchesVM = (BranchesViewViewModel) _sourceControlPanelVM.TabItems.Single(t => t.ViewModel.Tab == SourceControlTab.Branches).ViewModel;
 
-            _panelVM.OpenRepoStarted += DisableSinkEventHandlers;
-            _panelVM.OpenRepoCompleted += EnableSinkEventHandlersAndUpdateCache;
+            _sourceControlPanelVM.OpenRepoStarted += DisableSinkEventHandlers;
+            _sourceControlPanelVM.OpenRepoCompleted += EnableSinkEventHandlersAndUpdateCache;
 
             _branchesVM.LoadingComponentsStarted += DisableSinkEventHandlers;
             _branchesVM.LoadingComponentsCompleted += EnableSinkEventHandlersAndUpdateCache;
@@ -311,7 +311,7 @@ async void sink_ComponentRenamed(object sender, DispatcherRenamedEventArgs<VBCom
                 return;
             }
 
-            _panelVM.RenameComponent(e.Item, e.OldName);
+            _sourceControlPanelVM.HandleRenamedComponent(e.Item, e.OldName);
 
             _logger.Debug("Component '{0}' was renamed to '{1}'.", e.OldName, e.Item.Name);
 
@@ -327,7 +327,7 @@ async void sink_ComponentRemoved(object sender, DispatcherEventArgs<VBComponent>
                 return;
             }
 
-            _panelVM.RemoveComponent(e.Item);
+            _sourceControlPanelVM.HandleRemovedComponent(e.Item);
 
             _logger.Debug("Component '{0}' was removed.", e.Item.Name);
             _parser.State.ClearStateCache(e.Item, true);
@@ -355,7 +355,7 @@ async void sink_ComponentAdded(object sender, DispatcherEventArgs<VBComponent> e
                 return;
             }
 
-            _panelVM.AddComponent(e.Item);
+            _sourceControlPanelVM.HandleAddedComponent(e.Item);
 
             _logger.Debug("Component '{0}' was added.", e.Item.Name);
             _parser.State.OnParseRequested(sender, e.Item);
@@ -456,10 +456,10 @@ public void Dispose()
                 return;
             }
 
-            if (_panelVM != null)
+            if (_sourceControlPanelVM != null)
             {
-                _panelVM.OpenRepoStarted -= DisableSinkEventHandlers;
-                _panelVM.OpenRepoCompleted -= EnableSinkEventHandlersAndUpdateCache;
+                _sourceControlPanelVM.OpenRepoStarted -= DisableSinkEventHandlers;
+                _sourceControlPanelVM.OpenRepoCompleted -= EnableSinkEventHandlersAndUpdateCache;
             }
 
             if (_branchesVM != null)

RetailCoder.VBE/UI/RubberduckUI.Designer.cs

@@ -1630,6 +1630,6 @@ All our stargazers, likers & followers, for the warm fuzzies
     <value>No open repository to push to specified remote location.</value>
   </data>
   <data name="SourceControl_ExternalModifications" xml:space="preserve">
-    <value>Some source files were modified out of the editor; should Rubberduck reload them?</value>
+    <value>A source file was modified out of the editor; should Rubberduck reload it?</value>
   </data>
 </root>

RetailCoder.VBE/UI/RubberduckUI.resx

@@ -40,6 +40,7 @@ public sealed class SourceControlViewViewModel : ViewModelBase, IDisposable
         private readonly IMessageBox _messageBox;
         private readonly FileSystemWatcher _fileSystemWatcher;
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
+        private static readonly IEnumerable<string> VbFileExtensions = new[] { "cls", "bas", "frm" };
 
         public SourceControlViewViewModel(
             VBE vbe,
@@ -103,7 +104,7 @@ public void SetTab(SourceControlTab tab)
             SelectedItem = TabItems.First(t => t.ViewModel.Tab == tab);
         }
 
-        public void AddComponent(VBComponent component)
+        public void HandleAddedComponent(VBComponent component)
         {
             if (Provider == null || !Provider.NotifyVBAChanges) { return; }
 
@@ -114,7 +115,7 @@ public void AddComponent(VBComponent component)
             }
         }
 
-        public void RemoveComponent(VBComponent component)
+        public void HandleRemovedComponent(VBComponent component)
         {
             if (Provider == null || !Provider.NotifyVBAChanges) { return; }
 
@@ -125,7 +126,7 @@ public void RemoveComponent(VBComponent component)
             }
         }
 
-        public void RenameComponent(VBComponent component, string oldName)
+        public void HandleRenamedComponent(VBComponent component, string oldName)
         {
             if (Provider == null || !Provider.NotifyVBAChanges) { return; }
 
@@ -187,7 +188,7 @@ public ISourceControlProvider Provider
         private void _fileSystemWatcher_Changed(object sender, FileSystemEventArgs e)
         {
             // the file system filter doesn't support multiple filters
-            if (!new[] { "cls", "bas", "frm" }.Contains(e.Name.Split('.').Last()))
+            if (!VbFileExtensions.Contains(e.Name.Split('.').Last()))
             {
                 return;
             }
@@ -209,7 +210,7 @@ private void _fileSystemWatcher_Changed(object sender, FileSystemEventArgs e)
         private void _fileSystemWatcher_Renamed(object sender, RenamedEventArgs e)
         {
             // the file system filter doesn't support multiple filters
-            if (!new[] { "cls", "bas", "frm" }.Contains(e.Name.Split('.').Last()))
+            if (!VbFileExtensions.Contains(e.Name.Split('.').Last()))
             {
                 return;
             }
@@ -232,7 +233,7 @@ private void _fileSystemWatcher_Renamed(object sender, RenamedEventArgs e)
         private void _fileSystemWatcher_Deleted(object sender, FileSystemEventArgs e)
         {
             // the file system filter doesn't support multiple filters
-            if (!new[] { "cls", "bas", "frm" }.Contains(e.Name.Split('.').Last()))
+            if (!VbFileExtensions.Contains(e.Name.Split('.').Last()))
             {
                 return;
             }
@@ -254,7 +255,7 @@ private void _fileSystemWatcher_Deleted(object sender, FileSystemEventArgs e)
         private void _fileSystemWatcher_Created(object sender, FileSystemEventArgs e)
         {
             // the file system filter doesn't support multiple filters
-            if (!new[] { "cls", "bas", "frm" }.Contains(e.Name.Split('.').Last()))
+            if (!VbFileExtensions.Contains(e.Name.Split('.').Last()))
             {
                 return;
             }