-
Notifications
You must be signed in to change notification settings - Fork 81
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1338 from julia-vscode/add-diag-testitem-marking-…
…logic Move all marking logic for testitems and diag here
- Loading branch information
Showing
7 changed files
with
165 additions
and
121 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,147 @@ | ||
| function mark_current_diagnostics_testitems(jw::JuliaWorkspace) | ||
| ti_results = Dict{URI,UInt}(k => hash(v) for (k,v) in JuliaWorkspaces.get_test_items(jw)) | ||
|
|
||
| diag_results = Dict{URI,UInt}(k => hash(v) for (k,v) in JuliaWorkspaces.get_diagnostics(jw)) | ||
|
|
||
| return (testitems=ti_results, diagnostics=diag_results) | ||
| end | ||
|
|
||
| function get_files_with_updated_diagnostics_testitems(jw::JuliaWorkspace, old_marked_versions::@NamedTuple{testitems::Dict{URI,UInt},diagnostics::Dict{URI,UInt}}) | ||
| # Testitems | ||
| new_marked_versions_ti = Dict{URI,UInt}(k => hash(v) for (k,v) in JuliaWorkspaces.get_test_items(jw)) | ||
|
|
||
| old_text_files_ti = Set{URI}(keys(old_marked_versions.testitems)) | ||
| new_text_files_ti = Set{URI}(keys(new_marked_versions_ti)) | ||
|
|
||
| deleted_files_ti = setdiff(old_text_files_ti, new_text_files_ti) | ||
| updated_files_ti = Set{URI}() | ||
|
|
||
| for (uri,hash_value) in new_marked_versions_ti | ||
| if !(uri in old_text_files_ti) | ||
| push!(updated_files_ti, uri) | ||
| else | ||
| if hash_value != old_marked_versions.testitems[uri] | ||
| push!(updated_files_ti, uri) | ||
| end | ||
| end | ||
| end | ||
|
|
||
| # Diagnostics | ||
| new_marked_versions_diag = Dict{URI,UInt}(k => hash(v) for (k,v) in JuliaWorkspaces.get_diagnostics(jw)) | ||
|
|
||
| old_text_files_diag = Set{URI}(keys(old_marked_versions.diagnostics)) | ||
| new_text_files_diag = Set{URI}(keys(new_marked_versions_diag)) | ||
|
|
||
| deleted_files_diag = setdiff(old_text_files_diag, new_text_files_diag) | ||
| updated_files_diag = Set{URI}() | ||
|
|
||
| for (uri,hash_value) in new_marked_versions_diag | ||
| if !(uri in old_text_files_diag) | ||
| push!(updated_files_diag, uri) | ||
| else | ||
| if hash_value != old_marked_versions.diagnostics[uri] | ||
| push!(updated_files_diag, uri) | ||
| end | ||
| end | ||
| end | ||
|
|
||
| return (;updated_files_ti, deleted_files_ti, updated_files_diag, deleted_files_diag) | ||
| end | ||
|
|
||
| function publish_diagnostics(server, jw_diagnostics_updated, jw_diagnostics_deleted, uris::Vector{URI}) | ||
| all_uris_with_updates = Set{URI}() | ||
|
|
||
| for uri in uris | ||
| push!(all_uris_with_updates, uri) | ||
| end | ||
|
|
||
| for uri in jw_diagnostics_updated | ||
| push!(all_uris_with_updates, uri) | ||
| end | ||
|
|
||
| diagnostics = Dict{URI,Vector{Diagnostic}}() | ||
|
|
||
| for uri in all_uris_with_updates | ||
| diags = Diagnostic[] | ||
| diagnostics[uri] = diags | ||
|
|
||
| if hasdocument(server, uri) | ||
| doc = getdocument(server, uri) | ||
|
|
||
| if server.runlinter && (is_workspace_file(doc) || isunsavedfile(doc)) | ||
| pkgpath = getpath(doc) | ||
| if any(is_in_target_dir_of_package.(Ref(pkgpath), server.lint_disableddirs)) | ||
| filter!(!is_diag_dependent_on_env, doc.diagnostics) | ||
| end | ||
| append!(diags, doc.diagnostics) | ||
| end | ||
| end | ||
|
|
||
| if JuliaWorkspaces.has_file(server.workspace, uri) | ||
| st = JuliaWorkspaces.get_text_file(server.workspace, uri).content | ||
|
|
||
| new_diags = JuliaWorkspaces.get_diagnostic(server.workspace, uri) | ||
|
|
||
| append!(diags, Diagnostic( | ||
| Range(st, i.range), | ||
| if i.severity==:error | ||
| DiagnosticSeverities.Error | ||
| elseif i.severity==:warning | ||
| DiagnosticSeverities.Warning | ||
| elseif i.severity==:info | ||
| DiagnosticSeverities.Information | ||
| else | ||
| error("Unknown severity $(i.severity)") | ||
| end, | ||
| missing, | ||
| missing, | ||
| i.source, | ||
| i.message, | ||
| missing, | ||
| missing | ||
| ) for i in new_diags) | ||
| end | ||
| end | ||
|
|
||
| for (uri,diags) in diagnostics | ||
| version = get(server._open_file_versions, uri, missing) | ||
| params = PublishDiagnosticsParams(uri, version, diags) | ||
| JSONRPC.send(server.jr_endpoint, textDocument_publishDiagnostics_notification_type, params) | ||
| end | ||
| end | ||
|
|
||
| function publish_tests(server::LanguageServerInstance, updated_files, deleted_files) | ||
| if !ismissing(server.initialization_options) && get(server.initialization_options, "julialangTestItemIdentification", false) | ||
| for uri in updated_files | ||
| testitems_results = JuliaWorkspaces.get_test_items(server.workspace, uri) | ||
| st = JuliaWorkspaces.get_text_file(server.workspace, uri).content | ||
|
|
||
| testitems = TestItemDetail[TestItemDetail(i.id, i.name, Range(st, i.range), i.code, Range(st, i.code_range), i.option_default_imports, string.(i.option_tags), string.(i.option_setup)) for i in testitems_results.testitems] | ||
| testsetups= TestSetupDetail[TestSetupDetail(string(i.name), string(i.kind), Range(st, i.range), i.code, Range(st, i.code_range), ) for i in testitems_results.testsetups] | ||
| testerrors = TestErrorDetail[TestErrorDetail(te.id, te.name, Range(st, te.range), te.message) for te in testitems_results.testerrors] | ||
|
|
||
| version = get(server._open_file_versions, uri, missing) | ||
|
|
||
| params = PublishTestsParams( | ||
| uri, | ||
| version, | ||
| testitems, | ||
| testsetups, | ||
| testerrors | ||
| ) | ||
| JSONRPC.send(server.jr_endpoint, textDocument_publishTests_notification_type, params) | ||
| end | ||
|
|
||
| for uri in deleted_files | ||
| JSONRPC.send(server.jr_endpoint, textDocument_publishTests_notification_type, PublishTestsParams(uri, missing, TestItemDetail[], TestSetupDetail[], TestErrorDetail[])) | ||
| end | ||
| end | ||
| end | ||
|
|
||
|
|
||
| function publish_diagnostics_testitems(server, marked_versions, uris::Vector{URI}) | ||
| updated_files = get_files_with_updated_diagnostics_testitems(server.workspace, marked_versions) | ||
|
|
||
| publish_diagnostics(server, updated_files.updated_files_diag, updated_files.deleted_files_diag, uris) | ||
| publish_tests(server, updated_files.updated_files_ti, updated_files.deleted_files_ti) | ||
| end |