Merge pull request #690 from julia-vscode/import

Add auto fix for some missing refs

Author: ZacLN

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)),

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))
+