From 6d8aefa5e616049979f2b3239bb9047d923fdeb0 Mon Sep 17 00:00:00 2001
From: Iron-E <code.iron.e@gmail.com>
Date: Mon, 13 Mar 2023 14:20:48 -0400
Subject: [PATCH] ref: remove useless directory nesting

---
 lua/libmodal/{src => }/Layer.lua                  |  8 ++++----
 lua/libmodal/{src => }/Mode.lua                   |  8 ++++----
 lua/libmodal/{src => }/Prompt.lua                 |  2 +-
 lua/libmodal/{src => }/collections/ParseTable.lua |  2 +-
 lua/libmodal/{src => }/collections/Stack.lua      |  2 +-
 lua/libmodal/{src => }/collections/init.lua       |  4 ++--
 lua/libmodal/{src => }/globals.lua                |  0
 lua/libmodal/init.lua                             |  8 ++++----
 lua/libmodal/{src => }/utils/Help.lua             |  2 +-
 lua/libmodal/{src => }/utils/Popup.lua            |  2 +-
 lua/libmodal/{src => }/utils/Vars.lua             |  2 +-
 lua/libmodal/{src => }/utils/api.lua              |  2 +-
 lua/libmodal/{src => }/utils/classes.lua          |  0
 lua/libmodal/{src => }/utils/init.lua             | 10 +++++-----
 14 files changed, 26 insertions(+), 26 deletions(-)
 rename lua/libmodal/{src => }/Layer.lua (95%)
 rename lua/libmodal/{src => }/Mode.lua (96%)
 rename lua/libmodal/{src => }/Prompt.lua (98%)
 rename lua/libmodal/{src => }/collections/ParseTable.lua (98%)
 rename lua/libmodal/{src => }/collections/Stack.lua (92%)
 rename lua/libmodal/{src => }/collections/init.lua (61%)
 rename lua/libmodal/{src => }/globals.lua (100%)
 rename lua/libmodal/{src => }/utils/Help.lua (97%)
 rename lua/libmodal/{src => }/utils/Popup.lua (98%)
 rename lua/libmodal/{src => }/utils/Vars.lua (96%)
 rename lua/libmodal/{src => }/utils/api.lua (95%)
 rename lua/libmodal/{src => }/utils/classes.lua (100%)
 rename lua/libmodal/{src => }/utils/init.lua (72%)

diff --git a/lua/libmodal/src/Layer.lua b/lua/libmodal/Layer.lua
similarity index 95%
rename from lua/libmodal/src/Layer.lua
rename to lua/libmodal/Layer.lua
index 5909c72..df96bf0 100644
--- a/lua/libmodal/src/Layer.lua
+++ b/lua/libmodal/Layer.lua
@@ -1,5 +1,5 @@
-local globals = require 'libmodal.src.globals'
-local utils = require 'libmodal.src.utils' --- @type libmodal.utils
+local globals = require 'libmodal.globals'
+local utils = require 'libmodal.utils' --- @type libmodal.utils
 
 --- Normalizes a `buffer = true|false|0` argument into a number.
 --- @param buffer boolean|number the argument to normalize
@@ -67,7 +67,7 @@ local function unmap_existing(layer, buffer, mode, lhs)
 		end)
 
 		if not ok and err:match 'E31: No such mapping' then
-			require('libmodal.src.utils').notify_error('nvim-libmodal encountered an error while unmapping from layer', err)
+			require('libmodal.utils').notify_error('nvim-libmodal encountered an error while unmapping from layer', err)
 			return
 		end
 	end
@@ -80,7 +80,7 @@ end
 --- @field private active boolean whether the layer is currently applied
 --- @field private existing_keymaps_by_mode table the keymaps to restore when exiting the mode; generated automatically
 --- @field private layer_keymaps_by_mode table the keymaps to apply when entering the mode; provided by user
-local Layer = require('libmodal.src.utils.classes').new()
+local Layer = require('libmodal.utils.classes').new()
 
 --- apply the `Layer`'s keymaps buffer.
 --- @return nil
diff --git a/lua/libmodal/src/Mode.lua b/lua/libmodal/Mode.lua
similarity index 96%
rename from lua/libmodal/src/Mode.lua
rename to lua/libmodal/Mode.lua
index 049d1d6..a1a4ef5 100644
--- a/lua/libmodal/src/Mode.lua
+++ b/lua/libmodal/Mode.lua
@@ -1,6 +1,6 @@
-local globals = require 'libmodal.src.globals'
-local ParseTable = require 'libmodal.src.collections.ParseTable'
-local utils = require 'libmodal.src.utils' --- @type libmodal.utils
+local globals = require 'libmodal.globals'
+local ParseTable = require 'libmodal.collections.ParseTable'
+local utils = require 'libmodal.utils' --- @type libmodal.utils
 
 --- @class libmodal.Mode
 --- @field private exit libmodal.utils.Vars
