!fixup Add Option for Simplified Layout
* fix test
This commit is contained in:
parent
85a4e476f2
commit
5f2c5d2bda
3 changed files with 14 additions and 5 deletions
|
|
@ -178,7 +178,10 @@ mod config_test {
|
||||||
#[test]
|
#[test]
|
||||||
fn try_from_cli_args_with_option_clean() {
|
fn try_from_cli_args_with_option_clean() {
|
||||||
let mut opts = CliArgs::default();
|
let mut opts = CliArgs::default();
|
||||||
opts.option = Some(ConfigCli::Config { clean: true });
|
opts.option = Some(ConfigCli::Setup {
|
||||||
|
clean: true,
|
||||||
|
dump_config: false,
|
||||||
|
});
|
||||||
let result = Config::try_from(&opts);
|
let result = Config::try_from(&opts);
|
||||||
assert!(result.is_ok());
|
assert!(result.is_ok());
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,10 +4,10 @@ use std::collections::BTreeMap;
|
||||||
use std::os::unix::io::RawFd;
|
use std::os::unix::io::RawFd;
|
||||||
use std::str;
|
use std::str;
|
||||||
|
|
||||||
|
use crate::cli::ConfigCli;
|
||||||
|
use crate::common::input::options::Options;
|
||||||
use crate::common::pty::{PtyInstruction, VteBytes};
|
use crate::common::pty::{PtyInstruction, VteBytes};
|
||||||
use crate::common::thread_bus::Bus;
|
use crate::common::thread_bus::Bus;
|
||||||
use crate::common::input::options::Options;
|
|
||||||
use crate::cli::ConfigCli;
|
|
||||||
use crate::errors::{ContextType, ScreenContext};
|
use crate::errors::{ContextType, ScreenContext};
|
||||||
use crate::layout::Layout;
|
use crate::layout::Layout;
|
||||||
use crate::panes::PaneId;
|
use crate::panes::PaneId;
|
||||||
|
|
@ -16,7 +16,7 @@ use crate::server::ServerInstruction;
|
||||||
use crate::tab::Tab;
|
use crate::tab::Tab;
|
||||||
use crate::wasm_vm::PluginInstruction;
|
use crate::wasm_vm::PluginInstruction;
|
||||||
|
|
||||||
use zellij_tile::data::{Event, InputMode, ModeInfo, Palette, TabInfo, PluginCapabilities};
|
use zellij_tile::data::{Event, InputMode, ModeInfo, Palette, PluginCapabilities, TabInfo};
|
||||||
|
|
||||||
/// Instructions that can be sent to the [`Screen`].
|
/// Instructions that can be sent to the [`Screen`].
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
|
|
|
||||||
|
|
@ -217,7 +217,13 @@ fn init_session(
|
||||||
let options = opts.option;
|
let options = opts.option;
|
||||||
|
|
||||||
move || {
|
move || {
|
||||||
screen_thread_main(screen_bus, max_panes, full_screen_ws, options, config_options);
|
screen_thread_main(
|
||||||
|
screen_bus,
|
||||||
|
max_panes,
|
||||||
|
full_screen_ws,
|
||||||
|
options,
|
||||||
|
config_options,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue