提交 23d8069d 编写于 作者: D David Barbet

Pass client name properly

上级 323844fc
......@@ -20,6 +20,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Implementation.LanguageService
{
internal abstract class AbstractLiveShareLanguageServerClient : ILanguageClient
{
private readonly string? _diagnosticsClientName;
private readonly IDiagnosticService _diagnosticService;
private readonly LanguageServerProtocol _languageServerProtocol;
private readonly Workspace _workspace;
......@@ -56,11 +57,13 @@ internal abstract class AbstractLiveShareLanguageServerClient : ILanguageClient
/// </summary>
public event AsyncEventHandler<EventArgs>? StopAsync { add { } remove { } }
public AbstractLiveShareLanguageServerClient(LanguageServerProtocol languageServerProtocol, VisualStudioWorkspace workspace, IDiagnosticService diagnosticService)
public AbstractLiveShareLanguageServerClient(LanguageServerProtocol languageServerProtocol, VisualStudioWorkspace workspace,
IDiagnosticService diagnosticService, string? diagnosticsClientName)
{
_languageServerProtocol = languageServerProtocol;
_workspace = workspace;
_diagnosticService = diagnosticService;
_diagnosticsClientName = diagnosticsClientName;
}
public Task<Connection> ActivateAsync(CancellationToken token)
......@@ -68,7 +71,7 @@ public Task<Connection> ActivateAsync(CancellationToken token)
Contract.ThrowIfFalse(_languageServer == null, "This language server has already been initialized");
var (clientStream, serverStream) = FullDuplexStream.CreatePair();
_languageServer = new InProcLanguageServer(serverStream, serverStream, _languageServerProtocol, _workspace, _diagnosticService, clientName: null);
_languageServer = new InProcLanguageServer(serverStream, serverStream, _languageServerProtocol, _workspace, _diagnosticService, clientName: _diagnosticsClientName);
return Task.FromResult(new Connection(clientStream, clientStream));
}
......
......@@ -23,7 +23,7 @@ internal class LiveShareLanguageServerClient : AbstractLiveShareLanguageServerCl
[ImportingConstructor]
[Obsolete(MefConstruction.ImportingConstructorMessage, true)]
public LiveShareLanguageServerClient(LanguageServerProtocol languageServerProtocol, VisualStudioWorkspace workspace, IDiagnosticService diagnosticService)
: base(languageServerProtocol, workspace, diagnosticService)
: base(languageServerProtocol, workspace, diagnosticService, diagnosticsClientName: null)
{
}
......
......@@ -37,7 +37,7 @@ internal class RazorLanguageClient : AbstractLiveShareLanguageServerClient
[ImportingConstructor]
public RazorLanguageClient(LanguageServerProtocol languageServerProtocol, VisualStudioWorkspace workspace, IDiagnosticService diagnosticService)
: base(languageServerProtocol, workspace, diagnosticService)
: base(languageServerProtocol, workspace, diagnosticService, ClientName)
{
}
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册