mirrors/helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2025-04-05 20:07:44 +03:00
Code Issues Projects Releases Packages Wiki Activity

Make prompt suggestions greyed out

Browse source
This commit is contained in:
Jonathan LEI 2022-12-10 09:56:12 +00:00 • committed by Michael Davis
parent 042d03269e
commit 24cd7f6adf
2 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
book/src/themes.md
View file

@ -268,6 +268,7 @@ These scopes are used for theming the editor interface.
| `ui.help` | Description box for commands | | `ui.help` | Description box for commands |
| `ui.text` | Command prompts, popup text, etc. | | `ui.text` | Command prompts, popup text, etc. |
| `ui.text.focus` | | | `ui.text.focus` | |
| `ui.text.inactive` | Same as `ui.text` but when the text is inactive (e.g. suggestions) |
| `ui.text.info` | The key: command text in `ui.popup.info` boxes | | `ui.text.info` | The key: command text in `ui.popup.info` boxes |
| `ui.virtual.ruler` | Ruler columns (see the [`editor.rulers` config][editor-section]) | | `ui.virtual.ruler` | Ruler columns (see the [`editor.rulers` config][editor-section]) |
| `ui.virtual.whitespace` | Visible whitespace characters | | `ui.virtual.whitespace` | Visible whitespace characters |

19
helix-term/src/ui/prompt.rs
View file

@ -352,6 +352,7 @@ impl Prompt {
let prompt_color = theme.get("ui.text"); let prompt_color = theme.get("ui.text");
let completion_color = theme.get("ui.menu"); let completion_color = theme.get("ui.menu");
let selected_color = theme.get("ui.menu.selected"); let selected_color = theme.get("ui.menu.selected");
let suggestion_color = theme.get("ui.text.inactive");
// completion // completion
let max_len = self let max_len = self
@ -450,21 +451,29 @@ impl Prompt {
// render buffer text // render buffer text
surface.set_string(area.x, area.y + line, &self.prompt, prompt_color); surface.set_string(area.x, area.y + line, &self.prompt, prompt_color);
let input: Cow<str> = if self.line.is_empty() { let (input, is_suggestion): (Cow<str>, bool) = if self.line.is_empty() {
// latest value in the register list // latest value in the register list
self.history_register match self
.history_register
.and_then(|reg| cx.editor.registers.last(reg)) .and_then(|reg| cx.editor.registers.last(reg))
.map(|entry| entry.into()) .map(|entry| entry.into())
.unwrap_or_else(|| Cow::from("")) {
Some(value) => (value, true),
None => (Cow::from(""), false),
}
} else { } else {
self.line.as_str().into() (self.line.as_str().into(), false)
}; };
surface.set_string( surface.set_string(
area.x + self.prompt.len() as u16, area.x + self.prompt.len() as u16,
area.y + line, area.y + line,
&input, &input,
prompt_color, if is_suggestion {
suggestion_color
} else {
prompt_color
},
); );
} }
} }