summaryrefslogtreecommitdiffstats
path: root/src/repl/init.rs
diff options
context:
space:
mode:
authorsigoden <sigoden@gmail.com>2023-03-10 07:08:40 +0800
committersigoden <sigoden@gmail.com>2023-03-10 07:08:40 +0800
commitff00426c2c9d7d16de9221644e4f276f7e24d74a (patch)
treed6bc1d31a1aba4430e7d3b07adab5625290e417a /src/repl/init.rs
parent4161eaa6c3ea0b6a10bd70d36f47bbbae0ae209c (diff)
downloadaichat-ff00426c2c9d7d16de9221644e4f276f7e24d74a.tar.gz
chore: improve code quality, split rep/prompt.rs from repl/init.rs
Diffstat (limited to 'src/repl/init.rs')
-rw-r--r--src/repl/init.rs63
1 files changed, 3 insertions, 60 deletions
diff --git a/src/repl/init.rs b/src/repl/init.rs
index faafd9d..61351fc 100644
--- a/src/repl/init.rs
+++ b/src/repl/init.rs
@@ -5,17 +5,13 @@ use crate::config::{Config, SharedConfig};
use anyhow::{Context, Result};
use reedline::{
default_emacs_keybindings, ColumnarMenu, DefaultCompleter, Emacs, FileBackedHistory, KeyCode,
- KeyModifiers, Keybindings, Prompt, PromptHistorySearch, PromptHistorySearchStatus, Reedline,
- ReedlineEvent, ReedlineMenu, ValidationResult, Validator,
+ KeyModifiers, Keybindings, Reedline, ReedlineEvent, ReedlineMenu, ValidationResult, Validator,
};
-use std::borrow::Cow;
const MENU_NAME: &str = "completion_menu";
-const DEFAULT_MULTILINE_INDICATOR: &str = "::: ";
pub struct Repl {
pub editor: Reedline,
- pub prompt: ReplPrompt,
}
impl Repl {
@@ -25,7 +21,7 @@ impl Repl {
.filter(|(_, _, v)| *v)
.map(|(v, _, _)| *v)
.collect();
- let completer = Self::create_completer(config.clone());
+ let completer = Self::create_completer(config);
let keybindings = Self::create_keybindings();
let history = Self::create_history()?;
let menu = Self::create_menu();
@@ -39,8 +35,7 @@ impl Repl {
.with_partial_completions(true)
.with_validator(Box::new(ReplValidator { multiline_commands }))
.with_ansi_colors(true);
- let prompt = ReplPrompt(config);
- Ok(Self { editor, prompt })
+ Ok(Self { editor })
}
fn create_completer(config: SharedConfig) -> DefaultCompleter {
@@ -120,55 +115,3 @@ fn incomplete_brackets(line: &str, multiline_commands: &[&str]) -> bool {
!balance.is_empty()
}
-
-#[derive(Clone)]
-pub struct ReplPrompt(SharedConfig);
-
-impl Prompt for ReplPrompt {
- fn render_prompt_left(&self) -> Cow<str> {
- let config = self.0.lock();
- if let Some(role) = config.role.as_ref() {
- role.name.to_string().into()
- } else {
- Cow::Borrowed("")
- }
- }
-
- fn render_prompt_right(&self) -> Cow<str> {
- let config = self.0.lock();
- if let Some(conversation) = config.conversation.as_ref() {
- conversation.reamind_tokens().to_string().into()
- } else {
- Cow::Borrowed("")
- }
- }
-
- fn render_prompt_indicator(&self, _prompt_mode: reedline::PromptEditMode) -> Cow<str> {
- let config = self.0.lock();
- if config.conversation.is_some() {
- Cow::Borrowed("$")
- } else {
- Cow::Borrowed("〉")
- }
- }
-
- fn render_prompt_multiline_indicator(&self) -> Cow<str> {
- Cow::Borrowed(DEFAULT_MULTILINE_INDICATOR)
- }
-
- fn render_prompt_history_search_indicator(
- &self,
- history_search: PromptHistorySearch,
- ) -> Cow<str> {
- let prefix = match history_search.status {
- PromptHistorySearchStatus::Passing => "",
- PromptHistorySearchStatus::Failing => "failing ",
- };
- // NOTE: magic strings, given there is logic on how these compose I am not sure if it
- // is worth extracting in to static constant
- Cow::Owned(format!(
- "({}reverse-search: {}) ",
- prefix, history_search.term
- ))
- }
-}