Merge pull request #1383 from julia-vscode/jsonrpc-3

Update to JSONRPC 3.0.0

Author: davidanthoff

Project.toml

@@ -23,7 +23,7 @@ Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
 [compat]
 CSTParser = "3.3"
 JSON = "0.20, 0.21"
-JSONRPC = "2"
+JSONRPC = "3"
 JuliaFormatter = "1"
 PrecompileTools = "1"
 StaticLint = "9.0"

src/languageserverinstance.jl

@@ -80,7 +80,7 @@ mutable struct LanguageServerInstance
     _send_request_metrics::Bool
 
     function LanguageServerInstance(@nospecialize(pipe_in), @nospecialize(pipe_out), env_path="", depot_path="", err_handler=nothing, symserver_store_path=nothing, download=true, symbolcache_upstream = nothing, julia_exe::Union{NamedTuple{(:path,:version),Tuple{String,VersionNumber}},Nothing}=nothing)
-        endpoint = JSONRPC.JSONRPCEndpoint(pipe_in, pipe_out, err_handler)
+        endpoint = JSONRPC.JSONRPCEndpoint(pipe_in, pipe_out)
         jw = JuliaWorkspace()
         # if hasfield(typeof(jw.runtime), :performance_tracing_callback)
         #     jw.runtime.performance_tracing_callback = (name, start_time, duration) -> begin
@@ -351,7 +351,7 @@ function Base.run(server::LanguageServerInstance; timings = [])
 
     server.status = :started
 
-    run(server.jr_endpoint)
+    JSONRPC.start(server.jr_endpoint)
     @debug "Connected at $(round(Int, time()))"
     add_timer_message!(did_show_timer, timings, "connection established")
 

test/test_communication.jl

@@ -75,7 +75,7 @@
     client = connect(global_socket_name)
     try
         endpoint = JSONRPC.JSONRPCEndpoint(client, client)
-        run(endpoint)
+        JSONRPC.start(endpoint)
 
         response = JSONRPC.send_request(endpoint, "initialize", init_request)
 

test/test_edit.jl

@@ -11,7 +11,7 @@
     mktempdir() do dir
 
         # TODO use types directly and skip the string JSON entirely
-        initstr = """{"processId":17712,"rootPath":"","rootUri":"$(LanguageServer.filepath2uri(dir))","capabilities":{"workspace":{"applyEdit":true,"workspaceEdit":{"documentChanges":true},"didChangeConfiguration":{"dynamicRegistration":true},"didChangeWatchedFiles":{"dynamicRegistration":true},"symbol":{"dynamicRegistration":true,"symbolKind":{"valueSet":[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26]}},"executeCommand":{"dynamicRegistration":true},"configuration":true,"workspaceFolders":true},"textDocument":{"publishDiagnostics":{"relatedInformation":true},"synchronization":{"dynamicRegistration":true,"willSave":true,"willSaveWaitUntil":true,"didSave":true},"completion":{"dynamicRegistration":true,"contextSupport":true,"completionItem":{"snippetSupport":true,"commitCharactersSupport":true,"documentationFormat":["markdown","plaintext"],"deprecatedSupport":true},"completionItemKind":{"valueSet":[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25]}},"hover":{"dynamicRegistration":true,"contentFormat":["markdown","plaintext"]},"signatureHelp":{"dynamicRegistration":true,"signatureInformation":{"documentationFormat":["markdown","plaintext"]}},"definition":{"dynamicRegistration":true},"references":{"dynamicRegistration":true},"documentHighlight":{"dynamicRegistration":true},"documentSymbol":{"dynamicRegistration":true,"symbolKind":{"valueSet":[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26]}},"codeAction":{"dynamicRegistration":true,"codeActionLiteralSupport":{"codeActionKind":{"valueSet":["","quickfix","refactor","refactor.extract","refactor.inline","refactor.rewrite","source","source.organizeImports"]}}},"codeLens":{"dynamicRegistration":true},"formatting":{"dynamicRegistration":true},"rangeFormatting":{"dynamicRegistration":true},"onTypeFormatting":{"dynamicRegistration":true},"rename":{"dynamicRegistration":true},"documentLink":{"dynamicRegistration":true},"typeDefinition":{"dynamicRegistration":true},"implementation":{"dynamicRegistration":true},"colorProvider":{"dynamicRegistration":true}}},"trace":"off","workspaceFolders":[{"uri":"$(LanguageServer.filepath2uri(dir))","name":"CSTParser"}]}"""
+        initstr = """{"processId":null,"rootPath":"","rootUri":"$(LanguageServer.filepath2uri(dir))","capabilities":{"workspace":{"applyEdit":true,"workspaceEdit":{"documentChanges":true},"didChangeConfiguration":{"dynamicRegistration":true},"didChangeWatchedFiles":{"dynamicRegistration":true},"symbol":{"dynamicRegistration":true,"symbolKind":{"valueSet":[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26]}},"executeCommand":{"dynamicRegistration":true},"configuration":true,"workspaceFolders":true},"textDocument":{"publishDiagnostics":{"relatedInformation":true},"synchronization":{"dynamicRegistration":true,"willSave":true,"willSaveWaitUntil":true,"didSave":true},"completion":{"dynamicRegistration":true,"contextSupport":true,"completionItem":{"snippetSupport":true,"commitCharactersSupport":true,"documentationFormat":["markdown","plaintext"],"deprecatedSupport":true},"completionItemKind":{"valueSet":[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25]}},"hover":{"dynamicRegistration":true,"contentFormat":["markdown","plaintext"]},"signatureHelp":{"dynamicRegistration":true,"signatureInformation":{"documentationFormat":["markdown","plaintext"]}},"definition":{"dynamicRegistration":true},"references":{"dynamicRegistration":true},"documentHighlight":{"dynamicRegistration":true},"documentSymbol":{"dynamicRegistration":true,"symbolKind":{"valueSet":[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26]}},"codeAction":{"dynamicRegistration":true,"codeActionLiteralSupport":{"codeActionKind":{"valueSet":["","quickfix","refactor","refactor.extract","refactor.inline","refactor.rewrite","source","source.organizeImports"]}}},"codeLens":{"dynamicRegistration":true},"formatting":{"dynamicRegistration":true},"rangeFormatting":{"dynamicRegistration":true},"onTypeFormatting":{"dynamicRegistration":true},"rename":{"dynamicRegistration":true},"documentLink":{"dynamicRegistration":true},"typeDefinition":{"dynamicRegistration":true},"implementation":{"dynamicRegistration":true},"colorProvider":{"dynamicRegistration":true}}},"trace":"off","workspaceFolders":[{"uri":"$(LanguageServer.filepath2uri(dir))","name":"CSTParser"}]}"""
         init_params = LanguageServer.InitializeParams(JSON.parse(initstr))
 
         docversion = 0
@@ -64,6 +64,6 @@
         @test test_edit(server, "a\nb\ne", (1, 1), (1, 1), "\nc\nd")[1]
         @test test_edit(server, "aaa\nbbb", (0, 0), (0, 0), "\n")[1]
 
-        @test server._open_file_versions[uri"untitled:none"] == docversion
+        @test !haskey(server._open_file_versions, uri"untitled:none")
     end
 end

test/test_shared_init_request.jl

@@ -1,7 +1,7 @@
 import JSONRPC, LanguageServer
 
 init_request = LanguageServer.InitializeParams(
-        9902,
+        nothing,
         missing,
         nothing,
         nothing,