andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-22 01:16:18 +04:00
Code Issues Projects Releases Wiki Activity

fix: remove unneeded allocations when calling helix_view::Info::new

Browse Source
This commit is contained in:
Alexis (Poliorcetics) Bourget 2022-10-08 20:06:23 +02:00 committed by Blaž Hrastnik
parent 28cb89eadb
commit b58899bc8e
2 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
helix-term/src/commands.rs
View File

@ -4455,13 +4455,7 @@ fn select_textobject(cx: &mut Context, objtype: textobject::TextObject) {
(" ", "... or any character acting as a pair"),
];
cx.editor.autoinfo = Some(Info::new(
title,
help_text
.into_iter()
.map(|(col1, col2)| (col1.to_string(), col2.to_string()))
.collect(),
));
cx.editor.autoinfo = Some(Info::new(title, &help_text));
}
fn surround_add(cx: &mut Context) {

33
helix-view/src/info.rs
View File

@ -16,7 +16,11 @@ pub struct Info {
}
impl Info {
pub fn new(title: &str, body: Vec<(String, String)>) -> Self {
pub fn new<T, U>(title: &str, body: &[(T, U)]) -> Self
where
T: AsRef<str>,
U: AsRef<str>,
{
if body.is_empty() {
return Self {
title: title.to_string(),
@ -26,11 +30,21 @@ pub fn new(title: &str, body: Vec<(String, String)>) -> Self {
};
}
let item_width = body.iter().map(|(item, _)| item.width()).max().unwrap();
let item_width = body
.iter()
.map(|(item, _)| item.as_ref().width())
.max()
.unwrap();
let mut text = String::new();
for (item, desc) in &body {
let _ = writeln!(text, "{:width$} {}", item, desc, width = item_width);
for (item, desc) in body {
let _ = writeln!(
text,
"{:width$} {}",
item.as_ref(),
desc.as_ref(),
width = item_width
);
}
Self {
@ -42,19 +56,19 @@ pub fn new(title: &str, body: Vec<(String, String)>) -> Self {
}
pub fn from_keymap(title: &str, body: Vec<(&str, BTreeSet<KeyEvent>)>) -> Self {
let body = body
let body: Vec<_> = body
.into_iter()
.map(|(desc, events)| {
let events = events.iter().map(ToString::to_string).collect::<Vec<_>>();
(events.join(", "), desc.to_string())
(events.join(", "), desc)
})
.collect();
Self::new(title, body)
Self::new(title, &body)
}
pub fn from_registers(registers: &Registers) -> Self {
let body = registers
let body: Vec<_> = registers
.inner()
.iter()
.map(|(ch, reg)| {
@ -62,13 +76,12 @@ pub fn from_registers(registers: &Registers) -> Self {
.read()
.get(0)
.and_then(|s| s.lines().next())
.map(String::from)
.unwrap_or_default();
(ch.to_string(), content)
})
.collect();
let mut infobox = Self::new("Registers", body);
let mut infobox = Self::new("Registers", &body);
infobox.width = 30; // copied content could be very long
infobox
}