Remove RazorLogger from RazorProjectInfoPublisher

Author: DustinCampbell

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/RazorProjectInfoPublisher.cs

@@ -9,6 +9,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Razor;
+using Microsoft.CodeAnalysis.Razor.Logging;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 using Microsoft.CodeAnalysis.Razor.Workspaces;
 
@@ -26,7 +27,7 @@ internal class RazorProjectInfoPublisher : IRazorStartupService
     internal bool _active;
 
     private const string TempFileExt = ".temp";
-    private readonly RazorLogger _logger;
+    private readonly ILogger _logger;
     private readonly LSPEditorFeatureDetector _lspEditorFeatureDetector;
     private readonly IProjectSnapshotManager _projectManager;
     private readonly ProjectConfigurationFilePathStore _projectConfigurationFilePathStore;
@@ -41,7 +42,7 @@ public RazorProjectInfoPublisher(
         LSPEditorFeatureDetector lSPEditorFeatureDetector,
         IProjectSnapshotManager projectManager,
         ProjectConfigurationFilePathStore projectConfigurationFilePathStore,
-        RazorLogger logger)
+        ILoggerFactory loggerFactory)
     {
         DeferredPublishTasks = new Dictionary<string, Task>(FilePathComparer.Instance);
         _pendingProjectPublishes = new Dictionary<ProjectKey, IProjectSnapshot>();
@@ -50,7 +51,7 @@ public RazorProjectInfoPublisher(
 
         _lspEditorFeatureDetector = lSPEditorFeatureDetector;
         _projectConfigurationFilePathStore = projectConfigurationFilePathStore;
-        _logger = logger;
+        _logger = loggerFactory.GetOrCreateLogger<RazorProjectInfoPublisher>();
 
         _projectManager = projectManager;
         _projectManager.Changed += ProjectManager_Changed;

src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/LanguageClient/RazorProjectInfoPublisherTest.cs

@@ -10,6 +10,7 @@
 using Microsoft.AspNetCore.Razor.Test.Common;
 using Microsoft.AspNetCore.Razor.Test.Common.LanguageServer;
 using Microsoft.AspNetCore.Razor.Test.Common.ProjectSystem;
+using Microsoft.CodeAnalysis.Razor.Logging;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 using Microsoft.CodeAnalysis.Razor.Workspaces;
 using Microsoft.CodeAnalysis.Text;
@@ -42,6 +43,7 @@ public async Task ProjectManager_Changed_Remove_Change_NoopsOnDelayedPublish()
         var publisher = new TestRazorProjectInfoPublisher(
             projectManager,
             projectConfigurationFilePathStore,
+            LoggerFactory,
             onSerializeToFile: (snapshot, configurationFilePath) =>
             {
                 Assert.Same(expectedProjectSnapshot, snapshot);
@@ -88,6 +90,7 @@ await projectManager.UpdateAsync(updater =>
         var publisher = new TestRazorProjectInfoPublisher(
             projectManager,
             projectConfigurationFilePathStore,
+            LoggerFactory,
             onSerializeToFile: (snapshot, configurationFilePath) => attemptedToSerialize = true)
         {
             EnqueueDelay = 10,
@@ -124,6 +127,7 @@ await projectManager.UpdateAsync(updater =>
         var publisher = new TestRazorProjectInfoPublisher(
             projectManager,
             projectConfigurationFilePathStore,
+            LoggerFactory,
             onSerializeToFile: (snapshot, configurationFilePath) => attemptedToSerialize = true)
         {
             EnqueueDelay = 10,
@@ -164,6 +168,7 @@ await projectManager.UpdateAsync(updater =>
         var publisher = new TestRazorProjectInfoPublisher(
             projectManager,
             projectConfigurationFilePathStore,
+            LoggerFactory,
             onSerializeToFile: (snapshot, configurationFilePath) =>
             {
                 Assert.Equal(expectedConfigurationFilePath, configurationFilePath);
@@ -208,6 +213,7 @@ await projectManager.UpdateAsync(updater =>
         var publisher = new TestRazorProjectInfoPublisher(
             projectManager,
             projectConfigurationFilePathStore,
+            LoggerFactory,
             onSerializeToFile: (snapshot, configurationFilePath) =>
             {
                 Assert.Equal(expectedConfigurationFilePath, configurationFilePath);
@@ -246,6 +252,7 @@ internal async Task ProjectManager_Changed_EnqueuesPublishAsync(ProjectChangeKin
         var publisher = new TestRazorProjectInfoPublisher(
             projectManager,
             projectConfigurationFilePathStore,
+            LoggerFactory,
             onSerializeToFile: (snapshot, configurationFilePath) =>
             {
                 Assert.Same(projectSnapshot, snapshot);
@@ -284,6 +291,7 @@ internal async Task ProjectManager_ChangedTagHelpers_PublishesImmediately()
         var publisher = new TestRazorProjectInfoPublisher(
             projectManager,
             projectConfigurationFilePathStore,
+            LoggerFactory,
             onSerializeToFile: (snapshot, configurationFilePath) =>
             {
                 if (!aboutToChange)
@@ -334,6 +342,7 @@ public async Task ProjectManager_Changed_ProjectRemoved_AfterEnqueuedPublishAsyn
         var publisher = new TestRazorProjectInfoPublisher(
             projectManager,
             projectConfigurationFilePathStore,
+            LoggerFactory,
             onSerializeToFile: (snapshot, configurationFilePath) => attemptedToSerialize = true)
         {
             EnqueueDelay = 10,
@@ -368,6 +377,7 @@ public async Task EnqueuePublish_BatchesPublishRequestsAsync()
         var publisher = new TestRazorProjectInfoPublisher(
             projectManager,
             projectConfigurationFilePathStore,
+            LoggerFactory,
             onSerializeToFile: (snapshot, configurationFilePath) =>
             {
                 Assert.Same(secondSnapshot, snapshot);
@@ -405,6 +415,7 @@ public async Task EnqueuePublish_OnProjectWithoutRazor_Publishes()
         var publisher = new TestRazorProjectInfoPublisher(
             projectManager,
             projectConfigurationFilePathStore,
+            LoggerFactory,
             onSerializeToFile: (snapshot, configurationFilePath) =>
             {
                 Assert.Same(secondSnapshot, snapshot);
@@ -450,6 +461,7 @@ public async Task EnqueuePublish_OnProjectBeforeTagHelperProcessed_DoesNotPublis
         var publisher = new TestRazorProjectInfoPublisher(
             projectManager,
             projectConfigurationFilePathStore,
+            LoggerFactory,
             onSerializeToFile: (snapshot, configurationFilePath) =>
             {
                 Assert.Same(secondSnapshot, snapshot);
@@ -480,7 +492,7 @@ public void Publish_UnsetConfigurationFilePath_Noops()
         var projectManager = CreateProjectSnapshotManager();
         var projectConfigurationFilePathStore = new DefaultProjectConfigurationFilePathStore();
 
-        var publisher = new TestRazorProjectInfoPublisher(projectManager, projectConfigurationFilePathStore)
+        var publisher = new TestRazorProjectInfoPublisher(projectManager, projectConfigurationFilePathStore, LoggerFactory)
         {
             _active = true,
         };
@@ -504,6 +516,7 @@ public void Publish_PublishesToSetPublishFilePath()
         var publisher = new TestRazorProjectInfoPublisher(
             projectManager,
             projectConfigurationFilePathStore,
+            LoggerFactory,
             onSerializeToFile: (snapshot, configurationFilePath) =>
             {
                 Assert.Same(omniSharpProjectSnapshot, snapshot);
@@ -536,6 +549,7 @@ public async Task ProjectAdded_PublishesToCorrectFilePathAsync()
         var publisher = new TestRazorProjectInfoPublisher(
             projectManager,
             projectConfigurationFilePathStore,
+            LoggerFactory,
             onSerializeToFile: (snapshot, configurationFilePath) =>
             {
                 Assert.Equal(expectedConfigurationFilePath, configurationFilePath);
@@ -574,6 +588,7 @@ public async Task ProjectAdded_DoesNotPublishWithoutProjectWorkspaceStateAsync()
         var publisher = new TestRazorProjectInfoPublisher(
             projectManager,
             projectConfigurationFilePathStore,
+            LoggerFactory,
             onSerializeToFile: (snapshot, configurationFilePath) =>
             {
                 Assert.Fail("Serialization should not have been attempted because there is no ProjectWorkspaceState.");
@@ -603,7 +618,7 @@ public async Task ProjectRemoved_UnSetPublishFilePath_NoopsAsync()
         var projectManager = CreateProjectSnapshotManager();
         var projectConfigurationFilePathStore = new DefaultProjectConfigurationFilePathStore();
 
-        var publisher = new TestRazorProjectInfoPublisher(projectManager, projectConfigurationFilePathStore)
+        var publisher = new TestRazorProjectInfoPublisher(projectManager, projectConfigurationFilePathStore, LoggerFactory)
         {
             _active = true,
         };
@@ -632,6 +647,7 @@ public async Task ProjectAdded_DoesNotFireWhenNotReadyAsync()
         var publisher = new TestRazorProjectInfoPublisher(
             projectManager,
             projectConfigurationFilePathStore,
+            LoggerFactory,
             onSerializeToFile: (snapshot, configurationFilePath) =>
             {
                 Assert.Equal(expectedConfigurationFilePath, configurationFilePath);
@@ -678,6 +694,7 @@ internal static IProjectSnapshot CreateProjectSnapshot(string projectFilePath, s
     private class TestRazorProjectInfoPublisher(
         IProjectSnapshotManager projectManager,
         ProjectConfigurationFilePathStore projectStatePublishFilePathStore,
+        ILoggerFactory loggerFactory,
         Action<IProjectSnapshot, string>? onSerializeToFile = null,
         bool shouldSerialize = true,
         bool useRealShouldSerialize = false,
@@ -686,7 +703,7 @@ private class TestRazorProjectInfoPublisher(
             s_lspEditorFeatureDetector.Object,
             projectManager,
             projectStatePublishFilePathStore,
-            TestRazorLogger.Instance)
+            loggerFactory)
     {
         private static readonly StrictMock<LSPEditorFeatureDetector> s_lspEditorFeatureDetector = new();