Merge pull request #74542 from CyrusNajmabadi/saveFix

Author: CyrusNajmabadi

src/VisualStudio/Core/Def/ProjectSystem/IOpenTextBufferEventListener.cs

@@ -29,6 +29,12 @@ internal interface IOpenTextBufferEventListener
     /// <param name="moniker">the moniker of the closed document.</param>
     void OnCloseDocument(string moniker);
 
+    /// <summary>
+    /// Triggered when a document is saved.
+    /// </summary>
+    /// <param name="moniker">the moniker of the saved document.</param>
+    void OnSaveDocument(string moniker);
+
     /// <summary>
     /// Triggered when a document context is refreshed with a new hierarchy.
     /// </summary>

src/VisualStudio/Core/Def/ProjectSystem/MiscellaneousFilesWorkspace.cs

@@ -81,17 +81,9 @@ public async Task InitializeAsync()
     }
 
     void IOpenTextBufferEventListener.OnOpenDocument(string moniker, ITextBuffer textBuffer, IVsHierarchy _) => TrackOpenedDocument(moniker, textBuffer);
-    void IOpenTextBufferEventListener.OnDocumentOpenedIntoWindowFrame(string moniker, IVsWindowFrame windowFrame) { }
 
     void IOpenTextBufferEventListener.OnCloseDocument(string moniker) => TryUntrackClosingDocument(moniker);
 
-    /// <summary>
-    /// File hierarchy events are not relevant to the misc workspace.
-    /// </summary>
-    void IOpenTextBufferEventListener.OnRefreshDocumentContext(string moniker, IVsHierarchy hierarchy)
-    {
-    }
-
     void IOpenTextBufferEventListener.OnRenameDocument(string newMoniker, string oldMoniker, ITextBuffer buffer)
     {
         // We want to consider this file to be added in one of two situations:
@@ -106,6 +98,21 @@ void IOpenTextBufferEventListener.OnRenameDocument(string newMoniker, string old
         }
     }
 
+    /// <summary>
+    /// Not relevant to the misc workspace.
+    /// </summary>
+    void IOpenTextBufferEventListener.OnRefreshDocumentContext(string moniker, IVsHierarchy hierarchy) { }
+
+    /// <summary>
+    /// Not relevant to the misc workspace.
+    /// </summary>
+    void IOpenTextBufferEventListener.OnDocumentOpenedIntoWindowFrame(string moniker, IVsWindowFrame windowFrame) { }
+
+    /// <summary>
+    /// Not relevant to the misc workspace.
+    /// </summary>
+    void IOpenTextBufferEventListener.OnSaveDocument(string moniker) { }
+
     public void RegisterLanguage(Guid languageGuid, string languageName, string scriptExtension)
         => _languageInformationByLanguageGuid.Add(languageGuid, new LanguageInformation(languageName, scriptExtension));
 

src/VisualStudio/Core/Def/ProjectSystem/OpenTextBufferProvider.cs

@@ -131,7 +131,15 @@ public int OnBeforeLastDocumentUnlock(uint docCookie, uint dwRDTLockType, uint d
     }
 
     public int OnAfterSave(uint docCookie)
-        => VSConstants.E_NOTIMPL;
+    {
+        if (_runningDocumentTable.IsDocumentInitialized(docCookie))
+        {
+            var moniker = _runningDocumentTable.GetDocumentMoniker(docCookie);
+            RaiseEventForEachListener(l => l.OnSaveDocument(moniker));
+        }
+
+        return VSConstants.S_OK;
+    }
 
     public int OnAfterAttributeChange(uint docCookie, uint grfAttribs)
         => VSConstants.E_NOTIMPL;

src/VisualStudio/Core/Def/ProjectSystem/VisualStudioWorkspaceImpl.OpenFileTracker.cs

@@ -31,7 +31,7 @@ internal partial class VisualStudioWorkspaceImpl
     /// <summary>
     /// Singleton the updates the workspace in response to files being opened or closed.
     /// </summary>
-    public sealed class OpenFileTracker : IOpenTextBufferEventListener
+    public sealed partial class OpenFileTracker : IOpenTextBufferEventListener
     {
         private readonly VisualStudioWorkspaceImpl _workspace;
         private readonly ProjectSystemProjectFactory _projectSystemProjectFactory;

src/VisualStudio/Core/Def/ProjectSystem/VisualStudioWorkspaceImpl_SourceGenerators.cs

@@ -2,19 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
-using System.ComponentModel.Composition;
 using System.Linq;
-using Microsoft.CodeAnalysis.Editor;
 using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
 using Microsoft.CodeAnalysis.Host;
-using Microsoft.CodeAnalysis.Host.Mef;
-using Microsoft.CodeAnalysis.Text;
-using Microsoft.VisualStudio.Commanding;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
-using Microsoft.VisualStudio.Text.Editor.Commanding.Commands;
-using Microsoft.VisualStudio.Utilities;
 
 namespace Microsoft.VisualStudio.LanguageServices.Implementation.ProjectSystem;
 
@@ -69,31 +61,16 @@ public void SubscribeToSourceGeneratorImpactingEvents()
         this.EnqueueUpdateSourceGeneratorVersion(projectId: null, forceRegeneration: false);
     }
 
