diff --git a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer.UnitTests/Utilities/AbstractLanguageServerHostTests.cs b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer.UnitTests/Utilities/AbstractLanguageServerHostTests.cs index ae12838c614a2..565830264407d 100644 --- a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer.UnitTests/Utilities/AbstractLanguageServerHostTests.cs +++ b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer.UnitTests/Utilities/AbstractLanguageServerHostTests.cs @@ -68,7 +68,7 @@ private TestLspServer(ExportProvider exportProvider, ILoggerFactory loggerFactor var typeRefResolver = new ExtensionTypeRefResolver(assemblyLoader, loggerFactory); var (clientStream, serverStream) = FullDuplexStream.CreatePair(); - LanguageServerHost = new LanguageServerHost(serverStream, serverStream, exportProvider, loggerFactory.CreateLogger(), typeRefResolver); + LanguageServerHost = new LanguageServerHost(serverStream, serverStream, exportProvider, loggerFactory, typeRefResolver); var messageFormatter = RoslynLanguageServer.CreateJsonMessageFormatter(); _clientRpc = new JsonRpc(new HeaderDelimitedMessageHandler(clientStream, clientStream, messageFormatter)) diff --git a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/LanguageServer/LanguageServerHost.cs b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/LanguageServer/LanguageServerHost.cs index a874f6049f8c6..8e6b86e719db9 100644 --- a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/LanguageServer/LanguageServerHost.cs +++ b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/LanguageServer/LanguageServerHost.cs @@ -26,7 +26,7 @@ internal sealed class LanguageServerHost private readonly AbstractLanguageServer _roslynLanguageServer; private readonly JsonRpc _jsonRpc; - public LanguageServerHost(Stream inputStream, Stream outputStream, ExportProvider exportProvider, ILogger logger, AbstractTypeRefResolver typeRefResolver) + public LanguageServerHost(Stream inputStream, Stream outputStream, ExportProvider exportProvider, ILoggerFactory loggerFactory, AbstractTypeRefResolver typeRefResolver) { var messageFormatter = RoslynLanguageServer.CreateJsonMessageFormatter(); @@ -41,7 +41,7 @@ public LanguageServerHost(Stream inputStream, Stream outputStream, ExportProvide var roslynLspFactory = exportProvider.GetExportedValue(); var capabilitiesProvider = new ServerCapabilitiesProvider(exportProvider.GetExportedValue()); - _logger = logger; + _logger = loggerFactory.CreateLogger("LSP"); var lspLogger = new LspServiceLogger(_logger); var hostServices = exportProvider.GetExportedValue().HostServices; diff --git a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Program.cs b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Program.cs index 779bb65eea742..115adac328b11 100644 --- a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Program.cs +++ b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Program.cs @@ -122,12 +122,10 @@ static async Task RunAsync(ServerConfiguration serverConfiguration, Cancellation // TODO: Remove, the path should match exactly. Workaround for https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1830914. Microsoft.CodeAnalysis.EditAndContinue.EditAndContinueMethodDebugInfoReader.IgnoreCaseWhenComparingDocumentNames = Path.DirectorySeparatorChar == '\\'; - var languageServerLogger = loggerFactory.CreateLogger(nameof(LanguageServerHost)); - LanguageServerHost? server = null; if (serverConfiguration.UseStdIo) { - server = new LanguageServerHost(Console.OpenStandardInput(), Console.OpenStandardOutput(), exportProvider, languageServerLogger, typeRefResolver); + server = new LanguageServerHost(Console.OpenStandardInput(), Console.OpenStandardOutput(), exportProvider, loggerFactory, typeRefResolver); } else { @@ -147,7 +145,7 @@ static async Task RunAsync(ServerConfiguration serverConfiguration, Cancellation // Wait for connection from client await pipeServer.WaitForConnectionAsync(cancellationToken); - server = new LanguageServerHost(pipeServer, pipeServer, exportProvider, languageServerLogger, typeRefResolver); + server = new LanguageServerHost(pipeServer, pipeServer, exportProvider, loggerFactory, typeRefResolver); } server.Start();