Fix tests

julia-vscode · Jul 14, 2020 · 783b3d2 · 783b3d2
1 parent ae5bbf1
commit 783b3d2
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 1 deletion.
diff --git a/src/languageserverinstance.jl b/src/languageserverinstance.jl
@@ -28,7 +28,7 @@ For normal usage, the language server can be instantiated with
   path. The path must exist on disc before this is called.
 """
 mutable struct LanguageServerInstance
-    jr_endpoint::JSONRPC.JSONRPCEndpoint
+    jr_endpoint::Union{JSONRPC.JSONRPCEndpoint,Nothing}
     workspaceFolders::Set{String}
     _documents::Dict{URI2,Document}
 

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -1,8 +1,12 @@
 using Test, Sockets, LanguageServer, CSTParser, SymbolServer, SymbolServer.Pkg, StaticLint, JSON
 using LanguageServer: Document, get_text, get_offset, get_line_offsets, get_position_at, get_open_in_editor, set_open_in_editor, is_workspace_file, applytextdocumentchanges
+import JSONRPC
 const LS = LanguageServer
 const Range = LanguageServer.Range
 
+# TODO Replace this with a proper mock endpoint
+JSONRPC.send(::Nothing, ::Any, ::Any) = nothing
+
 @testset "LanguageServer" begin
 
     @testset "document" begin

diff --git a/test/test_actions.jl b/test/test_actions.jl
@@ -1,5 +1,6 @@
 server = LanguageServerInstance(IOBuffer(), IOBuffer(), dirname(Pkg.Types.Context().env.project_file), first(Base.DEPOT_PATH))
 server.runlinter = true
+server.jr_endpoint = nothing
 
 LanguageServer.initialize_request(init_request, server, nothing)
 

diff --git a/test/test_edit.jl b/test/test_edit.jl
@@ -9,6 +9,7 @@ mktempdir() do dir
     init_params = LanguageServer.InitializeParams(JSON.parse(initstr))
 
     server.runlinter = true
+    server.jr_endpoint = nothing
     LanguageServer.initialize_request(init_params, server, nothing)
     # LanguageServer.process(LanguageServer.JSONRPC.Request{Val{Symbol("initialized")},Any}(0, nothing), server)
 

diff --git a/test/test_intellisense.jl b/test/test_intellisense.jl
@@ -1,5 +1,6 @@
 server = LanguageServerInstance(IOBuffer(), IOBuffer(), dirname(Pkg.Types.Context().env.project_file), first(Base.DEPOT_PATH))
 server.runlinter = true
+server.jr_endpoint = nothing
 
 LanguageServer.initialize_request(init_request, server, nothing)