Ensure language is set on diffs from ActionLog and AcpThread (#46129)
Release Notes: - N/A
This commit is contained in:
1 parent
7d50c2e799
commit
2fdf91c3c2
2 files changed
+15
-2
No files matched your search
@@ -86,9 +86,16 @@ impl Diff {
|
||||
|
||||
pub fn new(buffer: Entity<Buffer>, cx: &mut Context<Self>) -> Self {
|
||||
let buffer_text_snapshot = buffer.read(cx).text_snapshot();
|
||||
let language = buffer.read(cx).language().cloned();
|
||||
let language_registry = buffer.read(cx).language_registry();
|
||||
let buffer_diff = cx.new(|cx| {
|
||||
let mut diff = BufferDiff::new_unchanged(&buffer_text_snapshot, cx);
|
||||
let secondary_diff = cx.new(|cx| BufferDiff::new_unchanged(&buffer_text_snapshot, cx));
|
||||
diff.language_changed(language.clone(), language_registry.clone(), cx);
|
||||
let secondary_diff = cx.new(|cx| {
|
||||
let mut diff = BufferDiff::new_unchanged(&buffer_text_snapshot, cx);
|
||||
diff.language_changed(language, language_registry, cx);
|
||||
diff
|
||||
});
|
||||
diff.set_secondary_diff(secondary_diff);
|
||||
diff
|
||||
});
|
||||
|
||||
@@ -79,7 +79,13 @@ impl ActionLog {
|
||||
});
|
||||
|
||||
let text_snapshot = buffer.read(cx).text_snapshot();
|
||||
let diff = cx.new(|cx| BufferDiff::new(&text_snapshot, cx));
|
||||
let language = buffer.read(cx).language().cloned();
|
||||
let language_registry = buffer.read(cx).language_registry();
|
||||
let diff = cx.new(|cx| {
|
||||
let mut diff = BufferDiff::new(&text_snapshot, cx);
|
||||
diff.language_changed(language, language_registry, cx);
|
||||
diff
|
||||
});
|
||||
let (diff_update_tx, diff_update_rx) = mpsc::unbounded();
|
||||
let diff_base;
|
||||
let unreviewed_edits;
|
||||
|
||||
Reference in new issue
Block a user