Add "Diagnose" argument

Author: razzmatazz

src/CSharpLanguageServer/CSharpLanguageServer.fsproj

@@ -28,6 +28,7 @@
     <Compile Include="ProgressReporter.fs" />
     <Compile Include="RoslynHelpers.fs" />
     <Compile Include="DocumentationUtil.fs" />
+    <Compile Include="Diagnostics.fs" />
     <Compile Include="Lsp/Client.fs" />
     <Compile Include="State/ServerState.fs" />
     <Compile Include="State/ServerRequestContext.fs" />

src/CSharpLanguageServer/Diagnostics.fs

@@ -0,0 +1,21 @@
+namespace CSharpLanguageServer
+
+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.error (
+            Log.setMessage "diagnoseSolution: loading solution {sln}"
+            >> Log.addContext "sln" settings.SolutionPath
+        )
+
+        let exitCode = 0
+        exitCode

src/CSharpLanguageServer/Program.fs

@@ -8,53 +8,81 @@ 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
     | [<AltCommandLine("-l")>] LogLevel of level:string
     | [<AltCommandLine("-s")>] Solution of solution:string
+    | Diagnose
     with
         interface IArgParserTemplate with
             member s.Usage =
                 match s with
-                | Version -> "display versioning information"
-                | Solution _ -> ".sln file to load (relative to CWD)"
-                | LogLevel _ -> "log level, <log|info|warning|error>; default is `log`"
+                | Version -> "Display versioning information"
+                | Solution _ -> "Specify .sln file to load (relative to CWD)"
+                | LogLevel _ -> "Set log level, <log|info|warning|error>; default is `log`"
+                | 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 =
-    try
-        let argParser = ArgumentParser.Create<CLIArguments>(programName = "csharp-ls")
-        let serverArgs = argParser.Parse args
+    let argParser = ArgumentParser.Create<CLIArguments>(programName = "csharp-ls")
+    let serverArgs = argParser.Parse args
+
+    let settings = {
+        ServerSettings.Default with
+            SolutionPath = serverArgs.TryGetResult <@ Solution @>
+            LogLevel = serverArgs.TryGetResult(<@ LogLevel @>) |> Option.defaultValue "log"
+    }
 
-        serverArgs.TryGetResult(<@ CLIArguments.Version @>)
+    try
+        serverArgs.TryGetResult <@ Version @>
             |> Option.iter (fun _ -> printfn "csharp-ls, %s"
                                              (Assembly.GetExecutingAssembly().GetName().Version |> string)
                                      exit 0)
 
-        let logLevelArg =
-            serverArgs.TryGetResult(<@ CLIArguments.LogLevel @>)
-            |> Option.defaultValue "log"
-
-        let logLevel =
-            match logLevelArg with
-                | "error" -> LogLevel.Error
-                | "warning" -> LogLevel.Warning
-                | "info" -> LogLevel.Information
-                | "debug" -> LogLevel.Debug
-                | "trace" -> LogLevel.Trace
-                | _ -> LogLevel.Information
-
-        Logging.setupLogging logLevel
+        match serverArgs.TryGetResult <@ Diagnose @> with
+        | Some _ ->
+            configureLogger "log"
+            diagnoseSolution settings
 
-        let settings = {
-            ServerSettings.Default with
-                SolutionPath = serverArgs.TryGetResult(<@ CLIArguments.Solution @>)
-                LogLevel = logLevelArg
-        }
+        | _ ->
+            configureLogger settings.LogLevel
+            Server.start settings
 
-        Server.start settings
     with
     | :? ArguParseException as ex ->
         eprintfn "%s" ex.Message