Force refresh on Projects property

IvenBach · IvenBach · commit c723c3fa681d · 2018-09-15T13:23:57.000-07:00
Extracted logic from setter into a separate method that is invoked.
diff --git a/Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerViewModel.cs b/Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerViewModel.cs
@@ -296,9 +296,7 @@ public ObservableCollection<CodeExplorerItemViewModel> Projects
             get => _projects;
             set
             {
-                ReorderChildNodes(value);
-                _projects = new ObservableCollection<CodeExplorerItemViewModel>(value.OrderBy(o => o.NameWithSignature));
-                CanSearch = _projects.Any();
+                _projects = ForceProjectsRefresh(value);
 
                 OnPropertyChanged();
                 // Once a Project has been set, show the TreeView
@@ -307,6 +305,14 @@ public ObservableCollection<CodeExplorerItemViewModel> Projects
             }
         }
 
+        private ObservableCollection<CodeExplorerItemViewModel> ForceProjectsRefresh(ObservableCollection<CodeExplorerItemViewModel> projects)
+        {
+            ReorderChildNodes(projects);
+            CanSearch = projects.Any();
+
+            return new ObservableCollection<CodeExplorerItemViewModel>(projects.OrderBy(o => o.NameWithSignature));
+        }
+
         private void HandleStateChanged(object sender, ParserStateEventArgs e)
         {
             if (Projects == null)
@@ -425,9 +431,7 @@ private void ParserState_ModuleStateChanged(object sender, ParseProgressEventArg
                     folderNode.AddChild(newNode);
 
                     // Force a refresh. OnPropertyChanged("Projects") didn't work.
-                    Projects = Projects;
-
-                    
+                    ForceProjectsRefresh(Projects);
                 }
                 catch (Exception exception)
                 {

Original file line number	Diff line number	Diff line change
`@@ -296,9 +296,7 @@ public ObservableCollection<CodeExplorerItemViewModel> Projects`
`296`	`296`	`get => _projects;`
`297`	`297`	`set`
`298`	`298`	`{`
`299`		`- ReorderChildNodes(value);`
`300`		`- _projects = new ObservableCollection<CodeExplorerItemViewModel>(value.OrderBy(o => o.NameWithSignature));`
`301`		`- CanSearch = _projects.Any();`
	`299`	`+ _projects = ForceProjectsRefresh(value);`
`302`	`300`
`303`	`301`	`OnPropertyChanged();`
`304`	`302`	`// Once a Project has been set, show the TreeView`
`@@ -307,6 +305,14 @@ public ObservableCollection<CodeExplorerItemViewModel> Projects`
`307`	`305`	`}`
`308`	`306`	`}`
`309`	`307`
	`308`	`+ private ObservableCollection<CodeExplorerItemViewModel> ForceProjectsRefresh(ObservableCollection<CodeExplorerItemViewModel> projects)`
	`309`	`+ {`
	`310`	`+ ReorderChildNodes(projects);`
	`311`	`+ CanSearch = projects.Any();`
	`312`	`+`
	`313`	`+ return new ObservableCollection<CodeExplorerItemViewModel>(projects.OrderBy(o => o.NameWithSignature));`
	`314`	`+ }`
	`315`	`+`
`310`	`316`	`private void HandleStateChanged(object sender, ParserStateEventArgs e)`
`311`	`317`	`{`
`312`	`318`	`if (Projects == null)`
`@@ -425,9 +431,7 @@ private void ParserState_ModuleStateChanged(object sender, ParseProgressEventArg`
`425`	`431`	`folderNode.AddChild(newNode);`
`426`	`432`
`427`	`433`	`// Force a refresh. OnPropertyChanged("Projects") didn't work.`
`428`		`- Projects = Projects;`
`429`		`-`
`430`		`-`
	`434`	`+ ForceProjectsRefresh(Projects);`
`431`	`435`	`}`
`432`	`436`	`catch (Exception exception)`
`433`	`437`	`{`