aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authora-kenji <aks.kenji@protonmail.com>2021-05-10 21:21:19 +0200
committera-kenji <aks.kenji@protonmail.com>2021-05-10 21:21:19 +0200
commit5f2c5d2bda972de532fb222d7938e91580a2bcc2 (patch)
treec8d3cd29f0dabed3743c603fe2874574e9c05407 /src
parentfixup! Merge branch 'main' of https://github.com/zellij-org/zellij into simpl... (diff)
downloadsl0ppij-5f2c5d2bda972de532fb222d7938e91580a2bcc2.tar.gz
sl0ppij-5f2c5d2bda972de532fb222d7938e91580a2bcc2.tar.xz
sl0ppij-5f2c5d2bda972de532fb222d7938e91580a2bcc2.zip
!fixup Add Option for Simplified Layout
* fix test
Diffstat (limited to 'src')
-rw-r--r--src/common/input/config.rs5
-rw-r--r--src/common/screen.rs6
-rw-r--r--src/server/mod.rs8
3 files changed, 14 insertions, 5 deletions
diff --git a/src/common/input/config.rs b/src/common/input/config.rs
index 019d1c4c..5f2656f3 100644
--- a/src/common/input/config.rs
+++ b/src/common/input/config.rs
@@ -178,7 +178,10 @@ mod config_test {
#[test]
fn try_from_cli_args_with_option_clean() {
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);
assert!(result.is_ok());
}
diff --git a/src/common/screen.rs b/src/common/screen.rs
index 82f63537..6f5a4cb3 100644
--- a/src/common/screen.rs
+++ b/src/common/screen.rs
@@ -4,10 +4,10 @@ use std::collections::BTreeMap;
use std::os::unix::io::RawFd;
use std::str;
+use crate::cli::ConfigCli;
+use crate::common::input::options::Options;
use crate::common::pty::{PtyInstruction, VteBytes};
use crate::common::thread_bus::Bus;
-use crate::common::input::options::Options;
-use crate::cli::ConfigCli;
use crate::errors::{ContextType, ScreenContext};
use crate::layout::Layout;
use crate::panes::PaneId;
@@ -16,7 +16,7 @@ use crate::server::ServerInstruction;
use crate::tab::Tab;
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`].
#[derive(Debug, Clone)]
diff --git a/src/server/mod.rs b/src/server/mod.rs
index 1b08f95f..d9875727 100644
--- a/src/server/mod.rs
+++ b/src/server/mod.rs
@@ -217,7 +217,13 @@ fn init_session(
let options = opts.option;
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();