Get full path of the current file name

Author: kristijanhusak

lua/orgmode/capture/init.lua

@@ -134,7 +134,7 @@ function Capture:_get_refile_vars()
   local template = vim.api.nvim_buf_get_var(0, 'org_template') or {}
   local file = vim.fn.fnamemodify(template.target or config.org_default_notes_file, ':p')
   local lines = vim.api.nvim_buf_get_lines(0, 0, -1, true)
-  local org_file = File.from_content(lines, 'capture', vim.fn.bufname())
+  local org_file = File.from_content(lines, 'capture', utils.current_file_path())
   local item = nil
   if org_file then
     item = org_file:get_headlines()[1]
@@ -242,7 +242,7 @@ function Capture:_refile_to(file, lines, item, destination_line)
     return false
   end
 
-  local is_same_file = file == vim.fn.bufname()
+  local is_same_file = file == utils.current_file_path()
   local cur_win = vim.api.nvim_get_current_win()
 
   if is_same_file and item then

lua/orgmode/capture/templates.lua

@@ -1,5 +1,6 @@
 local config = require('orgmode.config')
 local Date = require('orgmode.objects.date')
+local utils = require('orgmode.utils')
 local expansions = {
   ['%f'] = function()
     return vim.fn.expand('%')
@@ -26,7 +27,7 @@ local expansions = {
     return string.format('[%s]', Date.now():to_string())
   end,
   ['%a'] = function()
-    return string.format('[[file:%s +%s]]', vim.fn.bufname(), vim.api.nvim_win_get_cursor(0)[1])
+    return string.format('[[file:%s +%s]]', utils.current_file_path(), vim.api.nvim_win_get_cursor(0)[1])
   end,
 }
 

lua/orgmode/clock/init.lua

@@ -68,7 +68,7 @@ function Clock:org_clock_goto()
     utils.echo_info('No running clock, this is the most recently clocked task')
   end
 
-  if vim.fn.bufname() ~= active_headline.file then
+  if utils.current_file_path() ~= active_headline.file then
     vim.cmd('edit ' .. vim.fn.fnameescape(active_headline.file))
   end
   vim.fn.cursor({ active_headline.range.start_line, 0 })

lua/orgmode/export/init.lua

@@ -92,7 +92,7 @@ end
 
 ---@param extension string
 function Export.pandoc(extension)
-  local file = vim.fn.bufname()
+  local file = utils.current_file_path()
   local target = vim.fn.fnamemodify(file, ':p:r') .. '.' .. extension
   if vim.fn.executable('pandoc') ~= 1 then
     return utils.echo_error('pandoc executable not found. Make sure pandoc is in $PATH.')
@@ -104,7 +104,7 @@ end
 ---@param format string
 ---@param extension string
 function Export.emacs(format, extension)
-  local file = vim.fn.bufname()
+  local file = utils.current_file_path()
   local target = vim.fn.fnamemodify(file, ':p:r') .. '.' .. extension
   local emacs = config.emacs_config.executable_path
   local emacs_config_path = config.emacs_config.config_path

lua/orgmode/org/syntax.lua

@@ -1,8 +1,9 @@
 local Files = require('orgmode.parser.files')
 local config = require('orgmode.config')
+local utils = require('orgmode.utils')
 
 local function load_code_blocks()
-  local file = vim.fn.bufname()
+  local file = utils.current_file_path()
   if not file or file == '' then
     return
   end

lua/orgmode/parser/files.lua

@@ -119,7 +119,7 @@ end
 
 ---@return File
 function Files.get_current_file()
-  local name = vim.fn.bufname()
+  local name = utils.current_file_path()
   local has_capture_var, is_capture = pcall(vim.api.nvim_buf_get_var, 0, 'org_capture')
   if has_capture_var and is_capture then
     return File.from_content(vim.api.nvim_buf_get_lines(0, 0, -1, false))
@@ -160,7 +160,7 @@ function Files.update_file(filename, action)
   if not file then
     return Promise.resolve()
   end
-  local is_same_file = filename == vim.fn.bufname()
+  local is_same_file = filename == utils.current_file_path()
   local cur_win = vim.api.nvim_get_current_win()
   if is_same_file then
     return utils.promisify(action(file)):next(function(result)

lua/orgmode/utils/init.lua

@@ -495,4 +495,8 @@ function utils.get_nearest_block_node(file, cursor, accept_at_cursor)
   }
 end
 
+function utils.current_file_path()
+  return vim.fn.fnamemodify(vim.fn.bufname(), ':p')
+end
+
 return utils