Llewellyn/exa
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/exa.git synced 2024-12-26 01:57:32 +00:00
Code Issues Projects Releases Wiki Activity

A file’s colour is actually a style

Browse Source
This commit is contained in:
Benjamin Sago 2017-05-01 15:43:27 +01:00
parent 7531b2617c
commit 5e0b9e0a10
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/output/file_name.rs
View File

@ -61,7 +61,7 @@ impl<'a, 'dir> FileName<'a, 'dir> {
} }
if !target.name.is_empty() { if !target.name.is_empty() {
bits.push(FileName::new(&target, self.colours).file_colour().paint(target.name)); bits.push(FileName::new(&target, self.colours).style().paint(target.name));
} }
}, },
@ -113,11 +113,11 @@ impl<'a, 'dir> FileName<'a, 'dir> {
/// So in that situation, those characters will be escaped and highlighted in /// So in that situation, those characters will be escaped and highlighted in
/// a different colour. /// a different colour.
fn coloured_file_name<'unused>(&self) -> Vec<ANSIString<'unused>> { fn coloured_file_name<'unused>(&self) -> Vec<ANSIString<'unused>> {
let colour = self.file_colour(); let file_style = self.style();
let mut bits = Vec::new(); let mut bits = Vec::new();
if self.file.name.chars().all(|c| c >= 0x20 as char) { if self.file.name.chars().all(|c| c >= 0x20 as char) {
bits.push(colour.paint(self.file.name.clone())); bits.push(file_style.paint(self.file.name.clone()));
} }
else { else {
for c in self.file.name.chars() { for c in self.file.name.chars() {
@ -129,7 +129,7 @@ impl<'a, 'dir> FileName<'a, 'dir> {
// hence the `all` check above. // hence the `all` check above.
let mut s = String::new(); let mut s = String::new();
s.push(c); s.push(c);
bits.push(colour.paint(s)); bits.push(file_style.paint(s));
} else { } else {
let s = c.escape_default().collect::<String>(); let s = c.escape_default().collect::<String>();
bits.push(self.colours.control_char.paint(s)); bits.push(self.colours.control_char.paint(s));
@ -140,7 +140,7 @@ impl<'a, 'dir> FileName<'a, 'dir> {
bits bits
} }
pub fn file_colour(&self) -> Style { pub fn style(&self) -> Style {
match self.file { match self.file {
f if f.is_directory() => self.colours.filetypes.directory, f if f.is_directory() => self.colours.filetypes.directory,
f if f.is_executable_file() => self.colours.filetypes.executable, f if f.is_executable_file() => self.colours.filetypes.executable,