Add new tree_dirs to path when switching config

Author: kentookura

lua/forester.lua

@@ -22,6 +22,7 @@ end
 
 local function setup()
   vim.filetype.add({ extension = { tree = "forester" } })
+  local forester_group = vim.api.nvim_create_augroup("ForesterGroup", { clear = true })
 
   local cfg = config.find_default_config()
   if cfg ~= "" then
@@ -45,22 +46,34 @@ local function setup()
     })
   end
 
+  -- Make links followable with `gf`
+  local add_treedirs_to_path = function()
+    pcall(function()
+      local dirs = config.tree_dirs()
+      for _, v in pairs(dirs) do
+        vim.opt.path:append(v)
+      end
+    end)
+  end
+
+  vim.api.nvim_create_autocmd("User", {
+    group = forester_group,
+    pattern = "SwitchedForesterConfig",
+    callback = function()
+      add_treedirs_to_path()
+    end,
+  })
+
   local cmp = require("cmp")
 
   cmp.register_source("forester", completionSource)
   cmp.setup.filetype("forester", { sources = { { name = "forester", dup = 0 } } })
 
   add_treesitter_config()
 
-  -- Make links followable with `gf`
-
-  local _ = pcall(function()
-    local dirs = config.tree_dirs()
-    for _, v in pairs(dirs) do
-      vim.opt.path:append(v)
-    end
-  end)
   vim.opt.suffixesadd:prepend(".tree")
+
+  add_treedirs_to_path()
   ui.setup()
 end
 

lua/forester/commands.lua

@@ -2,12 +2,12 @@ local util = require("forester.util")
 local Forester = require("forester.bindings")
 local Job = require("plenary.job")
 local pickers = require("forester.pickers")
-local Config = require("forester.config")
+local config = require("forester.config")
 local M = {}
 
 M.commands = {
   config = function()
-    Config.switch_config()
+    config.switch()
   end,
 
   build = function()
@@ -31,7 +31,7 @@ M.commands = {
   end,
 
   new_random = function()
-    local prefixes = Config.all_prefixes()
+    local prefixes = config.all_prefixes()
     vim.ui.select(prefixes, { -- TODO: Don't select when #all_prefixes == 1
       format_item = function(item)
         return item
@@ -43,7 +43,7 @@ M.commands = {
         end
       else
         do
-          local path = Config.dir_of_latest_tree_of_prefix(choice)
+          local path = config.dir_of_latest_tree_of_prefix(choice)
           local new_tree = Forester.new_random(choice, path, vim.g.forester_current_config)[1]
           vim.cmd("edit " .. new_tree)
         end
@@ -52,7 +52,7 @@ M.commands = {
   end,
 
   new = function()
-    local prefixes = Config.all_prefixes()
+    local prefixes = config.all_prefixes()
     vim.ui.select(prefixes, { -- TODO: Don't select when #all_prefixes == 1
       format_item = function(item)
         return item
@@ -64,7 +64,7 @@ M.commands = {
         end
       else
         do
-          local path = Config.dir_of_latest_tree_of_prefix(choice)
+          local path = config.dir_of_latest_tree_of_prefix(choice)
           local new_tree = Forester.new(choice, path, vim.g.forester_current_config)[1]
           vim.cmd("edit " .. new_tree)
         end
@@ -73,7 +73,7 @@ M.commands = {
   end,
 
   transclude_new = function()
-    local prefixes = Config.all_prefixes()
+    local prefixes = config.all_prefixes()
     vim.ui.select(prefixes, { -- TODO: Don't select when #all_prefixes == 1
       format_item = function(item)
         return item
@@ -85,7 +85,7 @@ M.commands = {
         end
       else
         do
-          local path = Config.dir_of_latest_tree_of_prefix(choice)
+          local path = config.dir_of_latest_tree_of_prefix(choice)
           local new_tree = Forester.new(choice, path, vim.g.forester_current_config)[1]
           local addr = util.filename(new_tree):match("(.+)%..+$")
           local content = { "\\transclude{" .. addr .. "}" }
@@ -96,7 +96,7 @@ M.commands = {
   end,
 
   link_new = function()
-    local prefixes = Config.all_prefixes()
+    local prefixes = config.all_prefixes()
     vim.ui.select(prefixes, {
       format_item = function(item)
         return item
@@ -108,7 +108,7 @@ M.commands = {
         end
       else
         do
-          local path = Config.dir_of_latest_tree_of_prefix(choice)
+          local path = config.dir_of_latest_tree_of_prefix(choice)
           local new_tree = Forester.new(choice, path)[1]
           local addr = util.filename(new_tree):match("(.+)%..+$")
           local content = { "[](" .. addr .. ")" } --  NOTE: We should improve the workflow with snippets or something similar

lua/forester/config.lua

@@ -103,13 +103,14 @@ local function all_prefixes()
   return pfxs
 end
 
-local function switch_config()
+local function switch()
   local configs = all_configs()
   pickers.pick_config(configs)
+  vim.api.nvim_exec_autocmds("User", { pattern = "SwitchedForesterConfig" })
 end
 
 M.all_prefixes = all_prefixes
 M.tree_dirs = tree_dirs
-M.switch_config = switch_config
+M.switch_config = switch
 
 return M