Merge branch 'master' into local-completions

Author: aviatesk

src/LSP/basic-json-structures.jl

@@ -318,23 +318,6 @@ Structure to capture a description for an error code.
     href::URI
 end
 
-"""
-Represents a reference to a command. Provides a title which will be used to
-represent a command in the UI. Commands are identified by a string
-identifier. The recommended way to handle commands is to implement their
-execution on the server side if the client and server provides the corresponding
-capabilities. Alternatively the tool extension code could handle the
-command. The protocol currently doesn’t specify a set of well-known commands.
-"""
-@interface Command begin
-    "Title of the command, like `save`."
-    title::String
-    "The identifier of the actual command handler."
-    command::String
-    "Arguments that the command handler should be invoked with"
-    arguments::Union{Vector{Any}, Nothing} = nothing
-end
-
 """
 Represents a diagnostic, such as a compiler error or warning.
 Diagnostic objects are only valid in the scope of a resource.
@@ -395,6 +378,71 @@ Diagnostic objects are only valid in the scope of a resource.
     data::Union{Any, Nothing} = nothing
 end
 
+"""
+Describes the content type that a client supports in various
+result literals like `Hover`, `ParameterInfo` or `CompletionItem`.
+Please note that `MarkupKinds` must not start with a `\$`. This kinds
+are reserved for internal usage.
+"""
+@namespace MarkupKind::String begin
+    "Plain text is supported as a content format"
+    PlainText = "plaintext"
+    "Markdown is supported as a content format"
+    Markdown = "markdown"
+end
+
+"""
+A `MarkupContent` literal represents a string value which content is
+interpreted base on its kind flag. Currently the protocol supports
+`plaintext` and `markdown` as markup kinds.
+
+If the kind is `markdown` then the value can contain fenced code blocks like
+in GitHub issues.
+
+Here is an example how such a string can be constructed using
+JavaScript / TypeScript:
+```typescript
+let markdown: MarkdownContent = {
+    kind: MarkupKind.Markdown,
+    value: [
+        '# Header',
+        'Some text',
+        '```typescript',
+        'someCode();',
+        '```',
+    ].join('\n')
+};
+```
+
+*Please Note* that clients might sanitize the return markdown. A client could
+decide to remove HTML from the markdown to avoid script execution.
+ */
+"""
+@interface MarkupContent begin
+    "The type of the Markup"
+    kind::MarkupKind.Ty
+
+    "The content itself"
+    value::String
+end
+
+"""
+Represents a reference to a command. Provides a title which will be used to
+represent a command in the UI. Commands are identified by a string
+identifier. The recommended way to handle commands is to implement their
+execution on the server side if the client and server provides the corresponding
+capabilities. Alternatively the tool extension code could handle the
+command. The protocol currently doesn’t specify a set of well-known commands.
+"""
+@interface Command begin
+    "Title of the command, like `save`."
+    title::String
+    "The identifier of the actual command handler."
+    command::String
+    "Arguments that the command handler should be invoked with"
+    arguments::Union{Vector{Any}, Nothing} = nothing
+end
+
 # Work done progress
 # ==================
 

src/LSP/language-features/completions.jl

@@ -276,8 +276,7 @@ end
     detail::Union{String, Nothing} = nothing
 
     "A human-readable string that represents a doc-comment."
-    # documentation::Union{Union{MarkupContent, String}, Nothing} = nothing
-    documentation::Union{String, Nothing} = nothing
+    documentation::Union{MarkupContent, String, Nothing} = nothing
 
     """
     Indicates if this item is deprecated.
@@ -528,11 +527,11 @@ end
         """
         commitCharactersSupport::Union{Nothing, Bool} = nothing
 
-        # """
-        # Client supports the follow content formats for the documentation
-        # property. The order describes the preferred format of the client.
-        # """
-        # documentationFormat::Union{Nothing, Vector{MarkupKind}} = nothing
+        """
+        Client supports the follow content formats for the documentation
+        property. The order describes the preferred format of the client.
+        """
+        documentationFormat::Union{Nothing, Vector{MarkupKind.Ty}} = nothing
 
         """
         Client supports the deprecated property on a completion item.

src/completions.jl

@@ -1,8 +1,8 @@
 import JuliaLowering: SyntaxTree, JuliaLowering as JL
 import JuliaSyntax: @K_str, @KSet_str, JuliaSyntax as JS
 
-# get_fileinfo(s::ServerState, t::TextDocumentPositionParams) = get_fileinfo(s, t.textDocument)
-get_fileinfo(s::ServerState, t::CompletionParams) = get_fileinfo(s, t.textDocument)
+# local completions
+# =================
 
 """
 Like `Base.unique`, but over node ids, and with this comment promising that the
@@ -238,24 +238,78 @@ function test_handle_CompletionRequest(s::String, b::Int)
     map(o->to_completion(o[1], o[2], o[3]), out)
 end
 
+function local_completions!(items::Vector{CompletionItem}, s::ServerState, uri::URI, pos::Position)
+    fi = get_fileinfo(s, uri)
+    fi === nothing && return items
+    st0 = JuliaSyntax.build_tree(SyntaxTree, fi.parsed_stream)
+    for o in cursor_bindings(st0, xy_to_offset(fi, pos))
+        push!(items, to_completion(o[1], o[2]))
+    end
+    return items
+end
+
+# global completions
+# ==================
+
+function find_file_module(state::ServerState, uri::URI, pos::Position)
+    haskey(state.contexts, uri) || return Main
+    contexts = state.contexts[uri]
+    context = first(contexts)
+    for ctx in contexts
+        # prioritize `PackageSourceAnalysisEntry` if exists
+        if isa(context.entry, PackageSourceAnalysisEntry)
+            context = ctx
+            break
+        end
+    end
+    haskey(context.analyzed_file_infos, uri) || return Main
+    analyzed_file_info = context.analyzed_file_infos[uri]
+    curline = Int(pos.line) + 1
+    _, idx = findmin(analyzed_file_info.module_range_infos) do (range, mod)
+        curline in range || return typemax(Int)
+        return last(range) - first(range)
+    end
+    return last(analyzed_file_info.module_range_infos[idx])
+end
+
+function global_completions!(items::Vector{CompletionItem}, state::ServerState, uri::URI, pos::Position)
+    mod = find_file_module(state, uri, pos)
+    for name in names(mod; all=true, imported=true, usings=true)
+        s = String(name)
+        startswith(s, "#") && continue
+        push!(items, CompletionItem(
+            ; label = s,
+            labelDetails = CompletionItemLabelDetails(
+                ; description = "global"),
+            kind = CompletionItemKind.Variable,
+            documentation = nothing))
+    end
+    return items
+end
+
+
+# request handler
+# ===============
 
 function handle_CompletionRequest(s::ServerState, msg::CompletionRequest)
-    fi = get_fileinfo(s, msg.params)
-    b = xy_to_offset(fi, msg.params.position)
+    uri = URI(msg.params.textDocument.uri)
 
-    st0 = JuliaSyntax.build_tree(SyntaxTree, fi.parsed_stream)
-    out = map(o->to_completion(o[1], o[2]), cursor_bindings(st0, b))
+    # show local completions first, and then global completions
+    items = CompletionItem[]
+    # local_completions!(items, s, uri, msg.params.position)
+    # global_completions!(items, s, uri, msg.params.position)
 
     return s.send(
         ResponseMessage(
             ; id = msg.id,
             result =
                 CompletionList(
                     ; isIncomplete = true,
-                    items = out,
-                    itemDefaults = (
-                        ; data = (
-                            ; position = msg.params.position,
-                            translated_pos = b,
-                            untranslated_pos = offset_to_xy(fi, b))))))
+                    items,
+                    # itemDefaults = (
+                    #     ; data = (
+                    #         ; position = msg.params.position,
+                    #         translated_pos = b,
+                    #         untranslated_pos = offset_to_xy(fi, b)))
+                    )))
 end

src/utils.jl

@@ -42,10 +42,8 @@ end
 """
 Fetch cached FileInfo given an LSclient-provided structure with a URI
 """
-function get_fileinfo(s::ServerState, t::TextDocumentIdentifier)
-    uri = URI(t.uri)
-    return haskey(s.file_cache, uri) ? s.file_cache[uri] : nothing
-end
+get_fileinfo(s::ServerState, uri::URI) = haskey(s.file_cache, uri) ? s.file_cache[uri] : nothing
+get_fileinfo(s::ServerState, t::TextDocumentIdentifier) = get_fileinfo(s, URI(t.uri))
 
 # JuliaLowering uses byte offsets; LSP uses lineno and UTF-* character offset.
 # These functions do the conversion.