huskies: merge 978

crates/source-map-gen/src/ts_adapter.rs

@@ -9,7 +9,7 @@
 use std::fs;
 use std::path::Path;
 
-use crate::{CheckFailure, CheckResult, LanguageAdapter};
+use crate::{CheckFailure, CheckResult, LanguageAdapter, relative_key};
 
 /// TypeScript documentation coverage adapter.
 pub struct TypeScriptAdapter;
@@ -80,10 +80,11 @@ impl LanguageAdapter for TypeScriptAdapter {
         &self,
         passing_files: &[&Path],
         source_map_path: &Path,
+        root: Option<&Path>,
     ) -> Result<(), String> {
         let mut map = crate::read_map(source_map_path)?;
         for &file in passing_files {
-            let key = file.to_string_lossy().to_string();
+            let key = relative_key(file, root);
             let items: Vec<serde_json::Value> = Self::extract_items(file)
                 .into_iter()
                 .map(serde_json::Value::String)