
There's still a bit more work to do on this, but this PR is compiling (with warnings) after eliminating the key types. When the tasks below are complete, this will be the new narrative for GPUI: - `Entity<T>` - This replaces `View<T>`/`Model<T>`. It represents a unit of state, and if `T` implements `Render`, then `Entity<T>` implements `Element`. - `&mut App` This replaces `AppContext` and represents the app. - `&mut Context<T>` This replaces `ModelContext` and derefs to `App`. It is provided by the framework when updating an entity. - `&mut Window` Broken out of `&mut WindowContext` which no longer exists. Every method that once took `&mut WindowContext` now takes `&mut Window, &mut App` and every method that took `&mut ViewContext<T>` now takes `&mut Window, &mut Context<T>` Not pictured here are the two other failed attempts. It's been quite a month! Tasks: - [x] Remove `View`, `ViewContext`, `WindowContext` and thread through `Window` - [x] [@cole-miller @mikayla-maki] Redraw window when entities change - [x] [@cole-miller @mikayla-maki] Get examples and Zed running - [x] [@cole-miller @mikayla-maki] Fix Zed rendering - [x] [@mikayla-maki] Fix todo! macros and comments - [x] Fix a bug where the editor would not be redrawn because of view caching - [x] remove publicness window.notify() and replace with `AppContext::notify` - [x] remove `observe_new_window_models`, replace with `observe_new_models` with an optional window - [x] Fix a bug where the project panel would not be redrawn because of the wrong refresh() call being used - [x] Fix the tests - [x] Fix warnings by eliminating `Window` params or using `_` - [x] Fix conflicts - [x] Simplify generic code where possible - [x] Rename types - [ ] Update docs ### issues post merge - [x] Issues switching between normal and insert mode - [x] Assistant re-rendering failure - [x] Vim test failures - [x] Mac build issue Release Notes: - N/A --------- Co-authored-by: Antonio Scandurra <me@as-cii.com> Co-authored-by: Cole Miller <cole@zed.dev> Co-authored-by: Mikayla <mikayla@zed.dev> Co-authored-by: Joseph <joseph@zed.dev> Co-authored-by: max <max@zed.dev> Co-authored-by: Michael Sloan <michael@zed.dev> Co-authored-by: Mikayla Maki <mikaylamaki@Mikaylas-MacBook-Pro.local> Co-authored-by: Mikayla <mikayla.c.maki@gmail.com> Co-authored-by: joão <joao@zed.dev>
222 lines
7.3 KiB
Rust
222 lines
7.3 KiB
Rust
use anyhow::Result;
|
|
use chrono::{Datelike, Local, NaiveTime, Timelike};
|
|
use editor::scroll::Autoscroll;
|
|
use editor::Editor;
|
|
use gpui::{actions, App, Context, Window};
|
|
use schemars::JsonSchema;
|
|
use serde::{Deserialize, Serialize};
|
|
use settings::{Settings, SettingsSources};
|
|
use std::{
|
|
fs::OpenOptions,
|
|
path::{Path, PathBuf},
|
|
sync::Arc,
|
|
};
|
|
use workspace::{AppState, OpenVisible, Workspace};
|
|
|
|
actions!(journal, [NewJournalEntry]);
|
|
|
|
/// Settings specific to journaling
|
|
#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
|
|
pub struct JournalSettings {
|
|
/// The path of the directory where journal entries are stored.
|
|
///
|
|
/// Default: `~`
|
|
pub path: Option<String>,
|
|
/// What format to display the hours in.
|
|
///
|
|
/// Default: hour12
|
|
pub hour_format: Option<HourFormat>,
|
|
}
|
|
|
|
impl Default for JournalSettings {
|
|
fn default() -> Self {
|
|
Self {
|
|
path: Some("~".into()),
|
|
hour_format: Some(Default::default()),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema)]
|
|
#[serde(rename_all = "snake_case")]
|
|
pub enum HourFormat {
|
|
#[default]
|
|
Hour12,
|
|
Hour24,
|
|
}
|
|
|
|
impl settings::Settings for JournalSettings {
|
|
const KEY: Option<&'static str> = Some("journal");
|
|
|
|
type FileContent = Self;
|
|
|
|
fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
|
|
sources.json_merge()
|
|
}
|
|
}
|
|
|
|
pub fn init(_: Arc<AppState>, cx: &mut App) {
|
|
JournalSettings::register(cx);
|
|
|
|
cx.observe_new(
|
|
|workspace: &mut Workspace, _window, _cx: &mut Context<Workspace>| {
|
|
workspace.register_action(|workspace, _: &NewJournalEntry, window, cx| {
|
|
new_journal_entry(workspace, window, cx);
|
|
});
|
|
},
|
|
)
|
|
.detach();
|
|
}
|
|
|
|
pub fn new_journal_entry(workspace: &Workspace, window: &mut Window, cx: &mut App) {
|
|
let settings = JournalSettings::get_global(cx);
|
|
let journal_dir = match journal_dir(settings.path.as_ref().unwrap()) {
|
|
Some(journal_dir) => journal_dir,
|
|
None => {
|
|
log::error!("Can't determine journal directory");
|
|
return;
|
|
}
|
|
};
|
|
let journal_dir_clone = journal_dir.clone();
|
|
|
|
let now = Local::now();
|
|
let month_dir = journal_dir
|
|
.join(format!("{:02}", now.year()))
|
|
.join(format!("{:02}", now.month()));
|
|
let entry_path = month_dir.join(format!("{:02}.md", now.day()));
|
|
let now = now.time();
|
|
let entry_heading = heading_entry(now, &settings.hour_format);
|
|
|
|
let create_entry = cx.background_executor().spawn(async move {
|
|
std::fs::create_dir_all(month_dir)?;
|
|
OpenOptions::new()
|
|
.create(true)
|
|
.truncate(false)
|
|
.write(true)
|
|
.open(&entry_path)?;
|
|
Ok::<_, std::io::Error>((journal_dir, entry_path))
|
|
});
|
|
|
|
let worktrees = workspace.visible_worktrees(cx).collect::<Vec<_>>();
|
|
let mut open_new_workspace = true;
|
|
'outer: for worktree in worktrees.iter() {
|
|
let worktree_root = worktree.read(cx).abs_path();
|
|
if *worktree_root == journal_dir_clone {
|
|
open_new_workspace = false;
|
|
break;
|
|
}
|
|
for directory in worktree.read(cx).directories(true, 1) {
|
|
let full_directory_path = worktree_root.join(&directory.path);
|
|
if full_directory_path.ends_with(&journal_dir_clone) {
|
|
open_new_workspace = false;
|
|
break 'outer;
|
|
}
|
|
}
|
|
}
|
|
|
|
let app_state = workspace.app_state().clone();
|
|
let view_snapshot = workspace.weak_handle().clone();
|
|
|
|
window
|
|
.spawn(cx, |mut cx| async move {
|
|
let (journal_dir, entry_path) = create_entry.await?;
|
|
let opened = if open_new_workspace {
|
|
let (new_workspace, _) = cx
|
|
.update(|_window, cx| {
|
|
workspace::open_paths(
|
|
&[journal_dir],
|
|
app_state,
|
|
workspace::OpenOptions::default(),
|
|
cx,
|
|
)
|
|
})?
|
|
.await?;
|
|
new_workspace
|
|
.update(&mut cx, |workspace, window, cx| {
|
|
workspace.open_paths(vec![entry_path], OpenVisible::All, None, window, cx)
|
|
})?
|
|
.await
|
|
} else {
|
|
view_snapshot
|
|
.update_in(&mut cx, |workspace, window, cx| {
|
|
workspace.open_paths(vec![entry_path], OpenVisible::All, None, window, cx)
|
|
})?
|
|
.await
|
|
};
|
|
|
|
if let Some(Some(Ok(item))) = opened.first() {
|
|
if let Some(editor) = item.downcast::<Editor>().map(|editor| editor.downgrade()) {
|
|
editor.update_in(&mut cx, |editor, window, cx| {
|
|
let len = editor.buffer().read(cx).len(cx);
|
|
editor.change_selections(Some(Autoscroll::center()), window, cx, |s| {
|
|
s.select_ranges([len..len])
|
|
});
|
|
if len > 0 {
|
|
editor.insert("\n\n", window, cx);
|
|
}
|
|
editor.insert(&entry_heading, window, cx);
|
|
editor.insert("\n\n", window, cx);
|
|
})?;
|
|
}
|
|
}
|
|
|
|
anyhow::Ok(())
|
|
})
|
|
.detach_and_log_err(cx);
|
|
}
|
|
|
|
fn journal_dir(path: &str) -> Option<PathBuf> {
|
|
let expanded_journal_dir = shellexpand::full(path) //TODO handle this better
|
|
.ok()
|
|
.map(|dir| Path::new(&dir.to_string()).to_path_buf().join("journal"));
|
|
|
|
expanded_journal_dir
|
|
}
|
|
|
|
fn heading_entry(now: NaiveTime, hour_format: &Option<HourFormat>) -> String {
|
|
match hour_format {
|
|
Some(HourFormat::Hour24) => {
|
|
let hour = now.hour();
|
|
format!("# {}:{:02}", hour, now.minute())
|
|
}
|
|
_ => {
|
|
let (pm, hour) = now.hour12();
|
|
let am_or_pm = if pm { "PM" } else { "AM" };
|
|
format!("# {}:{:02} {}", hour, now.minute(), am_or_pm)
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
mod heading_entry_tests {
|
|
use super::super::*;
|
|
|
|
#[test]
|
|
fn test_heading_entry_defaults_to_hour_12() {
|
|
let naive_time = NaiveTime::from_hms_milli_opt(15, 0, 0, 0).unwrap();
|
|
let actual_heading_entry = heading_entry(naive_time, &None);
|
|
let expected_heading_entry = "# 3:00 PM";
|
|
|
|
assert_eq!(actual_heading_entry, expected_heading_entry);
|
|
}
|
|
|
|
#[test]
|
|
fn test_heading_entry_is_hour_12() {
|
|
let naive_time = NaiveTime::from_hms_milli_opt(15, 0, 0, 0).unwrap();
|
|
let actual_heading_entry = heading_entry(naive_time, &Some(HourFormat::Hour12));
|
|
let expected_heading_entry = "# 3:00 PM";
|
|
|
|
assert_eq!(actual_heading_entry, expected_heading_entry);
|
|
}
|
|
|
|
#[test]
|
|
fn test_heading_entry_is_hour_24() {
|
|
let naive_time = NaiveTime::from_hms_milli_opt(15, 0, 0, 0).unwrap();
|
|
let actual_heading_entry = heading_entry(naive_time, &Some(HourFormat::Hour24));
|
|
let expected_heading_entry = "# 15:00";
|
|
|
|
assert_eq!(actual_heading_entry, expected_heading_entry);
|
|
}
|
|
}
|
|
}
|