Merge branch 'master' into disable-comp

Author: davidanthoff

src/document.jl

@@ -37,6 +37,8 @@ function get_text(doc::Document)
 end
 
 function set_text!(doc::Document, text)
+    # TODO Remove this check eventually
+    occursin('\0', text) && throw(LSInvalidFile("Tried to set a text with an embedded NULL as the document content."))
     doc._content = text
     doc._line_offsets = nothing
     doc._line_offsets2 = nothing
@@ -127,7 +129,7 @@ function get_offset2(doc::Document, line::Integer, character::Integer)
         pos = nextind(text, pos)
     end
 
-    return pos
+return pos
 end
 
 # Note: to be removed
@@ -166,7 +168,7 @@ function get_line_offsets(doc::Document, force=false)
         doc._line_offsets = Int[0]
         text = get_text(doc)
         ind = firstindex(text)
-        while ind <= lastindex(text)
+            while ind <= lastindex(text)
             c = text[ind]
             nl = c == '\n' || c == '\r'
             if c == '\r' && ind + 1 <= lastindex(text) && text[ind + 1] == '\n'
@@ -175,7 +177,7 @@ function get_line_offsets(doc::Document, force=false)
             nl && push!(doc._line_offsets, ind)
             ind = nextind(text, ind)
         end
-    end
+end
     return doc._line_offsets
 end
 
@@ -184,7 +186,7 @@ function get_line_offsets2!(doc::Document, force=false)
         doc._line_offsets2 = Int[1]
         text = get_text(doc)
         ind = firstindex(text)
-        while ind <= lastindex(text)
+            while ind <= lastindex(text)
             c = text[ind]
             if c == '\n' || c == '\r'
                 if c == '\r' && ind + 1 <= lastindex(text) && text[ind + 1] == '\n'
@@ -212,7 +214,7 @@ function get_line_of(line_offsets::Vector{Int}, offset::Integer)
             end
             line += 1
         end
-    end
+end
     return line, line_offsets[line]
 end
 
@@ -233,7 +235,7 @@ function get_position_at(doc::Document, offset::Integer)
         c = read(io, Char)
         character += 1
         if UInt32(c) >= 0x010000
-            character += 1
+    character += 1
         end
     end
     close(io)

src/exception_types.jl

@@ -60,4 +60,12 @@ end
 
 function Base.showerror(io::IO, ex::LSInfiniteLoop)
     print(io, ex.msg)
-end
+end
+
+struct LSInvalidFile <: Exception
+    msg::AbstractString
+end
+
+function Base.showerror(io::IO, ex::LSInvalidFile)
+    print(io, ex.msg)
+end

src/protocol/completion.jl

@@ -74,11 +74,15 @@ struct CompletionRegistrationOptions <: Outbound
     resolveProvider::Union{Bool,Missing}
 end
 
-@dict_readable struct CompletionContext <: Outbound
+struct CompletionContext <: Outbound
     triggerKind::CompletionTriggerKind
     triggerCharacter::Union{String,Missing}
 end
 
+function CompletionContext(d::Dict)
+    CompletionContext(d["triggerKind"], haskey(d, "triggerCharacter") && d["triggerCharacter"] isa String ? d["triggerCharacter"] : missing)
+end
+
 @dict_readable struct CompletionParams <: Outbound
     textDocument::TextDocumentIdentifier
     position::Position

src/requests/actions.jl

@@ -152,7 +152,13 @@ end
 
 function reexport_package(x::EXPR, server, conn)
     (refof(x) isa SymbolServer.ModuleStore || refof(x).type === StaticLint.CoreTypes.Module || (refof(x).val isa StaticLint.Binding && refof(x).val.type === StaticLint.CoreTypes.Module)) || (refof(x).val isa SymbolServer.ModuleStore) || return
-    mod::SymbolServer.ModuleStore = refof(x) isa SymbolServer.ModuleStore ? refof(x) : refof(x).val
+    mod = if refof(x) isa SymbolServer.ModuleStore
+        refof(x)
+    elseif refof(x).val isa SymbolServer.ModuleStore
+        refof(x).val
+    else
+        return
+    end
     using_stmt = parentof(x)
     file, offset = get_file_loc(x)
     insertpos = get_next_line_offset(using_stmt)

src/requests/features.jl

@@ -23,7 +23,7 @@ function get_definitions(x::SymbolServer.ModuleStore, tls, server, locations)
     end
 end
 
