on master help sign in
highlighted_code_block: Take input text as &str
953073aMichael Davis
helix-term/src/ui/lsp.rs+2−2
@@ -62,7 +62,7 @@ impl Component for SignatureHelp {
62 });
62 });
63
63
64 let sig_text = crate::ui::markdown::highlighted_code_block(
64 let sig_text = crate::ui::markdown::highlighted_code_block(
65− self.signature.clone(),
65+ &self.signature,
66 &self.language,
66 &self.language,
67 Some(&cx.editor.theme),
67 Some(&cx.editor.theme),
68 Arc::clone(&self.config_loader),
68 Arc::clone(&self.config_loader),
@@ -109,7 +109,7 @@ impl Component for SignatureHelp {
109 let max_text_width = (viewport.0 - PADDING).min(120);
109 let max_text_width = (viewport.0 - PADDING).min(120);
110
110
111 let signature_text = crate::ui::markdown::highlighted_code_block(
111 let signature_text = crate::ui::markdown::highlighted_code_block(
112− self.signature.clone(),
112+ &self.signature,
113 &self.language,
113 &self.language,
114 None,
114 None,
115 Arc::clone(&self.config_loader),
115 Arc::clone(&self.config_loader),
helix-term/src/ui/markdown.rs+3−3
@@ -17,7 +17,7 @@ use helix_view::{
17 Theme,
17 Theme,
18};
18};
19
19
20−fn styled_multiline_text<'a>(text: String, style: Style) -> Text<'a> {
20+fn styled_multiline_text<'a>(text: &str, style: Style) -> Text<'a> {
21 let spans: Vec<_> = text
21 let spans: Vec<_> = text
22 .lines()
22 .lines()
23 .map(|line| Span::styled(line.to_string(), style))
23 .map(|line| Span::styled(line.to_string(), style))
@@ -27,7 +27,7 @@ fn styled_multiline_text<'a>(text: String, style: Style) -> Text<'a> {
27}
27}
28
28
29pub fn highlighted_code_block<'a>(
29pub fn highlighted_code_block<'a>(
30− text: String,
30+ text: &str,
31 language: &str,
31 language: &str,
32 theme: Option<&Theme>,
32 theme: Option<&Theme>,
33 config_loader: Arc<syntax::Loader>,
33 config_loader: Arc<syntax::Loader>,
@@ -267,7 +267,7 @@ impl Markdown {
267 CodeBlockKind::Indented => "",
267 CodeBlockKind::Indented => "",
268 };
268 };
269 let tui_text = highlighted_code_block(
269 let tui_text = highlighted_code_block(
270− text.to_string(),
270+ &text,
271 language,
271 language,
272 theme,
272 theme,
273 Arc::clone(&self.config_loader),
273 Arc::clone(&self.config_loader),
helix-term/src/ui/prompt.rs+1−1
@@ -476,7 +476,7 @@ impl Prompt {
476 }
476 }
477 } else if let Some((language, loader)) = self.language.as_ref() {
477 } else if let Some((language, loader)) = self.language.as_ref() {
478 let mut text: ui::text::Text = crate::ui::markdown::highlighted_code_block(
478 let mut text: ui::text::Text = crate::ui::markdown::highlighted_code_block(
479− self.line.clone(),
479+ &self.line,
480 language,
480 language,
481 Some(&cx.editor.theme),
481 Some(&cx.editor.theme),
482 loader.clone(),
482 loader.clone(),