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

markdown_preview: Fix release notes title being overridden (#31703)

Browse source 
Closes: #31701

Screenshot:

<img width="383" alt="image"
src="https://github.com/user-attachments/assets/7fd8ce70-2208-4aca-bc70-860d6c649765"
/>



Release Notes:

- Fixed in-app release notes having an incorrect title

---------

Co-authored-by: Gilles Peiffer <gilles.peiffer.yt@gmail.com>
This commit is contained in:
Simon Pham 2025-05-30 15:29:52 +07:00 • committed by GitHub
parent d7f0241d7b
commit 89c184a26f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/auto_update_ui/src/auto_update_ui.rs
View file

@ -91,7 +91,7 @@ fn view_release_notes_locally(
let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx)); let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
let tab_content = SharedString::from(body.title.to_string()); let tab_content = Some(SharedString::from(body.title.to_string()));
let editor = cx.new(|cx| { let editor = cx.new(|cx| {
Editor::for_multibuffer(buffer, Some(project), window, cx) Editor::for_multibuffer(buffer, Some(project), window, cx)
}); });

14
crates/markdown_preview/src/markdown_preview_view.rs
View file

@ -36,7 +36,7 @@ pub struct MarkdownPreviewView {
contents: Option<ParsedMarkdown>, contents: Option<ParsedMarkdown>,
selected_block: usize, selected_block: usize,
list_state: ListState, list_state: ListState,
tab_content_text: SharedString, tab_content_text: Option<SharedString>,
language_registry: Arc<LanguageRegistry>, language_registry: Arc<LanguageRegistry>,
parsing_markdown_task: Option<Task<Result<()>>>, parsing_markdown_task: Option<Task<Result<()>>>,
} }
@ -130,7 +130,7 @@ impl MarkdownPreviewView {
editor, editor,
workspace_handle, workspace_handle,
language_registry, language_registry,
"Markdown Preview".into(), None,
window, window,
cx, cx,
) )
@ -141,7 +141,7 @@ impl MarkdownPreviewView {
active_editor: Entity<Editor>, active_editor: Entity<Editor>,
workspace: WeakEntity<Workspace>, workspace: WeakEntity<Workspace>,
language_registry: Arc<LanguageRegistry>, language_registry: Arc<LanguageRegistry>,
tab_content_text: SharedString, tab_content_text: Option<SharedString>,
window: &mut Window, window: &mut Window,
cx: &mut Context<Workspace>, cx: &mut Context<Workspace>,
) -> Entity<Self> { ) -> Entity<Self> {
@ -343,7 +343,9 @@ impl MarkdownPreviewView {
); );
let tab_content = editor.read(cx).tab_content_text(0, cx); let tab_content = editor.read(cx).tab_content_text(0, cx);
self.tab_content_text = format!("Preview {}", tab_content).into(); if self.tab_content_text.is_none() {
self.tab_content_text = Some(format!("Preview {}", tab_content).into());
}
self.active_editor = Some(EditorState { self.active_editor = Some(EditorState {
editor, editor,
@ -494,7 +496,9 @@ impl Item for MarkdownPreviewView {
} }
fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString { fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
self.tab_content_text.clone() self.tab_content_text
.clone()
.unwrap_or_else(|| SharedString::from("Markdown Preview"))
} }
fn telemetry_event_text(&self) -> Option<&'static str> { fn telemetry_event_text(&self) -> Option<&'static str> {