Skip to content

Commit

Permalink
remove as keyword from preset importing
Browse files Browse the repository at this point in the history
  • Loading branch information
@ynqa
ynqa committed Feb 15, 2024
1 parent 80277d6 commit e044f31
Show file tree
Hide file tree
Showing 7 changed files with 51 additions and 60 deletions.
13 changes: 6 additions & 7 deletions src/preset/checkbox.rs
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
use std::fmt::Display;

use crate::{
checkbox::{Builder as CheckboxRendererBuilder, Renderer as CheckboxRenderer},
checkbox,
error::Result,
preset::theme::checkbox::Theme,
render::{Renderable, State},
text::Builder as TextRendererBuilder,
Prompt,
text, Prompt,
};

pub struct Checkbox {
title_builder: TextRendererBuilder,
checkbox_builder: CheckboxRendererBuilder,
title_builder: text::Builder,
checkbox_builder: checkbox::Builder,
}

impl Checkbox {
pub fn new<T: Display, I: IntoIterator<Item = T>>(items: I) -> Self {
Self {
title_builder: Default::default(),
checkbox_builder: CheckboxRendererBuilder::new(items),
checkbox_builder: checkbox::Builder::new(items),
}
.theme(Theme::default())
}
Expand Down Expand Up @@ -54,7 +53,7 @@ impl Checkbox {
|renderables: &Vec<Box<dyn Renderable + 'static>>| -> Result<Vec<String>> {
Ok(renderables[1]
.as_any()
.downcast_ref::<State<CheckboxRenderer>>()
.downcast_ref::<State<checkbox::Renderer>>()
.unwrap()
.after
.borrow()
Expand Down
18 changes: 8 additions & 10 deletions src/preset/confirm.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,21 @@ use crate::{
error::Result,
preset::theme::confirm::Theme,
render::{Renderable, State},
text::{Builder as TextRendererBuilder, Renderer as TextRenderer},
text_editor::{
Builder as TextEditorRendererBuilder, Renderer as TextEditorRenderer, TextEditor,
},
text,
text_editor::{self, TextEditor},
validate::Validator,
Prompt,
};

pub struct Confirm {
text_editor_builder: TextEditorRendererBuilder,
error_message_builder: TextRendererBuilder,
text_editor_builder: text_editor::Builder,
error_message_builder: text::Builder,
}

impl Confirm {
pub fn new<T: AsRef<str>>(text: T) -> Self {
Self {
text_editor_builder: TextEditorRendererBuilder::default()
text_editor_builder: text_editor::Builder::default()
.prefix(format!("{} (y/n) ", text.as_ref())),
error_message_builder: Default::default(),
}
Expand Down Expand Up @@ -56,7 +54,7 @@ impl Confirm {
-> Result<bool> {
let text_editor_state = renderables[0]
.as_any()
.downcast_ref::<State<TextEditorRenderer>>()
.downcast_ref::<State<text_editor::Renderer>>()
.unwrap();

let text = text_editor_state
Expand All @@ -67,7 +65,7 @@ impl Confirm {

let error_message_state = renderables[1]
.as_any()
.downcast_ref::<State<TextRenderer>>()
.downcast_ref::<State<text::Renderer>>()
.unwrap();

let ret = match event {
Expand Down Expand Up @@ -95,7 +93,7 @@ impl Confirm {
|renderables: &Vec<Box<dyn Renderable + 'static>>| -> Result<String> {
Ok(renderables[0]
.as_any()
.downcast_ref::<State<TextEditorRenderer>>()
.downcast_ref::<State<text_editor::Renderer>>()
.unwrap()
.after
.borrow()
Expand Down
15 changes: 7 additions & 8 deletions src/preset/password.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,16 @@ use crate::{
error::Result,
preset::theme::password::Theme,
render::{Renderable, State},
text::{Builder as TextRendererBuilder, Renderer as TextRenderer},
text_editor::{Builder as TextEditorRendererBuilder, Renderer as TextEditorRenderer},
text, text_editor,
validate::Validator,
Prompt,
};

pub struct Password {
title_builder: TextRendererBuilder,
text_editor_builder: TextEditorRendererBuilder,
title_builder: text::Builder,
text_editor_builder: text_editor::Builder,
validator: Option<Validator<str>>,
error_message_builder: TextRendererBuilder,
error_message_builder: text::Builder,
}

impl Default for Password {
Expand Down Expand Up @@ -70,7 +69,7 @@ impl Password {
-> Result<bool> {
let text: String = renderables[1]
.as_any()
.downcast_ref::<State<TextEditorRenderer>>()
.downcast_ref::<State<text_editor::Renderer>>()
.unwrap()
.after
.borrow()
Expand All @@ -79,7 +78,7 @@ impl Password {

let error_message_state = renderables[2]
.as_any()
.downcast_ref::<State<TextRenderer>>()
.downcast_ref::<State<text::Renderer>>()
.unwrap();

let ret = match event {
Expand Down Expand Up @@ -109,7 +108,7 @@ impl Password {
|renderables: &Vec<Box<dyn Renderable + 'static>>| -> Result<String> {
Ok(renderables[1]
.as_any()
.downcast_ref::<State<TextEditorRenderer>>()
.downcast_ref::<State<text_editor::Renderer>>()
.unwrap()
.after
.borrow()
Expand Down
22 changes: 10 additions & 12 deletions src/preset/queryselect.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,20 @@ use std::{fmt::Display, iter::FromIterator};
use crate::{
crossterm::event::Event,
error::Result,
listbox::{Builder as ListboxRendererBuilder, Listbox, Renderer as ListboxRenderer},
listbox::{self, Listbox},
preset::theme::queryselect::Theme,
render::{Renderable, State},
text::Builder as TextRendererBuilder,
text_editor::{
Builder as TextEditorRendererBuilder, Mode, Renderer as TextEditorRenderer, Suggest,
},
text,
text_editor::{self, Mode, Suggest},
Prompt,
};

type Filter = dyn Fn(&str, &Vec<String>) -> Vec<String>;

pub struct QuerySelect {
title_builder: TextRendererBuilder,
text_editor_builder: TextEditorRendererBuilder,
listbox_builder: ListboxRendererBuilder,
title_builder: text::Builder,
text_editor_builder: text_editor::Builder,
listbox_builder: listbox::Builder,
filter: Box<Filter>,
}

Expand All @@ -32,7 +30,7 @@ impl QuerySelect {
Self {
title_builder: Default::default(),
text_editor_builder: Default::default(),
listbox_builder: ListboxRendererBuilder::new(items),
listbox_builder: listbox::Builder::new(items),
filter: Box::new(filter),
}
.theme(Theme::default())
Expand Down Expand Up @@ -91,11 +89,11 @@ impl QuerySelect {
move |_: &Event, renderables: &Vec<Box<dyn Renderable + 'static>>| -> Result<bool> {
let text_editor_state = renderables[1]
.as_any()
.downcast_ref::<State<TextEditorRenderer>>()
.downcast_ref::<State<text_editor::Renderer>>()
.unwrap();
let select_state = renderables[2]
.as_any()
.downcast_ref::<State<ListboxRenderer>>()
.downcast_ref::<State<listbox::Renderer>>()
.unwrap();

if text_editor_state.text_changed() {
Expand All @@ -113,7 +111,7 @@ impl QuerySelect {
|renderables: &Vec<Box<dyn Renderable + 'static>>| -> Result<String> {
Ok(renderables[2]
.as_any()
.downcast_ref::<State<ListboxRenderer>>()
.downcast_ref::<State<listbox::Renderer>>()
.unwrap()
.after
.borrow()
Expand Down
18 changes: 8 additions & 10 deletions src/preset/readline.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,17 @@ use crate::{
error::Result,
preset::theme::readline::Theme,
render::{Renderable, State},
text::{Builder as TextRendererBuilder, Renderer as TextRenderer},
text_editor::{
Builder as TextEditorRendererBuilder, Mode, Renderer as TextEditorRenderer, Suggest,
},
text,
text_editor::{self, Mode, Suggest},
validate::Validator,
Prompt,
};

pub struct Readline {
title_builder: TextRendererBuilder,
text_editor_builder: TextEditorRendererBuilder,
title_builder: text::Builder,
text_editor_builder: text_editor::Builder,
validator: Option<Validator<str>>,
error_message_builder: TextRendererBuilder,
error_message_builder: text::Builder,
}

impl Default for Readline {
Expand Down Expand Up @@ -91,7 +89,7 @@ impl Readline {
-> Result<bool> {
let text: String = renderables[1]
.as_any()
.downcast_ref::<State<TextEditorRenderer>>()
.downcast_ref::<State<text_editor::Renderer>>()
.unwrap()
.after
.borrow()
Expand All @@ -100,7 +98,7 @@ impl Readline {

let error_message_state = renderables[2]
.as_any()
.downcast_ref::<State<TextRenderer>>()
.downcast_ref::<State<text::Renderer>>()
.unwrap();

let ret = match event {
Expand Down Expand Up @@ -130,7 +128,7 @@ impl Readline {
|renderables: &Vec<Box<dyn Renderable + 'static>>| -> Result<String> {
Ok(renderables[1]
.as_any()
.downcast_ref::<State<TextEditorRenderer>>()
.downcast_ref::<State<text_editor::Renderer>>()
.unwrap()
.after
.borrow()
Expand Down
13 changes: 6 additions & 7 deletions src/preset/select.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,22 @@ use std::fmt::Display;

use crate::{
error::Result,
listbox::{Builder as ListboxRendererBuilder, Renderer as ListboxRenderer},
listbox,
preset::theme::select::Theme,
render::{Renderable, State},
text::Builder as TextRendererBuilder,
Prompt,
text, Prompt,
};

pub struct Select {
title_builder: TextRendererBuilder,
listbox_builder: ListboxRendererBuilder,
title_builder: text::Builder,
listbox_builder: listbox::Builder,
}

impl Select {
pub fn new<T: Display, I: IntoIterator<Item = T>>(items: I) -> Self {
Self {
title_builder: Default::default(),
listbox_builder: ListboxRendererBuilder::new(items),
listbox_builder: listbox::Builder::new(items),
}
.theme(Theme::default())
}
Expand Down Expand Up @@ -53,7 +52,7 @@ impl Select {
|renderables: &Vec<Box<dyn Renderable + 'static>>| -> Result<String> {
Ok(renderables[1]
.as_any()
.downcast_ref::<State<ListboxRenderer>>()
.downcast_ref::<State<listbox::Renderer>>()
.unwrap()
.after
.borrow()
Expand Down
12 changes: 6 additions & 6 deletions src/preset/tree.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@ use crate::{
error::Result,
preset::theme::tree::Theme,
render::{Renderable, State},
text::Builder as TextRendererBuilder,
tree::{Builder as TreeRendererBuilder, Node, Renderer as TreeRenderer},
text,
tree::{self, Node},
Prompt,
};

pub struct Tree {
title_builder: TextRendererBuilder,
tree_builder: TreeRendererBuilder,
title_builder: text::Builder,
tree_builder: tree::Builder,
}

impl Tree {
pub fn new(root: Node) -> Self {
Self {
title_builder: Default::default(),
tree_builder: TreeRendererBuilder::new(root),
tree_builder: tree::Builder::new(root),
}
.theme(Theme::default())
}
Expand Down Expand Up @@ -52,7 +52,7 @@ impl Tree {
|renderables: &Vec<Box<dyn Renderable + 'static>>| -> Result<String> {
Ok(renderables[1]
.as_any()
.downcast_ref::<State<TreeRenderer>>()
.downcast_ref::<State<tree::Renderer>>()
.unwrap()
.after
.borrow()
Expand Down

0 comments on commit e044f31

Please sign in to comment.