From c0f5d2dfeb1ced72c6de9fe8f3284e77670c3719 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sat, 20 Apr 2024 12:03:24 -0700
Subject: [PATCH] Better reload logic

---
 lua/{ => argonaut}/config.lua           |  0
 lua/{argonaut.lua => argonaut/init.lua} |  2 +-
 plugin/argonaut.lua                     | 11 ++++++-----
 3 files changed, 7 insertions(+), 6 deletions(-)
 rename lua/{ => argonaut}/config.lua (100%)
 rename lua/{argonaut.lua => argonaut/init.lua} (99%)

diff --git a/lua/config.lua b/lua/argonaut/config.lua
similarity index 100%
rename from lua/config.lua
rename to lua/argonaut/config.lua
diff --git a/lua/argonaut.lua b/lua/argonaut/init.lua
similarity index 99%
rename from lua/argonaut.lua
rename to lua/argonaut/init.lua
index 15c6b53..35c0413 100644
--- a/lua/argonaut.lua
+++ b/lua/argonaut/init.lua
@@ -1,4 +1,4 @@
-local config = require('config')
+local config = require('argonaut.config')
 
 local function setup(opts, filetypes)
     config.set_filetype_opts(opts, filetypes)
diff --git a/plugin/argonaut.lua b/plugin/argonaut.lua
index ad21888..ab917f2 100644
--- a/plugin/argonaut.lua
+++ b/plugin/argonaut.lua
@@ -1,14 +1,15 @@
 if not vim.g.argonaut then
-    local argonaut = require('argonaut')
-
     local function argonaut_reload()
-        package.loaded.argonaut = nil
-        argonaut = require('argonaut')
+        for name, _ in pairs(package.loaded) do
+            if vim.startswith(name, 'argonaut') then
+                package.loaded[name] = nil
+            end
+        end
     end
 
     local function argonaut_reflow()
         argonaut_reload()
-        argonaut.reflow()
+        require('argonaut').reflow()
     end
 
     vim.api.nvim_create_user_command('ArgonautReload', argonaut_reload, {})