feat(nvim): support picker buffer direction

Author: kkharji

lua/xbase/pickers.lua

@@ -1,5 +1,6 @@
 local M = {}
 local a = require "telescope.actions"
+local action_set = require "telescope.actions.set"
 local s = require "telescope.actions.state"
 local finder = require("telescope.finders").new_table
 local picker = require("telescope.pickers").new
@@ -8,9 +9,10 @@ local maker = require("telescope.pickers.entry_display").create
 local xbase = require "xbase"
 local watch = require "xbase.watch"
 
-local handle_action = function(bufnr)
+local handle_action = function(direction, bufnr)
   a.close(bufnr)
   local selected = s.get_selected_entry()
+  selected.direction = direction
 
   if selected.command == "Build" then
     xbase.build(selected)
@@ -105,7 +107,9 @@ M.watch = function(opts)
       end,
     },
     attach_mappings = function(_, _)
-      a.select_default:replace(handle_action)
+      a.select_default:replace(function(bufnr)
+        handle_action(nil, bufnr)
+      end)
       return true
     end,
   }):find()
@@ -160,7 +164,9 @@ M.build_run = function(command, opts)
       end,
     },
     attach_mappings = function(_, _)
-      a.select_default:replace(handle_action)
+      action_set.select:replace(function(bufnr, direction)
+        handle_action(direction, bufnr)
+      end)
       return true
     end,
   }):find()

src/daemon/requests/build.rs

@@ -3,7 +3,7 @@ use crate::{nvim::BufferDirection, types::BuildConfiguration};
 use std::fmt::Debug;
 
 #[cfg(feature = "daemon")]
-use crate::{constants::DAEMON_STATE, nvim::WatchLogger, xcode::stream_build};
+use crate::{constants::DAEMON_STATE, nvim::Logger, xcode::stream_build};
 
 /// Build a project.
 #[derive(Debug, Serialize, Deserialize)]
@@ -30,7 +30,7 @@ impl Handler for Build {
 
         let direction = self.direction.clone();
 
-        WatchLogger::new(nvim, "Build", &config)
+        Logger::new(nvim, "Build", &config)
             .log_stream(stream_build(&root, &config).await?, direction, true, true)
             .await?;
 

src/nvim.rs

@@ -1,14 +1,14 @@
 mod buffer;
 #[cfg(feature = "daemon")]
-mod watchlogger;
+mod logger;
 
 pub use buffer::BufferDirection;
 
 #[cfg(feature = "daemon")]
 use nvim_rs::compat::tokio::Compat;
 
 #[cfg(feature = "daemon")]
-pub use watchlogger::*;
+pub use logger::*;
 
 use serde::{Deserialize, Serialize};
 

src/nvim/buffer.rs

@@ -7,19 +7,21 @@ use serde::{Deserialize, Serialize};
 #[derive(Clone, Debug, strum::EnumString, Serialize, Deserialize)]
 #[strum(ascii_case_insensitive)]
 pub enum BufferDirection {
-    Float,
+    Default,
     Vertical,
     Horizontal,
+    TabEdit,
 }
 
 #[cfg(feature = "daemon")]
 impl BufferDirection {
     pub fn to_nvim_command(&self, bufnr: i64) -> String {
         match self {
-            // TOOD: support build log float
-            BufferDirection::Float => format!("sbuffer {bufnr}"),
+            // TOOD: support build log float as default
+            BufferDirection::Default => format!("sbuffer {bufnr}"),
             BufferDirection::Vertical => format!("vert sbuffer {bufnr}"),
             BufferDirection::Horizontal => format!("sbuffer {bufnr}"),
+            BufferDirection::TabEdit => format!("tabe {bufnr}"),
         }
     }
 

src/nvim/watchlogger.rs src/nvim/logger.rssrc/nvim/watchlogger.rs renamed to src/nvim/logger.rs

@@ -5,13 +5,13 @@ use anyhow::Result;
 use nvim_rs::{Buffer, Window};
 use tokio_stream::{Stream, StreamExt};
 
-pub struct WatchLogger<'a> {
+pub struct Logger<'a> {
     pub nvim: &'a NvimClient,
     pub title: &'a str,
     pub request: &'a BuildConfiguration,
 }
 
-impl<'a> WatchLogger<'a> {
+impl<'a> Logger<'a> {
     pub fn new(nvim: &'a NvimClient, title: &'a str, request: &'a BuildConfiguration) -> Self {
         Self {
             nvim,
@@ -47,6 +47,9 @@ impl<'a> WatchLogger<'a> {
         );
 
         let buf = Buffer::new(nvim.log_bufnr.into(), nvim.inner().clone());
+        // TODO(nvim): close log buffer if it is open for new direction
+        //
+        // Currently the buffer direction will be ignored if the buffer is opened already
 
         if clear {
             buf.set_lines(0, -1, false, vec![]).await?;
@@ -58,7 +61,6 @@ impl<'a> WatchLogger<'a> {
         };
 
         // TODO(nvim): build log correct height
-        // TODO(nvim): make auto clear configurable
         let command =
             match BufferDirection::get_window_direction(nvim, direction, nvim.log_bufnr).await {
                 Ok(open_command) => open_command,

src/watcher/handle/target.rs

@@ -1,7 +1,7 @@
 use super::{WatchArguments, WatchError};
 use crate::constants::DAEMON_STATE;
 use crate::daemon::{WatchKind, WatchTarget};
-use crate::nvim::WatchLogger;
+use crate::nvim::Logger;
 use crate::types::{BuildConfiguration, Client};
 use crate::xcode;
 use anyhow::Result;
@@ -68,7 +68,7 @@ pub async fn create(req: WatchArguments) -> Result<(), WatchError> {
         }
     };
 
-    WatchLogger::new(nvim, "Build", &config)
+    Logger::new(nvim, "Build", &config)
         .log_stream(stream, None, false, false)
         .await
         .map_err(WatchError::r#continue)?;