Skip to content

Fixes a race condition when checking projects #308

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Mar 25, 2025
Merged

Fixes a race condition when checking projects #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion ls.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ type
failTable*: Table[string, int]
#Project file to fail count
#List of errors (crashes) nimsuggest has had since the lsp session started
checkInProgress*: bool

Certainty* = enum
None
Expand Down Expand Up @@ -900,6 +901,11 @@ proc tryGetNimsuggest*(
return none(NimSuggest)

proc checkProject*(ls: LanguageServer, uri: string): Future[void] {.async, gcsafe.} =
if ls.checkInProgress:
return
ls.checkInProgress = true
defer: ls.checkInProgress = false

if not ls.getWorkspaceConfiguration.await().autoCheckProject.get(true):
return
let conf = await ls.getAndWaitForWorkspaceConfiguration()
Expand Down Expand Up @@ -953,6 +959,10 @@ proc checkProject*(ls: LanguageServer, uri: string): Future[void] {.async, gcsaf
ls.workDoneProgressCreate(token)
ls.progress(token, "begin", fmt "Checking project {uri.uriToPath}")
nimsuggest.checkProjectInProgress = true
defer:
nimsuggest.checkProjectInProgress = false
ls.progress(token, "end")

proc getFilepath(s: Suggest): string =
s.filepath

Expand All @@ -976,7 +986,6 @@ proc checkProject*(ls: LanguageServer, uri: string): Future[void] {.async, gcsaf
PublishDiagnosticsParams %* {"uri": pathToUri(path), "diagnostics": @[]}
ls.notify("textDocument/publishDiagnostics", %params)
ls.filesWithDiags = filesWithDiags
nimsuggest.checkProjectInProgress = false

if nimsuggest.needsCheckProject:
nimsuggest.needsCheckProject = false
Expand Down
9 changes: 9 additions & 0 deletions test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Content-Length: 256

{"jsonrpc":"2.0","method":"extension/statusUpdate","params":{"lspPath":"/Volumes/Store/langserver/nimlangserver","version":"1.6.0","nimsuggestInstances":[],"openFiles":[],"extensionCapabilities":["RestartSuggest"],"pendingRequests":[],"projectErrors":[]}}
Content-Length: 256

{"jsonrpc":"2.0","method":"extension/statusUpdate","params":{"lspPath":"/Volumes/Store/langserver/nimlangserver","version":"1.6.0","nimsuggestInstances":[],"openFiles":[],"extensionCapabilities":["RestartSuggest"],"pendingRequests":[],"projectErrors":[]}}
Content-Length: 256

{"jsonrpc":"2.0","method":"extension/statusUpdate","params":{"lspPath":"/Volumes/Store/langserver/nimlangserver","version":"1.6.0","nimsuggestInstances":[],"openFiles":[],"extensionCapabilities":["RestartSuggest"],"pendingRequests":[],"projectErrors":[]}}