|
|
@ -154,11 +154,14 @@ fn connection_mode() -> ConnectionMode {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
async fn start_neovim_runtime(
|
|
|
|
async fn start_neovim_runtime(
|
|
|
|
ui_command_sender: LoggingTx<UiCommand>,
|
|
|
|
#[cfg(windows)] ui_command_sender: LoggingTx<UiCommand>,
|
|
|
|
ui_command_receiver: UnboundedReceiver<UiCommand>,
|
|
|
|
ui_command_receiver: UnboundedReceiver<UiCommand>,
|
|
|
|
redraw_event_sender: LoggingTx<RedrawEvent>,
|
|
|
|
redraw_event_sender: LoggingTx<RedrawEvent>,
|
|
|
|
) {
|
|
|
|
) {
|
|
|
|
|
|
|
|
#[cfg(windows)]
|
|
|
|
let handler = NeovimHandler::new(ui_command_sender.clone(), redraw_event_sender.clone());
|
|
|
|
let handler = NeovimHandler::new(ui_command_sender.clone(), redraw_event_sender.clone());
|
|
|
|
|
|
|
|
#[cfg(not(windows))]
|
|
|
|
|
|
|
|
let handler = NeovimHandler::new(redraw_event_sender.clone());
|
|
|
|
let (nvim, io_handler) = match connection_mode() {
|
|
|
|
let (nvim, io_handler) = match connection_mode() {
|
|
|
|
ConnectionMode::Child => create::new_child_cmd(&mut create_nvim_command(), handler).await,
|
|
|
|
ConnectionMode::Child => create::new_child_cmd(&mut create_nvim_command(), handler).await,
|
|
|
|
ConnectionMode::RemoteTcp(address) => create::new_tcp(address, handler).await,
|
|
|
|
ConnectionMode::RemoteTcp(address) => create::new_tcp(address, handler).await,
|
|
|
@ -291,12 +294,13 @@ pub struct Bridge {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
pub fn start_bridge(
|
|
|
|
pub fn start_bridge(
|
|
|
|
ui_command_sender: LoggingTx<UiCommand>,
|
|
|
|
#[cfg(windows)] ui_command_sender: LoggingTx<UiCommand>,
|
|
|
|
ui_command_receiver: UnboundedReceiver<UiCommand>,
|
|
|
|
ui_command_receiver: UnboundedReceiver<UiCommand>,
|
|
|
|
redraw_event_sender: LoggingTx<RedrawEvent>,
|
|
|
|
redraw_event_sender: LoggingTx<RedrawEvent>,
|
|
|
|
) -> Bridge {
|
|
|
|
) -> Bridge {
|
|
|
|
let runtime = Runtime::new().unwrap();
|
|
|
|
let runtime = Runtime::new().unwrap();
|
|
|
|
runtime.spawn(start_neovim_runtime(
|
|
|
|
runtime.spawn(start_neovim_runtime(
|
|
|
|
|
|
|
|
#[cfg(windows)]
|
|
|
|
ui_command_sender,
|
|
|
|
ui_command_sender,
|
|
|
|
ui_command_receiver,
|
|
|
|
ui_command_receiver,
|
|
|
|
redraw_event_sender,
|
|
|
|
redraw_event_sender,
|
|
|
|