Merge branch 'master' into nonwsopt

Author: ZacLN

src/languageserverinstance.jl

@@ -266,10 +266,7 @@ function Base.run(server::LanguageServerInstance)
                     scopepass(root, doc)
                 end
 
-                StaticLint.check_all(getcst(doc), server.lint_options, server)
-                empty!(doc.diagnostics)
-                mark_errors(doc, doc.diagnostics)
-                publish_diagnostics(doc, server)
+                lint!(doc, server)
             end
         end
     end

src/requests/actions.jl

@@ -21,6 +21,9 @@ function process(r::JSONRPC.Request{Val{Symbol("textDocument/codeAction")},CodeA
         if is_in_fexpr(x, CSTParser.defines_struct)
             push!(commands, Command("Add default constructor", "AddDefaultConstructor", arguments))
         end
+        if is_fixable_missing_ref(x, r.params.context)
+            push!(commands, Command("Fix missing reference", "FixMissingRef", arguments))
+        end
         # if r.params.range.start.line != r.params.range.stop.line # selection across _line_offsets
         #     push!(commands, Command("Wrap in `if` block.", "WrapIfBlock", arguments))
         # end
@@ -49,6 +52,8 @@ function process(r::JSONRPC.Request{Val{Symbol("workspace/executeCommand")},Exec
         end
     elseif r.params.command == "WrapIfBlock"
         wrap_block(get_expr(getcst(doc), r.params.arguments[2]:r.params.arguments[3]), r.id + 1, server, :if)
+    elseif r.params.command == "FixMissingRef"
+        applymissingreffix(x, server)
     end
 end
 
@@ -265,3 +270,36 @@ function wrap_block(x::EXPR, id, server, type)
 
     JSONRPCEndpoints.send_request(server.jr_endpoint, "workspace/applyEdit", ApplyWorkspaceEditParams(missing, WorkspaceEdit(nothing, TextDocumentEdit[tde])))
 end
+
+
+function is_fixable_missing_ref(x::EXPR, cac::CodeActionContext)
+    if !isempty(cac.diagnostics) && any(startswith(d.message, "Missing reference") for d::Diagnostic in cac.diagnostics) && CSTParser.isidentifier(x)
+        xname = StaticLint.valofid(x)
+        tls = StaticLint.retrieve_toplevel_scope(x)
+        if tls.modules !== nothing
+            for (n,m) in tls.modules
+                if (m isa SymbolServer.ModuleStore && haskey(m, Symbol(xname))) || (m isa StaticLint.Scope && StaticLint.scopehasbinding(m, xname))
+                    return true
+                end
+            end
+        end
+    end
+    return false
+end
+
+function applymissingreffix(x, server)
+    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
+            if (m isa SymbolServer.ModuleStore && haskey(m, Symbol(xname))) || (m isa StaticLint.Scope && StaticLint.scopehasbinding(m, xname))
+                tde = TextDocumentEdit(VersionedTextDocumentIdentifier(file._uri, file._version), TextEdit[
+                    TextEdit(Range(file, offset .+ (0:0)), string(n, "."))
+                ])
+                JSONRPCEndpoints.send_request(server.jr_endpoint, "workspace/applyEdit", ApplyWorkspaceEditParams(missing, WorkspaceEdit(nothing, TextDocumentEdit[tde])))
+            end
+        end
+    end
+end

src/requests/init.jl

@@ -23,7 +23,7 @@ const serverCapabilities = ServerCapabilities(
     missing,
     true,
     false,
-    ExecuteCommandOptions(missing, String["ExplicitPackageVarImport", "ExpandFunction", "AddDefaultConstructor", "ReexportModule"]),
+    ExecuteCommandOptions(missing, String["ExplicitPackageVarImport", "ExpandFunction", "AddDefaultConstructor", "ReexportModule", "FixMissingRef"]),
     false,
     true,
     WorkspaceOptions(WorkspaceFoldersOptions(true, true)),

src/requests/textdocument.jl

@@ -80,10 +80,7 @@ function process(r::JSONRPC.Request{Val{Symbol("textDocument/didChange")},DidCha
         tdcce = first(r.params.contentChanges)
         new_cst = _partial_update(doc, tdcce) 
         scopepass(getroot(doc), doc)
-        StaticLint.check_all(getcst(doc), server.lint_options, server)
-        empty!(doc.diagnostics)
-        mark_errors(doc, doc.diagnostics)
-        publish_diagnostics(doc, server)
+        lint!(doc, server)
     else
         for tdcce in r.params.contentChanges
             applytextdocumentchanges(doc, tdcce)
@@ -234,11 +231,7 @@ function parse_all(doc::Document, server::LanguageServerInstance)
     end
 
     scopepass(getroot(doc), doc)
-    StaticLint.check_all(getcst(doc), server.lint_options, server)
-    empty!(doc.diagnostics)
-    mark_errors(doc, doc.diagnostics)
-    
-    publish_diagnostics(doc, server)
+    lint!(doc, server)
 end
 
 function mark_errors(doc, out = Diagnostic[])

src/requests/workspace.jl

@@ -101,25 +101,18 @@ function request_julia_config(server::LanguageServerInstance)
         ConfigurationItem(missing, "julia.lint.nonwsfiles")
         ]))
 
-    new_DF_opts = DocumentFormat.FormatOptions([isnothing(opt) ? DocumentFormat.default_options[i] : opt for (i,opt) in enumerate(response[1:11])]...)
-    new_SL_opts = StaticLint.LintOptions([isnothing(opt) ? StaticLint.default_options[i] : opt for (i,opt) in enumerate(response[12:21])]...)
-    new_lintrun = isnothing(response[22]) ? true : response[22]
-    new_missingref = isnothing(response[23]) ? :all : Symbol(response[23])
-    new_nonwsfiles = isnothing(response[24]) ? true : response[24]
-    
+    server.format_options = DocumentFormat.FormatOptions(response[1:11]...)
+    server.runlinter = something(response[22], true)
+    server.lint_missingrefs = Symbol(something(response[23], :all))
+
+    new_SL_opts = StaticLint.LintOptions(response[12:21]...)
+    # TODO: implement == for StaticLint.LintOptions
     rerun_lint = any(getproperty(server.lint_options, opt) != getproperty(new_SL_opts, opt) for opt in fieldnames(StaticLint.LintOptions))
-    server.format_options = new_DF_opts
     server.lint_options = new_SL_opts
-    server.runlinter = new_lintrun
-    server.lint_missingrefs = new_missingref
-    server.lint_nonwsfiles = new_nonwsfiles
 
     if rerun_lint
         for doc in getdocuments_value(server)
-            StaticLint.check_all(getcst(doc), server.lint_options, server)
-            empty!(doc.diagnostics)
-            mark_errors(doc, doc.diagnostics)
-            publish_diagnostics(doc, server)
+            lint!(doc, server)
         end
     end
 
@@ -150,4 +143,4 @@ function process(r::JSONRPC.Request{Val{Symbol("workspace/symbol")},WorkspaceSym
     end
 
     return syms
-end
+end

src/staticlint.jl

@@ -56,4 +56,11 @@ getserver(file::Document) = file.server
 function setserver(file::Document, server::LanguageServerInstance)
     file.server = server
     return file
-end
+end
+
+function lint!(doc, server)
+    StaticLint.check_all(getcst(doc), server.lint_options, server)
+    empty!(doc.diagnostics)
+    mark_errors(doc, doc.diagnostics)
+    publish_diagnostics(doc, server)
+end

test/runtests.jl

@@ -17,5 +17,8 @@ end
 @testset "edit" begin
 include("text_edit.jl")
 end
+@testset "actions" begin
+include("test_actions.jl")
+end
 
 end

test/test_actions.jl

@@ -0,0 +1,14 @@
+server = LanguageServerInstance(IOBuffer(), IOBuffer(), dirname(Pkg.Types.Context().env.project_file), first(Base.DEPOT_PATH))
+server.runlinter = true
+
+LanguageServer.process(LanguageServer.parse(LanguageServer.JSONRPC.Request, Dict("jsonrpc"=>"2.0","id"=>0,"method"=>"initialize","params"=>init_request)), server)
+
+testtext = """
+decode_overlong
+"""
+LanguageServer.process(LanguageServer.JSONRPC.Request{Val{Symbol("textDocument/didOpen")},LanguageServer.DidOpenTextDocumentParams}(0, LanguageServer.DidOpenTextDocumentParams(LanguageServer.TextDocumentItem("testdoc", "julia", 0, testtext))), server)
+
+doc = LanguageServer.getdocument(server, LanguageServer.URI2("testdoc"))
+
+@test !isempty(LanguageServer.process(LanguageServer.JSONRPC.Request{Val{Symbol("textDocument/codeAction")},LanguageServer.CodeActionParams}(0, LanguageServer.CodeActionParams(LanguageServer.TextDocumentIdentifier("testdoc"), LanguageServer.Range(LanguageServer.Position(0,1),LanguageServer.Position(0,1)), LanguageServer.CodeActionContext(LanguageServer.Diagnostic[doc.diagnostics[1]], missing))), server))
+