1 files changed, 14 insertions, 2 deletions
diff --git a/cli/lsp/sources.rs b/cli/lsp/sources.rs
index fac1120fb..c2ef27010 100644
--- a/cli/lsp/sources.rs
+++ b/cli/lsp/sources.rs
@@ -98,6 +98,14 @@ impl Sources {
     Some(metadata.line_index)
   }
 
+  pub fn get_maybe_types(
+    &mut self,
+    specifier: &ModuleSpecifier,
+  ) -> Option<analysis::ResolvedDependency> {
+    let metadata = self.get_metadata(specifier)?;
+    metadata.maybe_types
+  }
+
   pub fn get_media_type(
     &mut self,
     specifier: &ModuleSpecifier,
@@ -115,6 +123,8 @@ impl Sources {
         }
       }
     }
+    // TODO(@kitsonk) this needs to be refactored, lots of duplicate logic and
+    // is really difficult to follow.
     let version = self.get_script_version(specifier)?;
     let path = self.get_path(specifier)?;
     if let Ok(bytes) = fs::read(path) {
@@ -123,12 +133,13 @@ impl Sources {
         if let Ok(source) = get_source_from_bytes(bytes, Some(charset)) {
           let media_type = MediaType::from(specifier);
           let mut maybe_types = None;
+          let maybe_import_map = self.maybe_import_map.clone();
           let dependencies = if let Some((dependencies, mt)) =
             analysis::analyze_dependencies(
               &specifier,
               &source,
               &media_type,
-              &None,
+              &maybe_import_map,
             ) {
             maybe_types = mt;
             Some(dependencies)
@@ -165,12 +176,13 @@ impl Sources {
             } else {
               None
             };
+          let maybe_import_map = self.maybe_import_map.clone();
           let dependencies = if let Some((dependencies, mt)) =
             analysis::analyze_dependencies(
               &specifier,
               &source,
               &media_type,
-              &None,
+              &maybe_import_map,
             ) {
             if maybe_types.is_none() {
               maybe_types = mt;