Skip to content

Simplify configuration code #691

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davidanthoff merged 2 commits into from
May 10, 2020
Merged

Simplify configuration code #691

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0b010b
Cleanup option-handling code
non-Jedi May 10, 2020
15c3505
Refactor repeated linting steps into helper function
non-Jedi May 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Cleanup option-handling code
  • Loading branch information
@non-Jedi
non-Jedi committed May 10, 2020
commit a0b010ba4cbca7221ce7676e3e34b2e997af77f8
17 changes: 8 additions & 9 deletions src/requests/workspace.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,19 +100,18 @@ function request_julia_config(server::LanguageServerInstance)
ConfigurationItem(missing, "julia.lint.missingrefs")
]))

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

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

if rerun_lint
for doc in getdocuments_value(server)
# TODO: wrap next 4 lines in function since it's repeated throughout project
StaticLint.check_all(getcst(doc), server.lint_options, server)
empty!(doc.diagnostics)
mark_errors(doc, doc.diagnostics)
Expand Down Expand Up @@ -147,4 +146,4 @@ function process(r::JSONRPC.Request{Val{Symbol("workspace/symbol")},WorkspaceSym
end

return syms
end
end