@@ -223,7 +223,7 @@ function Mode.new(name, instruction, supress_exit)
 		self.mappings = ParseTable.new(instruction)
 
 		-- create a table for mode-specific data.
-		self.src.popups = require('libmodal.collections.Stack').new()
+		self.popups = require('libmodal.collections.Stack').new()
 
 		-- create a variable for whether or not timeouts are enabled.
 		self.timeouts = utils.Vars.new('timeouts', self.name)
diff --git a/lua/libmodal/src/Prompt.lua b/lua/libmodal/Prompt.lua
similarity index 98%
rename from lua/libmodal/src/Prompt.lua
rename to lua/libmodal/Prompt.lua
index 9e77e16..830c93a 100644
--- a/lua/libmodal/src/Prompt.lua
+++ b/lua/libmodal/Prompt.lua
@@ -1,4 +1,4 @@
-local utils = require 'libmodal.src.utils' --- @type libmodal.utils
+local utils = require 'libmodal.utils' --- @type libmodal.utils
 
 --- @class libmodal.Prompt
 --- @field private completions? string[]
diff --git a/lua/libmodal/src/collections/ParseTable.lua b/lua/libmodal/collections/ParseTable.lua
similarity index 98%
rename from lua/libmodal/src/collections/ParseTable.lua
rename to lua/libmodal/collections/ParseTable.lua
index 0fc0338..6baabdd 100644
--- a/lua/libmodal/src/collections/ParseTable.lua
+++ b/lua/libmodal/collections/ParseTable.lua
@@ -1,4 +1,4 @@
-local utils = require('libmodal.src.utils') --- @type libmodal.utils
+local utils = require('libmodal.utils') --- @type libmodal.utils
 
 --- the number corresponding to `<CR>` in vim.
 local CR = utils.api.replace_termcodes('<CR>'):byte()
diff --git a/lua/libmodal/src/collections/Stack.lua b/lua/libmodal/collections/Stack.lua
similarity index 92%
rename from lua/libmodal/src/collections/Stack.lua
rename to lua/libmodal/collections/Stack.lua
index 53a9663..edba07e 100644
--- a/lua/libmodal/src/collections/Stack.lua
+++ b/lua/libmodal/collections/Stack.lua
@@ -1,6 +1,6 @@
 --- @class libmodal.collections.Stack<T>
 --- @field private [number] T
-local Stack = require('libmodal.src.utils.classes').new()
+local Stack = require('libmodal.utils.classes').new()
 
 --- @generic T
 --- @return libmodal.collections.Stack<T>
diff --git a/lua/libmodal/src/collections/init.lua b/lua/libmodal/collections/init.lua
similarity index 61%
rename from lua/libmodal/src/collections/init.lua
rename to lua/libmodal/collections/init.lua
index 6ec29eb..b07020d 100644
--- a/lua/libmodal/src/collections/init.lua
+++ b/lua/libmodal/collections/init.lua
@@ -3,8 +3,8 @@
 --- @field Stack libmodal.collections.Stack
 local collections =
 {
-	ParseTable = require 'libmodal.src.collections.ParseTable',
-	Stack = require 'libmodal.src.collections.Stack'
+	ParseTable = require 'libmodal.collections.ParseTable',
+	Stack = require 'libmodal.collections.Stack'
 }
 
 return collections
diff --git a/lua/libmodal/src/globals.lua b/lua/libmodal/globals.lua
similarity index 100%
rename from lua/libmodal/src/globals.lua
rename to lua/libmodal/globals.lua
diff --git a/lua/libmodal/init.lua b/lua/libmodal/init.lua
index b4e1abb..1a92158 100644
--- a/lua/libmodal/init.lua
+++ b/lua/libmodal/init.lua
@@ -8,7 +8,7 @@ local libmodal = setmetatable(
 			--- @param exit_char? string a character which can be used to exit the layer from normal mode.
 			--- @return fun()|nil exit a function to exit the layer, or `nil` if `exit_char` is passed
 			enter = function(keymap, exit_char)
-				local layer = require('libmodal.src.Layer').new(keymap)
+				local layer = require('libmodal.Layer').new(keymap)
 				layer:enter()
 
 				if exit_char then
@@ -22,7 +22,7 @@ local libmodal = setmetatable(
 			--- @param keymap table the keymaps (e.g. `{n = {gg = {rhs = 'G', silent = true}}}`)
 			--- @return libmodal.Layer
 			new = function(keymap)
-				return require('libmodal.src.Layer').new(keymap)
+				return require('libmodal.Layer').new(keymap)
 			end,
 		},
 
@@ -32,7 +32,7 @@ local libmodal = setmetatable(
 			--- @param name string the name of the mode.
 			--- @param instruction fun()|string|table a Lua function, keymap dictionary, Vimscript command.
 			enter = function(name, instruction, supress_exit)
-				require('libmodal.src.Mode').new(name, instruction, supress_exit):enter()
+				require('libmodal.Mode').new(name, instruction, supress_exit):enter()
 			end
 		},
 
@@ -43,7 +43,7 @@ local libmodal = setmetatable(
 			--- @param instruction fun()|{[string]: fun()|string} what to do with user input
 			--- @param user_completions? string[] a list of possible inputs, provided by the user
 			enter = function(name, instruction, user_completions)
-				require('libmodal.src.Prompt').new(name, instruction, user_completions):enter()
+				require('libmodal.Prompt').new(name, instruction, user_completions):enter()
 			end
 		}
 	},
