fix formatting

macos-click-through
Keith Simmons 3 years ago
parent 894c07bf5a
commit c1f7af6eaa

@ -123,7 +123,8 @@ pub fn build_neovide_command(channel: u64, num_args: u64, command: &str, event:
pub fn create_nvim_command() -> Command { pub fn create_nvim_command() -> Command {
let mut cmd = build_nvim_cmd(); let mut cmd = build_nvim_cmd();
cmd.arg("--embed").args(SETTINGS.get::<CmdLineSettings>().neovim_args.iter()); cmd.arg("--embed")
.args(SETTINGS.get::<CmdLineSettings>().neovim_args.iter());
info!("Starting neovim with: {:?}", cmd); info!("Starting neovim with: {:?}", cmd);

@ -181,8 +181,8 @@ pub fn handle_command_line_arguments(args: Vec<String>) -> Result<(), String> {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use std::sync::Mutex;
use std::env::set_var; use std::env::set_var;
use std::sync::Mutex;
use lazy_static::lazy_static; use lazy_static::lazy_static;
@ -195,39 +195,41 @@ mod tests {
#[test] #[test]
fn test_neovim_passthrough() { fn test_neovim_passthrough() {
let args: Vec<String> = vec![ let args: Vec<String> = vec!["neovide", "--", "--clean"]
"neovide", .iter()
"--",
"--clean",
].iter()
.map(|s| s.to_string()) .map(|s| s.to_string())
.collect(); .collect();
let _accessing_settings = ACCESSING_SETTINGS.lock().unwrap(); let _accessing_settings = ACCESSING_SETTINGS.lock().unwrap();
handle_command_line_arguments(args).expect("Could not parse arguments"); handle_command_line_arguments(args).expect("Could not parse arguments");
assert_eq!(SETTINGS.get::<CmdLineSettings>().neovim_args, vec!["--clean"]); assert_eq!(
SETTINGS.get::<CmdLineSettings>().neovim_args,
vec!["--clean"]
);
} }
#[test] #[test]
fn test_geometry() { fn test_geometry() {
let args: Vec<String> = vec![ let args: Vec<String> = vec!["neovide", "--geometry=42x24"]
"neovide", .iter()
"--geometry=42x24",
].iter()
.map(|s| s.to_string()) .map(|s| s.to_string())
.collect(); .collect();
let _accessing_settings = ACCESSING_SETTINGS.lock().unwrap(); let _accessing_settings = ACCESSING_SETTINGS.lock().unwrap();
handle_command_line_arguments(args).expect("Could not parse arguments"); handle_command_line_arguments(args).expect("Could not parse arguments");
assert_eq!(SETTINGS.get::<CmdLineSettings>().geometry, Dimensions { width: 42, height: 24 }); assert_eq!(
SETTINGS.get::<CmdLineSettings>().geometry,
Dimensions {
width: 42,
height: 24
}
);
} }
#[test] #[test]
fn test_log_to_file() { fn test_log_to_file() {
let args: Vec<String> = vec![ let args: Vec<String> = vec!["neovide", "--log"]
"neovide", .iter()
"--log",
].iter()
.map(|s| s.to_string()) .map(|s| s.to_string())
.collect(); .collect();
@ -238,10 +240,8 @@ mod tests {
#[test] #[test]
fn test_frameless_flag() { fn test_frameless_flag() {
let args: Vec<String> = vec![ let args: Vec<String> = vec!["neovide", "--frameless"]
"neovide", .iter()
"--frameless",
].iter()
.map(|s| s.to_string()) .map(|s| s.to_string())
.collect(); .collect();
@ -252,11 +252,7 @@ mod tests {
#[test] #[test]
fn test_frameless_environment_variable() { fn test_frameless_environment_variable() {
let args: Vec<String> = vec![ let args: Vec<String> = vec!["neovide"].iter().map(|s| s.to_string()).collect();
"neovide",
].iter()
.map(|s| s.to_string())
.collect();
let _accessing_settings = ACCESSING_SETTINGS.lock().unwrap(); let _accessing_settings = ACCESSING_SETTINGS.lock().unwrap();
set_var("NEOVIDE_FRAMELESS", "true"); set_var("NEOVIDE_FRAMELESS", "true");
@ -266,30 +262,29 @@ mod tests {
#[test] #[test]
fn test_neovim_bin_arg() { fn test_neovim_bin_arg() {
let args: Vec<String> = vec![ let args: Vec<String> = vec!["neovide", "--neovim-bin", "foo"]
"neovide", .iter()
"--neovim-bin",
"foo",
].iter()
.map(|s| s.to_string()) .map(|s| s.to_string())
.collect(); .collect();
let _accessing_settings = ACCESSING_SETTINGS.lock().unwrap(); let _accessing_settings = ACCESSING_SETTINGS.lock().unwrap();
handle_command_line_arguments(args).expect("Could not parse arguments"); handle_command_line_arguments(args).expect("Could not parse arguments");
assert_eq!(SETTINGS.get::<CmdLineSettings>().neovim_bin, Some("foo".to_owned())); assert_eq!(
SETTINGS.get::<CmdLineSettings>().neovim_bin,
Some("foo".to_owned())
);
} }
#[test] #[test]
fn test_neovim_bin_environment_variable() { fn test_neovim_bin_environment_variable() {
let args: Vec<String> = vec![ let args: Vec<String> = vec!["neovide"].iter().map(|s| s.to_string()).collect();
"neovide",
].iter()
.map(|s| s.to_string())
.collect();
let _accessing_settings = ACCESSING_SETTINGS.lock().unwrap(); let _accessing_settings = ACCESSING_SETTINGS.lock().unwrap();
set_var("NEOVIM_BIN", "foo"); set_var("NEOVIM_BIN", "foo");
handle_command_line_arguments(args).expect("Could not parse arguments"); handle_command_line_arguments(args).expect("Could not parse arguments");
assert_eq!(SETTINGS.get::<CmdLineSettings>().neovim_bin, Some("foo".to_owned())); assert_eq!(
SETTINGS.get::<CmdLineSettings>().neovim_bin,
Some("foo".to_owned())
);
} }
} }

@ -30,8 +30,8 @@ extern crate derive_new;
#[macro_use] #[macro_use]
extern crate lazy_static; extern crate lazy_static;
use std::sync::mpsc::channel;
use std::env::args; use std::env::args;
use std::sync::mpsc::channel;
use log::trace; use log::trace;
use tokio::sync::mpsc::unbounded_channel; use tokio::sync::mpsc::unbounded_channel;

Loading…
Cancel
Save