foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-21 15:04:11 -05:00
Code Issues Packages 1 Wiki Activity

refactor: simplify signature of diagnose_resolution (#19753)

Browse source 
This commit makes the data flow in the
`diagnose_dependency` function more obvious.
This commit is contained in:
Martin Fischer 2023-07-25 23:29:29 +02:00 committed by GitHub
parent 88885d9c2b
commit 5d8d1105a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
cli/lsp/diagnostics.rs
View file

@ -1082,13 +1082,11 @@ impl DenoDiagnostic {
}
fn diagnose_resolution(
lsp_diagnostics: &mut Vec<lsp::Diagnostic>,
snapshot: &language_server::StateSnapshot,
resolution: &Resolution,
is_dynamic: bool,
maybe_assert_type: Option<&str>,
ranges: Vec<lsp::Range>,
) {
) -> Vec<DenoDiagnostic> {
let mut diagnostics = vec![];
match resolution {
Resolution::Ok(resolved) => {
@ -1172,11 +1170,7 @@ fn diagnose_resolution(
}
_ => (),
}
for range in ranges {
for diagnostic in &diagnostics {
lsp_diagnostics.push(diagnostic.to_lsp_diagnostic(&range));
}
}
diagnostics
}
/// Generate diagnostics related to a dependency. The dependency is analyzed to
@ -1210,21 +1204,30 @@ fn diagnose_dependency(
}
}
}
diagnose_resolution(
diagnostics,
snapshot,
if dependency.maybe_code.is_none() {
&dependency.maybe_type
} else {
&dependency.maybe_code
},
dependency.is_dynamic,
dependency.maybe_assert_type.as_deref(),
dependency
.imports
.iter()
.map(|i| documents::to_lsp_range(&i.range))
.collect(),
let import_ranges: Vec<_> = dependency
.imports
.iter()
.map(|i| documents::to_lsp_range(&i.range))
.collect();
diagnostics.extend(
diagnose_resolution(
snapshot,
if dependency.maybe_code.is_none() {
&dependency.maybe_type
} else {
&dependency.maybe_code
},
dependency.is_dynamic,
dependency.maybe_assert_type.as_deref(),
)
.iter()
.flat_map(|diag| {
import_ranges
.iter()
.map(|range| diag.to_lsp_diagnostic(range))
}),
);
// TODO(nayeemrmn): This is a crude way of detecting `@deno-types` which has
// a different specifier and therefore needs a separate call to
@ -1241,13 +1244,15 @@ fn diagnose_dependency(
Resolution::Err(error) => documents::to_lsp_range(error.range()),
Resolution::None => unreachable!(),
};
diagnose_resolution(
diagnostics,
snapshot,
&dependency.maybe_type,
dependency.is_dynamic,
dependency.maybe_assert_type.as_deref(),
vec![range],
diagnostics.extend(
diagnose_resolution(
snapshot,
&dependency.maybe_type,
dependency.is_dynamic,
dependency.maybe_assert_type.as_deref(),
)
.iter()
.map(|diag| diag.to_lsp_diagnostic(&range)),
);
}
}