diff --git a/src/main.rs b/src/main.rs index 969396e..4035a8b 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,4 +1,3 @@ -mod blocks; mod document; mod preview; mod provider; @@ -16,17 +15,16 @@ use std::{ collections::HashMap, fs, io::Write, - ops::Range, path::PathBuf, process::{Command, Stdio}, }; -const BG: u32 = 0xf3f0e9; -const PAPER: u32 = 0xfffdf8; -const EDGE: u32 = 0xd9d5cd; -const TEXT: u32 = 0x262521; -const MUTED: u32 = 0x77736d; -const ACCENT: u32 = 0x85603c; +const BG: u32 = 0x151a1e; +const PAPER: u32 = 0x1b2126; +const EDGE: u32 = 0x37414a; +const TEXT: u32 = 0xe8eaed; +const MUTED: u32 = 0x9da7af; +const ACCENT: u32 = 0xf3b84b; #[derive(Clone, Copy, PartialEq)] enum Mode { @@ -43,8 +41,8 @@ enum Provider { struct Vool { editor: Entity, - active: Range, - rendered: HashMap, + active_answer: Option, + rendered_answer: String, render_seq: u64, suppress_save: bool, answer_styles: TextDecorationCollection, @@ -93,28 +91,25 @@ impl Vool { .cloned() .unwrap_or_else(|| notes_dir.join("Welcome.md")); let saved_text = fs::read_to_string(&path).unwrap_or_else(|_| String::from( - "# A place to follow your curiosity\n\nWrite a question here. Press Esc, move with h/j/k/l, then v to select a thought. Press a to ask.\n\nAnswers appear immediately after the question.\n" + "# A place to follow your curiosity\n\nWrite a question here. Press Esc, move with h/j/k/l, then v to select a thought. Press a to ask.\n\nThe answer appears beside your note.\n" )); let answers = Answers::load(&path.with_extension("vool.json")); - let active = blocks::ranges(&saved_text).first().cloned().unwrap_or(0..0); + let active_answer = answers.items.last().map(|answer| answer.id); let editor = cx.new(|cx| { EditorState::new(window, cx) .line_number(false) .soft_wrap(true) - .default_value(saved_text[active.clone()].to_string()) + .default_value(saved_text.clone()) }); editor.update(cx, |state, cx| state.set_readonly(true, cx)); let answer_styles = editor.update(cx, |state, cx| { state.create_decorations_collection( - Self::answer_decorations(&answers, &saved_text, &active), + Self::answer_decorations(&answers, &saved_text, active_answer), cx, ) }); let markdown_styles = editor.update(cx, |state, cx| { - state.create_decorations_collection( - Self::markdown_decorations(&saved_text[active.clone()]), - cx, - ) + state.create_decorations_collection(Self::markdown_decorations(&saved_text), cx) }); let model_input = cx.new(|cx| InputState::new(window, cx).placeholder("Default model")); let key_input = cx.new(|cx| { @@ -132,8 +127,8 @@ impl Vool { window.defer(cx, move |window, cx| focus.focus(window, cx)); Self { editor, - active, - rendered: HashMap::new(), + active_answer, + rendered_answer: String::new(), render_seq: 0, suppress_save: false, answer_styles, @@ -160,10 +155,8 @@ impl Vool { fn save(&mut self, cx: &mut Context) { let value = self.editor.read(cx).value().to_string(); - let previous = self.saved_text.clone(); - self.saved_text.replace_range(self.active.clone(), &value); - self.answers.reconcile(&previous, &self.saved_text); - self.active.end = self.active.start + value.len(); + self.answers.reconcile(&self.saved_text, &value); + self.saved_text = value.clone(); self.refresh_answer_styles(cx); self.markdown_styles .set(Self::markdown_decorations(&value), cx); @@ -172,16 +165,25 @@ impl Vool { { self.status = format!("Could not save: {error}"); } - self.refresh_render(cx); cx.notify(); } fn refresh_render(&mut self, cx: &mut Context) { self.render_seq += 1; let seq = self.render_seq; - let source = self.saved_text.clone(); + let source = self + .answers + .items + .iter() + .find(|answer| Some(answer.id) == self.active_answer) + .map(|answer| answer.text.clone()) + .unwrap_or_default(); let path = self.path.clone(); - let cached = self.rendered.clone(); + self.rendered_answer = source.clone(); + if source.is_empty() { + cx.notify(); + return; + } cx.spawn(async move |this, cx| { cx.background_executor() .timer(std::time::Duration::from_millis(180)) @@ -192,22 +194,11 @@ impl Vool { if !still_current { return; } - let task = cx.background_spawn(async move { - let mut rendered = HashMap::new(); - for range in blocks::ranges(&source) { - let block = &source[range]; - let view = cached - .get(block) - .cloned() - .unwrap_or_else(|| preview::render(block, &path).0); - rendered.insert(block.to_string(), view); - } - rendered - }); + let task = cx.background_spawn(async move { preview::render(&source, &path).0 }); let rendered = task.await; _ = this.update(cx, |state, cx| { if state.render_seq == seq { - state.rendered = rendered; + state.rendered_answer = rendered; cx.notify(); } }); @@ -218,25 +209,20 @@ impl Vool { fn answer_decorations( answers: &Answers, text: &str, - active: &Range, + active_id: Option, ) -> Vec { answers .items .iter() .filter_map(|answer| { - let start = answer.block_start.saturating_add(2); - let end = text - .get(start..answer.block_end)? - .find('\n') - .map(|n| start + n)?; - if start < active.start || end > active.end { + if Some(answer.id) != active_id { return None; } + text.get(answer.start..answer.end)?; Some(TextDecoration::new( - start - active.start..end - active.start, + answer.start..answer.end, HighlightStyle { - color: Some(rgb(ACCENT).into()), - font_weight: Some(FontWeight::SEMIBOLD), + background_color: Some(rgba(0xf3b84b44).into()), ..Default::default() }, )) @@ -246,7 +232,7 @@ impl Vool { fn refresh_answer_styles(&self, cx: &mut Context) { self.answer_styles.set( - Self::answer_decorations(&self.answers, &self.saved_text, &self.active), + Self::answer_decorations(&self.answers, &self.saved_text, self.active_answer), cx, ); } @@ -327,35 +313,11 @@ impl Vool { self.saved_text = text.clone(); self.path = path; self.pending.clear(); - self.rendered.clear(); - self.active = blocks::ranges(&text).first().cloned().unwrap_or(0..0); + self.active_answer = self.answers.items.last().map(|answer| answer.id); self.settings_open = false; self.mode = Mode::Normal; self.status = "i insert · v select · a ask".into(); self.suppress_save = true; - self.editor.update(cx, |state, cx| { - state.set_value(text[self.active.clone()].to_string(), window, cx); - state.set_readonly(true, cx); - state.focus(window, cx); - }); - self.suppress_save = false; - self.refresh_answer_styles(cx); - self.markdown_styles - .set(Self::markdown_decorations(&text[self.active.clone()]), cx); - self.refresh_render(cx); - cx.notify(); - } - - fn focus_block(&mut self, range: Range, window: &mut Window, cx: &mut Context) { - if self.active == range { - self.editor.update(cx, |state, cx| state.focus(window, cx)); - return; - } - self.save(cx); - self.active = range.clone(); - self.mode = Mode::Normal; - self.suppress_save = true; - let text = self.saved_text[range].to_string(); self.editor.update(cx, |state, cx| { state.set_value(text.clone(), window, cx); state.set_readonly(true, cx); @@ -365,6 +327,7 @@ impl Vool { self.refresh_answer_styles(cx); self.markdown_styles .set(Self::markdown_decorations(&text), cx); + self.refresh_render(cx); cx.notify(); } @@ -438,7 +401,7 @@ impl Vool { cx.notify(); } - fn move_cursor(&mut self, key: &str, window: &mut Window, cx: &mut Context) { + fn move_cursor(&mut self, key: &str, cx: &mut Context) { let text = self.editor.read(cx).value().to_string(); let range = self.editor.read(cx).selected_range(); let cursor = if self.mode == Mode::Visual { @@ -458,28 +421,11 @@ impl Vool { let col = cursor - start; let line = if key == "j" { let Some(i) = text[cursor..].find('\n') else { - if self.mode == Mode::Normal { - let next = blocks::ranges(&self.saved_text) - .into_iter() - .find(|r| r.start >= self.active.end && r != &self.active); - if let Some(range) = next { - self.focus_block(range, window, cx); - } - } return; }; cursor + i + 1 } else { if start == 0 { - if self.mode == Mode::Normal { - let previous = blocks::ranges(&self.saved_text) - .into_iter() - .rev() - .find(|r| r.end <= self.active.start); - if let Some(range) = previous { - self.focus_block(range, window, cx); - } - } return; } text[..start - 1].rfind('\n').map_or(0, |i| i + 1) @@ -534,54 +480,23 @@ impl Vool { } "h" | "j" | "k" | "l" | "0" | "$" => { cx.stop_propagation(); - self.move_cursor(key, window, cx); + self.move_cursor(key, cx); } _ => {} } } - fn write_answer(&mut self, id: u64, body: &str, window: &mut Window, cx: &mut Context) { - let Some(answer) = self.answers.items.iter().find(|a| a.id == id) else { + fn write_answer(&mut self, id: u64, body: &str, cx: &mut Context) { + let Some(answer) = self.answers.items.iter_mut().find(|a| a.id == id) else { return; }; - let start = if answer.block_end > answer.block_start { - answer.block_start - } else { - answer.end - }; - let end = if answer.block_end > answer.block_start { - answer.block_end - } else { - start - }; - let old_len = self.saved_text.len(); - self.answers.replace_block(id, &mut self.saved_text, body); - let shift = self.saved_text.len() as isize - old_len as isize; - if end <= self.active.start { - self.active.start = self.active.start.saturating_add_signed(shift); - self.active.end = self.active.end.saturating_add_signed(shift); - } else if start < self.active.end { - self.active.end = self.active.end.saturating_add_signed(shift); - let cursor = self.editor.read(cx).selected_range(); - let value = self.saved_text[self.active.clone()].to_string(); - self.suppress_save = true; - self.editor.update(cx, |state, cx| { - state.set_value(value, window, cx); - state.set_selected_range(cursor, cx); - }); - self.suppress_save = false; - } - self.refresh_answer_styles(cx); - self.markdown_styles.set( - Self::markdown_decorations(&self.editor.read(cx).value()), - cx, - ); - if let Err(error) = - fs::write(&self.path, &self.saved_text).and_then(|_| self.answers.save(&self.sidecar())) - { + answer.text = body.into(); + if let Err(error) = self.answers.save(&self.sidecar()) { self.status = format!("Could not save: {error}"); } + if self.active_answer == Some(id) { self.refresh_render(cx); + } cx.notify(); } @@ -599,13 +514,14 @@ impl Vool { } else { &model }; - let range = self.active.start + range.start..self.active.start + range.end; let id = self.answers.ask(range, &prompt, selected_model); + self.active_answer = Some(id); + self.refresh_answer_styles(cx); self.request_seq += 1; let request = self.request_seq; self.pending.insert(id, request); let path = self.path.clone(); - self.write_answer(id, "Thinking…", window, cx); + self.write_answer(id, "Thinking…", cx); self.set_mode(Mode::Normal, cx); self.status = if self.provider == Provider::Codex { "Asking Codex…" @@ -632,7 +548,7 @@ impl Vool { }); cx.spawn_in(window, async move |this, window| { let result = task.await; - _ = window.update(|window, cx| { + _ = window.update(|_, cx| { _ = this.update(cx, |this, cx| { if this.path != path || this.pending.get(&id) != Some(&request) { return; @@ -640,9 +556,9 @@ impl Vool { this.pending.remove(&id); let failed = result.is_err(); let body = result.unwrap_or_else(|err| format!("Answer unavailable: {err}")); - this.write_answer(id, &body, window, cx); + this.write_answer(id, &body, cx); this.status = if failed { - "Answer failed · check the inline message and retry".into() + "Answer failed · check the answer pane and retry".into() } else { "Answer ready · reselect question and press a to regenerate".into() }; @@ -733,8 +649,8 @@ impl Render for Vool { .to_string(); let selected = self.editor.read(cx).selected_range().len() > 0; let header = div() - .h(px(48.)) - .px_8() + .h(px(44.)) + .px_6() .flex() .items_center() .justify_between() @@ -745,114 +661,168 @@ impl Render for Vool { div() .flex() .items_center() - .gap_4() - .child(div().font_weight(FontWeight::SEMIBOLD).child("vool")) - .child(div().text_color(rgb(EDGE)).child("/")) - .child(div().text_color(rgb(MUTED)).child(format!("{title}.md"))), - ) - .child(div().text_xs().text_color(rgb(MUTED)).child(format!( - "{} / {}", - if self.provider == Provider::Codex { - "CODEX" - } else { - "OPENROUTER" - }, - if self.model.is_empty() { + .gap_5() + .child(format!("{title}.md")) + .child(div().text_color(rgb(EDGE)).child("│")) + .child( + div() + .text_color(rgb(MUTED)) + .child(if self.model.is_empty() { if self.provider == Provider::Codex { - "DEFAULT" + "Codex default".to_string() } else { - provider::OPENROUTER_MODEL + provider::OPENROUTER_MODEL.to_string() } } else { - &self.model - } - ))); - - let active_text = self.editor.read(cx).value().to_string(); - let active_font = if active_text.starts_with("# ") { - 27. - } else if active_text.starts_with("## ") { - 23. - } else { - 16. - }; - let active_rows = active_text.lines().count().max(1) + active_text.len() / 110; - let mut active_editor = Some( - Editor::new(&self.editor) - .appearance(false) - .bordered(false) - .readonly(self.mode != Mode::Insert) - .font_family("Noto Sans") - .text_color(rgb(TEXT)) - .text_size(px(active_font)) - .w_full() - .h(px((active_rows as f32 * active_font * 1.5).max(34.))), - ); - let mut document = div().flex().flex_col().gap_5().w_full(); - let mut active_drawn = false; - let ranges = blocks::ranges(&self.saved_text); - for range in &ranges { - if range.start >= self.active.start && range.start < self.active.end - || self.active == *range - { - if !active_drawn { - document = document.child(active_editor.take().unwrap()); - let raw = &self.saved_text[range.clone()]; - if raw.starts_with("![") || raw.starts_with("```mermaid") { - if let Some(rendered) = self.rendered.get(raw) { - document = document.child( - TextView::markdown( - format!("active-media-{}", range.start), - rendered.clone(), + self.model.clone() + }), + ), ) - .w_full(), + .child( + div() + .flex() + .items_center() + .gap_6() + .child(div().text_xs().text_color(rgb(MUTED)).child(format!( + "{} words", + self.saved_text.split_whitespace().count() + ))) + .child( + div() + .id("settings-button") + .cursor_pointer() + .text_color(rgb(TEXT)) + .child(if self.settings_open { "Back" } else { "☰" }) + .on_click( + cx.listener(|this, _, window, cx| this.toggle_settings(window, cx)), + ), + ), ); - } - } - active_drawn = true; - } - continue; - } - let raw = &self.saved_text[range.clone()]; - let display = self - .rendered - .get(raw) - .map(String::as_str) - .unwrap_or(raw) - .to_string(); - let target = range.clone(); - document = document.child( + + let answer = self + .answers + .items + .iter() + .find(|answer| Some(answer.id) == self.active_answer); + let answer_pane = div() + .w(px(410.)) + .h_full() + .min_h_0() + .border_l_1() + .border_color(rgb(EDGE)) + .bg(rgb(BG)) + .font_family("Noto Sans Mono") + .child( div() - .id(format!("block-{}", range.start)) - .w_full() + .id("answer-scroll") + .size_full() + .overflow_y_scrollbar() + .child( + div() + .px_6() + .py_7() + .flex() + .flex_col() + .gap_5() + .child( + div() + .flex() + .justify_between() + .items_center() + .child(div().font_weight(FontWeight::SEMIBOLD).child("Answer")) + .child( + div() + .id("close-answer") .cursor_pointer() + .text_color(rgb(MUTED)) + .child("×") + .on_click(cx.listener(|this, _, _, cx| { + this.active_answer = None; + this.refresh_answer_styles(cx); + this.refresh_render(cx); + })), + ), + ) + .when_some(answer, |this, answer| { + this.child(div().text_sm().child(answer.prompt.clone())) .child( - TextView::markdown(format!("rich-{}", range.start), display) + div() + .p_4() + .rounded_md() + .border_1() + .border_color(rgb(EDGE)) + .bg(rgb(PAPER)) + .child( + TextView::markdown( + format!("answer-{}", answer.id), + self.rendered_answer.clone(), + ) .style(TextViewStyle { - heading_base_font_size: px(24.), + heading_base_font_size: px(20.), ..Default::default() }) .text_color(rgb(TEXT)) - .text_size(px(16.)) + .text_size(px(14.)) .w_full(), + ), ) - .on_click(cx.listener(move |this, _, window, cx| { - this.focus_block(target.clone(), window, cx) - })), - ); - } - if !active_drawn { - document = document.child(active_editor.take().unwrap()); - } - let center = div().flex_1().min_h_0().min_w_0().bg(rgb(PAPER)).child( + }) + .when(answer.is_none(), |this| { + this.child( + div().text_sm().text_color(rgb(MUTED)).child( + "Select a question in your note, then press a to ask.", + ), + ) + }) + .when(self.answers.items.len() > 1, |this| { + this.child(div().pt_4().text_color(rgb(MUTED)).child("Related")) + .children( + self.answers + .items + .iter() + .filter(|item| Some(item.id) != self.active_answer) + .map(|item| { + let id = item.id; div() - .id("document-scroll") - .size_full() - .px(px(120.)) - .py(px(46.)) - .overflow_y_scrollbar() - .child(document), + .id(format!("related-{id}")) + .cursor_pointer() + .text_sm() + .child(item.prompt.clone()) + .on_click(cx.listener(move |this, _, _, cx| { + this.active_answer = Some(id); + this.refresh_answer_styles(cx); + this.refresh_render(cx); + })) + }), + ) + }), + ), ); + let center = div() + .flex_1() + .min_h_0() + .min_w_0() + .flex() + .bg(rgb(PAPER)) + .child( + div() + .flex_1() + .min_h_0() + .min_w_0() + .px(px(66.)) + .py(px(42.)) + .child( + Editor::new(&self.editor) + .appearance(false) + .bordered(false) + .readonly(self.mode != Mode::Insert) + .font_family("Noto Sans Mono") + .text_color(rgb(TEXT)) + .text_size(px(17.)) + .size_full(), + ), + ) + .child(answer_pane); let settings = div().flex_1().min_h_0().bg(rgb(PAPER)) .child(div().id("settings-scroll").size_full().px(px(120.)).py(px(46.)).overflow_y_scrollbar() @@ -901,6 +871,21 @@ impl Render for Vool { Mode::Insert => "INSERT", Mode::Visual => "VISUAL", }; + let cursor = self + .editor + .read(cx) + .selected_range() + .start + .min(self.saved_text.len()); + let before_cursor = &self.saved_text[..self.saved_text.floor_char_boundary(cursor)]; + let line = before_cursor.bytes().filter(|byte| *byte == b'\n').count() + 1; + let column = before_cursor + .rsplit('\n') + .next() + .unwrap_or("") + .chars() + .count() + + 1; let footer = div() .h(px(42.)) .px_8() @@ -935,18 +920,8 @@ impl Render for Vool { }) .child( div() - .id("settings-button") - .px_3() - .py_1() - .rounded_sm() - .cursor_pointer() - .text_color(rgb(ACCENT)) - .child(if self.settings_open { - "Back to note" - } else { - "Settings ⚙" - }) - .on_click(cx.listener(|this, _, window, cx| this.toggle_settings(window, cx))), + .text_color(rgb(MUTED)) + .child(format!("Ln {line}, Col {column} 100%")), ); let block_cursor = if !self.settings_open @@ -961,7 +936,7 @@ impl Render for Vool { .top(bounds.origin.y) .w(px(10.)) .h(bounds.size.height) - .bg(rgba(0x85603c77)) + .bg(rgba(0xf3b84b99)) }) } else { None @@ -985,6 +960,11 @@ impl Render for Vool { fn main() { gpui_kit::application().run(|cx| { gpui_kit::init(cx); + gpui_kit::component::theme::Theme::change( + gpui_kit::component::theme::ThemeMode::Dark, + None, + cx, + ); let bounds = WindowBounds::centered(size(px(1320.), px(820.)), cx); cx.spawn(async move |cx| { cx.open_window(

Restore continuous note editor with dark answer pane

Changes