1 files changed, 7 insertions, 8 deletions

diff --git a/cli/lsp/diagnostics.rs b/cli/lsp/diagnostics.rs
index e518f4c6e..ac1f522d7 100644
--- a/cli/lsp/diagnostics.rs
+++ b/cli/lsp/diagnostics.rs
@@ -811,7 +811,7 @@ fn generate_lint_diagnostics(
     let (lint_options, lint_rules) = config
       .tree
       .scope_for_specifier(document.specifier())
-      .and_then(|s| config_data_by_scope.get(&s))
+      .and_then(|s| config_data_by_scope.get(s))
       .map(|d| (d.lint_options.clone(), d.lint_rules.clone()))
       .unwrap_or_default();
     diagnostics_vec.push(DiagnosticRecord {
@@ -1452,8 +1452,8 @@ fn diagnose_dependency(
     }
   }
 
-  let import_map = snapshot.config.tree.import_map_for_specifier(referrer);
-  if let Some(import_map) = &import_map {
+  let import_map = snapshot.config.tree.root_import_map();
+  if let Some(import_map) = import_map {
     if let Resolution::Ok(resolved) = &dependency.maybe_code {
       if let Some(to) = import_map.lookup(&resolved.specifier, referrer) {
         if dependency_key != to {
@@ -1502,7 +1502,7 @@ fn diagnose_dependency(
       },
       dependency.is_dynamic,
       dependency.maybe_attribute_type.as_deref(),
-      import_map.as_deref(),
+      import_map.map(|i| i.as_ref()),
     )
     .iter()
     .flat_map(|diag| {
@@ -1525,7 +1525,7 @@ fn diagnose_dependency(
         &dependency.maybe_type,
         dependency.is_dynamic,
         dependency.maybe_attribute_type.as_deref(),
-        import_map.as_deref(),
+        import_map.map(|i| i.as_ref()),
       )
       .iter()
       .map(|diag| diag.to_lsp_diagnostic(&range)),
@@ -1614,7 +1614,7 @@ mod tests {
         (*source).into(),
       );
     }
-    let config = Config::new_with_roots([resolve_url("file:///").unwrap()]);
+    let mut config = Config::new_with_roots([resolve_url("file:///").unwrap()]);
     if let Some((base_url, json_string)) = maybe_import_map {
       let base_url = resolve_url(base_url).unwrap();
       let config_file = ConfigFile::new(
@@ -1689,8 +1689,7 @@ let c: number = "a";
     let snapshot = Arc::new(snapshot);
     let cache =
       Arc::new(GlobalHttpCache::new(cache_location, RealDenoCacheEnv));
-    let ts_server =
-      TsServer::new(Default::default(), cache, Default::default());
+    let ts_server = TsServer::new(Default::default(), cache);
     ts_server.start(None);
 
     // test enabled