Skip to content

Commit 5727ba8

Browse files
authored
Merge pull request #1379 from julia-vscode/sp/fix-pid-polling
fix: correctly init editor pid polling
2 parents 7f6092e + 546447d commit 5727ba8

3 files changed

Lines changed: 7 additions & 5 deletions

File tree

src/languageserverinstance.jl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -357,8 +357,6 @@ function Base.run(server::LanguageServerInstance; timings = [])
357357

358358
trigger_symbolstore_reload(server)
359359

360-
poll_editor_pid(server)
361-
362360
@async try
363361
@debug "LS: Starting client listener task."
364362
add_timer_message!(did_show_timer, timings, "(async) listening to client events")

src/requests/init.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,8 @@ function initialize_request(params::InitializeParams, server::LanguageServerInst
164164
server.clientInfo = params.clientInfo
165165
server.editor_pid = params.processId
166166

167+
poll_editor_pid(server)
168+
167169
if !ismissing(params.capabilities.window) && !ismissing(params.capabilities.window.workDoneProgress) && params.capabilities.window.workDoneProgress
168170
server.clientcapability_window_workdoneprogress = true
169171
else

src/utilities.jl

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -539,13 +539,15 @@ function poll_editor_pid(server::LanguageServerInstance)
539539
if server.editor_pid === nothing
540540
return
541541
end
542-
@info "Monitoring editor process with id $(server.editor_pid)"
543-
return @async while !server.shutdown_requested
544-
sleep(10)
542+
@debug "Monitoring editor process with pid $(server.editor_pid)"
543+
544+
Threads.@spawn while !server.shutdown_requested
545+
sleep(30)
545546

546547
# kill -0 $editor_pid
547548
r = ccall(:uv_kill, Cint, (Cint, Cint), server.editor_pid, 0)
548549
if r != 0
550+
@info "Parent process $(server.editor_pid) has shut down. Exiting..."
549551
exit(1)
550552
end
551553
end

0 commit comments

Comments
 (0)