From e21d1b1acb214cfcae2e17fda9b40e9f07e1737c Mon Sep 17 00:00:00 2001
From: Keith Simmons <keith@zed.dev>
Date: Thu, 9 Jun 2022 17:07:32 -0700
Subject: [PATCH] Merge fix

---
 crates/editor/src/test.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/editor/src/test.rs b/crates/editor/src/test.rs
index f24e3db174..41eadd6130 100644
--- a/crates/editor/src/test.rs
+++ b/crates/editor/src/test.rs
@@ -467,7 +467,7 @@ impl<'a> EditorLspTestContext<'a> {
     // Constructs lsp range using a marked string with '[', ']' range delimiters
     pub fn lsp_range(&mut self, marked_text: &str) -> lsp::Range {
         let (unmarked, mut ranges) = marked_text_ranges_by(marked_text, vec![('[', ']').into()]);
-        assert_eq!(unmarked, self.cx.editor_text());
+        assert_eq!(unmarked, self.cx.buffer_text());
         let snapshot = self.update_editor(|editor, cx| editor.snapshot(cx));
 
         let offset_range = ranges.remove(&('[', ']').into()).unwrap()[0].clone();