Output expected/actual string diffs for tooltip test failures

Author: alexheretic

Cargo.lock

@@ -49,6 +49,9 @@ toml = "0.4"
 # for more information.
 rustc-workspace-hack = "1.0.0"
 
+[dev-dependencies]
+difference = "2"
+
 [build-dependencies]
 rustc_tools_util = { git = "https://github.com/rust-lang/rust-clippy", rev = "a3c77f6ad1c1c185e561e9cd7fdec7db569169d1" }
 

Cargo.toml

@@ -991,6 +991,7 @@ pub mod test {
     use std::path::PathBuf;
     use std::process;
     use std::sync::{Arc, Mutex};
+    use std::fmt;
 
     #[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone)]
     pub struct Test {
@@ -1106,7 +1107,7 @@ pub mod test {
         }
     }
 
-    #[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]
+    #[derive(PartialEq, Eq)]
     pub struct TestFailure {
         /// The test case, indicating file, line, and column
         pub test: Test,
@@ -1123,6 +1124,21 @@ pub mod test {
         pub actual_data: Result<Result<Vec<MarkedString>, String>, ()>,
     }
 
+    impl fmt::Debug for TestFailure {
+        fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+            fmt.debug_struct("TestFailure")
+                .field("test", &self.test)
+                .field("expect_file", &self.expect_file)
+                .field("actual_file", &self.actual_file)
+                .finish()?;
+
+            let expected = format!("{:#?}", self.expect_data);
+            let actual = format!("{:#?}", self.actual_data);
+            write!(fmt, "-diff: {}", difference::Changeset::new(&expected, &actual, ""))
+        }
+    }
+
+
     #[derive(Clone, Default)]
     pub struct LineOutput {
         req_id: Arc<Mutex<u64>>,
@@ -2117,7 +2133,7 @@ pub mod test {
             Ok(())
         } else {
             eprintln!("{}\n\n", out.reset().join("\n"));
-            eprintln!("{:#?}\n\n", failures);
+            eprintln!("Failures (\x1b[91mexpected\x1b[92mactual\x1b[0m): {:#?}\n\n", failures);
             Err(format!("{} of {} tooltip tests failed", failures.len(), tests.len()).into())
         }
     }
@@ -2172,7 +2188,7 @@ pub mod test {
             Ok(())
         } else {
             eprintln!("{}\n\n", out.reset().join("\n"));
-            eprintln!("{:#?}\n\n", failures);
+            eprintln!("Failures (\x1b[91mexpected\x1b[92mactual\x1b[0m): {:#?}\n\n", failures);
             Err(format!("{} of {} tooltip tests failed", failures.len(), tests.len()).into())
         }
     }

src/actions/hover.rs

@@ -15,7 +15,6 @@ use crate::Span;
 use log::{debug, trace, warn};
 use rls_vfs::{Change, VfsSpan};
 use serde::Deserialize;
-use serde_json;
 use std::sync::atomic::Ordering;
 
 use crate::build::*;