h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-24 01:11:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Rename RgbColor to Color

Browse Source 
RgbColor can also be a named color, so this name is surprising to readers
who don't have the implicit assumption that named colors are the default
and that RGB support is something novel.
This commit is contained in:
Johannes Altmanninger
2025-04-12 16:22:21 +02:00
parent 6f65661109
commit 5b9ba559c7
5 changed files with 83 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/reader.rs
View File

@@ -46,7 +46,7 @@
use crate::builtins::shared::ErrorCode;
use crate::builtins::shared::STATUS_CMD_ERROR;
use crate::builtins::shared::STATUS_CMD_OK;
use crate::color::RgbColor;
use crate::color::Color;
use crate::common::restore_term_foreground_process_group_for_exit;
use crate::common::{
escape, escape_string, exit_without_destructors, get_ellipsis_char, get_obfuscation_read_char,
@@ -2292,7 +2292,7 @@ fn readline(&mut self, nchars: Option<NonZeroUsize>) -> Option<WString> {
}
Outputter::stdoutput()
.borrow_mut()
.set_color(RgbColor::RESET, RgbColor::RESET);
.set_color(Color::RESET, Color::RESET);
}
let result = self
.rls()
@@ -2700,7 +2700,7 @@ fn handle_readline_command(&mut self, c: ReadlineCmd) {
);
}
outp.write_wstr(L!("^C"));
outp.set_color(RgbColor::RESET, RgbColor::RESET);
outp.set_color(Color::RESET, Color::RESET);
// We print a newline last so the prompt_sp hack doesn't get us.
outp.push(b'\n');
@@ -4466,7 +4466,7 @@ fn reader_interactive_init(parser: &Parser) {
fn reader_interactive_destroy() {
Outputter::stdoutput()
.borrow_mut()
.set_color(RgbColor::RESET, RgbColor::RESET);
.set_color(Color::RESET, Color::RESET);
}
/// Return whether fish is currently unwinding the stack in preparation to exit.
@@ -4530,7 +4530,7 @@ pub fn reader_write_title(
out.write_command(Osc0WindowTitle(&lst));
}
out.set_color(RgbColor::RESET, RgbColor::RESET);
out.set_color(Color::RESET, Color::RESET);
if reset_cursor_position && !lst.is_empty() {
// Put the cursor back at the beginning of the line (issue #2453).
out.write_bytes(b"\r");
@@ -5659,7 +5659,7 @@ fn reader_run_command(parser: &Parser, cmd: &wstr) -> EvalRes {
reader_write_title(cmd, parser, true);
Outputter::stdoutput()
.borrow_mut()
.set_color(RgbColor::NORMAL, RgbColor::NORMAL);
.set_color(Color::NORMAL, Color::NORMAL);
term_donate(false);
let time_before = Instant::now();