Merge pull request #85 from jghauser/only-start-once

Only start once

Author: jghauser

doc/papis.txt

@@ -1,4 +1,4 @@
-*papis.txt*              For NVIM v0.8.0             Last change: 2024 July 02
+*papis.txt*              For NVIM v0.8.0             Last change: 2024 July 03
 
 ==============================================================================
 Table of Contents                                    *papis-table-of-contents*

lua/papis/config.lua

@@ -165,6 +165,9 @@ function M:update(opts)
     end
   end
 
+  -- add checkhealth to filetypes (so papis gets loaded there)
+  table.insert(newconf.init_filetypes, "checkhealth")
+
   -- if debug mode is on, log level should be at least debug
   if newconf.enable_modules["debug"] == true then
     newconf.log = {

lua/papis/init.lua

@@ -7,14 +7,19 @@
 
 local config = require("papis.config")
 local api = vim.api
+local has_run = false
 
 ---Creates the `autocmd` that starts papis.nvim when configured conditions are fulfilled
 local function make_start_autocmd()
   local load_papis = api.nvim_create_augroup("loadPapis", { clear = true })
   api.nvim_create_autocmd("FileType", {
     once = true,
     pattern = config.init_filetypes,
-    callback = require("papis").start,
+    callback = function()
+      if not has_run then
+        require("papis").start()
+      end
+    end,
     group = load_papis,
     desc = "Load papis.nvim for defined filetypes",
   })
@@ -52,6 +57,8 @@ function M.start()
   log.new(config["log"] or log.get_default_config(), true)
   log.debug("_________________________STARTING PAPIS.NVIM_________________________")
 
+  has_run = true
+
   -- set up db
   local db = require("papis.sqlite-wrapper")
   if not db then
@@ -72,11 +79,6 @@ function M.start()
     return nil
   end
 
-  -- setup commands
-  require("papis.commands").setup()
-  -- setup keymaps
-  require("papis.keymaps"):setup()
-
   -- setup enabled modules
   for module_name, _ in pairs(config.enable_modules) do
     log.trace(module_name .. " is enabled")
@@ -88,6 +90,12 @@ function M.start()
     end
   end
 
+  -- setup commands
+  require("papis.commands").setup()
+  -- setup keymaps
+  require("papis.keymaps"):setup()
+
+
   -- check if other neovim instances has file watchers
   local does_pid_exist = require("papis.utils").does_pid_exist
   if not does_pid_exist(db.state:get_fw_running()) then

lua/papis/keymaps.lua

@@ -5,29 +5,50 @@
 -- Sets up default keymaps.
 --
 
+local api = vim.api
 local config = require("papis.config")
 
 local M = {}
 
 ---@class PapisKeymaps
 ---@type table<string, table>
-local keymaps = {}
+local keymaps_tbl = {}
+
+local function create_keymaps()
+  for _, module_keymaps in pairs(keymaps_tbl) do
+    for _, keymap in pairs(module_keymaps) do
+      local opts = vim.deepcopy(keymap.opts)
+      opts.silent = true
+      opts.buffer = true
+      vim.keymap.set(keymap.mode, keymap.lhs, keymap.rhs, opts)
+    end
+  end
+end
+
+---Creates the `autocmd` that starts papis.nvim when configured conditions are fulfilled
+local function make_keymap_autocmd()
+  local create_papis_keymap = api.nvim_create_augroup("createPapisKeymap", { clear = true })
+  api.nvim_create_autocmd("FileType", {
+    pattern = config.init_filetypes,
+    callback = create_keymaps,
+    group = create_papis_keymap,
+    desc = "Set Papis keymap",
+  })
+end
 
 ---Sets up the keymaps for all enabled modules
 function M:setup()
-  self:add_keymaps(keymaps)
+  -- create keymaps for the buffer when papis is first started
+  create_keymaps()
+  -- creates keymaps for all subsequent buffers
+  make_keymap_autocmd()
 end
 
 --- Recursively merges the provided table with the keymaps table.
 ---@param module_keymaps table #A table with a module's keymaps
 function M:add_keymaps(module_keymaps)
   if config.enable_keymaps then
-    for _, keymap in pairs(module_keymaps) do
-      local opts = vim.deepcopy(keymap.opts)
-      opts.silent = true
-      opts.buffer = true
-      vim.keymap.set(keymap.mode, keymap.lhs, keymap.rhs, opts)
-    end
+    table.insert(keymaps_tbl, module_keymaps)
   end
 end