2 files changed, 17 insertions, 3 deletions

diff --git a/crates/profile/src/stop_watch.rs b/crates/profile/src/stop_watch.rs
index 5e276190e..cb6915d45 100644
--- a/crates/profile/src/stop_watch.rs
+++ b/crates/profile/src/stop_watch.rs
@@ -76,7 +76,11 @@ impl fmt::Display for StopWatchSpan {
                 instructions /= 1000;
                 prefix = "m"
             }
-            write!(f, ", {}{}i", instructions, prefix)?;
+            if instructions > 10000 {
+                instructions /= 1000;
+                prefix = "g"
+            }
+            write!(f, ", {}{}instr", instructions, prefix)?;
         }
         if let Some(memory) = self.memory {
             write!(f, ", {}", memory)?;
diff --git a/crates/rust-analyzer/tests/rust-analyzer/main.rs b/crates/rust-analyzer/tests/rust-analyzer/main.rs
index 38d09f3ee..f5c5c63e5 100644
--- a/crates/rust-analyzer/tests/rust-analyzer/main.rs
+++ b/crates/rust-analyzer/tests/rust-analyzer/main.rs
@@ -732,6 +732,16 @@ pub fn foo(_input: TokenStream) -> TokenStream {
         ),
         work_done_progress_params: Default::default(),
     });
-    let value = res.get("contents").unwrap().get("value").unwrap().to_string();
-    expect![[r#""\n```rust\nfoo::Bar\n```\n\n```rust\nfn bar()\n```""#]].assert_eq(&value);
+    let value = res.get("contents").unwrap().get("value").unwrap().as_str().unwrap();
+
+    expect![[r#"
+
+        ```rust
+        foo::Bar
+        ```
+
+        ```rust
+        fn bar()
+        ```"#]]
+    .assert_eq(&value);
 }