Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve expanded macro ergonomics (#25298)

Browse source 
Make the editor non-dirty and read-only.


Release Notes:

- Improve expanded macro ergonomics
This commit is contained in:
Kirill Bulatov 2025-02-21 02:40:08 +02:00 • committed by GitHub
parent 30850fe3bd
commit ee1a559827
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/editor/src/rust_analyzer_ext.rs
View file

@ -2,7 +2,7 @@ use std::{fs, path::Path};
use anyhow::Context as _; use anyhow::Context as _;
use gpui::{App, AppContext as _, Context, Entity, Window}; use gpui::{App, AppContext as _, Context, Entity, Window};
use language::Language; use language::{Capability, Language};
use multi_buffer::MultiBuffer; use multi_buffer::MultiBuffer;
use project::lsp_ext_command::ExpandMacro; use project::lsp_ext_command::ExpandMacro;
use text::ToPointUtf16; use text::ToPointUtf16;
@ -80,14 +80,17 @@ pub fn expand_macro_recursively(
.await?; .await?;
workspace.update_in(&mut cx, |workspace, window, cx| { workspace.update_in(&mut cx, |workspace, window, cx| {
buffer.update(cx, |buffer, cx| { buffer.update(cx, |buffer, cx| {
buffer.edit([(0..0, macro_expansion.expansion)], None, cx); buffer.set_text(macro_expansion.expansion, cx);
buffer.set_language(Some(rust_language), cx) buffer.set_language(Some(rust_language), cx);
buffer.set_capability(Capability::ReadOnly, cx);
}); });
let multibuffer = let multibuffer =
cx.new(|cx| MultiBuffer::singleton(buffer, cx).with_title(macro_expansion.name)); cx.new(|cx| MultiBuffer::singleton(buffer, cx).with_title(macro_expansion.name));
workspace.add_item_to_active_pane( workspace.add_item_to_active_pane(
Box::new(cx.new(|cx| { Box::new(cx.new(|cx| {
Editor::for_multibuffer(multibuffer, Some(project), true, window, cx) let mut editor = Editor::for_multibuffer(multibuffer, None, false, window, cx);
editor.set_read_only(true);
editor
})), })),
None, None,
true, true,