Merge pull request #819 from julia-vscode/create-pull-request/patch

[AUTO] Format files using DocumentFormat

Author: davidanthoff

docs/make.jl

@@ -2,21 +2,21 @@ using LanguageServer
 using Documenter
 
 makedocs(;
-    modules = [LanguageServer],
-    authors = "Julia VSCode",
-    repo = "https://github.com/julia-vscode/LanguageServer.jl/blob/{commit}{path}#L{line}",
-    sitename = "LanguageServer.jl",
-    format = Documenter.HTML(;
-        prettyurls = prettyurls = get(ENV, "CI", nothing) == "true",
+    modules=[LanguageServer],
+    authors="Julia VSCode",
+    repo="https://github.com/julia-vscode/LanguageServer.jl/blob/{commit}{path}#L{line}",
+    sitename="LanguageServer.jl",
+    format=Documenter.HTML(;
+        prettyurls=prettyurls = get(ENV, "CI", nothing) == "true",
         # canonical="https://www.julia-vscode.org/LanguageServer.jl",
         # assets=String[],
     ),
-    pages = [
+    pages=[
         "Home" => "index.md",
         "Syntax Reference" => "syntax.md",
     ],
 )
 
 deploydocs(;
-    repo = "github.com/julia-vscode/LanguageServer.jl",
+    repo="github.com/julia-vscode/LanguageServer.jl",
 )

src/document.jl

@@ -11,7 +11,7 @@ mutable struct Document
     _version::Int
     server
     root::Document
-    function Document(uri::AbstractString, text::AbstractString, workspace_file::Bool, server = nothing)
+    function Document(uri::AbstractString, text::AbstractString, workspace_file::Bool, server=nothing)
         path = something(uri2filepath(uri), "")
         cst = CSTParser.parse(text, true)
         doc = new(uri, path, text, nothing, nothing, false, workspace_file, cst, [], 0, server)
@@ -158,7 +158,7 @@ Updates the doc._line_offsets field, an n length Array each entry of which
 gives the byte offset position of the start of each line. This always starts 
 with 0 for the first line (even if empty).
 """
-function get_line_offsets(doc::Document, force = false)
+function get_line_offsets(doc::Document, force=false)
     if force || doc._line_offsets === nothing
         doc._line_offsets = Int[0]
         text = get_text(doc)
@@ -176,7 +176,7 @@ function get_line_offsets(doc::Document, force = false)
     return doc._line_offsets
 end
 
-function get_line_offsets2!(doc::Document, force = false)
+function get_line_offsets2!(doc::Document, force=false)
     if force || doc._line_offsets2 === nothing
         doc._line_offsets2 = Int[1]
         text = get_text(doc)

src/languageserverinstance.jl

@@ -62,7 +62,7 @@ mutable struct LanguageServerInstance
     clientCapabilities::Union{ClientCapabilities,Missing}
     clientInfo::Union{InfoParams,Missing}
 
-    function LanguageServerInstance(pipe_in, pipe_out, env_path = "", depot_path = "", err_handler = nothing, symserver_store_path = nothing)
+    function LanguageServerInstance(pipe_in, pipe_out, env_path="", depot_path="", err_handler=nothing, symserver_store_path=nothing)
         new(
             JSONRPC.JSONRPCEndpoint(pipe_in, pipe_out, err_handler),
             Set{String}(),
@@ -269,36 +269,36 @@ function Base.run(server::LanguageServerInstance)
     end
 
     msg_dispatcher = JSONRPC.MsgDispatcher()
-    msg_dispatcher[textDocument_codeAction_request_type] = (conn, params)->textDocument_codeAction_request(params, server, conn)
-    msg_dispatcher[workspace_executeCommand_request_type] = (conn, params)->workspace_executeCommand_request(params, server, conn)
-    msg_dispatcher[textDocument_completion_request_type] = (conn, params)->textDocument_completion_request(params, server, conn)
-    msg_dispatcher[textDocument_signatureHelp_request_type] = (conn, params)->textDocument_signatureHelp_request(params, server, conn)
-    msg_dispatcher[textDocument_definition_request_type] = (conn, params)->textDocument_definition_request(params, server, conn)
-    msg_dispatcher[textDocument_formatting_request_type] = (conn, params)->textDocument_formatting_request(params, server, conn)
-    msg_dispatcher[textDocument_references_request_type] = (conn, params)->textDocument_references_request(params, server, conn)
-    msg_dispatcher[textDocument_rename_request_type] = (conn, params)->textDocument_rename_request(params, server, conn)
-    msg_dispatcher[textDocument_documentSymbol_request_type] = (conn, params)->textDocument_documentSymbol_request(params, server, conn)
-    msg_dispatcher[julia_getModuleAt_request_type] = (conn, params)->julia_getModuleAt_request(params, server, conn)
-    msg_dispatcher[julia_getDocAt_request_type] = (conn, params)->julia_getDocAt_request(params, server, conn)
-    msg_dispatcher[textDocument_hover_request_type] = (conn, params)->textDocument_hover_request(params, server, conn)
-    msg_dispatcher[initialize_request_type] = (conn, params)->initialize_request(params, server, conn)
-    msg_dispatcher[initialized_notification_type] = (conn, params)->initialized_notification(params, server, conn)
-    msg_dispatcher[shutdown_request_type] = (conn, params)->shutdown_request(params, server, conn)
-    msg_dispatcher[exit_notification_type] = (conn, params)->exit_notification(params, server, conn)
-    msg_dispatcher[cancel_notification_type] = (conn, params)->cancel_notification(params, server, conn)
-    msg_dispatcher[setTraceNotification_notification_type] = (conn, params)->setTraceNotification_notification(params, server, conn)
-    msg_dispatcher[julia_getCurrentBlockRange_request_type] = (conn, params)->julia_getCurrentBlockRange_request(params, server, conn)
-    msg_dispatcher[julia_activateenvironment_notification_type] = (conn, params)->julia_activateenvironment_notification(params, server, conn)
-    msg_dispatcher[textDocument_didOpen_notification_type] = (conn, params)->textDocument_didOpen_notification(params, server, conn)
-    msg_dispatcher[textDocument_didClose_notification_type] = (conn, params)->textDocument_didClose_notification(params, server, conn)
-    msg_dispatcher[textDocument_didSave_notification_type] = (conn, params)->textDocument_didSave_notification(params, server, conn)
-    msg_dispatcher[textDocument_willSave_notification_type] = (conn, params)->textDocument_willSave_notification(params, server, conn)
-    msg_dispatcher[textDocument_willSaveWaitUntil_request_type] = (conn, params)->textDocument_willSaveWaitUntil_request(params, server, conn)
-    msg_dispatcher[textDocument_didChange_notification_type] = (conn, params)->textDocument_didChange_notification(params, server, conn)
-    msg_dispatcher[workspace_didChangeWatchedFiles_notification_type] = (conn, params)->workspace_didChangeWatchedFiles_notification(params, server, conn)
-    msg_dispatcher[workspace_didChangeConfiguration_notification_type] = (conn, params)->workspace_didChangeConfiguration_notification(params, server, conn)
-    msg_dispatcher[workspace_didChangeWorkspaceFolders_notification_type] = (conn, params)->workspace_didChangeWorkspaceFolders_notification(params, server, conn)
-    msg_dispatcher[workspace_symbol_request_type] = (conn, params)->workspace_symbol_request(params, server, conn)
+    msg_dispatcher[textDocument_codeAction_request_type] = (conn, params) -> textDocument_codeAction_request(params, server, conn)
+    msg_dispatcher[workspace_executeCommand_request_type] = (conn, params) -> workspace_executeCommand_request(params, server, conn)
+    msg_dispatcher[textDocument_completion_request_type] = (conn, params) -> textDocument_completion_request(params, server, conn)
+    msg_dispatcher[textDocument_signatureHelp_request_type] = (conn, params) -> textDocument_signatureHelp_request(params, server, conn)
+    msg_dispatcher[textDocument_definition_request_type] = (conn, params) -> textDocument_definition_request(params, server, conn)
+    msg_dispatcher[textDocument_formatting_request_type] = (conn, params) -> textDocument_formatting_request(params, server, conn)
+    msg_dispatcher[textDocument_references_request_type] = (conn, params) -> textDocument_references_request(params, server, conn)
+    msg_dispatcher[textDocument_rename_request_type] = (conn, params) -> textDocument_rename_request(params, server, conn)
+    msg_dispatcher[textDocument_documentSymbol_request_type] = (conn, params) -> textDocument_documentSymbol_request(params, server, conn)
+    msg_dispatcher[julia_getModuleAt_request_type] = (conn, params) -> julia_getModuleAt_request(params, server, conn)
+    msg_dispatcher[julia_getDocAt_request_type] = (conn, params) -> julia_getDocAt_request(params, server, conn)
+    msg_dispatcher[textDocument_hover_request_type] = (conn, params) -> textDocument_hover_request(params, server, conn)
+    msg_dispatcher[initialize_request_type] = (conn, params) -> initialize_request(params, server, conn)
+    msg_dispatcher[initialized_notification_type] = (conn, params) -> initialized_notification(params, server, conn)
+    msg_dispatcher[shutdown_request_type] = (conn, params) -> shutdown_request(params, server, conn)
+    msg_dispatcher[exit_notification_type] = (conn, params) -> exit_notification(params, server, conn)
+    msg_dispatcher[cancel_notification_type] = (conn, params) -> cancel_notification(params, server, conn)
+    msg_dispatcher[setTraceNotification_notification_type] = (conn, params) -> setTraceNotification_notification(params, server, conn)
+    msg_dispatcher[julia_getCurrentBlockRange_request_type] = (conn, params) -> julia_getCurrentBlockRange_request(params, server, conn)
+    msg_dispatcher[julia_activateenvironment_notification_type] = (conn, params) -> julia_activateenvironment_notification(params, server, conn)
+    msg_dispatcher[textDocument_didOpen_notification_type] = (conn, params) -> textDocument_didOpen_notification(params, server, conn)
+    msg_dispatcher[textDocument_didClose_notification_type] = (conn, params) -> textDocument_didClose_notification(params, server, conn)
+    msg_dispatcher[textDocument_didSave_notification_type] = (conn, params) -> textDocument_didSave_notification(params, server, conn)
+    msg_dispatcher[textDocument_willSave_notification_type] = (conn, params) -> textDocument_willSave_notification(params, server, conn)
+    msg_dispatcher[textDocument_willSaveWaitUntil_request_type] = (conn, params) -> textDocument_willSaveWaitUntil_request(params, server, conn)
+    msg_dispatcher[textDocument_didChange_notification_type] = (conn, params) -> textDocument_didChange_notification(params, server, conn)
+    msg_dispatcher[workspace_didChangeWatchedFiles_notification_type] = (conn, params) -> workspace_didChangeWatchedFiles_notification(params, server, conn)
+    msg_dispatcher[workspace_didChangeConfiguration_notification_type] = (conn, params) -> workspace_didChangeConfiguration_notification(params, server, conn)
+    msg_dispatcher[workspace_didChangeWorkspaceFolders_notification_type] = (conn, params) -> workspace_didChangeWorkspaceFolders_notification(params, server, conn)
+    msg_dispatcher[workspace_symbol_request_type] = (conn, params) -> workspace_symbol_request(params, server, conn)
 
     while true
         message = take!(server.combined_msg_queue)

src/protocol/document.jl

@@ -11,7 +11,7 @@ struct CreateFile <: Outbound
     kind::String
     uri::DocumentUri
     options::Union{CreateFileOptions,Missing}
-    CreateFile(uri, options = missing) = new("create", uri, options)
+    CreateFile(uri, options=missing) = new("create", uri, options)
 end
 
 struct RenameFileOptions <: Outbound
@@ -24,7 +24,7 @@ struct RenameFile <: Outbound
     oldUri::DocumentUri
     newUri::DocumentUri
     options::Union{RenameFileOptions,Missing}
-    RenameFile(uri, options = missing) = new("rename", uri, options)
+    RenameFile(uri, options=missing) = new("rename", uri, options)
 end
 
 struct DeleteFileOptions <: Outbound
@@ -36,7 +36,7 @@ struct DeleteFile <: Outbound
     kind::String
     uri::DocumentUri
     options::Union{DeleteFileOptions,Missing}
-    DeleteFile(uri, options = missing) = new("delete", uri, options)
+    DeleteFile(uri, options=missing) = new("delete", uri, options)
 end
 
 

src/requests/actions.jl

@@ -246,7 +246,7 @@ function reexport_module(x::EXPR, server, conn)
     file, offset = 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)))
+    names = filter!(s -> !isempty(s), collect(CSTParser.str_value.(exported_names)))
     tde = TextDocumentEdit(VersionedTextDocumentIdentifier(file._uri, file._version), TextEdit[
         TextEdit(Range(file, insertpos .+ (0:0)), string("export ", join(sort(names), ", "), "\n"))
     ])

src/requests/completions.jl

@@ -116,7 +116,7 @@ const snippet_completions = Dict{String,String}(
     "while" => "while \$1\n\t\$0\nend"
     )
 
-function collect_completions(m::SymbolServer.ModuleStore, spartial, rng, CIs, server, inclexported = false, dotcomps = false)
+function collect_completions(m::SymbolServer.ModuleStore, spartial, rng, CIs, server, inclexported=false, dotcomps=false)
     for val in m.vals
         n, v = String(val[1]), val[2]
         (startswith(n, ".") || startswith(n, "#")) && continue
@@ -134,7 +134,7 @@ function collect_completions(m::SymbolServer.ModuleStore, spartial, rng, CIs, se
     end
 end
 
-function collect_completions(x::EXPR, spartial, rng, CIs, server, inclexported = false, dotcomps = false)
+function collect_completions(x::EXPR, spartial, rng, CIs, server, inclexported=false, dotcomps=false)
     if scopeof(x) !== nothing
         collect_completions(scopeof(x), spartial, rng, CIs, server, inclexported, dotcomps)
         if scopeof(x).modules isa Dict
@@ -150,7 +150,7 @@ function collect_completions(x::EXPR, spartial, rng, CIs, server, inclexported =
     end
 end
 
-function collect_completions(x::StaticLint.Scope, spartial, rng, CIs, server, inclexported = false, dotcomps = false)
+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)

src/requests/features.jl

@@ -1,6 +1,6 @@
-function get_signatures(b, tls, sigs, server, visited = nothing) end # Fallback
+function get_signatures(b, tls, sigs, server, visited=nothing) end # Fallback
 
-function get_signatures(b::StaticLint.Binding, tls::StaticLint.Scope, sigs::Vector{SignatureInformation}, server, visited = StaticLint.Binding[])
+function get_signatures(b::StaticLint.Binding, tls::StaticLint.Scope, sigs::Vector{SignatureInformation}, server, visited=StaticLint.Binding[])
     if b in visited                                      # TODO: remove
         throw(LSInfiniteLoop("Possible infinite loop.")) # TODO: remove
     else                                                 # TODO: remove
@@ -12,7 +12,7 @@ function get_signatures(b::StaticLint.Binding, tls::StaticLint.Scope, sigs::Vect
     elseif b.val isa EXPR && CSTParser.defines_struct(b.val)
         args = CSTParser.defines_mutable(b.val) ? b.val[4] : b.val[3]
         if length(args) > 0
-            inner_constructor_i = findfirst(a->CSTParser.defines_function(a), args.args)
+            inner_constructor_i = findfirst(a -> CSTParser.defines_function(a), args.args)
             if inner_constructor_i !== nothing
                 get_siginfo_from_call(args[inner_constructor_i], sigs)
             else
@@ -34,9 +34,9 @@ function get_signatures(b::StaticLint.Binding, tls::StaticLint.Scope, sigs::Vect
     get_signatures(b.prev, tls, sigs, server, visited)
 end
 
-function get_signatures(b::T, tls::StaticLint.Scope, sigs::Vector{SignatureInformation}, server, visited = nothing) where T <: Union{SymbolServer.FunctionStore,SymbolServer.DataTypeStore}
+function get_signatures(b::T, tls::StaticLint.Scope, sigs::Vector{SignatureInformation}, server, visited=nothing) where T <: Union{SymbolServer.FunctionStore,SymbolServer.DataTypeStore}
     StaticLint.iterate_over_ss_methods(b, tls, server, function (m)
-        push!(sigs, SignatureInformation(string(m), "", (a->ParameterInformation(string(a[1]), string(a[2]))).(m.sig)))
+        push!(sigs, SignatureInformation(string(m), "", (a -> ParameterInformation(string(a[1]), string(a[2]))).(m.sig)))
         return false
     end)
 end
@@ -88,12 +88,12 @@ function textDocument_signatureHelp_request(params::TextDocumentPositionParams,
     else
         arg = sum(CSTParser.is_comma(a) for a in parentof(x).args)
     end
-    return SignatureHelp(filter(s->length(s.parameters) > arg, sigs), 0, arg)
+    return SignatureHelp(filter(s -> length(s.parameters) > arg, sigs), 0, arg)
 end
 
 # TODO: should be in StaticLint. visited check is costly.
 resolve_shadow_binding(b) = b
-function resolve_shadow_binding(b::StaticLint.Binding, visited = StaticLint.Binding[])
+function resolve_shadow_binding(b::StaticLint.Binding, visited=StaticLint.Binding[])
     if b in visited
         throw(LSInfiniteLoop("Inifinite loop in bindings."))
     else
@@ -106,9 +106,9 @@ function resolve_shadow_binding(b::StaticLint.Binding, visited = StaticLint.Bind
     end
 end
 
-function get_definitions(x, tls, server, locations, visited = nothing) end # Fallback
+function get_definitions(x, tls, server, locations, visited=nothing) end # Fallback
 
-function get_definitions(x::T, tls, server, locations, visited = nothing) where T <: Union{SymbolServer.FunctionStore,SymbolServer.DataTypeStore}
+function get_definitions(x::T, tls, server, locations, visited=nothing) where T <: Union{SymbolServer.FunctionStore,SymbolServer.DataTypeStore}
     StaticLint.iterate_over_ss_methods(x, tls, server, function (m)
         try
             if isfile(m.file)
@@ -121,7 +121,7 @@ function get_definitions(x::T, tls, server, locations, visited = nothing) where
     end)
 end
 
-function get_definitions(b::StaticLint.Binding, tls, server, locations, visited = StaticLint.Binding[])
+function get_definitions(b::StaticLint.Binding, tls, server, locations, visited=StaticLint.Binding[])
     if b in visited                                      # TODO: remove
         throw(LSInfiniteLoop("Possible infinite loop.")) # TODO: remove
     else                                                 # TODO: remove
@@ -173,7 +173,7 @@ function textDocument_definition_request(params::TextDocumentPositionParams, ser
     return locations
 end
 
-function get_file_loc(x::EXPR, offset = 0, c = nothing)
+function get_file_loc(x::EXPR, offset=0, c=nothing)
     if c !== nothing
         for a in x.args
             a == c && break
@@ -216,7 +216,7 @@ function find_references(textDocument::TextDocumentIdentifier, position::Positio
 end
 
 # If
-function find_references(b::StaticLint.Binding, refs = EXPR[], from_end = false)
+function find_references(b::StaticLint.Binding, refs=EXPR[], from_end=false)
     if !from_end && (b.type === StaticLint.CoreTypes.Function || b.type === StaticLint.CoreTypes.DataType)
         b = StaticLint.last_method(b)
     end
@@ -284,7 +284,7 @@ function textDocument_documentSymbol_request(params::DocumentSymbolParams, serve
     return syms
 end
 
-function collect_bindings_w_loc(x::EXPR, pos = 0, bindings = Tuple{UnitRange{Int},StaticLint.Binding}[])
+function collect_bindings_w_loc(x::EXPR, pos=0, bindings=Tuple{UnitRange{Int},StaticLint.Binding}[])
     if bindingof(x) !== nothing
         push!(bindings, (pos .+ (0:x.span), bindingof(x)))
     end
@@ -297,7 +297,7 @@ function collect_bindings_w_loc(x::EXPR, pos = 0, bindings = Tuple{UnitRange{Int
     return bindings
 end
 
-function collect_toplevel_bindings_w_loc(x::EXPR, pos = 0, bindings = Tuple{UnitRange{Int},StaticLint.Binding}[]; query = "")
+function collect_toplevel_bindings_w_loc(x::EXPR, pos=0, bindings=Tuple{UnitRange{Int},StaticLint.Binding}[]; query="")
     if bindingof(x) isa StaticLint.Binding && valof(bindingof(x).name) isa String && bindingof(x).val isa EXPR && startswith(valof(bindingof(x).name), query)
         push!(bindings, (pos .+ (0:x.span), bindingof(x)))
     end
@@ -306,7 +306,7 @@ function collect_toplevel_bindings_w_loc(x::EXPR, pos = 0, bindings = Tuple{Unit
     end
     if x.args !== nothing
         for a in x.args
-            collect_toplevel_bindings_w_loc(a, pos, bindings, query = query)
+            collect_toplevel_bindings_w_loc(a, pos, bindings, query=query)
             pos += a.fullspan
         end
     end
@@ -366,7 +366,7 @@ function julia_getModuleAt_request(params::VersionedTextDocumentPositionParams,
     return "Main"
 end
 
-function get_module_of(s::StaticLint.Scope, ms = [])
+function get_module_of(s::StaticLint.Scope, ms=[])
     if CSTParser.defines_module(s.expr) && CSTParser.isidentifier(s.expr[2])
         pushfirst!(ms, StaticLint.valofid(s.expr[2]))
     end