Skip to content

Add diagnose command #224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
2 changes: 1 addition & 1 deletion src/CSharpLanguageServer/CSharpLanguageServer.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,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" />
Expand Down Expand Up @@ -67,7 +68,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>

Expand Down
56 changes: 56 additions & 0 deletions src/CSharpLanguageServer/Diagnostics.fs
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
namespace CSharpLanguageServer

open System.IO
open Microsoft.Extensions.Logging
open Ionide.LanguageServerProtocol
open Ionide.LanguageServerProtocol.Server
open Ionide.LanguageServerProtocol.Types
open Ionide.LanguageServerProtocol.JsonRpc

open CSharpLanguageServer.Types
open CSharpLanguageServer.Logging
open CSharpLanguageServer.RoslynHelpers

module Diagnostics =
let private logger = Logging.getLoggerByName "Diagnostics"

type LspClientStub() =
interface System.IDisposable with
member _.Dispose() = ()

interface ILspClient with
member _.WindowShowMessage(p: ShowMessageParams) = async { logger.LogDebug("WindowShowMessage: {message}", p.Message); return () }
member _.WindowLogMessage(p: LogMessageParams) = async { logger.LogDebug("WindowLogMessage: {message}", p.Message); return () }
member _.TelemetryEvent(_: LSPAny) = async { return () }
member _.TextDocumentPublishDiagnostics(_: PublishDiagnosticsParams) = async { return () }
member _.LogTrace(_: LogTraceParams) = async { return () }
member _.CancelRequest(_: CancelParams) = async { return () }
member _.Progress(_: ProgressParams) = async { return () }
member _.WorkspaceWorkspaceFolders() = async { return LspResult.Ok None }
member _.WorkspaceConfiguration(_: ConfigurationParams) = async { return LspResult.Ok [||] }
member _.WindowWorkDoneProgressCreate(_: WorkDoneProgressCreateParams) = async { return LspResult.Ok () }
member _.WorkspaceSemanticTokensRefresh() = async { return LspResult.Ok () }
member _.WindowShowDocument(_: ShowDocumentParams) = async { return LspResult.Ok { Success = false } }
member _.WorkspaceInlineValueRefresh() = async { return LspResult.Ok () }
member _.WorkspaceInlayHintRefresh() = async { return LspResult.Ok () }
member _.WorkspaceDiagnosticRefresh() = async { return LspResult.Ok () }
member _.ClientRegisterCapability(_: RegistrationParams) = async { return LspResult.Ok () }
member _.ClientUnregisterCapability(_: UnregistrationParams) = async { return LspResult.Ok () }
member _.WindowShowMessageRequest(_: ShowMessageRequestParams) = async { return LspResult.Ok None }
member _.WorkspaceCodeLensRefresh() = async { return LspResult.Ok () }
member _.WorkspaceApplyEdit(_: ApplyWorkspaceEditParams) = async { return LspResult.Ok { Applied = false; FailureReason = None; FailedChange = None } }

let diagnoseSolution (settings: ServerSettings): Async<int> = async {
logger.LogDebug("diagnoseSolution: settings={settings}", settings)

logger.LogDebug("diagnoseSolution: loading solution..")

let lspClient = new LspClientStub()
//let cwd = (string (Directory.GetCurrentDirectory())
let cwd = "/Users/bob/src/test-csharp-net8"
let! sln = loadSolutionOnSolutionPathOrDir lspClient logger None cwd

let exitCode = 0

return exitCode
}
16 changes: 0 additions & 16 deletions src/CSharpLanguageServer/Options.fs

This file was deleted.

57 changes: 50 additions & 7 deletions src/CSharpLanguageServer/Program.fs
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,54 @@ open Microsoft.Extensions.Logging
open CSharpLanguageServer.Types
open CSharpLanguageServer.Lsp
open CSharpLanguageServer.Logging
open CSharpLanguageServer.Diagnostics


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 _ -> "Specify .sln file to load (relative to CWD)"
| LogLevel _ -> "Set log level, <trace|debug|info|warning|error>; default is `info`"
| Diagnose -> "Run diagnostics"

[<EntryPoint>]
let entry args =
try
let argParser = ArgumentParser.Create<Options.CLIArguments>(programName = "csharp-ls")
let serverArgs = argParser.Parse 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

serverArgs.TryGetResult(<@ Options.CLIArguments.Version @>)
let settings = {
ServerSettings.Default with
SolutionPath = serverArgs.TryGetResult <@ Solution @>
LogLevel =
serverArgs.TryGetResult(<@ LogLevel @>)
|> Option.map parseLogLevel
|> Option.defaultValue LogLevel.Information
}

try
serverArgs.TryGetResult <@ 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 @>)

let logLevel =
match logLevelArg with
Expand All @@ -37,11 +71,20 @@ let entry args =

let settings = {
ServerSettings.Default with
SolutionPath = serverArgs.TryGetResult(<@ Options.CLIArguments.Solution @>)
SolutionPath = serverArgs.TryGetResult(<@ CLIArguments.Solution @>)
LogLevel = logLevel
}

Server.start settings
match serverArgs.TryGetResult <@ Diagnose @> with
| Some _ ->
Logging.setupLogging LogLevel.Trace
let exitCode = diagnoseSolution settings |> Async.RunSynchronously
exitCode

| _ ->
Logging.setupLogging settings.LogLevel
Server.start settings

with
| :? ArguParseException as ex ->
eprintfn "%s" ex.Message
Expand Down
10 changes: 0 additions & 10 deletions tests/CSharpLanguageServer.Tests/CSharpLanguageServer.Tests.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading