Skip to content

Commit bc055a3

Browse files
authored
Merge branch 'master' into fix-a-doc-del-bug
2 parents a2fe256 + 1bd311b commit bc055a3

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

src/requests/init.jl

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,10 @@ function initialize_request(params::InitializeParams, server::LanguageServerInst
131131
elseif (params.workspaceFolders !== nothing) & (params.workspaceFolders !== missing)
132132
for wksp in params.workspaceFolders
133133
if wksp.uri !== nothing
134-
push!(server.workspaceFolders, uri2filepath(wksp.uri))
134+
fpath = uri2filepath(wksp.uri)
135+
if fpath !== nothing
136+
push!(server.workspaceFolders, fpath)
137+
end
135138
end
136139
end
137140
end

src/requests/textdocument.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ end
7070
function textDocument_didChange_notification(params::DidChangeTextDocumentParams, server::LanguageServerInstance, conn)
7171
doc = getdocument(server, URI2(params.textDocument.uri))
7272
if params.textDocument.version < doc._version
73-
error("The client and server have different textDocument versions for $(doc._uri).")
73+
error("The client and server have different textDocument versions for $(doc._uri). LS version is $(doc._version), request version is $(params.textDocument.version).")
7474
end
7575
doc._version = params.textDocument.version
7676

0 commit comments

Comments
 (0)