Merge branch 'master' into disable-comp

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/LanguageServer.jl

@@ -28,6 +28,7 @@ include("requests/workspace.jl")
 include("requests/actions.jl")
 include("requests/init.jl")
 include("requests/signatures.jl")
+include("requests/highlight.jl")
 include("utilities.jl")
 
 end

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

@@ -1,5 +1,3 @@
-T = 0.0
-
 """
     LanguageServerInstance(pipe_in, pipe_out, env="", depot="", err_handler=nothing, symserver_store_path=nothing)
 
@@ -45,6 +43,7 @@ mutable struct LanguageServerInstance
     lint_options::StaticLint.LintOptions
     lint_missingrefs::Symbol
     lint_disableddirs::Vector{String}
+    completion_mode::Symbol
 
     combined_msg_queue::Channel{Any}
 
@@ -81,6 +80,7 @@ mutable struct LanguageServerInstance
             StaticLint.LintOptions(),
             :all,
             LINT_DIABLED_DIRS,
+            :import, # options: :import or :qualify, anything else turns this off
             Channel{Any}(Inf),
             err_handler,
             :created,
@@ -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,
@@ -303,6 +303,7 @@ function Base.run(server::LanguageServerInstance)
     msg_dispatcher[textDocument_references_request_type] = request_wrapper(textDocument_references_request, server)
     msg_dispatcher[textDocument_rename_request_type] = request_wrapper(textDocument_rename_request, server)
     msg_dispatcher[textDocument_documentSymbol_request_type] = request_wrapper(textDocument_documentSymbol_request, server)
+    msg_dispatcher[textDocument_documentHighlight_request_type] = request_wrapper(textDocument_documentHighlight_request, server)
     msg_dispatcher[julia_getModuleAt_request_type] = request_wrapper(julia_getModuleAt_request, server)
     msg_dispatcher[julia_getDocAt_request_type] = request_wrapper(julia_getDocAt_request, server)
     msg_dispatcher[textDocument_hover_request_type] = request_wrapper(textDocument_hover_request, server)

src/protocol/messagedefs.jl

@@ -6,6 +6,7 @@ const textDocument_formatting_request_type = JSONRPC.RequestType("textDocument/f
 const textDocument_references_request_type = JSONRPC.RequestType("textDocument/references", ReferenceParams, Vector{Location})
 const textDocument_rename_request_type = JSONRPC.RequestType("textDocument/rename", RenameParams, WorkspaceEdit)
 const textDocument_documentSymbol_request_type = JSONRPC.RequestType("textDocument/documentSymbol", DocumentSymbolParams, Vector{SymbolInformation})
+const textDocument_documentHighlight_request_type = JSONRPC.RequestType("textDocument/documentHighlight", DocumentHighlightParams, Vector{DocumentHighlight})
 const textDocument_hover_request_type = JSONRPC.RequestType("textDocument/hover", TextDocumentPositionParams, Hover)
 const textDocument_didOpen_notification_type = JSONRPC.NotificationType("textDocument/didOpen", DidOpenTextDocumentParams)
 const textDocument_didClose_notification_type = JSONRPC.NotificationType("textDocument/didClose", DidCloseTextDocumentParams)

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