Merge pull request #255 from X-Sharp/master

Sometimes project related events were called with a null argument

Author: madskristensen

src/toolkit/Community.VisualStudio.Toolkit.Shared/Solution/SolutionEvents.cs

@@ -68,28 +68,31 @@ internal SolutionEvents()
         /// <summary>Notifies listening clients that a project has been renamed.</summary>
         public event Action<Project?>? OnAfterRenameProject;
 
-#if !VS14
         /// <summary>Notifies listening clients that the folder is being closed.</summary>
         public event Action<string>? OnBeforeCloseFolder;
-
+#if !VS14
         /// <summary>Notifies listening clients that the folder has been closed.</summary>
         public event Action<string>? OnAfterCloseFolder;
-
+#endif
         /// <summary>Notifies listening clients that the folder has been opened.</summary>
         public event Action<string>? OnAfterOpenFolder;
-#endif
 
         /// <summary> Fired when the solution load process is fully complete, including all background loading of projects.</summary>
         public event Action? OnAfterBackgroundSolutionLoadComplete;
 
-        #region IVsSolutionEvents
+#region IVsSolutionEvents
         int IVsSolutionEvents.OnAfterOpenProject(IVsHierarchy pHierarchy, int fAdded)
         {
             ThreadHelper.ThrowIfNotOnUIThread();
             if (OnAfterOpenProject != null)
             {
-                Project? project = SolutionItem.FromHierarchy(pHierarchy, VSConstants.VSITEMID_ROOT) as Project;
-                OnAfterOpenProject?.Invoke(project);
+                SolutionItem? item = SolutionItem.FromHierarchy(pHierarchy, VSConstants.VSITEMID_ROOT) as Project;
+                if (item is Project project)
+                    OnAfterOpenProject?.Invoke(project);
+#if VS14
+                else if (item is SolutionFolder folder && folder.FullPath != null)
+                    OnAfterOpenFolder?.Invoke(folder.FullPath);
+#endif
             }
             return VSConstants.S_OK;
         }
@@ -104,8 +107,13 @@ int IVsSolutionEvents.OnBeforeCloseProject(IVsHierarchy pHierarchy, int fRemoved
             ThreadHelper.ThrowIfNotOnUIThread();
             if (OnBeforeCloseProject != null)
             {
-                Project? project = SolutionItem.FromHierarchy(pHierarchy, VSConstants.VSITEMID_ROOT) as Project;
-                OnBeforeCloseProject?.Invoke(project);
+                SolutionItem? item = SolutionItem.FromHierarchy(pHierarchy, VSConstants.VSITEMID_ROOT);
+                if (item is Project project)
+                    OnBeforeCloseProject?.Invoke(project);
+#if VS14
+                else if (item is SolutionFolder folder && folder.FullPath != null)
+                    OnBeforeCloseFolder?.Invoke(folder.FullPath);
+#endif
             }
             return VSConstants.S_OK;
         }
@@ -115,8 +123,9 @@ int IVsSolutionEvents.OnAfterLoadProject(IVsHierarchy pStubHierarchy, IVsHierarc
             ThreadHelper.ThrowIfNotOnUIThread();
             if (OnAfterLoadProject != null)
             {
-                Project? project = SolutionItem.FromHierarchy(pRealHierarchy, VSConstants.VSITEMID_ROOT) as Project;
-                OnAfterLoadProject?.Invoke(project);
+                SolutionItem? item = SolutionItem.FromHierarchy(pStubHierarchy, VSConstants.VSITEMID_ROOT);
+                if (item is Project project)
+                    OnAfterLoadProject?.Invoke(project);
             }
             return VSConstants.S_OK;
         }
@@ -132,8 +141,9 @@ int IVsSolutionEvents.OnBeforeUnloadProject(IVsHierarchy pRealHierarchy, IVsHier
 
             if (OnBeforeUnloadProject != null)
             {
-                Project? project = SolutionItem.FromHierarchy(pRealHierarchy, VSConstants.VSITEMID_ROOT) as Project;
-                OnBeforeUnloadProject?.Invoke(project);
+                SolutionItem? item = SolutionItem.FromHierarchy(pRealHierarchy, VSConstants.VSITEMID_ROOT);
+                if (item is Project project)
+                    OnBeforeUnloadProject?.Invoke(project);
             }
             return VSConstants.S_OK;
         }
@@ -173,9 +183,9 @@ int IVsSolutionEvents.OnAfterCloseSolution(object pUnkReserved)
             OnAfterCloseSolution?.Invoke();
             return VSConstants.S_OK;
         }
-        #endregion
+#endregion
 
-        #region IVsSolutionEvents2
+#region IVsSolutionEvents2
         int IVsSolutionEvents2.OnAfterOpenProject(IVsHierarchy pHierarchy, int fAdded)
         {
             ThreadHelper.ThrowIfNotOnUIThread();
@@ -241,17 +251,18 @@ int IVsSolutionEvents2.OnAfterMergeSolution(object pUnkReserved)
             OnAfterMergeSolution?.Invoke();
             return VSConstants.S_OK;
         }
-        #endregion
+#endregion
 
-        #region IVsSolutionEvents4
+#region IVsSolutionEvents4
         int IVsSolutionEvents4.OnAfterRenameProject(IVsHierarchy pHierarchy)
         {
             ThreadHelper.ThrowIfNotOnUIThread();
 
             if (OnAfterRenameProject != null)
             {
-                Project? project = SolutionItem.FromHierarchy(pHierarchy, VSConstants.VSITEMID_ROOT) as Project;
-                OnAfterRenameProject?.Invoke(project);
+                SolutionItem? item = SolutionItem.FromHierarchy(pHierarchy, VSConstants.VSITEMID_ROOT);
+                if (item is Project project)
+                    OnAfterRenameProject?.Invoke(project);
             }
             return VSConstants.S_OK;
         }
@@ -270,16 +281,16 @@ int IVsSolutionEvents4.OnAfterAsynchOpenProject(IVsHierarchy pHierarchy, int fAd
         {
             return VSConstants.S_OK;
         }
-        #endregion
+#endregion
 
-        #region IVsSolutionEvents5
+#region IVsSolutionEvents5
         void IVsSolutionEvents5.OnBeforeOpenProject(ref Guid guidProjectID, ref Guid guidProjectType, string pszFileName)
         {
             OnBeforeOpenProject?.Invoke(pszFileName);
         }
-        #endregion
+#endregion
 
-        #region IVsSolutionEvents7
+#region IVsSolutionEvents7
 #if !VS14
         void IVsSolutionEvents7.OnAfterOpenFolder(string folderPath)
         {
@@ -302,9 +313,9 @@ void IVsSolutionEvents7.OnAfterCloseFolder(string folderPath)
         void IVsSolutionEvents7.OnAfterLoadAllDeferredProjects()
         { }
 #endif
-        #endregion
+#endregion
 
-        #region IVsSolutionLoadEvents
+#region IVsSolutionLoadEvents
         int IVsSolutionLoadEvents.OnBeforeOpenSolution(string solutionFilename)
         {
             OnBeforeOpenSolution?.Invoke(solutionFilename);
@@ -337,6 +348,6 @@ int IVsSolutionLoadEvents.OnAfterBackgroundSolutionLoadComplete()
             OnAfterBackgroundSolutionLoadComplete?.Invoke();
             return VSConstants.S_OK;
         }
-        #endregion
+#endregion
     }
 }