diff --git a/src/main.rs b/src/main.rs index 30defc5..969396e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,3 +1,4 @@ +mod blocks; mod document; mod preview; mod provider; @@ -7,13 +8,15 @@ use gpui_kit::component::Root; use gpui_kit::component::input::{ Editor, EditorState, Input, InputEvent, InputState, TextDecoration, TextDecorationCollection, }; -use gpui_kit::component::text::{TextView, TextViewState, TextViewStyle}; +use gpui_kit::component::scroll::ScrollableElement; +use gpui_kit::component::text::{TextView, TextViewStyle}; use gpui_kit::prelude::FluentBuilder; use gpui_kit::*; use std::{ collections::HashMap, fs, io::Write, + ops::Range, path::PathBuf, process::{Command, Stdio}, }; @@ -30,7 +33,6 @@ enum Mode { Normal, Insert, Visual, - Command, } #[derive(Clone, Copy, PartialEq)] @@ -41,11 +43,16 @@ enum Provider { struct Vool { editor: Entity, - preview_view: Entity, - previewing: bool, - preview_seq: u64, + active: Range, + rendered: HashMap, + render_seq: u64, + suppress_save: bool, answer_styles: TextDecorationCollection, - command: Entity, + markdown_styles: TextDecorationCollection, + model_input: Entity, + key_input: Entity, + note_input: Entity, + settings_open: bool, mode: Mode, anchor: usize, visual_head: usize, @@ -86,24 +93,38 @@ 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. Press p to read rendered Markdown.\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\nAnswers appear immediately after the question.\n" )); let answers = Answers::load(&path.with_extension("vool.json")); + let active = blocks::ranges(&saved_text).first().cloned().unwrap_or(0..0); let editor = cx.new(|cx| { EditorState::new(window, cx) .line_number(false) .soft_wrap(true) - .default_value(saved_text.clone()) + .default_value(saved_text[active.clone()].to_string()) }); - let preview_view = cx.new(|cx| TextViewState::markdown(&saved_text, cx)); 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), cx) + state.create_decorations_collection( + Self::answer_decorations(&answers, &saved_text, &active), + cx, + ) }); - let command = - cx.new(|cx| InputState::new(window, cx).placeholder("new, open, files, w, model")); + let markdown_styles = editor.update(cx, |state, cx| { + state.create_decorations_collection( + Self::markdown_decorations(&saved_text[active.clone()]), + cx, + ) + }); + let model_input = cx.new(|cx| InputState::new(window, cx).placeholder("Default model")); + let key_input = cx.new(|cx| { + InputState::new(window, cx) + .masked(true) + .placeholder("Use environment key") + }); + let note_input = cx.new(|cx| InputState::new(window, cx).placeholder("New note name")); let _subscription = cx.subscribe(&editor, |this, _, event, cx| { - if matches!(event, InputEvent::Change) { + if matches!(event, InputEvent::Change) && !this.suppress_save { this.save(cx); } }); @@ -111,11 +132,16 @@ impl Vool { window.defer(cx, move |window, cx| focus.focus(window, cx)); Self { editor, - preview_view, - previewing: false, - preview_seq: 0, + active, + rendered: HashMap::new(), + render_seq: 0, + suppress_save: false, answer_styles, - command, + markdown_styles, + model_input, + key_input, + note_input, + settings_open: false, mode: Mode::Normal, anchor: 0, visual_head: 0, @@ -125,7 +151,7 @@ impl Vool { answers, model: String::new(), provider: Provider::Codex, - status: "i insert · v select · a ask · p read · : commands".into(), + status: "i insert · v select · a ask".into(), pending: HashMap::new(), request_seq: 0, _subscription, @@ -134,52 +160,66 @@ impl Vool { fn save(&mut self, cx: &mut Context) { let value = self.editor.read(cx).value().to_string(); - self.answers.reconcile(&self.saved_text, &value); - self.saved_text = value; + 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.refresh_answer_styles(cx); + self.markdown_styles + .set(Self::markdown_decorations(&value), cx); if let Err(error) = fs::write(&self.path, &self.saved_text).and_then(|_| self.answers.save(&self.sidecar())) { self.status = format!("Could not save: {error}"); } + self.refresh_render(cx); cx.notify(); } - fn toggle_preview(&mut self, window: &mut Window, cx: &mut Context) { - self.previewing = !self.previewing; - if !self.previewing { - self.preview_seq += 1; - self.editor.update(cx, |state, cx| state.focus(window, cx)); - self.status = "i insert · v select · a ask · p read · : commands".into(); - } else { - self.preview_seq += 1; - let focus = self.preview_view.read(cx).focus_handle().clone(); - focus.focus(window, cx); - let seq = self.preview_seq; - let path = self.path.clone(); + fn refresh_render(&mut self, cx: &mut Context) { + self.render_seq += 1; + let seq = self.render_seq; let source = self.saved_text.clone(); - self.status = "Rendering document… · p source".into(); - let task = cx.background_spawn(async move { preview::render(&source, &path) }); - cx.spawn_in(window, async move |this, window| { - let (rendered, failures) = task.await; - _ = window.update(|_, cx| { - _ = this.update(cx, |this, cx| { - if !this.previewing || this.preview_seq != seq { return; } - this.preview_view.update(cx, |state, cx| state.set_text(&rendered, cx)); - this.status = if failures == 0 { - "Rendered document · p source · : commands".into() - } else { - format!("{failures} diagram(s) could not render; showing their source · p source") - }; - cx.notify(); - }); - }); - }).detach(); + let path = self.path.clone(); + let cached = self.rendered.clone(); + cx.spawn(async move |this, cx| { + cx.background_executor() + .timer(std::time::Duration::from_millis(180)) + .await; + let still_current = this + .read_with(cx, |state, _| state.render_seq == seq) + .unwrap_or(false); + 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 rendered = task.await; + _ = this.update(cx, |state, cx| { + if state.render_seq == seq { + state.rendered = rendered; cx.notify(); } + }); + }) + .detach(); + } - fn answer_decorations(answers: &Answers, text: &str) -> Vec { + fn answer_decorations( + answers: &Answers, + text: &str, + active: &Range, + ) -> Vec { answers .items .iter() @@ -189,8 +229,11 @@ impl Vool { .get(start..answer.block_end)? .find('\n') .map(|n| start + n)?; + if start < active.start || end > active.end { + return None; + } Some(TextDecoration::new( - start..end, + start - active.start..end - active.start, HighlightStyle { color: Some(rgb(ACCENT).into()), font_weight: Some(FontWeight::SEMIBOLD), @@ -203,11 +246,80 @@ impl Vool { fn refresh_answer_styles(&self, cx: &mut Context) { self.answer_styles.set( - Self::answer_decorations(&self.answers, &self.saved_text), + Self::answer_decorations(&self.answers, &self.saved_text, &self.active), cx, ); } + fn markdown_decorations(text: &str) -> Vec { + use regex::Regex; + use std::sync::OnceLock; + static HEADINGS: OnceLock = OnceLock::new(); + static BOLD: OnceLock = OnceLock::new(); + static ITALIC: OnceLock = OnceLock::new(); + let mut styles = Vec::new(); + for capture in HEADINGS + .get_or_init(|| Regex::new(r"(?m)^(#{1,6})[ \t]+([^\n]+)").unwrap()) + .captures_iter(text) + { + styles.push(TextDecoration::new( + capture.get(1).unwrap().range(), + HighlightStyle { + color: Some(rgb(EDGE).into()), + ..Default::default() + }, + )); + styles.push(TextDecoration::new( + capture.get(2).unwrap().range(), + HighlightStyle { + color: Some(rgb(TEXT).into()), + font_weight: Some(FontWeight::BOLD), + ..Default::default() + }, + )); + } + for capture in BOLD + .get_or_init(|| Regex::new(r"\*\*([^*\n]+)\*\*").unwrap()) + .captures_iter(text) + { + styles.push(TextDecoration::new( + capture.get(1).unwrap().range(), + HighlightStyle { + font_weight: Some(FontWeight::BOLD), + ..Default::default() + }, + )); + for marker in [ + capture.get(0).unwrap().start()..capture.get(1).unwrap().start(), + capture.get(1).unwrap().end()..capture.get(0).unwrap().end(), + ] { + styles.push(TextDecoration::new( + marker, + HighlightStyle { + color: Some(rgb(EDGE).into()), + ..Default::default() + }, + )); + } + } + for capture in ITALIC + .get_or_init(|| Regex::new(r"(?:^|[^*])\*([^*\n]+)\*").unwrap()) + .captures_iter(text) + { + if text[capture.get(0).unwrap().end()..].starts_with('*') { + continue; + } + styles.push(TextDecoration::new( + capture.get(1).unwrap().range(), + HighlightStyle { + font_style: Some(FontStyle::Italic), + ..Default::default() + }, + )); + } + styles + } + fn open(&mut self, path: PathBuf, window: &mut Window, cx: &mut Context) { self.save(cx); let text = fs::read_to_string(&path).unwrap_or_default(); @@ -215,16 +327,44 @@ impl Vool { self.saved_text = text.clone(); self.path = path; self.pending.clear(); - self.previewing = false; - self.preview_seq += 1; + self.rendered.clear(); + self.active = blocks::ranges(&text).first().cloned().unwrap_or(0..0); + self.settings_open = false; self.mode = Mode::Normal; - self.status = "i insert · v select · a ask · p read · : commands".into(); + self.status = "i insert · v select · a ask".into(); + self.suppress_save = true; self.editor.update(cx, |state, cx| { - state.set_value(text, window, 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); + state.focus(window, cx); + }); + self.suppress_save = false; + self.refresh_answer_styles(cx); + self.markdown_styles + .set(Self::markdown_decorations(&text), cx); cx.notify(); } @@ -251,7 +391,7 @@ impl Vool { .join(format!("{}.md", name.trim_end_matches(".md"))) }; if path.exists() { - return Err("That note already exists. Use :open instead.".into()); + return Err("That note already exists. Choose it from Notes below.".into()); } fs::write(&path, "").map_err(|error| format!("Could not create note: {error}"))?; self.open(path, window, cx); @@ -263,91 +403,24 @@ impl Vool { Ok(()) } - fn run_command(&mut self, window: &mut Window, cx: &mut Context) { - let input = self.command.read(cx).value().to_string(); - let (verb, argument) = input.trim().split_once(' ').unwrap_or((input.trim(), "")); - let argument = argument.trim(); - let outcome = match verb { - "new" | "n" => self.new_note(argument, window, cx).err(), - "open" | "e" if valid_name(argument) => { - let path = self - .notes_dir - .join(format!("{}.md", argument.trim_end_matches(".md"))); - if path.exists() { - self.open(path, window, cx); - None - } else { - Some(format!( - "No note named {argument}. Use :files to list notes." - )) - } - } - "files" | "ls" => Some( - Self::files(&self.notes_dir) - .iter() - .map(|p| { - p.file_stem() - .unwrap_or_default() - .to_string_lossy() - .to_string() - }) - .collect::>() - .join(" · "), - ), - "w" => { - self.save(cx); - Some("Saved".into()) - } - "provider" if argument.is_empty() => Some("Providers: codex, openrouter".into()), - "provider" if argument == "codex" || argument == "openrouter" => { - self.provider = if argument == "codex" { - Provider::Codex - } else { - Provider::OpenRouter - }; - self.model.clear(); - Some(format!("Provider: {argument} · :model to select a model")) - } - "provider" => Some("Choose :provider codex or :provider openrouter".into()), - "model" if argument.is_empty() => Some(if self.provider == Provider::OpenRouter { - format!( - "OpenRouter default: {} · :model ID to override", - provider::OPENROUTER_MODEL - ) - } else { - "Codex default: CLI model · :model ID to override".into() - }), - "model" => { - self.model = if argument == "default" { - String::new() + fn toggle_settings(&mut self, window: &mut Window, cx: &mut Context) { + self.settings_open = !self.settings_open; + if self.settings_open { + self.model_input + .update(cx, |state, cx| state.focus(window, cx)); } else { - argument.into() - }; - Some(format!("Model: {argument}")) - } - "preview" | "read" if !self.previewing => { - self.toggle_preview(window, cx); - None - } - "edit" if self.previewing => { - self.toggle_preview(window, cx); - None - } - _ => Some(format!( - "Unknown command: {verb}. Try :new, :open, :files, :w, :provider, :model, :preview, :edit" - )), - }; - if self.mode == Mode::Command { - self.set_mode(Mode::Normal, cx); + self.editor.update(cx, |state, cx| state.focus(window, cx)); } - if let Some(message) = outcome { - self.status = message; + cx.notify(); } - if self.previewing { - let focus = self.preview_view.read(cx).focus_handle().clone(); - focus.focus(window, cx); + + fn create_note(&mut self, window: &mut Window, cx: &mut Context) { + let name = self.note_input.read(cx).value().to_string(); + if let Err(error) = self.new_note(name.trim(), window, cx) { + self.status = error; } else { - self.editor.update(cx, |state, cx| state.focus(window, cx)); + self.note_input + .update(cx, |state, cx| state.set_value("", window, cx)); } cx.notify(); } @@ -357,22 +430,15 @@ impl Vool { self.editor .update(cx, |state, cx| state.set_readonly(mode != Mode::Insert, cx)); self.status = match mode { - Mode::Normal => { - if self.previewing { - "Rendered document · p source · : commands" - } else { - "i insert · v select · a ask · p read · : commands" - } - } + Mode::Normal => "i insert · v select · a ask", Mode::Insert => "Esc normal", Mode::Visual => "h/j/k/l select · a ask · Esc cancel", - Mode::Command => "Enter run · Esc cancel", } .into(); cx.notify(); } - fn move_cursor(&mut self, key: &str, cx: &mut Context) { + fn move_cursor(&mut self, key: &str, window: &mut Window, 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 { @@ -392,11 +458,28 @@ 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) @@ -422,46 +505,18 @@ impl Vool { let key = event.keystroke.key.as_str(); if key == "escape" { cx.stop_propagation(); + self.settings_open = false; self.set_mode(Mode::Normal, cx); self.editor.update(cx, |state, cx| state.focus(window, cx)); return; } - if self.mode == Mode::Command { - if key == "enter" { - cx.stop_propagation(); - self.run_command(window, cx); - } - return; - } - if self.mode == Mode::Insert { - return; - } - if self.previewing { - if key == "p" { - cx.stop_propagation(); - self.toggle_preview(window, cx); - } else if key == ":" { - cx.stop_propagation(); - self.set_mode(Mode::Command, cx); - self.command.update(cx, |state, cx| { - state.set_value("", window, cx); - state.focus(window, cx); - }); - } + if self.settings_open || self.mode == Mode::Insert { return; } match key { - "p" if self.mode == Mode::Normal => { + "s" if self.mode == Mode::Normal => { cx.stop_propagation(); - self.toggle_preview(window, cx); - } - ":" if self.mode == Mode::Normal => { - cx.stop_propagation(); - self.set_mode(Mode::Command, cx); - self.command.update(cx, |state, cx| { - state.set_value("", window, cx); - state.focus(window, cx); - }); + self.toggle_settings(window, cx); } "i" if self.mode == Mode::Normal => { cx.stop_propagation(); @@ -479,30 +534,55 @@ impl Vool { } "h" | "j" | "k" | "l" | "0" | "$" => { cx.stop_propagation(); - self.move_cursor(key, cx); + self.move_cursor(key, window, cx); } _ => {} } } fn write_answer(&mut self, id: u64, body: &str, window: &mut Window, cx: &mut Context) { - let mut text = self.editor.read(cx).value().to_string(); - self.answers.reconcile(&self.saved_text, &text); - self.answers.replace_block(id, &mut text, body); - self.saved_text = text.clone(); - let range = self - .answers - .items - .iter() - .find(|a| a.id == id) - .map(|a| a.start..a.end); + let Some(answer) = self.answers.items.iter().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(text, window, cx); - if let Some(range) = range { - state.set_selected_range(range, cx); - } + state.set_value(value, window, cx); + state.set_selected_range(cursor, cx); }); - self.save(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())) + { + self.status = format!("Could not save: {error}"); + } + self.refresh_render(cx); + cx.notify(); } fn ask(&mut self, window: &mut Window, cx: &mut Context) { @@ -519,6 +599,7 @@ 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.request_seq += 1; let request = self.request_seq; @@ -534,6 +615,7 @@ impl Vool { .into(); let model = self.model.clone(); let provider = self.provider; + let key = self.key_input.read(cx).value().to_string(); let task = cx.background_spawn(async move { match provider { Provider::Codex => codex_answer(&prompt, &model), @@ -544,6 +626,7 @@ impl Vool { } else { &model }, + if key.is_empty() { None } else { Some(&key) }, ), } }); @@ -614,7 +697,7 @@ fn valid_name(name: &str) -> bool { #[cfg(test)] mod command_tests { - use super::valid_name; + use super::{Vool, valid_name}; #[test] fn note_names_cannot_escape_notes_directory() { @@ -624,6 +707,20 @@ mod command_tests { assert!(!valid_name(".hidden")); assert!(!valid_name("folder/note")); } + + #[test] + fn markdown_styles_use_utf8_byte_ranges() { + let source = "# Café\nA **bold** and *italic* idea"; + let decorations = Vool::markdown_decorations(source); + let styled: Vec<_> = decorations + .iter() + .map(|decoration| &source[decoration.range.clone()]) + .collect(); + assert!(styled.contains(&"Café")); + assert!(styled.contains(&"bold")); + assert!(styled.contains(&"italic")); + assert!(styled.contains(&"**")); + } } impl Render for Vool { @@ -671,53 +768,140 @@ impl Render for Vool { } ))); - let center = div() - .flex_1() - .min_w_0() - .h_full() - .flex() - .flex_col() - .bg(rgb(PAPER)) - .px(px(120.)) - .py(px(if self.previewing { 28. } else { 52. })) - .child( + 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(), + ) + .w_full(), + ); + } + } + 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( div() - .flex_1() - .min_h_0() - .overflow_hidden() - .when(self.previewing, |this| { - this.child( - TextView::new(&self.preview_view) + .id(format!("block-{}", range.start)) + .w_full() + .cursor_pointer() + .child( + TextView::markdown(format!("rich-{}", range.start), display) .style(TextViewStyle { heading_base_font_size: px(24.), ..Default::default() }) .text_color(rgb(TEXT)) .text_size(px(16.)) - .scrollable(true) - .size_full(), + .w_full(), ) - }) - .when(!self.previewing, |this| { - this.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(15.)) - .size_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( + div() + .id("document-scroll") + .size_full() + .px(px(120.)) + .py(px(46.)) + .overflow_y_scrollbar() + .child(document), ); + + 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() + .child(div().flex().flex_col().gap_6().w_full() + .child(div().text_3xl().font_weight(FontWeight::SEMIBOLD).child("Settings")) + .child(div().text_sm().text_color(rgb(MUTED)).child("Notes save locally. AI choices apply for this session.")) + .child(div().flex().gap_10().pt_6() + .child(div().flex().flex_col().gap_5().w(px(540.)) + .child(div().text_lg().font_weight(FontWeight::SEMIBOLD).child("AI provider")) + .child(div().flex().gap_3() + .child(div().id("provider-codex").px_4().py_2().rounded_md().cursor_pointer() + .bg(rgb(if self.provider == Provider::Codex { ACCENT } else { BG })) + .text_color(rgb(if self.provider == Provider::Codex { PAPER } else { TEXT })) + .child("Codex") + .on_click(cx.listener(|this, _, _, cx| { this.provider = Provider::Codex; this.model.clear(); cx.notify(); }))) + .child(div().id("provider-openrouter").px_4().py_2().rounded_md().cursor_pointer() + .bg(rgb(if self.provider == Provider::OpenRouter { ACCENT } else { BG })) + .text_color(rgb(if self.provider == Provider::OpenRouter { PAPER } else { TEXT })) + .child("OpenRouter") + .on_click(cx.listener(|this, _, _, cx| { this.provider = Provider::OpenRouter; this.model.clear(); cx.notify(); })))) + .child(div().text_sm().text_color(rgb(MUTED)).child(format!("Default model: {}", if self.provider == Provider::Codex { "Codex CLI default" } else { provider::OPENROUTER_MODEL }))) + .child(div().flex().gap_3().items_center() + .child(Input::new(&self.model_input).w(px(440.))) + .child(div().id("use-model").px_4().py_2().rounded_md().bg(rgb(ACCENT)).text_color(rgb(PAPER)).cursor_pointer().child("Use model") + .on_click(cx.listener(|this, _, _, cx| { this.model = this.model_input.read(cx).value().trim().to_string(); cx.notify(); }))) + .child(div().id("default-model").px_3().py_2().cursor_pointer().child("Default") + .on_click(cx.listener(|this, _, _, cx| { this.model.clear(); cx.notify(); })))) + .child(div().text_sm().text_color(rgb(MUTED)).child(format!("Selected: {}", if self.model.is_empty() { "provider default" } else { &self.model }))) + .child(div().pt_4().text_lg().font_weight(FontWeight::SEMIBOLD).child("OpenRouter key")) + .child(Input::new(&self.key_input).w(px(540.))) + .child(div().text_sm().text_color(rgb(MUTED)).child(if std::env::var_os("OPENROUTER_API_KEY").is_some() { "Environment key available. A key typed here overrides it for this session only." } else { "No environment key found. A key typed here is used for this session only." })) + ) + .child(div().flex().flex_col().gap_4().flex_1() + .child(div().text_lg().font_weight(FontWeight::SEMIBOLD).child("Notes")) + .child(div().flex().gap_3().items_center() + .child(Input::new(&self.note_input).flex_1()) + .child(div().id("create-note").px_4().py_2().rounded_md().bg(rgb(ACCENT)).text_color(rgb(PAPER)).cursor_pointer().child("Create note") + .on_click(cx.listener(|this, _, window, cx| this.create_note(window, cx))))) + .children(Self::files(&self.notes_dir).into_iter().map(|path| { + let label = path.file_stem().unwrap_or_default().to_string_lossy().to_string(); + div().id(format!("note-{label}")).px_3().py_2().rounded_sm().cursor_pointer().bg(rgb(BG)) + .child(label).on_click(cx.listener(move |this, _, window, cx| this.open(path.clone(), window, cx))) + })))))); let mode = match self.mode { Mode::Normal => "NORMAL", Mode::Insert => "INSERT", Mode::Visual => "VISUAL", - Mode::Command => "COMMAND", }; - let command_line = div() + let footer = div() .h(px(42.)) .px_8() .flex() @@ -733,22 +917,9 @@ impl Render for Vool { .font_weight(FontWeight::BOLD) .child(mode), ) - .when(self.mode == Mode::Command, |this| { - this.child(div().text_color(rgb(MUTED)).child(":")).child( - Input::new(&self.command) - .appearance(false) - .bordered(false) - .w(px(450.)) - .text_color(rgb(TEXT)), - ) - }) - .when(self.mode != Mode::Command, |this| { - this.child(div().text_color(rgb(MUTED)).child(self.status.clone())) - }) + .child(div().text_color(rgb(MUTED)).child(self.status.clone())) .child(div().flex_1()) - .when( - selected && !self.previewing && self.mode != Mode::Command, - |this| { + .when(selected && !self.settings_open, |this| { this.child( div() .id("ask-selection") @@ -761,9 +932,41 @@ impl Render for Vool { .child("Ask selection ↗") .on_click(cx.listener(|this, _, window, cx| this.ask(window, cx))), ) - }, + }) + .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))), ); + let block_cursor = if !self.settings_open + && self.mode == Mode::Normal + && !selected + && self.editor.focus_handle(cx).is_focused(_window) + { + self.editor.read(cx).cursor_layout().map(|(bounds, _)| { + div() + .absolute() + .left(bounds.origin.x) + .top(bounds.origin.y) + .w(px(10.)) + .h(bounds.size.height) + .bg(rgba(0x85603c77)) + }) + } else { + None + }; + div() .size_full() .flex() @@ -773,8 +976,9 @@ impl Render for Vool { .font_family("Noto Sans") .capture_key_down(cx.listener(Self::on_key)) .child(header) - .child(center) - .child(command_line) + .child(if self.settings_open { settings } else { center }) + .child(footer) + .when_some(block_cursor, |this, cursor| this.child(cursor)) } } @@ -790,6 +994,7 @@ fn main() { }, |window, cx| { let view = cx.new(|cx| Vool::new(window, cx)); + view.update(cx, |this, cx| this.refresh_render(cx)); cx.new(|cx| Root::new(view, window, cx)) }, )

Make Vool a continuous Markdown canvas with settings

Changes