Merge branch 'master' into sp/document-highlight

Author: pfitzseb

.github/workflows/jlpkgbutler-ci-master-workflow.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        julia-version: ['1.0', '1.1', '1.2', '1.3', '1.4', '1.5']
+        julia-version: ['1.0', '1.1', '1.2', '1.3', '1.4', '1.5', '1.6']
         julia-arch: [x64, x86]
         os: [ubuntu-latest, windows-latest, macOS-latest]
         exclude:

.github/workflows/jlpkgbutler-ci-pr-workflow.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        julia-version: ['1.0', '1.1', '1.2', '1.3', '1.4', '1.5']
+        julia-version: ['1.0', '1.1', '1.2', '1.3', '1.4', '1.5', '1.6']
         julia-arch: [x64, x86]
         os: [ubuntu-latest, windows-latest, macOS-latest]
         exclude:

.github/workflows/jlpkgbutler-codeformat-pr-workflow.yml

@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: julia-actions/julia-codeformat@releases/v1
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v2
+        uses: peter-evans/create-pull-request@v3
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: Format files using DocumentFormat

src/document.jl

@@ -155,7 +155,7 @@ function obscure_text(s)
         end
         i += di
     end
-    s1 = String(take!(io))
+    String(take!(io))
 end
 
 """
@@ -229,7 +229,7 @@ byte offset.
 function get_position_at(doc::Document, offset::Integer)
     offset > sizeof(get_text(doc)) && throw(LSPositionToOffsetException("offset[$offset] > sizeof(content)[$(sizeof(get_text(doc)))]")) # OK, offset comes from EXPR spans
     line_offsets = get_line_offsets(doc)
-    line, ind = get_line_of(line_offsets, offset)
+    line, _ = get_line_of(line_offsets, offset)
     io = IOBuffer(get_text(doc))
     seek(io, line_offsets[line])
     character = 0

src/languageserverinstance.jl

@@ -142,7 +142,7 @@ function create_symserver_progress_ui(server)
     if server.clientcapability_window_workdoneprogress
         token = string(uuid4())
         server.current_symserver_progress_token = token
-        response = JSONRPC.send(server.jr_endpoint, window_workDoneProgress_create_request_type, WorkDoneProgressCreateParams(token))
+        JSONRPC.send(server.jr_endpoint, window_workDoneProgress_create_request_type, WorkDoneProgressCreateParams(token))
 
         JSONRPC.send(
             server.jr_endpoint,
@@ -293,6 +293,7 @@ function Base.run(server::LanguageServerInstance)
     end
 
     msg_dispatcher = JSONRPC.MsgDispatcher()
+
     msg_dispatcher[textDocument_codeAction_request_type] = request_wrapper(textDocument_codeAction_request, server)
     msg_dispatcher[workspace_executeCommand_request_type] = request_wrapper(workspace_executeCommand_request, server)
     msg_dispatcher[textDocument_completion_request_type] = request_wrapper(textDocument_completion_request, server)
@@ -327,6 +328,7 @@ function Base.run(server::LanguageServerInstance)
     msg_dispatcher[workspace_symbol_request_type] = request_wrapper(workspace_symbol_request, server)
     msg_dispatcher[julia_refreshLanguageServer_notification_type] = request_wrapper(julia_refreshLanguageServer_notification, server)
     msg_dispatcher[julia_getDocFromWord_request_type] = request_wrapper(julia_getDocFromWord_request, server)
+    msg_dispatcher[textDocument_selectionRange_request_type] = request_wrapper(textDocument_selectionRange_request, server)
 
     while true
         message = take!(server.combined_msg_queue)

src/protocol/messagedefs.jl

@@ -15,6 +15,7 @@ const textDocument_didSave_notification_type = JSONRPC.NotificationType("textDoc
 const textDocument_willSave_notification_type = JSONRPC.NotificationType("textDocument/willSave", WillSaveTextDocumentParams)
 const textDocument_willSaveWaitUntil_request_type = JSONRPC.RequestType("textDocument/willSaveWaitUntil", WillSaveTextDocumentParams, Vector{TextEdit})
 const textDocument_publishDiagnostics_notification_type = JSONRPC.NotificationType("textDocument/publishDiagnostics", PublishDiagnosticsParams)
+const textDocument_selectionRange_request_type = JSONRPC.RequestType("textDocument/selectionRange", SelectionRangeParams, Vector{SelectionRange})
 
 const workspace_executeCommand_request_type = JSONRPC.RequestType("workspace/executeCommand", ExecuteCommandParams, Nothing)
 const workspace_symbol_request_type = JSONRPC.RequestType("workspace/symbol", WorkspaceSymbolParams, Vector{SymbolInformation})

src/requests/actions.jl

@@ -160,7 +160,7 @@ function reexport_package(x::EXPR, server, conn)
         return
     end
     using_stmt = parentof(x)
-    file, offset = get_file_loc(x)
+    file, _ = get_file_loc(x)
     insertpos = get_next_line_offset(using_stmt)
     insertpos == -1 && return
 
@@ -196,7 +196,7 @@ function reexport_module(x::EXPR, server, conn)
     exported_names = find_exported_names(mod_expr)
 
     isempty(exported_names) && return
-    file, offset = get_file_loc(x)
+    file, _ = get_file_loc(x)
     insertpos = get_next_line_offset(using_stmt)
     insertpos == -1 && return
     names = filter!(s -> !isempty(s), collect(CSTParser.str_value.(exported_names)))
@@ -210,8 +210,6 @@ end
 function wrap_block(x, server, type, conn) end
 function wrap_block(x::EXPR, server, type, conn)
     file, offset = get_file_loc(x) # rese
-    l0, _ = get_position_at(file, offset)
-    l1, _ = get_position_at(file, offset + x.span)
     if type == :if
         tde = TextDocumentEdit(VersionedTextDocumentIdentifier(file._uri, file._version), TextEdit[
             TextEdit(Range(file, offset .+ (0:0)), "if CONDITION\n"),
@@ -228,7 +226,7 @@ function is_fixable_missing_ref(x::EXPR, cac::CodeActionContext)
         xname = StaticLint.valofid(x)
         tls = StaticLint.retrieve_toplevel_scope(x)
         if tls isa StaticLint.Scope && tls.modules !== nothing
-            for (n, m) in tls.modules
+            for m in values(tls.modules)
                 if (m isa SymbolServer.ModuleStore && haskey(m, Symbol(xname))) || (m isa StaticLint.Scope && StaticLint.scopehasbinding(m, xname))
                     return true
                 end
@@ -241,7 +239,6 @@ end
 function applymissingreffix(x, server, conn)
     xname = StaticLint.valofid(x)
     file, offset = get_file_loc(x)
-    l, c = get_position_at(file, offset)
     tls = StaticLint.retrieve_toplevel_scope(x)
     if tls.modules !== nothing
         for (n, m) in tls.modules

src/requests/completions.jl

@@ -3,6 +3,22 @@
 # - fuzzy completions
 # - (maybe) export latex completions into a separate package
 
+using REPL
+
+"""
+    is_completion_match(s::AbstractString, prefix::AbstractString, cutoff=3)
+
+Returns true if `s` starts with `prefix` or has a sufficiently high fuzzy score.
+"""
+function is_completion_match(s::AbstractString, prefix::AbstractString, cutoff=3)
+    starter = if all(islowercase, prefix)
+        startswith(lowercase(s), prefix)
+    else
+        startswith(s, prefix)
+    end
+    starter || REPL.fuzzyscore(prefix, s) >= cutoff
+end
+
 function textDocument_completion_request(params::CompletionParams, server::LanguageServerInstance, conn)
     CIs = CompletionItem[]
     doc = getdocument(server, URI2(params.textDocument.uri))
@@ -61,14 +77,14 @@ function textDocument_completion_request(params::CompletionParams, server::Langu
 end
 
 function get_partial_completion(doc, offset)
-    ppt, pt, t = toks = get_toks(doc, offset)
+    ppt, pt, t = get_toks(doc, offset)
     is_at_end = offset == t.endbyte + 1
     return ppt, pt, t, is_at_end
 end
 
 function latex_completions(doc, offset, partial, CIs)
     for (k, v) in REPL.REPLCompletions.latex_symbols
-        if startswith(string(k), partial)
+        if is_completion_match(string(k), partial)
             t1 = TextEdit(Range(doc, (offset - sizeof(partial)):offset), v)
             push!(CIs, CompletionItem(k, 11, missing, v, v, missing, missing, missing, missing, missing, missing, t1, missing, missing, missing, missing))
         end
@@ -77,10 +93,10 @@ end
 
 function kw_completion(doc, spartial, CIs, offset)
     length(spartial) == 0 && return
-    fc = first(spartial)
     for (kw, comp) in snippet_completions
         if startswith(kw, spartial)
-            push!(CIs, CompletionItem(kw, 14, missing, missing, kw, missing, missing, missing, missing, missing, InsertTextFormats.Snippet, TextEdit(Range(doc, offset:offset), comp[length(spartial) + 1:end]), missing, missing, missing, missing))
+             t1 = TextEdit(Range(doc, (offset - sizeof(spartial)):offset), comp)
+            push!(CIs, CompletionItem(kw, 14, missing, missing, kw, missing, missing, missing, missing, missing, InsertTextFormats.Snippet, t1, missing, missing, missing, missing))
         end
     end
 end
@@ -123,13 +139,14 @@ function collect_completions(m::SymbolServer.ModuleStore, spartial, rng, CIs, se
     for val in m.vals
         n, v = String(val[1]), val[2]
         (startswith(n, ".") || startswith(n, "#")) && continue
-        !startswith(n, spartial) && continue
+        !is_completion_match(n, spartial) && continue
         if v isa SymbolServer.VarRef
             v = SymbolServer._lookup(v, getsymbolserver(server), true)
             v === nothing && return
         end
         if StaticLint.isexportedby(n, m) || inclexported
-            push!(CIs, CompletionItem(n, _completion_kind(v, server), MarkupContent(sanitize_docstring(v.doc)), TextEdit(rng, n[nextind(n, sizeof(spartial)):end])))
+            rng1 = Range(Position(rng.start.line, rng.start.character - sizeof(spartial)), rng.stop)
+            push!(CIs, CompletionItem(n, _completion_kind(v, server), MarkupContent(sanitize_docstring(v.doc)), TextEdit(rng1, n)))
         elseif dotcomps
             rng1 = Range(Position(rng.start.line, rng.start.character - sizeof(spartial)), rng.stop)
             push!(CIs, CompletionItem(n, _completion_kind(v, server), MarkupContent(sanitize_docstring(v.doc)), TextEdit(rng1, string(m.name, ".", n))))
@@ -156,13 +173,14 @@ end
 function collect_completions(x::StaticLint.Scope, spartial, rng, CIs, server, inclexported=false, dotcomps=false)
     if x.names !== nothing
         for n in x.names
-            if startswith(n[1], spartial)
+            if is_completion_match(n[1], spartial)
                 documentation = ""
                 if n[2] isa StaticLint.Binding
                     documentation = get_hover(n[2], documentation, server)
                     sanitize_docstring(documentation)
                 end
-                push!(CIs, CompletionItem(n[1], _completion_kind(n[2], server), MarkupContent(documentation), TextEdit(rng, n[1][nextind(n[1], sizeof(spartial)):end])))
+                rng1 = Range(Position(rng.start.line, rng.start.character - sizeof(spartial)), rng.stop)
+                push!(CIs, CompletionItem(n[1], _completion_kind(n[2], server), MarkupContent(documentation), TextEdit(rng1, n[1])))
             end
         end
     end
@@ -189,15 +207,17 @@ function _get_dot_completion(px::EXPR, spartial, rng, CIs, server)
             elseif refof(px).type isa SymbolServer.DataTypeStore
                 for a in refof(px).type.fieldnames
                     a = String(a)
-                    if startswith(a, spartial)
-                        push!(CIs, CompletionItem(a, 2, MarkupContent(a), TextEdit(rng, a[nextind(a, sizeof(spartial)):end])))
+                    if is_completion_match(a, spartial)
+                        rng1 = Range(Position(rng.start.line, rng.start.character - sizeof(spartial)), rng.stop)
+                        push!(CIs, CompletionItem(a, 2, MarkupContent(a), TextEdit(rng1, a)))
                     end
                 end
             elseif refof(px).type isa StaticLint.Binding && refof(px).type.val isa SymbolServer.DataTypeStore
                 for a in refof(px).type.val.fieldnames
                     a = String(a)
-                    if startswith(a, spartial)
-                        push!(CIs, CompletionItem(a, 2, MarkupContent(a), TextEdit(rng, a[nextind(a, sizeof(spartial)):end])))
+                    if is_completion_match(a, spartial)
+                        rng1 = Range(Position(rng.start.line, rng.start.character - sizeof(spartial)), rng.stop)
+                        push!(CIs, CompletionItem(a, 2, MarkupContent(a), TextEdit(rng1, a)))
                     end
                 end
             elseif refof(px).type isa StaticLint.Binding && refof(px).type.val isa EXPR && CSTParser.defines_struct(refof(px).type.val) && scopeof(refof(px).type.val) isa StaticLint.Scope
@@ -247,7 +267,7 @@ end
 function string_completion(doc, offset, rng, t, CIs)
     path_completion(doc, offset, rng, t, CIs)
     # Need to adjust things for quotation marks
-    if t.kind in (CSTParser.Tokenize.Tokens.STRING,CSTParser.Tokenize.Tokens.CMD)
+    if t.kind in (CSTParser.Tokenize.Tokens.STRING, CSTParser.Tokenize.Tokens.CMD)
         t.startbyte < offset <= t.endbyte || return
         relative_offset = offset - t.startbyte - 1
         content = t.val[2:prevind(t.val, lastindex(t.val))]
@@ -310,7 +330,8 @@ function path_completion(doc, offset, rng, t, CIs)
                         if isdir(joinpath(dir, f))
                             f = string(f, "/")
                         end
-                        push!(CIs, CompletionItem(f, 17, f, TextEdit(rng, f[nextind(f, lastindex(partial)):end])))
+                        rng1 = Range(doc, offset - sizeof(partial):offset)
+                        push!(CIs, CompletionItem(f, 17, f, TextEdit(rng1, f)))
                     catch err
                         isa(err, Base.IOError) || isa(err, Base.SystemError) || rethrow()
                     end
@@ -326,17 +347,18 @@ is_in_import_statement(x::EXPR) = is_in_fexpr(x, x -> headof(x) in (:using, :imp
 
 function import_completions(doc, offset, rng, ppt, pt, t, is_at_end, x, CIs, server)
     import_statement = StaticLint.get_parent_fexpr(x, x -> headof(x) === :using || headof(x) === :import)
-    
+
     import_root = get_import_root(import_statement)
-    
+
     if (t.kind == CSTParser.Tokens.WHITESPACE && pt.kind ∈ (CSTParser.Tokens.USING, CSTParser.Tokens.IMPORT, CSTParser.Tokens.IMPORTALL, CSTParser.Tokens.COMMA, CSTParser.Tokens.COLON)) ||
         (t.kind in (CSTParser.Tokens.COMMA, CSTParser.Tokens.COLON))
         # no partial, no dot
         if import_root !== nothing && refof(import_root) isa SymbolServer.ModuleStore
             for (n, m) in refof(import_root).vals
                 n = String(n)
-                if startswith(n, t.val) && !startswith(n, "#")
-                    push!(CIs, CompletionItem(n, _completion_kind(m, server), MarkupContent(m isa SymbolServer.SymStore ? sanitize_docstring(m.doc) : n), TextEdit(rng, n[length(t.val) + 1:end])))
+                if is_completion_match(n, t.val) && !startswith(n, "#")
+                    rng1 = Range(doc, offset - sizeof(t.val):offset)
+                    push!(CIs, CompletionItem(n, _completion_kind(m, server), MarkupContent(m isa SymbolServer.SymStore ? sanitize_docstring(m.doc) : n), TextEdit(rng1, n)))
                 end
             end
         else
@@ -358,24 +380,27 @@ function import_completions(doc, offset, rng, ppt, pt, t, is_at_end, x, CIs, ser
                 rootmod = StaticLint.getsymbolserver(server)[Symbol(ppt.val)]
                 for (n, m) in rootmod.vals
                     n = String(n)
-                    if startswith(n, t.val) && !startswith(n, "#")
-                        push!(CIs, CompletionItem(n, _completion_kind(m, server), MarkupContent(m isa SymbolServer.SymStore ? sanitize_docstring(m.doc) : n), TextEdit(rng, n[length(t.val) + 1:end])))
+                    if is_completion_match(n, t.val) && !startswith(n, "#")
+                        rng1 = Range(doc, offset - sizeof(t.val):offset)
+                        push!(CIs, CompletionItem(n, _completion_kind(m, server), MarkupContent(m isa SymbolServer.SymStore ? sanitize_docstring(m.doc) : n), TextEdit(rng1, n)))
                     end
                 end
             end
         else
             if import_root !== nothing && refof(import_root) isa SymbolServer.ModuleStore
                 for (n, m) in refof(import_root).vals
                     n = String(n)
-                    if startswith(n, t.val) && !startswith(n, "#")
-                        push!(CIs, CompletionItem(n, _completion_kind(m, server), MarkupContent(m isa SymbolServer.SymStore ? sanitize_docstring(m.doc) : n), TextEdit(rng, n[length(t.val) + 1:end])))
+                    if is_completion_match(n, t.val) && !startswith(n, "#")
+                        rng1 = Range(doc, offset - sizeof(t.val):offset)
+                        push!(CIs, CompletionItem(n, _completion_kind(m, server), MarkupContent(m isa SymbolServer.SymStore ? sanitize_docstring(m.doc) : n), TextEdit(rng1, n)))
                     end
                 end
             else
                 for (n, m) in StaticLint.getsymbolserver(server)
                     n = String(n)
-                    if startswith(n, t.val)
-                        push!(CIs, CompletionItem(n, 9, MarkupContent(m isa SymbolServer.SymStore ? m.doc : n), TextEdit(rng, n[nextind(n, sizeof(t.val)):end])))
+                    if is_completion_match(n, t.val)
+                        rng1 = Range(doc, offset - sizeof(t.val):offset)
+                        push!(CIs, CompletionItem(n, 9, MarkupContent(m isa SymbolServer.SymStore ? m.doc : n), TextEdit(rng1, n)))
                     end
                 end
             end

src/requests/features.jl

@@ -186,7 +186,6 @@ function get_name_of_binding(name::EXPR)
 end
 
 function textDocument_documentSymbol_request(params::DocumentSymbolParams, server::LanguageServerInstance, conn)
-    syms = SymbolInformation[]
     uri = params.textDocument.uri
     doc = getdocument(server, URI2(uri))
 
@@ -285,8 +284,20 @@ function julia_getModuleAt_request(params::VersionedTextDocumentPositionParams,
         doc = getdocument(server, uri)
         if doc._version == params.version
             offset = get_offset2(doc, params.position.line, params.position.character, true)
-            x = get_expr_or_parent(getcst(doc), offset, 1)
+            x, p = get_expr_or_parent(getcst(doc), offset, 1)
             if x isa EXPR
+                if x.head === :MODULE || x.head === :IDENTIFIER || x.head === :END
+                    if x.parent !== nothing && x.parent.head === :module
+                        x = x.parent
+                        if CSTParser.defines_module(x)
+                            x = x.parent
+                        end
+                    end
+                end
+                if CSTParser.defines_module(x) && p <= offset <= p + x[1].fullspan + x[2].fullspan
+                    x = x.parent
+                end
+
                 scope = StaticLint.retrieve_scope(x)
                 if scope !== nothing
                     return get_module_of(scope)
@@ -350,3 +361,21 @@ function julia_getDocFromWord_request(params::NamedTuple{(:word,),Tuple{String}}
         return join(isempty(exact_matches) ? approx_matches[1:min(end, 10)] : exact_matches, "\n---\n")
     end
 end
+
+function textDocument_selectionRange_request(params::SelectionRangeParams, server::LanguageServerInstance, conn)
+    doc = getdocument(server, URI2(params.textDocument.uri))
+    map(params.positions) do position
+        offset = get_offset(doc, position)
+        x = get_expr1(getcst(doc), offset)
+        get_selection_range_of_expr(x)
+    end
+end
+
+# Just returns a selection for each parent EXPR, should be more selective
+get_selection_range_of_expr(x) = missing
+function get_selection_range_of_expr(x::EXPR)
+    doc, offset = get_file_loc(x)
+    l1, c1 = get_position_at(doc, offset)
+    l2, c2 = get_position_at(doc, offset + x.span)
+    SelectionRange(Range(l1, c1, l2, c2), get_selection_range_of_expr(x.parent))
+end