Give broken links a different style in grid view

ogham · ogham · commit 9f6376a560df · 2017-05-07T14:45:04.000+01:00
Because the link style and status are now both available to the function that picks the colour style, we can have it highlight broken links differently. Fixes ogham#131.
diff --git a/src/fs/file.rs b/src/fs/file.rs
@@ -412,6 +412,16 @@ pub enum FileTarget<'dir> {
     Err(IOError),
 }
 
+impl<'dir> FileTarget<'dir> {
+    pub fn is_broken(&self) -> bool {
+        match self {
+            &FileTarget::Ok(_)      => false,
+            &FileTarget::Broken(_)  => true,
+            &FileTarget::Err(_)     => true,
+        }
+    }
+}
+
 
 #[cfg(test)]
 mod test {
diff --git a/src/output/file_name.rs b/src/output/file_name.rs
@@ -8,6 +8,7 @@ use output::escape;
 use output::cell::TextCellContents;
 
 
+#[derive(PartialEq, Debug, Copy, Clone)]
 pub enum LinkStyle {
     JustFilenames,
     FullLinkPaths,
@@ -48,7 +49,7 @@ impl<'a, 'dir> FileName<'a, 'dir> {
             }
         }
 
-        if let (&LinkStyle::FullLinkPaths, Some(ref target)) = (&self.link_style, self.target.as_ref()) {
+        if let (LinkStyle::FullLinkPaths, Some(ref target)) = (self.link_style, self.target.as_ref()) {
             match **target {
                 FileTarget::Ok(ref target) => {
                     bits.push(Style::default().paint(" "));
@@ -138,6 +139,14 @@ impl<'a, 'dir> FileName<'a, 'dir> {
     }
 
     pub fn style(&self) -> Style {
+        if let LinkStyle::JustFilenames = self.link_style {
+            if let Some(ref target) = self.target {
+                if target.is_broken() {
+                    return self.colours.broken_arrow;
+                }
+            }
+        }
+
         match self.file {
             f if f.is_directory()        => self.colours.filetypes.directory,
             f if f.is_executable_file()  => self.colours.filetypes.executable,
diff --git a/xtests/file_names_R b/xtests/file_names_R
@@ -6,7 +6,7 @@ emoji: [🆒]                       invalid-utf8-4: [�(�(]  utf-8: pâté
 escape: [[31m\u{1b}[0m]                 [1;34mlinks[0m                   vertical-tab: [[31m\u{b}[0m]
 
 /testcases/file-names/links:
-[36manother: [[31m\n[36m][0m  [36mbroken[0m  [36msubfile[0m
+[36manother: [[31m\n[36m][0m  [31mbroken[0m  [36msubfile[0m
 
 /testcases/file-names/new-line-dir: [\n]:
 another: [[31m\n[0m]  subfile
diff --git a/xtests/links b/xtests/links
@@ -1,2 +1,2 @@
-[36mbroken[0m       [36mforbidden[0m  [36mparent_dir[0m  some_file           [36msome_file_relative[0m
-[36mcurrent_dir[0m  [36mitself[0m     [36mroot[0m        [36msome_file_absolute[0m  [36musr[0m
+[31mbroken[0m       [31mforbidden[0m  [36mparent_dir[0m  some_file           [36msome_file_relative[0m
+[36mcurrent_dir[0m  [31mitself[0m     [36mroot[0m        [36msome_file_absolute[0m  [36musr[0m

-Original file line number
+Diff line change
 escape: [[31m\u{1b}[0m]                 [1;34mlinks[0m                   vertical-tab: [[31m\u{b}[0m]
 /testcases/file-names/links:
 -[36manother: [[31m\n[36m][0m  [36mbroken[0m  [36msubfile[0m
 +[36manother: [[31m\n[36m][0m  [31mbroken[0m  [36msubfile[0m
 /testcases/file-names/new-line-dir: [\n]:
 another: [[31m\n[0m]  subfile
-Original file line number
+Diff line change
@@ @@ -1,2 +1,2 @@ @@
 -[36mbroken[0m       [36mforbidden[0m  [36mparent_dir[0m  some_file           [36msome_file_relative[0m
 -[36mcurrent_dir[0m  [36mitself[0m     [36mroot[0m        [36msome_file_absolute[0m  [36musr[0m
 +[31mbroken[0m       [31mforbidden[0m  [36mparent_dir[0m  some_file           [36msome_file_relative[0m
 +[36mcurrent_dir[0m  [31mitself[0m     [36mroot[0m        [36msome_file_absolute[0m  [36musr[0m