fix: buffername and filetype when using Telescope

buffername and filetype was not detected correctly when using :GreyjoyTelescope
desdic · Sep 21, 2024 · bf65df2 · bf65df2
1 parent b9b6e33
commit bf65df2
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 9 deletions.
diff --git a/lua/greyjoy/init.lua b/lua/greyjoy/init.lua
@@ -279,7 +279,11 @@ greyjoy.run = function(arg, method)
 
     local pluginname = arg or ""
 
-    local fileobj = utils.new_file_obj(greyjoy.patterns)
+    local fileobj = utils.new_file_obj(
+        greyjoy.patterns,
+        vim.api.nvim_buf_get_name(0),
+        vim.bo.filetype
+    )
     local rootdir = fileobj.rootdir
     local elements = {}
 

diff --git a/lua/greyjoy/telescope.lua b/lua/greyjoy/telescope.lua
@@ -46,8 +46,14 @@ local collect_output = function(output, on_item_collected)
     end
 end
 
-greytelescope.run_async = function(arg, on_item_collected, on_complete)
-    local fileobj = utils.new_file_obj(greyjoy.patterns)
+greytelescope.run_async = function(
+    arg,
+    bufname,
+    filetype,
+    on_item_collected,
+    on_complete
+)
+    local fileobj = utils.new_file_obj(greyjoy.patterns, bufname, filetype)
     local rootdir = fileobj.rootdir
 
     local pluginname = arg or ""
@@ -120,6 +126,10 @@ greytelescope.run = function(arg)
         })
     end
 
+    -- Get name of buffer before opening telescope, else we get the telescope buffer
+    local bufname = vim.api.nvim_buf_get_name(0)
+    local filetype = vim.bo.filetype
+
     local picker = pickers.new({}, {
         prompt_title = "Runners",
         finder = generate_finder(),
@@ -195,7 +205,13 @@ greytelescope.run = function(arg)
     end
 
     -- Start the asynchronous collection and processing
-    greytelescope.run_async(arg, on_item_collected, on_complete)
+    greytelescope.run_async(
+        arg,
+        bufname,
+        filetype,
+        on_item_collected,
+        on_complete
+    )
 end
 
 return greytelescope
diff --git a/lua/greyjoy/utils.lua b/lua/greyjoy/utils.lua
@@ -57,11 +57,10 @@ M.str_to_array = function(str)
     return words
 end
 
-M.new_file_obj = function(patterns)
-    local filetype = vim.bo.filetype
-    local fullname = vim.api.nvim_buf_get_name(0)
-    local filename = vim.fs.basename(fullname)
-    local filepath = vim.fs.dirname(fullname)
+M.new_file_obj = function(patterns, bufname, filetype)
+    local fullname = bufname
+    local filename = vim.fs.basename(bufname)
+    local filepath = vim.fs.dirname(bufname)
 
     filepath = M.if_nil(filepath, "")
     if filepath == "" then