-function get_definitions(x::Union{SymbolServer.FunctionStore,SymbolServer.DataTypeStore}, tls, server, locations) 
+function get_definitions(x::Union{SymbolServer.FunctionStore,SymbolServer.DataTypeStore}, tls, server, locations)
     StaticLint.iterate_over_ss_methods(x, tls, server, function (m)
         try
             if isfile(m.file)
@@ -178,14 +178,33 @@ function textDocument_documentSymbol_request(params::DocumentSymbolParams, serve
     uri = params.textDocument.uri
     doc = getdocument(server, URI2(uri))
 
-    bs = collect_bindings_w_loc(getcst(doc))
-    for x in bs
-        p, b = x[1], x[2]
-        !(b.val isa EXPR) && continue
-        !is_valid_binding_name(b.name) && continue
-        push!(syms, SymbolInformation(get_name_of_binding(b.name), _binding_kind(b, server), false, Location(doc._uri, Range(doc, p)), missing))
+    return collect_document_symbols(getcst(doc), server, doc)
+end
+
+function collect_document_symbols(x::EXPR, server::LanguageServerInstance, doc, pos=0, symbols=[])
+    if bindingof(x) !== nothing
+        b =  bindingof(x)
+        if b.val isa EXPR && is_valid_binding_name(b.name)
+            ds = DocumentSymbol(
+                get_name_of_binding(b.name), # name
+                missing, # detail
+                _binding_kind(b, server), # kind
+                false, # deprecated
+                Range(doc, (pos .+ (0:x.span))), # range
+                Range(doc, (pos .+ (0:x.span))), # selection range
+                DocumentSymbol[] # children
+            )
+            push!(symbols, ds)
+            symbols = ds.children
+        end
+    end
+    if length(x) > 0
+        for a in x
+            collect_document_symbols(a, server, doc, pos, symbols)
+            pos += a.fullspan
+        end
     end
-    return syms
+    return symbols
 end
 
 function collect_bindings_w_loc(x::EXPR, pos=0, bindings=Tuple{UnitRange{Int},StaticLint.Binding}[])

src/requests/hover.jl

@@ -46,7 +46,7 @@ function get_hover(b::StaticLint.Binding, documentation::String, server)
                 end
             end
         else
-            try
+            documentation = try
                 documentation = if binding_has_preceding_docs(b)
                     string(documentation, Expr(parentof(b.val).args[3]))
                 elseif const_binding_has_preceding_docs(b)
@@ -56,8 +56,7 @@ function get_hover(b::StaticLint.Binding, documentation::String, server)
                 end
                 documentation = string(documentation, "```julia\n", Expr(b.val), "\n```\n")
             catch err
-                doc1, offset1 = get_file_loc(b.val)
-                throw(LSHoverError(string("get_hover failed to convert the following to code: ", String(codeunits(get_text(doc1))[offset1 .+ (1:b.val.span)]))))
+                throw(LSHoverError(string("get_hover failed to convert Expr")))
             end
         end
     elseif b.val isa SymbolServer.SymStore

src/requests/init.jl

@@ -60,7 +60,7 @@ function has_too_many_files(path, N=5000)
             end
         end
     catch err
-        isa(err, Base.IOError) || isa(err, Base.SystemError) || (VERSION >= v"1.3.0" && isa(err, Base.TaskFailedException) && isa(err.task.exception, Base.IOError)) || rethrow()
+        is_walkdir_error(err) || rethrow()
         return false
     end
 
@@ -76,7 +76,7 @@ function load_rootpath(path)
             !isjuliabasedir(path) &&
             !has_too_many_files(path)
     catch err
-        isa(err, Base.IOError) || isa(err, Base.SystemError) || rethrow()
+        is_walkdir_error(err) || rethrow()
         return false
     end
 end
@@ -103,7 +103,7 @@ function load_folder(path::String, server)
                                 isvalid(s) || continue
                                 s
                             catch err
-                                isa(err, Base.IOError) || isa(err, Base.SystemError) || rethrow()
+                                is_walkdir_error(err) || rethrow()
                                 continue
                             end
                             doc = Document(uri, content, true, server)
@@ -114,11 +114,17 @@ function load_folder(path::String, server)
                 end
             end
         catch err
-            isa(err, Base.IOError) || isa(err, Base.SystemError) || rethrow()
+            is_walkdir_error(err) || rethrow()
         end
     end
 end
 
+is_walkdir_error(_) = false
+is_walkdir_error(::Base.IOError) = true
+is_walkdir_error(::Base.SystemError) = true
+@static if VERSION > v"1.3.0-"
+    is_walkdir_error(err::Base.TaskFailedException) = is_walkdir_error(err.task.exception)
+end
 
 function initialize_request(params::InitializeParams, server::LanguageServerInstance, conn)
     # Only look at rootUri and rootPath if the client doesn't support workspaceFolders

src/requests/workspace.jl

@@ -109,15 +109,10 @@ function request_julia_config(server::LanguageServerInstance, conn)
         ConfigurationItem(missing, "julia.lint.disabledDirs")
         ]))
 
-    if server.clientInfo isa InfoParams && (server.clientInfo.name == "Visual Studio Code" || server.clientInfo.name == "Visual Studio Code - Insiders")
-        server.format_options = DocumentFormat.FormatOptions([isnothing(a) ? (DocumentFormat.default_options[i] isa Bool ? false : DocumentFormat.default_options[i]) : a for (i, a) in enumerate(response[1:12])]...)
-        new_runlinter = isnothing(response[23]) ? false : true
-        new_SL_opts = StaticLint.LintOptions([isnothing(a) ? (StaticLint.default_options[i] isa Bool ? false : StaticLint.default_options[i]) : a for (i, a) in enumerate(response[13:22])]...)
-    else
-        server.format_options = DocumentFormat.FormatOptions(response[1:12]...)
-        new_runlinter = something(response[23], true)
-        new_SL_opts = StaticLint.LintOptions(response[13:22]...)
-    end
+    server.format_options = DocumentFormat.FormatOptions(response[1:12]...)
+    new_runlinter = something(response[23], true)
+    new_SL_opts = StaticLint.LintOptions(response[13:22]...)
+
     new_lint_missingrefs = Symbol(something(response[24], :all))
     new_lint_disableddirs = something(response[25], LINT_DIABLED_DIRS)
 

src/utilities.jl

@@ -141,14 +141,11 @@ function remove_workspace_files(root, server)
         fpath = getpath(doc)
         isempty(fpath) && continue
         get_open_in_editor(doc) && continue
-        for folder in server.workspaceFolders
-            if startswith(fpath, folder)
-                continue
-            end
+        # If the file is in any other workspace folder, don't delete it
+        any(folder -> startswith(fpath, folder), server.workspaceFolders) && continue
             deletedocument!(server, uri)
         end
     end
-end
 
 
 function Base.getindex(server::LanguageServerInstance, r::Regex)