Merge branch 'master' into rmactions

Author: davidanthoff

src/document.jl

@@ -63,7 +63,7 @@ end
 """
     get_offset(doc, line, char)
 
-Returns the byte offset position corresponding to a line/character position. 
+Returns the byte offset position corresponding to a line/character position.
 This takes 0 based line/char inputs. Corresponding functions are available for
 Position and Range arguments, the latter returning a UnitRange{Int}.
 """
@@ -101,10 +101,10 @@ function get_offset2(doc::Document, line::Integer, character::Integer)
     text = get_text(doc)
 
     if line >= length(line_offsets)
-        error("Invalid arguments.")
+        throw(LSOffsetError("get_offset2 crashed. More diagnostics:\nline=$line\nline_offsets='$line_offsets'"))
         return nextind(text, lastindex(text))
     elseif line < 0
-        error("Invalid arguments.")
+        throw(LSOffsetError("get_offset2 crashed. More diagnostics:\nline=$line\nline_offsets='$line_offsets'"))
     end
 
     line_offset = line_offsets[line + 1]
@@ -153,9 +153,9 @@ end
 
 """
     get_line_offsets(doc::Document)
-    
-Updates the doc._line_offsets field, an n length Array each entry of which 
-gives the byte offset position of the start of each line. This always starts 
+
+Updates the doc._line_offsets field, an n length Array each entry of which
+gives the byte offset position of the start of each line. This always starts
 with 0 for the first line (even if empty).
 """
 function get_line_offsets(doc::Document, force=false)

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
 
@@ -433,7 +433,7 @@ function is_parentof(parent_path, child_path, server)
         end
         pdoc = Document(puri, content, false, server)
         setdocument!(server, URI2(puri), pdoc)
-        CSTParser.parse(get_text(pdoc))
+        CSTParser.parse(get_text(pdoc), true)
         if typof(pdoc.cst) === CSTParser.FileH
             pdoc.cst.val = getpath(pdoc)
             set_doc(pdoc.cst, pdoc)

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

test/test_document.jl

@@ -64,7 +64,7 @@ d6 = Document("untitled", s6, false)
     LS.applytextdocumentchanges(doc, c3)
     @test LS.get_text(doc) == "println(\"Hello World\")"
     # doc currently has only one line, applying change to 2nd line should throw
-    @test_throws ErrorException LS.applytextdocumentchanges(doc, c2)
+    @test_throws LanguageServer.LSOffsetError LS.applytextdocumentchanges(doc, c2)
 end
 
 @testset "UTF16 handling" begin