diff --git a/lua/libmodal/src/utils/Help.lua b/lua/libmodal/utils/Help.lua
similarity index 97%
rename from lua/libmodal/src/utils/Help.lua
rename to lua/libmodal/utils/Help.lua
index 1eca193..c0c17d8 100644
--- a/lua/libmodal/src/utils/Help.lua
+++ b/lua/libmodal/utils/Help.lua
@@ -1,6 +1,6 @@
 --- @class libmodal.utils.Help
 --- @field private [integer] string[]
-local Help = require('libmodal.src.utils.classes').new()
+local Help = require('libmodal.utils.classes').new()
 
 --- align `tbl` according to the `longest_key_len`.
 --- @param longest_key_len number how long the longest key is.
diff --git a/lua/libmodal/src/utils/Popup.lua b/lua/libmodal/utils/Popup.lua
similarity index 98%
rename from lua/libmodal/src/utils/Popup.lua
rename to lua/libmodal/utils/Popup.lua
index 798f4a8..f3afa96 100644
--- a/lua/libmodal/src/utils/Popup.lua
+++ b/lua/libmodal/utils/Popup.lua
@@ -2,7 +2,7 @@
 --- @field private buffer_number integer the number of the window which this popup is rendered on.
 --- @field private input_chars string[] the characters input by the user.
 --- @field private window_number integer the number of the window which this popup is rendered on.
-local Popup = require('libmodal.src.utils.classes').new()
+local Popup = require('libmodal.utils.classes').new()
 
 --- @param window number
 --- @return boolean `true` if the window is non-`nil` and `nvim_win_is_valid`
diff --git a/lua/libmodal/src/utils/Vars.lua b/lua/libmodal/utils/Vars.lua
similarity index 96%
rename from lua/libmodal/src/utils/Vars.lua
rename to lua/libmodal/utils/Vars.lua
index 384031f..77fbf8a 100644
--- a/lua/libmodal/src/utils/Vars.lua
+++ b/lua/libmodal/utils/Vars.lua
@@ -1,7 +1,7 @@
 --- @class libmodal.utils.Vars
 --- @field private mode_name string the highlight group to use when printing `str`
 --- @field private var_name string the highlight group to use when printing `str`
-local Vars = require('libmodal.src.utils.classes').new()
+local Vars = require('libmodal.utils.classes').new()
 
 --- @return unknown `vim.g[self:name()])`
 function Vars:get()
diff --git a/lua/libmodal/src/utils/api.lua b/lua/libmodal/utils/api.lua
similarity index 95%
rename from lua/libmodal/src/utils/api.lua
rename to lua/libmodal/utils/api.lua
index 6553606..a0b4318 100644
--- a/lua/libmodal/src/utils/api.lua
+++ b/lua/libmodal/utils/api.lua
@@ -1,4 +1,4 @@
-local globals = require 'libmodal.src.globals'
+local globals = require 'libmodal.globals'
 
 --- @class libmodal.utils.api
 local api = {}
diff --git a/lua/libmodal/src/utils/classes.lua b/lua/libmodal/utils/classes.lua
similarity index 100%
rename from lua/libmodal/src/utils/classes.lua
rename to lua/libmodal/utils/classes.lua
diff --git a/lua/libmodal/src/utils/init.lua b/lua/libmodal/utils/init.lua
similarity index 72%
rename from lua/libmodal/src/utils/init.lua
rename to lua/libmodal/utils/init.lua
index 433259a..9083c96 100644
--- a/lua/libmodal/src/utils/init.lua
+++ b/lua/libmodal/utils/init.lua
@@ -6,11 +6,11 @@
 --- @field Vars libmodal.utils.Vars
 local utils =
 {
-	api = require 'libmodal.src.utils.api',
-	classes = require 'libmodal.src.utils.classes',
-	Help = require 'libmodal.src.utils.Help',
-	Popup = require 'libmodal.src.utils.Popup',
-	Vars  = require 'libmodal.src.utils.Vars',
+	api = require 'libmodal.utils.api',
+	classes = require 'libmodal.utils.classes',
+	Help = require 'libmodal.utils.Help',
+	Popup = require 'libmodal.utils.Popup',
+	Vars  = require 'libmodal.utils.Vars',
 }
 
 --- `vim.notify` with a `msg` some `error` which has a `vim.v.throwpoint` and `vim.v.exception`.