Integrate CSharpLanguageServer.Options into .Program

Author: razzmatazz

Directory.Packages.props

@@ -10,7 +10,7 @@
     <MSBuildLocatorPackageVersion>1.9.1</MSBuildLocatorPackageVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Argu" Version="6.2.3" />
+    <PackageVersion Include="Argu" Version="6.2.5" />
     <PackageVersion Include="Castle.Core" Version="5.1.1" />
     <PackageVersion Include="coverlet.collector" Version="3.0.3" />
     <PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.2.25" />

src/CSharpLanguageServer/CSharpLanguageServer.fsproj

@@ -66,7 +66,6 @@
     <Compile Include="Handlers/Workspace.fs" />
     <Compile Include="Handlers/WorkspaceSymbol.fs" />
     <Compile Include="Lsp/Server.fs" />
-    <Compile Include="Options.fs" />
     <Compile Include="Program.fs" />
   </ItemGroup>
 

src/CSharpLanguageServer/Options.fs

@@ -10,19 +10,31 @@ open CSharpLanguageServer.Types
 open CSharpLanguageServer.Lsp
 open CSharpLanguageServer.Logging
 
+type CLIArguments =
+    | [<AltCommandLine("-v")>] Version
+    | [<AltCommandLine("-l")>] LogLevel of level:string
+    | [<AltCommandLine("-s")>] Solution of solution:string
+    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`"
+
 [<EntryPoint>]
 let entry args =
     try
-        let argParser = ArgumentParser.Create<Options.CLIArguments>(programName = "csharp-ls")
+        let argParser = ArgumentParser.Create<CLIArguments>(programName = "csharp-ls")
         let serverArgs = argParser.Parse args
 
-        serverArgs.TryGetResult(<@ Options.CLIArguments.Version @>)
+        serverArgs.TryGetResult(<@ CLIArguments.Version @>)
             |> Option.iter (fun _ -> printfn "csharp-ls, %s"
                                              (Assembly.GetExecutingAssembly().GetName().Version |> string)
                                      exit 0)
 
         let logLevelArg =
-            serverArgs.TryGetResult(<@ Options.CLIArguments.LogLevel @>)
+            serverArgs.TryGetResult(<@ CLIArguments.LogLevel @>)
             |> Option.defaultValue "log"
 
         let logLevel =
@@ -38,7 +50,7 @@ let entry args =
 
         let settings = {
             ServerSettings.Default with
-                SolutionPath = serverArgs.TryGetResult(<@ Options.CLIArguments.Solution @>)
+                SolutionPath = serverArgs.TryGetResult(<@ CLIArguments.Solution @>)
                 LogLevel = logLevelArg
         }