Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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<LanguageServerHost>(), typeRefResolver);
LanguageServerHost = new LanguageServerHost(serverStream, serverStream, exportProvider, loggerFactory, typeRefResolver);

var messageFormatter = RoslynLanguageServer.CreateJsonMessageFormatter();
_clientRpc = new JsonRpc(new HeaderDelimitedMessageHandler(clientStream, clientStream, messageFormatter))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ internal sealed class LanguageServerHost
private readonly AbstractLanguageServer<RequestContext> _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();

Expand All @@ -41,7 +41,7 @@ public LanguageServerHost(Stream inputStream, Stream outputStream, ExportProvide
var roslynLspFactory = exportProvider.GetExportedValue<ILanguageServerFactory>();
var capabilitiesProvider = new ServerCapabilitiesProvider(exportProvider.GetExportedValue<ExperimentalCapabilitiesProvider>());

_logger = logger;
_logger = loggerFactory.CreateLogger("LSP");
var lspLogger = new LspServiceLogger(_logger);

var hostServices = exportProvider.GetExportedValue<HostServicesProvider>().HostServices;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand All @@ -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();
Expand Down
Loading