From d3e601a5201db0d12aef58d4ab4abb2b4488fce8 Mon Sep 17 00:00:00 2001
From: Iron-E <code.iron.e@gmail.com>
Date: Wed, 26 Aug 2020 16:35:36 -0400
Subject: [PATCH] Replace broken references to utils.api

---
 lua/libmodal/src/Layer.lua             |  3 ++-
 lua/libmodal/src/Mode.lua              | 10 +++++-----
 lua/libmodal/src/Prompt.lua            |  6 +++---
 lua/libmodal/src/utils/WindowState.lua |  5 +++--
 lua/libmodal/src/utils/init.lua        |  6 +++---
 5 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/lua/libmodal/src/Layer.lua b/lua/libmodal/src/Layer.lua
index 5a6cbf9..c904584 100644
--- a/lua/libmodal/src/Layer.lua
+++ b/lua/libmodal/src/Layer.lua
@@ -4,7 +4,8 @@
 	 */
 --]]
 
-local api  = require('libmodal/src/utils/api')
+local api          = vim.api
+local libmodal_api = require('libmodal/src/utils/api')
 
 --[[
 	/*
diff --git a/lua/libmodal/src/Mode.lua b/lua/libmodal/src/Mode.lua
index 39c0867..914da4c 100644
--- a/lua/libmodal/src/Mode.lua
+++ b/lua/libmodal/src/Mode.lua
@@ -10,7 +10,7 @@ local ParseTable = require('libmodal/src/collections/ParseTable')
 local utils      = require('libmodal/src/utils')
 local Vars       = require('libmodal/src/Vars')
 
-local api = utils.api
+local api = vim.api
 
 --[[
 	/*
@@ -161,7 +161,7 @@ function _metaMode:_initMappings()
 	self._timeouts = Vars.new('timeouts', self._name)
 
 	-- Read the correct timeout variable.
-	if api.nvim_exists('g', self._timeouts:name())
+	if utils.api.nvim_exists('g', self._timeouts:name())
 	then self._timeouts.enabled =
 		self._timeouts:nvimGet()
 	else self._timeouts.enabled =
@@ -186,10 +186,10 @@ function _metaMode:_inputLoop()
 	end
 
 	-- Echo the indicator.
-	api.nvim_lecho(self.indicator)
+	utils.api.nvim_lecho(self.indicator)
 
 	-- Capture input.
-	local userInput = api.nvim_input()
+	local userInput = utils.api.nvim_input()
 
 	-- Return if there was a timeout event.
 	if userInput == _TIMEOUT.NR then
@@ -226,7 +226,7 @@ function _metaMode:_tearDown()
 	end
 
 	self._winState:restore()
-	api.nvim_redraw()
+	utils.api.nvim_redraw()
 end
 
 --[[
diff --git a/lua/libmodal/src/Prompt.lua b/lua/libmodal/src/Prompt.lua
index 7044f03..fa64d47 100644
--- a/lua/libmodal/src/Prompt.lua
+++ b/lua/libmodal/src/Prompt.lua
@@ -7,7 +7,7 @@
 local globals   = require('libmodal/src/globals')
 local utils     = require('libmodal/src/utils')
 
-local api  = utils.api
+local api  = vim.api
 
 --[[
 	/*
@@ -42,7 +42,7 @@ local _metaPrompt = require('libmodal/src/classes').new(Prompt.TYPE)
 ---------------------------------
 function _metaPrompt:_inputLoop()
 	-- clear previous `echo`s.
-	api.nvim_redraw()
+	utils.api.nvim_redraw()
 
 	-- define a placeholder for user input
 	local userInput = ''
@@ -72,7 +72,7 @@ function _metaPrompt:_inputLoop()
 			elseif userInput == _HELP then -- the user did not define a 'help' command, so use the default.
 				self._help:show()
 			else -- show an error.
-				api.nvim_show_err(globals.DEFAULT_ERROR_TITLE, 'Unknown command')
+				utils.api.nvim_show_err(globals.DEFAULT_ERROR_TITLE, 'Unknown command')
 			end
 		else -- attempt to call the instruction.
 			instruction()
diff --git a/lua/libmodal/src/utils/WindowState.lua b/lua/libmodal/src/utils/WindowState.lua
index 8121e98..777340e 100644
--- a/lua/libmodal/src/utils/WindowState.lua
+++ b/lua/libmodal/src/utils/WindowState.lua
@@ -4,7 +4,8 @@
 	 */
 --]]
 
-local api = require('libmodal/src/utils/api')
+local api = vim.api
+local libmodal_api = require('libmodal/src/utils/api')
 
 --[[
 	/*
@@ -33,7 +34,7 @@ local _metaWindowState = require('libmodal/src/classes').new(WindowState.TYPE)
 function _metaWindowState:restore()
 	api.nvim_set_option(height, self.height)
 	api.nvim_set_option(width, self.width)
-	api.nvim_redraw()
+	libmodal_api.nvim_redraw()
 end
 
 --[[
diff --git a/lua/libmodal/src/utils/init.lua b/lua/libmodal/src/utils/init.lua
index dc344a2..841c754 100644
--- a/lua/libmodal/src/utils/init.lua
+++ b/lua/libmodal/src/utils/init.lua
@@ -24,11 +24,11 @@ utils.WindowState = require('libmodal/src/utils/WindowState')
 ]]
 ----------------------------------
 function utils.show_error(pcall_err)
-	local api = utils.api
+	local api = vim.api
 
-	api.nvim_bell()
+	utils.api.nvim_bell()
 
-	api.nvim_show_err(
+	utils.api.nvim_show_err(
 		require('libmodal/src/globals').DEFAULT_ERROR_TITLE,
 		api.nvim_get_vvar('throwpoint')
 		.. '\n' ..