minor fixes with some null exceptions...

Author: david-driscoll

sample/SampleServer/Program.cs

@@ -25,7 +25,10 @@ static async Task MainAsync(string[] args)
                 options
                     .WithInput(Console.OpenStandardInput())
                     .WithOutput(Console.OpenStandardOutput())
-                    .WithLoggerFactory(new LoggerFactory()));
+                    .WithLoggerFactory(new LoggerFactory())
+                    .AddDefaultLoggingProvider()
+                    .WithMinimumLogLevel(LogLevel.Trace)
+                );
 
             server.AddHandlers(new TextDocumentHandler(server));
 

src/Server/LanguageServer.cs

@@ -91,6 +91,7 @@ internal LanguageServer(
         {
             var outputHandler = new OutputHandler(output, serializer);
 
+            services.AddLogging();
             _reciever = reciever;
             _serializer = serializer;
             _collection = new HandlerCollection(_supportedCapabilities);
@@ -99,9 +100,10 @@ internal LanguageServer(
 
             services.AddSingleton<IOutputHandler>(outputHandler);
             services.AddSingleton(_collection);
-            services.AddSingleton(serializer);
+            services.AddSingleton(_serializer);
+            services.AddSingleton<OmniSharp.Extensions.JsonRpc.ISerializer>(_serializer);
             services.AddSingleton(requestProcessIdentifier);
-            services.AddSingleton(reciever);
+            services.AddSingleton(_reciever);
             services.AddSingleton(loggerFactory);
 
             services.AddJsonRpcMediatR(assemblies);

src/Server/LanguageServerLogger.cs

@@ -12,8 +12,9 @@ class LanguageServerLogger : ILogger
         private readonly LanguageServer _responseRouter;
         private readonly Func<LogLevel> _logLevelGetter;
 
-        public LanguageServerLogger(LanguageServer responseRouter)
+        public LanguageServerLogger(LanguageServer responseRouter, Func<LogLevel> logLevelGetter)
         {
+            _logLevelGetter = logLevelGetter;
             _responseRouter = responseRouter;
         }
 

src/Server/LanguageServerLoggerProvider.cs

@@ -1,3 +1,4 @@
+using System;
 using Microsoft.Extensions.Logging;
 
 namespace OmniSharp.Extensions.LanguageServer.Server
@@ -13,7 +14,7 @@ public LanguageServerLoggerProvider(LanguageServer languageServer)
 
         public ILogger CreateLogger(string categoryName)
         {
-            return new LanguageServerLogger(_languageServer);
+            return new LanguageServerLogger(_languageServer, () => _languageServer.MinimumLogLevel);
         }
 
         public void Dispose()

src/Server/LanguageServerOptions.cs

@@ -4,6 +4,7 @@
 using System.Reflection;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
 using OmniSharp.Extensions.JsonRpc;
 using OmniSharp.Extensions.LanguageServer.Server.Abstractions;
 using ISerializer = OmniSharp.Extensions.LanguageServer.Protocol.Serialization.ISerializer;
@@ -18,9 +19,10 @@ public LanguageServerOptions()
 
         public Stream Input { get; set; }
         public Stream Output { get; set; }
-        public ILoggerFactory LoggerFactory { get; set; }
-        public ISerializer Serializer { get; set; }
-        public IRequestProcessIdentifier RequestProcessIdentifier { get; set; }
+        public LogLevel MinimumLogLevel { get; set; } = LogLevel.Information;
+        public ILoggerFactory LoggerFactory { get; set; } = new LoggerFactory();
+        public ISerializer Serializer { get; set; } = Protocol.Serialization.Serializer.Instance;
+        public IRequestProcessIdentifier RequestProcessIdentifier { get; set; } = new RequestProcessIdentifier();
         public ILspReciever Reciever { get; set; } = new LspReciever();
         public IServiceCollection Services { get; set; } = new ServiceCollection();
         internal List<Type> HandlerTypes { get; set; } = new List<Type>();

src/Server/LanguageServerOptionsExtensions.cs

@@ -22,6 +22,12 @@ public static LanguageServerOptions WithOutput(this LanguageServerOptions option
             return options;
         }
 
+        public static LanguageServerOptions WithMinimumLogLevel(this LanguageServerOptions options, LogLevel logLevel)
+        {
+            options.MinimumLogLevel = logLevel;
+            return options;
+        }
+
         public static LanguageServerOptions WithLoggerFactory(this LanguageServerOptions options, ILoggerFactory loggerFactory)
         {
             options.LoggerFactory = loggerFactory;

src/Server/Server.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFrameworks>netstandard2.0</TargetFrameworks>
         <PlatformTarget>AnyCPU</PlatformTarget>
@@ -9,6 +9,7 @@
     <ItemGroup>
         <PackageReference Include="System.Reactive" Version="$(System_Reactive_Version)" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(Microsoft_Extensions_DependencyInjection_Version)" />
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="$(Microsoft_Extensions_Logging_Version)" />
     </ItemGroup>
 
     <ItemGroup>