more

Author: razzmatazz

src/CSharpLanguageServer/Diagnostics.fs

@@ -1,21 +1,17 @@
 namespace CSharpLanguageServer
 
+open Microsoft.Extensions.Logging
+
 open CSharpLanguageServer.Types
 open CSharpLanguageServer.Logging
 
 module Diagnostics =
     let private logger = Logging.getLoggerByName "Diagnostics"
 
     let diagnoseSolution (settings: ServerSettings): int =
-        logger.debug (
-            Log.setMessage "diagnoseSolution: loading solution {sln}"
-            >> Log.addContext "sln" settings.SolutionPath
-        )
+        logger.LogDebug("diagnoseSolution: loading solution, settings={settings}", settings.SolutionPath)
 
-        logger.error (
-            Log.setMessage "diagnoseSolution: loading solution {sln}"
-            >> Log.addContext "sln" settings.SolutionPath
-        )
+        logger.LogError("diagnoseSolution: loading solution {sln}", settings.SolutionPath)
 
         let exitCode = 0
         exitCode

src/CSharpLanguageServer/Program.fs

@@ -8,12 +8,9 @@ open Microsoft.Extensions.Logging
 
 open CSharpLanguageServer.Types
 open CSharpLanguageServer.Lsp
-<<<<<<< HEAD
 open CSharpLanguageServer.Logging
-=======
 open CSharpLanguageServer.Diagnostics
 
->>>>>>> 756634c (Add "Diagnose" argument)
 
 type CLIArguments =
     | [<AltCommandLine("-v")>] Version
@@ -26,46 +23,31 @@ type CLIArguments =
                 match s with
                 | Version -> "Display versioning information"
                 | Solution _ -> "Specify .sln file to load (relative to CWD)"
-                | LogLevel _ -> "Set log level, <log|info|warning|error>; default is `log`"
+                | LogLevel _ -> "Set log level, <trace|debug|info|warning|error>; default is `info`"
                 | Diagnose -> "Run diagnostics"
 
 
-let configureLogger (logLevelArg: string): unit =
-    System.Console.Error.WriteLine("configureLogger; logLevelArg={0}", logLevelArg)
-    let logLevel =
-        match logLevelArg with
-            | "error" -> LogEventLevel.Error
-            | "warning" -> LogEventLevel.Warning
-            | "info" -> LogEventLevel.Information
-            | "log" -> LogEventLevel.Verbose
-            | _ -> LogEventLevel.Information
-
-    let logConfig =
-        LoggerConfiguration()
-            .MinimumLevel.ControlledBy(LoggingLevelSwitch(logLevel))
-            .Enrich.FromLogContext()
-            .WriteTo.Async(fun conf ->
-                conf.Console(
-                    outputTemplate =
-                        "[{Timestamp:HH:mm:ss.fff} {Level:u3}] [{SourceContext}] {Message:lj}{NewLine}{Exception}",
-                    // Redirect all logs to stderr since stdout is used to communicate with client.
-                    standardErrorFromLevel = Nullable<_>(LogEventLevel.Verbose),
-                    theme = Serilog.Sinks.SystemConsole.Themes.AnsiConsoleTheme.Code
-                )
-                |> ignore)
-
-    Log.Logger <- logConfig.CreateLogger()
-
-
 [<EntryPoint>]
 let entry args =
     let argParser = ArgumentParser.Create<CLIArguments>(programName = "csharp-ls")
     let serverArgs = argParser.Parse args
 
+    let parseLogLevel logLevelArg =
+        match logLevelArg with
+        | "error" -> LogLevel.Error
+        | "warning" -> LogLevel.Warning
+        | "info" -> LogLevel.Information
+        | "debug" -> LogLevel.Debug
+        | "trace" -> LogLevel.Trace
+        | _ -> LogLevel.Information
+
     let settings = {
         ServerSettings.Default with
             SolutionPath = serverArgs.TryGetResult <@ Solution @>
-            LogLevel = serverArgs.TryGetResult(<@ LogLevel @>) |> Option.defaultValue "log"
+            LogLevel =
+                serverArgs.TryGetResult(<@ LogLevel @>)
+                |> Option.map parseLogLevel
+                |> Option.defaultValue LogLevel.Information
     }
 
     try
@@ -76,11 +58,11 @@ let entry args =
 
         match serverArgs.TryGetResult <@ Diagnose @> with
         | Some _ ->
-            configureLogger "log"
+            Logging.setupLogging LogLevel.Trace
             diagnoseSolution settings
 
         | _ ->
-            configureLogger settings.LogLevel
+            Logging.setupLogging settings.LogLevel
             Server.start settings
 
     with

src/CSharpLanguageServer/Types.fs

@@ -3,15 +3,16 @@ module CSharpLanguageServer.Types
 open Ionide.LanguageServerProtocol
 open Ionide.LanguageServerProtocol.Types
 open Ionide.LanguageServerProtocol.JsonRpc
+open Microsoft.Extensions.Logging
 
 type ServerSettings =
     { SolutionPath: string option
-      LogLevel: string
+      LogLevel: LogLevel
       ApplyFormattingOptions: bool
     }
     static member Default: ServerSettings =
         { SolutionPath = None
-          LogLevel = "log"
+          LogLevel = LogLevel.Information
           ApplyFormattingOptions = false
         }
 

tests/CSharpLanguageServer.Tests/CSharpLanguageServer.Tests.fsproj

@@ -9,17 +9,7 @@
 
   <ItemGroup>
     <Compile Include="Tooling.fs" />
-    <Compile Include="CodeActionTests.fs" />
-    <Compile Include="DiagnosticTests.fs" />
-    <Compile Include="DocumentationTests.fs" />
-    <Compile Include="HoverTests.fs" />
-    <Compile Include="InitializationTests.fs" />
-    <Compile Include="ReferenceTests.fs" />
-    <Compile Include="DefinitionTests.fs" />
-    <Compile Include="DocumentFormattingTests.fs" />
-    <Compile Include="InternalTests.fs" />
     <Compile Include="CompletionTests.fs" />
-    <Compile Include="WorkspaceSymbolTests.fs" />
   </ItemGroup>
 
   <ItemGroup>