Skip to content

Commit 4fd9d7e

Browse files
committed
Update OmniSharp.Extensions.LanguageServer to "0.14.2" to fix synchronisation
See OmniSharp/csharp-language-server-protocol#199
1 parent 6c9d8a5 commit 4fd9d7e

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

build/Packages.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<PackageReference Update="Nuget.ProjectModel" Version="$(NuGetPackageVersion)" />
6363
<PackageReference Update="Nuget.Versioning" Version="$(NuGetPackageVersion)" />
6464

65-
<PackageReference Update="OmniSharp.Extensions.LanguageServer" Version="0.13.1" />
65+
<PackageReference Update="OmniSharp.Extensions.LanguageServer" Version="0.14.2" />
6666

6767
<PackageReference Update="SQLitePCLRaw.bundle_green" Version="1.1.2" />
6868
<PackageReference Update="System.Collections.Immutable" Version="1.4.0" />

src/OmniSharp.LanguageServerProtocol/Handlers/OmniSharpTextDocumentSyncHandler.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.Linq;
55
using System.Threading;
66
using System.Threading.Tasks;
7-
using OmniSharp.Extensions.Embedded.MediatR;
7+
using MediatR;
88
using OmniSharp.Extensions.JsonRpc;
99
using OmniSharp.Extensions.LanguageServer.Protocol;
1010
using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;

src/OmniSharp.LanguageServerProtocol/LanguageServerHost.cs

+10-9
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
using OmniSharp.LanguageServerProtocol.Eventing;
1717
using OmniSharp.LanguageServerProtocol.Handlers;
1818
using OmniSharp.Mef;
19-
using OmniSharp.Models.Diagnostics;
2019
using OmniSharp.Options;
2120
using OmniSharp.Roslyn;
2221
using OmniSharp.Services;
@@ -28,7 +27,6 @@ internal class LanguageServerHost : IDisposable
2827
{
2928
private readonly LanguageServerOptions _options;
3029
private IServiceCollection _services;
31-
private readonly LoggerFactory _loggerFactory;
3230
private readonly CommandLineApplication _application;
3331
private readonly CancellationTokenSource _cancellationTokenSource;
3432
private CompositionHost _compositionHost;
@@ -44,24 +42,24 @@ public LanguageServerHost(
4442
CommandLineApplication application,
4543
CancellationTokenSource cancellationTokenSource)
4644
{
47-
_loggerFactory = new LoggerFactory();
48-
_logger = _loggerFactory.CreateLogger<LanguageServerHost>();
4945
_options = new LanguageServerOptions()
5046
.WithInput(input)
5147
.WithOutput(output)
52-
.WithLoggerFactory(_loggerFactory)
53-
.AddDefaultLoggingProvider()
48+
.ConfigureLogging(x => x
49+
.AddLanguageServer()
50+
.SetMinimumLevel(application.LogLevel))
5451
.OnInitialize(Initialize)
55-
.WithMinimumLogLevel(application.LogLevel)
56-
.WithServices(services => _services = services);
52+
.WithServices(services => {
53+
_services = services;
54+
});
55+
5756
_application = application;
5857
_cancellationTokenSource = cancellationTokenSource;
5958
}
6059

6160
public void Dispose()
6261
{
6362
_compositionHost?.Dispose();
64-
_loggerFactory?.Dispose();
6563
_cancellationTokenSource?.Dispose();
6664
}
6765

@@ -93,6 +91,9 @@ private void CreateCompositionHost(InitializeParams initializeParams)
9391
_eventEmitter = new LanguageServerEventEmitter();
9492
_serviceProvider = CompositionHostBuilder.CreateDefaultServiceProvider(_environment, configurationRoot, _eventEmitter, _services);
9593

94+
var loggerFactory = _serviceProvider.GetService<ILoggerFactory>();
95+
_logger = loggerFactory.CreateLogger<LanguageServerHost>();
96+
9697
var options = _serviceProvider.GetRequiredService<IOptionsMonitor<OmniSharpOptions>>();
9798
var plugins = _application.CreatePluginAssemblies(options.CurrentValue, _environment);
9899

0 commit comments

Comments
 (0)