Merge branch 'master' into improve-errors

Author: davidanthoff

src/requests/init.jl

@@ -131,7 +131,10 @@ function initialize_request(params::InitializeParams, server::LanguageServerInst
     elseif (params.workspaceFolders !== nothing) & (params.workspaceFolders !== missing)
         for wksp in params.workspaceFolders
             if wksp.uri !== nothing
-                push!(server.workspaceFolders, uri2filepath(wksp.uri))
+                fpath = uri2filepath(wksp.uri)
+                if fpath !== nothing
+                    push!(server.workspaceFolders, fpath)
+                end
             end
         end
     end

src/requests/textdocument.jl

@@ -70,7 +70,7 @@ end
 function textDocument_didChange_notification(params::DidChangeTextDocumentParams, server::LanguageServerInstance, conn)
     doc = getdocument(server, URI2(params.textDocument.uri))
     if params.textDocument.version < doc._version
-        error("The client and server have different textDocument versions for $(doc._uri).")
+        error("The client and server have different textDocument versions for $(doc._uri). LS version is $(doc._version), request version is $(params.textDocument.version).")
     end
     doc._version = params.textDocument.version
 

src/utilities.jl

@@ -120,6 +120,10 @@ end
 # the include follow logic.
 function remove_workspace_files(root, server)
     for (uri, doc) in getdocuments_pair(server)
+        # We first check whether the doc still exists on the server
+        # because a previous loop iteration could have deleted it
+        # via dependency removal of files
+        hasdocument(server, uri) || continue
         fpath = getpath(doc)
         isempty(fpath) && continue
         get_open_in_editor(doc) && continue