style(format): rustfmt
This commit is contained in:
@@ -5,9 +5,9 @@ use ::std::sync::mpsc::{Receiver, SyncSender};
|
|||||||
use ::tui::backend::Backend;
|
use ::tui::backend::Backend;
|
||||||
|
|
||||||
use crate::messages::{handle_instructions, Instruction};
|
use crate::messages::{handle_instructions, Instruction};
|
||||||
use crate::state::{UiEffects, FileToDelete};
|
use crate::state::files::{FileOrFolder, FileTree, Folder};
|
||||||
use crate::state::files::{FileTree, FileOrFolder, Folder};
|
|
||||||
use crate::state::tiles::Board;
|
use crate::state::tiles::Board;
|
||||||
|
use crate::state::{FileToDelete, UiEffects};
|
||||||
use crate::ui::Display;
|
use crate::ui::Display;
|
||||||
use crate::Event;
|
use crate::Event;
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
use ::std::io::stdin;
|
use ::std::io::stdin;
|
||||||
use ::termion::event::Event;
|
use ::termion::event::Event;
|
||||||
use ::termion::input::TermRead;
|
|
||||||
use ::termion::event::Key;
|
use ::termion::event::Key;
|
||||||
|
use ::termion::input::TermRead;
|
||||||
use ::tui::backend::Backend;
|
use ::tui::backend::Backend;
|
||||||
|
|
||||||
use crate::state::FileToDelete;
|
use crate::state::FileToDelete;
|
||||||
|
|||||||
@@ -4,11 +4,11 @@ use ::termion::event::Event as TermionEvent;
|
|||||||
use ::tui::backend::Backend;
|
use ::tui::backend::Backend;
|
||||||
use ::walkdir::DirEntry;
|
use ::walkdir::DirEntry;
|
||||||
|
|
||||||
use crate::{App, UiMode};
|
|
||||||
use crate::input::{
|
use crate::input::{
|
||||||
handle_keypress_delete_file_mode, handle_keypress_error_message, handle_keypress_loading_mode,
|
handle_keypress_delete_file_mode, handle_keypress_error_message, handle_keypress_loading_mode,
|
||||||
handle_keypress_normal_mode, handle_keypress_screen_too_small,
|
handle_keypress_normal_mode, handle_keypress_screen_too_small,
|
||||||
};
|
};
|
||||||
|
use crate::{App, UiMode};
|
||||||
|
|
||||||
pub enum Instruction {
|
pub enum Instruction {
|
||||||
SetPathToRed,
|
SetPathToRed,
|
||||||
|
|||||||
@@ -195,11 +195,8 @@ impl TreeMap {
|
|||||||
} else {
|
} else {
|
||||||
let current_row_worst_ratio =
|
let current_row_worst_ratio =
|
||||||
self.worst_in_renderable_row(&row, length_of_row, min_first_side, min_second_side);
|
self.worst_in_renderable_row(&row, length_of_row, min_first_side, min_second_side);
|
||||||
let row_with_first_child: Vec<&FileMetadata> = row
|
let row_with_first_child: Vec<&FileMetadata> =
|
||||||
.iter()
|
row.iter().chain(children.iter().take(1)).copied().collect();
|
||||||
.chain(children.iter().take(1))
|
|
||||||
.copied()
|
|
||||||
.collect();
|
|
||||||
|
|
||||||
let row_with_child_worst_ratio = self.worst_in_renderable_row(
|
let row_with_child_worst_ratio = self.worst_in_renderable_row(
|
||||||
&row_with_first_child,
|
&row_with_first_child,
|
||||||
|
|||||||
@@ -4,13 +4,13 @@ use ::std::io::prelude::*;
|
|||||||
use ::std::iter;
|
use ::std::iter;
|
||||||
use ::std::path::{Path, PathBuf};
|
use ::std::path::{Path, PathBuf};
|
||||||
|
|
||||||
use ::termion::event::{Event, Key};
|
|
||||||
use ::insta::assert_snapshot;
|
use ::insta::assert_snapshot;
|
||||||
|
use ::termion::event::{Event, Key};
|
||||||
|
|
||||||
use crate::start;
|
use crate::start;
|
||||||
use crate::tests::fakes::TerminalEvent::*;
|
|
||||||
use crate::tests::cases::test_utils::{sleep_and_quit_events, test_backend_factory};
|
use crate::tests::cases::test_utils::{sleep_and_quit_events, test_backend_factory};
|
||||||
use crate::tests::fakes::KeyboardEvents;
|
use crate::tests::fakes::KeyboardEvents;
|
||||||
|
use crate::tests::fakes::TerminalEvent::*;
|
||||||
|
|
||||||
fn create_root_temp_dir(name: &str) -> Result<PathBuf, failure::Error> {
|
fn create_root_temp_dir(name: &str) -> Result<PathBuf, failure::Error> {
|
||||||
let mut dir = env::temp_dir();
|
let mut dir = env::temp_dir();
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
use ::std::path::PathBuf;
|
use ::std::path::PathBuf;
|
||||||
|
use ::tui::buffer::Buffer;
|
||||||
use ::tui::layout::Rect;
|
use ::tui::layout::Rect;
|
||||||
use ::tui::style::{Color, Modifier, Style};
|
use ::tui::style::{Color, Modifier, Style};
|
||||||
use ::tui::widgets::Widget;
|
use ::tui::widgets::Widget;
|
||||||
use ::tui::buffer::Buffer;
|
|
||||||
|
|
||||||
use crate::state::tiles::{FileType, Tile};
|
use crate::state::tiles::{FileType, Tile};
|
||||||
use crate::ui::format::{truncate_middle, DisplaySize};
|
use crate::ui::format::{truncate_middle, DisplaySize};
|
||||||
|
|||||||
@@ -4,9 +4,9 @@ use ::tui::layout::{Constraint, Direction, Layout, Rect};
|
|||||||
use ::tui::widgets::Widget;
|
use ::tui::widgets::Widget;
|
||||||
use ::tui::Terminal;
|
use ::tui::Terminal;
|
||||||
|
|
||||||
use crate::state::UiEffects;
|
|
||||||
use crate::state::files::FileTree;
|
use crate::state::files::FileTree;
|
||||||
use crate::state::tiles::Board;
|
use crate::state::tiles::Board;
|
||||||
|
use crate::state::UiEffects;
|
||||||
use crate::ui::grid::RectangleGrid;
|
use crate::ui::grid::RectangleGrid;
|
||||||
use crate::ui::modals::{ErrorBox, MessageBox};
|
use crate::ui::modals::{ErrorBox, MessageBox};
|
||||||
use crate::ui::title::TitleLine;
|
use crate::ui::title::TitleLine;
|
||||||
|
|||||||
@@ -20,8 +20,7 @@ fn tile_first_line(tile: &Tile) -> String {
|
|||||||
let descendant_count = descendant_count.expect("folder should have descendants");
|
let descendant_count = descendant_count.expect("folder should have descendants");
|
||||||
let short_descendants_indication = format!("(+{})", descendant_count);
|
let short_descendants_indication = format!("(+{})", descendant_count);
|
||||||
let long_descendants_indication = format!("(+{} descendants)", descendant_count);
|
let long_descendants_indication = format!("(+{} descendants)", descendant_count);
|
||||||
if filename_text.len() + long_descendants_indication.len() <= max_text_length as usize
|
if filename_text.len() + long_descendants_indication.len() <= max_text_length as usize {
|
||||||
{
|
|
||||||
format!("{} {}", filename_text, long_descendants_indication)
|
format!("{} {}", filename_text, long_descendants_indication)
|
||||||
} else if filename_text.len() + short_descendants_indication.len()
|
} else if filename_text.len() + short_descendants_indication.len()
|
||||||
<= max_text_length as usize
|
<= max_text_length as usize
|
||||||
@@ -64,8 +63,14 @@ pub fn tile_style(tile: &Tile, selected: bool) -> (Option<Style>, Style, Style)
|
|||||||
{
|
{
|
||||||
(true, FileType::File) => (
|
(true, FileType::File) => (
|
||||||
Some(Style::default().fg(Color::Gray).bg(Color::Gray)),
|
Some(Style::default().fg(Color::Gray).bg(Color::Gray)),
|
||||||
Style::default().fg(Color::Magenta).bg(Color::Gray).modifier(Modifier::BOLD),
|
Style::default()
|
||||||
Style::default().fg(Color::Magenta).bg(Color::Gray).modifier(Modifier::BOLD),
|
.fg(Color::Magenta)
|
||||||
|
.bg(Color::Gray)
|
||||||
|
.modifier(Modifier::BOLD),
|
||||||
|
Style::default()
|
||||||
|
.fg(Color::Magenta)
|
||||||
|
.bg(Color::Gray)
|
||||||
|
.modifier(Modifier::BOLD),
|
||||||
),
|
),
|
||||||
(false, FileType::File) => (None, Style::default(), Style::default()),
|
(false, FileType::File) => (None, Style::default(), Style::default()),
|
||||||
(true, FileType::Folder) => (
|
(true, FileType::Folder) => (
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
|
use ::tui::buffer::Buffer;
|
||||||
use ::tui::layout::Rect;
|
use ::tui::layout::Rect;
|
||||||
use ::tui::style::{Modifier, Style};
|
use ::tui::style::{Modifier, Style};
|
||||||
use ::tui::widgets::Widget;
|
use ::tui::widgets::Widget;
|
||||||
use ::tui::buffer::Buffer;
|
|
||||||
|
|
||||||
pub struct TermTooSmall {}
|
pub struct TermTooSmall {}
|
||||||
|
|
||||||
|
|||||||
@@ -179,7 +179,7 @@ impl TitleTelescope {
|
|||||||
} else {
|
} else {
|
||||||
truncate_middle(
|
truncate_middle(
|
||||||
&cell_size_opt.content,
|
&cell_size_opt.content,
|
||||||
(rect.width - 1 - current_position) / number_of_parts_to_truncate
|
(rect.width - 1 - current_position) / number_of_parts_to_truncate,
|
||||||
)
|
)
|
||||||
};
|
};
|
||||||
buf.set_string(current_position, rect.y, &truncated_cell, style);
|
buf.set_string(current_position, rect.y, &truncated_cell, style);
|
||||||
|
|||||||
Reference in New Issue
Block a user