Merge pull request #869 from julia-vscode/fix-jsonrpc-types

Replace single arg JSON RPC types

Author: davidanthoff

src/extensions/messagedefs.jl

@@ -1,4 +1,4 @@
 const julia_getModuleAt_request_type = JSONRPC.RequestType("julia/getModuleAt", VersionedTextDocumentPositionParams, String)
 const julia_getCurrentBlockRange_request_type = JSONRPC.RequestType("julia/getCurrentBlockRange", VersionedTextDocumentPositionParams, Position)
 const julia_getDocAt_request_type = JSONRPC.RequestType("julia/getDocAt", VersionedTextDocumentPositionParams, String)
-const julia_getDocFromWord_request_type = JSONRPC.RequestType("julia/getDocFromWord", String, String)
+const julia_getDocFromWord_request_type = JSONRPC.RequestType("julia/getDocFromWord", NamedTuple{(:word,),Tuple{String}}, String)

src/protocol/messagedefs.jl

@@ -22,7 +22,7 @@ const workspace_didChangeConfiguration_notification_type = JSONRPC.NotificationT
 const workspace_didChangeWorkspaceFolders_notification_type = JSONRPC.NotificationType("workspace/didChangeWorkspaceFolders", DidChangeWorkspaceFoldersParams)
 const workspace_applyEdit_request_type = JSONRPC.RequestType("workspace/applyEdit", ApplyWorkspaceEditParams, ApplyWorkspaceEditResponse)
 const workspace_configuration_request_type = JSONRPC.RequestType("workspace/configuration", ConfigurationParams, Vector{Any})
-const julia_activateenvironment_notification_type = JSONRPC.NotificationType("julia/activateenvironment", String)
+const julia_activateenvironment_notification_type = JSONRPC.NotificationType("julia/activateenvironment", NamedTuple{(:envPath,),Tuple{String}})
 const julia_refreshLanguageServer_notification_type = JSONRPC.NotificationType("julia/refreshLanguageServer", Nothing)
 
 const initialize_request_type = JSONRPC.RequestType("initialize", InitializeParams, InitializeResult)

src/requests/features.jl

@@ -397,10 +397,10 @@ function julia_getDocAt_request(params::VersionedTextDocumentPositionParams, ser
 end
 
 # TODO: handle documentation resolving properly, respect how Documenter handles that
-function julia_getDocFromWord_request(word::String, server::LanguageServerInstance, conn)
+function julia_getDocFromWord_request(params::NamedTuple{(:word,),Tuple{String}}, server::LanguageServerInstance, conn)
     exact_matches = []
     approx_matches = []
-    word_sym = Symbol(word)
+    word_sym = Symbol(params.word)
     traverse_by_name(getsymbolserver(server)) do sym, val
         is_exact_match = sym === word_sym
         # this would ideally use the Damerau-Levenshtein distance or even something fancier:

src/requests/misc.jl

@@ -66,8 +66,8 @@ function julia_getCurrentBlockRange_request(tdpp::VersionedTextDocumentPositionP
     return fallback
 end
 
-function julia_activateenvironment_notification(params::String, server::LanguageServerInstance, conn)
-    server.env_path = params
+function julia_activateenvironment_notification(params::NamedTuple{(:envPath,),Tuple{String}}, server::LanguageServerInstance, conn)
+    server.env_path = params.envPath
 
     trigger_symbolstore_reload(server)
 end