-    [Export(typeof(ICommandHandler))]
-    [ContentType(ContentTypeNames.RoslynContentType)]
-    [ContentType(ContentTypeNames.XamlContentType)]
-    [Name(PredefinedCommandHandlerNames.SourceGeneratorSave)]
-    [method: ImportingConstructor]
-    [method: Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
-    internal sealed class SaveCommandHandler() : IChainedCommandHandler<SaveCommandArgs>
+    public sealed partial class OpenFileTracker
     {
-        public string DisplayName => ServicesVSResources.Roslyn_save_command_handler;
-
-        public CommandState GetCommandState(SaveCommandArgs args, Func<CommandState> nextCommandHandler)
-            => nextCommandHandler();
-
-        public void ExecuteCommand(SaveCommandArgs args, Action nextCommandHandler, CommandExecutionContext executionContext)
+        void IOpenTextBufferEventListener.OnSaveDocument(string moniker)
         {
-            nextCommandHandler();
+            // Note: this will find docs, additional docs, and analyzer config docs.  Thats good. We do want changing
+            // any of those to cause rerunning generators in any affected project.
+            var documentIds = _workspace.CurrentSolution.GetDocumentIdsWithFilePath(moniker);
 
-            // After a save happens, enqueue a request to run generators on the projects impacted by the save.
-            foreach (var projectGroup in args.SubjectBuffer.GetRelatedDocuments().GroupBy(d => d.Project))
-            {
-                if (projectGroup.Key.Solution.Workspace is VisualStudioWorkspaceImpl visualStudioWorkspace)
-                {
-                    visualStudioWorkspace.EnqueueUpdateSourceGeneratorVersion(projectGroup.Key.Id, forceRegeneration: false);
-                }
-            }
+            foreach (var projectId in documentIds.Select(i => i.ProjectId).Distinct())
+                _workspace.EnqueueUpdateSourceGeneratorVersion(projectId, forceRegeneration: false);
         }
     }
 }

src/VisualStudio/Core/Def/Workspace/SourceGeneratedFileManager.cs

@@ -224,13 +224,9 @@ void IOpenTextBufferEventListener.OnCloseDocument(string moniker)
         }
     }
 
-    void IOpenTextBufferEventListener.OnRefreshDocumentContext(string moniker, IVsHierarchy hierarchy)
-    {
-    }
-
-    void IOpenTextBufferEventListener.OnRenameDocument(string newMoniker, string oldMoniker, ITextBuffer textBuffer)
-    {
-    }
+    void IOpenTextBufferEventListener.OnRefreshDocumentContext(string moniker, IVsHierarchy hierarchy) { }
+    void IOpenTextBufferEventListener.OnRenameDocument(string newMoniker, string oldMoniker, ITextBuffer textBuffer) { }
+    void IOpenTextBufferEventListener.OnSaveDocument(string moniker) { }
 
     private sealed class OpenSourceGeneratedFile : IDisposable
     {

src/VisualStudio/LiveShare/Impl/Client/RemoteLanguageServiceWorkspace.cs

@@ -98,8 +98,6 @@ public RemoteLanguageServiceWorkspace(
 
         void IOpenTextBufferEventListener.OnOpenDocument(string moniker, ITextBuffer textBuffer, IVsHierarchy? hierarchy) => NotifyOnDocumentOpened(moniker, textBuffer);
 
-        void IOpenTextBufferEventListener.OnDocumentOpenedIntoWindowFrame(string moniker, IVsWindowFrame windowFrame) { }
-
         void IOpenTextBufferEventListener.OnCloseDocument(string moniker) => NotifyOnDocumentClosing(moniker);
 
         void IOpenTextBufferEventListener.OnRefreshDocumentContext(string moniker, IVsHierarchy hierarchy)
@@ -112,6 +110,10 @@ void IOpenTextBufferEventListener.OnRenameDocument(string newMoniker, string old
             // Handled by Add/Remove.
         }
 
+        void IOpenTextBufferEventListener.OnDocumentOpenedIntoWindowFrame(string moniker, IVsWindowFrame windowFrame) { }
+
+        void IOpenTextBufferEventListener.OnSaveDocument(string moniker) { }
+
         public async Task SetSessionAsync(CollaborationSession session)
         {
             _session = session;