zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-19 10:29:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Restore timestamp insertion for journal: new journal entry (#3870)

Browse Source 
This PR restores the insertion of the timestamp when using the `journal:
new journal entry` action.

Release Notes:

- Restored timestamp insertion when creating new journal entries.
This commit is contained in:
Marshall Bowers 2024-01-03 18:09:55 -05:00 committed by GitHub
parent 1a3c931d61
commit 3ddba6fc71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
crates/journal/src/journal.rs
View File

@ -1,6 +1,8 @@
use anyhow::Result; use anyhow::Result;
use chrono::{Datelike, Local, NaiveTime, Timelike}; use chrono::{Datelike, Local, NaiveTime, Timelike};
use gpui::{actions, AppContext, ViewContext}; use editor::scroll::autoscroll::Autoscroll;
use editor::Editor;
use gpui::{actions, AppContext, ViewContext, WindowContext};
use schemars::JsonSchema; use schemars::JsonSchema;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use settings::Settings; use settings::Settings;
@ -63,7 +65,7 @@ pub fn init(_: Arc<AppState>, cx: &mut AppContext) {
.detach(); .detach();
} }
pub fn new_journal_entry(app_state: Arc<AppState>, cx: &mut AppContext) { pub fn new_journal_entry(app_state: Arc<AppState>, cx: &mut WindowContext) {
let settings = JournalSettings::get_global(cx); let settings = JournalSettings::get_global(cx);
let journal_dir = match journal_dir(settings.path.as_ref().unwrap()) { let journal_dir = match journal_dir(settings.path.as_ref().unwrap()) {
Some(journal_dir) => journal_dir, Some(journal_dir) => journal_dir,
@ -79,7 +81,7 @@ pub fn new_journal_entry(app_state: Arc<AppState>, cx: &mut AppContext) {
.join(format!("{:02}", now.month())); .join(format!("{:02}", now.month()));
let entry_path = month_dir.join(format!("{:02}.md", now.day())); let entry_path = month_dir.join(format!("{:02}.md", now.day()));
let now = now.time(); let now = now.time();
let _entry_heading = heading_entry(now, &settings.hour_format); let entry_heading = heading_entry(now, &settings.hour_format);
let create_entry = cx.background_executor().spawn(async move { let create_entry = cx.background_executor().spawn(async move {
std::fs::create_dir_all(month_dir)?; std::fs::create_dir_all(month_dir)?;
@ -93,31 +95,30 @@ pub fn new_journal_entry(app_state: Arc<AppState>, cx: &mut AppContext) {
cx.spawn(|mut cx| async move { cx.spawn(|mut cx| async move {
let (journal_dir, entry_path) = create_entry.await?; let (journal_dir, entry_path) = create_entry.await?;
let (workspace, _) = cx let (workspace, _) = cx
.update(|cx| workspace::open_paths(&[journal_dir], &app_state, None, cx))? .update(|_, cx| workspace::open_paths(&[journal_dir], &app_state, None, cx))?
.await?; .await?;
let _opened = workspace let opened = workspace
.update(&mut cx, |workspace, cx| { .update(&mut cx, |workspace, cx| {
workspace.open_paths(vec![entry_path], true, cx) workspace.open_paths(vec![entry_path], true, cx)
})? })?
.await; .await;
// todo!("editor") if let Some(Some(Ok(item))) = opened.first() {
// if let Some(Some(Ok(item))) = opened.first() { if let Some(editor) = item.downcast::<Editor>().map(|editor| editor.downgrade()) {
// if let Some(editor) = item.downcast::<Editor>().map(|editor| editor.downgrade()) { editor.update(&mut cx, |editor, cx| {
// editor.update(&mut cx, |editor, cx| { let len = editor.buffer().read(cx).len(cx);
// let len = editor.buffer().read(cx).len(cx); editor.change_selections(Some(Autoscroll::center()), cx, |s| {
// editor.change_selections(Some(Autoscroll::center()), cx, |s| { s.select_ranges([len..len])
// s.select_ranges([len..len]) });
// }); if len > 0 {
// if len > 0 { editor.insert("\n\n", cx);
// editor.insert("\n\n", cx); }
// } editor.insert(&entry_heading, cx);
// editor.insert(&entry_heading, cx); editor.insert("\n\n", cx);
// editor.insert("\n\n", cx); })?;
// })?; }
// } }
// }
anyhow::Ok(()) anyhow::Ok(())
}) })