mirror of
https://github.com/Llewellynvdm/exa.git
synced 2024-12-28 02:35:03 +00:00
Move Git render_char to its own method
This commit is contained in:
parent
e2f2bd69de
commit
c9a3affb4c
@ -9,7 +9,7 @@ use users::{OSUsers, Users};
|
||||
|
||||
use super::filename;
|
||||
|
||||
use ansi_term::{ANSIStrings, Style};
|
||||
use ansi_term::{ANSIString, ANSIStrings, Style};
|
||||
use ansi_term::Style::Plain;
|
||||
|
||||
use locale;
|
||||
@ -293,23 +293,24 @@ impl Table {
|
||||
}
|
||||
|
||||
fn render_git_status(&self, git: f::Git) -> Cell {
|
||||
let render_char = |chr| {
|
||||
match chr {
|
||||
f::GitStatus::NotModified => self.colours.punctuation.paint("-"),
|
||||
f::GitStatus::New => self.colours.git.new.paint("N"),
|
||||
f::GitStatus::Modified => self.colours.git.modified.paint("M"),
|
||||
f::GitStatus::Deleted => self.colours.git.deleted.paint("D"),
|
||||
f::GitStatus::Renamed => self.colours.git.renamed.paint("R"),
|
||||
f::GitStatus::TypeChange => self.colours.git.typechange.paint("T"),
|
||||
}
|
||||
};
|
||||
|
||||
Cell {
|
||||
text: ANSIStrings(&[ render_char(git.staged), render_char(git.unstaged) ]).to_string(),
|
||||
text: ANSIStrings(&[ self.render_git_char(git.staged),
|
||||
self.render_git_char(git.unstaged) ]).to_string(),
|
||||
length: 2,
|
||||
}
|
||||
}
|
||||
|
||||
fn render_git_char(&self, status: f::GitStatus) -> ANSIString {
|
||||
match status {
|
||||
f::GitStatus::NotModified => self.colours.punctuation.paint("-"),
|
||||
f::GitStatus::New => self.colours.git.new.paint("N"),
|
||||
f::GitStatus::Modified => self.colours.git.modified.paint("M"),
|
||||
f::GitStatus::Deleted => self.colours.git.deleted.paint("D"),
|
||||
f::GitStatus::Renamed => self.colours.git.renamed.paint("R"),
|
||||
f::GitStatus::TypeChange => self.colours.git.typechange.paint("T"),
|
||||
}
|
||||
}
|
||||
|
||||
fn render_user(&mut self, user: f::User) -> Cell {
|
||||
let user_name = match self.users.get_user_by_uid(user.0) {
|
||||
Some(user) => user.name,
|
||||
|
Loading…
Reference in New Issue
Block a user