mirror of
https://github.com/TECHNOFAB11/tmux-copyrat.git
synced 2025-12-15 17:33:51 +01:00
refactor(clean): better names
This commit is contained in:
parent
d8386615a3
commit
cab6ff3418
3 changed files with 43 additions and 85 deletions
14
src/lib.rs
14
src/lib.rs
|
|
@ -16,7 +16,7 @@ pub mod view;
|
|||
/// # Note
|
||||
///
|
||||
/// Maybe the decision to take ownership of the buffer is a bit bold.
|
||||
pub fn run(buffer: String, opt: &CliOpt) -> Vec<(String, bool)> {
|
||||
pub fn run(buffer: String, opt: &CliOpt) -> Option<(String, bool)> {
|
||||
let lines: Vec<&str> = buffer.split('\n').collect();
|
||||
|
||||
let mut state = state::State::new(&lines, &opt.alphabet, &opt.custom_regex);
|
||||
|
|
@ -34,10 +34,9 @@ pub fn run(buffer: String, opt: &CliOpt) -> Vec<(String, bool)> {
|
|||
},
|
||||
};
|
||||
|
||||
let selections: Vec<(String, bool)> = {
|
||||
let selection: Option<(String, bool)> = {
|
||||
let mut viewbox = view::View::new(
|
||||
&mut state,
|
||||
opt.multi_selection,
|
||||
opt.reverse,
|
||||
opt.unique_hint,
|
||||
&opt.hint_alignment,
|
||||
|
|
@ -48,7 +47,7 @@ pub fn run(buffer: String, opt: &CliOpt) -> Vec<(String, bool)> {
|
|||
viewbox.present()
|
||||
};
|
||||
|
||||
selections
|
||||
selection
|
||||
}
|
||||
|
||||
/// Main configuration, parsed from command line.
|
||||
|
|
@ -72,10 +71,6 @@ pub struct CliOpt {
|
|||
#[clap(short = "X", long)]
|
||||
custom_regex: Vec<String>,
|
||||
|
||||
/// Enable multi-selection.
|
||||
#[clap(short, long)]
|
||||
multi_selection: bool,
|
||||
|
||||
/// Reverse the order for assigned hints.
|
||||
#[clap(short, long)]
|
||||
reverse: bool,
|
||||
|
|
@ -161,9 +156,6 @@ impl CliOpt {
|
|||
}
|
||||
"@copyrat-regex-id" => (), // TODO
|
||||
"@copyrat-custom-regex" => self.custom_regex = vec![String::from(value)],
|
||||
"@copyrat-multi-selection" => {
|
||||
self.multi_selection = value.parse::<bool>()?;
|
||||
}
|
||||
"@copyrat-reverse" => {
|
||||
self.reverse = value.parse::<bool>()?;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue