Archives
/
nvim-libmodal
mirror of https://github.com/Iron-E/nvim-libmodal
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rework imports

Browse Source
pull/3/head
Iron-E 4 years ago
parent 380295c94d
commit dc16475788
No known key found for this signature in database
GPG Key ID: 19B71B7B7B021D22
14 changed files with 36 additions and 78 deletions
Show Stats Download Patch File Download Diff File

2
lua/libmodal/init.lua
Unescape Escape View File

@ -15,7 +15,7 @@ local libmodal = require('libmodal/src')
libmodal.layer = {['enter'] = function(name, mappings)
local layer = libmodal.Layer.new(name, mappings)
layer:enter()
return layer.exit
return function() layer:exit() end
end}
libmodal.mode = {['enter'] = function(name, instruction, ...)

5
lua/libmodal/src/Layer.lua
Unescape Escape View File

@ -4,8 +4,7 @@
*/
--]]
local api = vim.api
local classes = require('libmodal/src/classes')
local api = vim.api
--[[
/*
@ -38,7 +37,7 @@ end
*/
--]]
local _metaLayer = classes.new(Layer.TYPE)
local _metaLayer = require('libmodal/src/classes').new(Layer.TYPE)
---------------------------
--[[ SUMMARY:

5
lua/libmodal/src/Mode/Popup.lua
Unescape Escape View File

@ -4,8 +4,7 @@
*/
--]]
local api = vim.api
local classes = require('libmodal/src/classes')
local api = vim.api
--[[
/*
@ -34,7 +33,7 @@ local _winOpenOpts = {
*/
--]]
local _metaPopup = classes.new(Popup.TYPE)
local _metaPopup = require('libmodal/src/classes').new(Popup.TYPE)
---------------------------
--[[ SUMMARY:

5
lua/libmodal/src/Mode/init.lua
Unescape Escape View File

@ -6,7 +6,6 @@
local classes = require('libmodal/src/classes')
local globals = require('libmodal/src/globals')
local Indicator = require('libmodal/src/Indicator')
local collections = require('libmodal/src/collections')
local utils = require('libmodal/src/utils')
local Vars = require('libmodal/src/Vars')
@ -50,6 +49,8 @@ local _metaInputBytes = classes.new(nil, {
end
})
classes = nil
-----------------------------------------------
--[[ SUMMARY:
* Parse `self.mappings` and see if there is any command to execute.
@ -253,7 +254,7 @@ function Mode.new(name, instruction, ...)
local self = setmetatable(
{
['exit'] = Vars.new('exit', name),
['indicator'] = Indicator.mode(name),
['indicator'] = require('libmodal/src/Indicator').mode(name),
['input'] = Vars.new('input', name),
['_instruction'] = instruction,
['_name'] = name,

16
lua/libmodal/src/ModeLayer.lua
Unescape Escape View File

@ -1,13 +1,3 @@
--[[
/*
* IMPORTS
*/
--]]
local classes = require('libmodal/src/classes')
local globals = require('libmodal/src/globals')
local Mode = require('libmodal/src/Mode')
--[[
/*
* MODULE
@ -22,7 +12,7 @@ local ModeLayer = {['TYPE'] = 'libmodal-mode-layer'}
*/
--]]
local _metaModeLayer = classes.new(ModeLayer.TYPE)
local _metaModeLayer = require('libmodal/src/classes').new(ModeLayer.TYPE)
-------------------------------
--[[ SUMMARY:
@ -84,12 +74,12 @@ end
]]
-----------------------------------------
function ModeLayer.new(mode, instruction)
if classes.type(mode) == Mode.TYPE
if require('libmodal/src/classes').type(mode) == require('libmodal/src/Mode').TYPE
and type(mode._instruction) == type(instruction)
then
return setmetatable(
{
['_isTable'] = type(instruction) == globals.TYPE_TBL,
['_isTable'] = type(instruction) == require('libmodal/src/globals').TYPE_TBL,
['_instruction'] = instruction,
['_mode'] = mode
}, _metaModeLayer

9
lua/libmodal/src/Prompt.lua
Unescape Escape View File

@ -4,11 +4,8 @@
*/
--]]
local classes = require('libmodal/src/classes')
local globals = require('libmodal/src/globals')
local Indicator = require('libmodal/src/Indicator')
local utils = require('libmodal/src/utils')
local Vars = require('libmodal/src/Vars')
local api = utils.api
@ -36,7 +33,7 @@ end
*/
--]]
local _metaPrompt = classes.new(Prompt.TYPE)
local _metaPrompt = require('libmodal/src/classes').new(Prompt.TYPE)
---------------------------------
--[[ SUMMARY:
@ -178,8 +175,8 @@ end
function Prompt.new(name, instruction, ...)
local self = setmetatable(
{
['indicator'] = Indicator.prompt(name),
['input'] = Vars.new('input', name),
['indicator'] = require('libmodal/src/Indicator').prompt(name),
['input'] = require('libmodal/src/Vars').new('input', name),
['_instruction'] = instruction,
['_name'] = name
},

6
lua/libmodal/src/Vars.lua
Unescape Escape View File

@ -4,9 +4,7 @@
*/
--]]
local api = vim.api
local classes = require('libmodal/src/classes')
local globals = require('libmodal/src/globals')
local api = vim.api
--[[
/*
@ -27,7 +25,7 @@ local Vars = {
*/
--]]
local _metaVars = classes.new(Vars.TYPE)
local _metaVars = require('libmodal/src/classes').new(Vars.TYPE)
---------------------------------
--[[ SUMMARY:

12
lua/libmodal/src/classes.lua
Unescape Escape View File

@ -1,3 +1,9 @@
--[[
/*
* MODULE
*/
--]]
local classes = {}
--------------------------
@ -29,4 +35,10 @@ function classes.type(v)
return v.__type or type(v)
end
--[[
/*
* PUBLICIZE `classes`
*/
--]]
return classes

4
lua/libmodal/src/collections/ParseTable.lua
Unescape Escape View File

@ -4,8 +4,6 @@
*/
--]]
local api = vim.api
local classes = require('libmodal/src/classes')
local globals = require('libmodal/src/globals')
--[[
@ -151,7 +149,7 @@ end -- ‡
*/
--]]
local _metaParseTable = classes.new(ParseTable.TYPE)
local _metaParseTable = require('libmodal/src/classes').new(ParseTable.TYPE)
------------------------------------------
--[[ SUMMARY:

11
lua/libmodal/src/collections/Stack.lua
Unescape Escape View File

@ -1,11 +1,3 @@
--[[
/*
* IMPORTS
*/
--]]
local classes = require('libmodal/src/classes')
--[[
/*
* MODULE `Stack`
@ -20,10 +12,9 @@ local Stack = {['TYPE'] = 'libmodal-stack'}
*/
--]]
local _metaStack = classes.new(Stack.TYPE)
local _metaStack = require('libmodal/src/classes').new(Stack.TYPE)
_metaStack._len = 0
_metaStack._top = nil
--------------------------------
--[[ SUMMARY:

10
lua/libmodal/src/utils/Help.lua
Unescape Escape View File

@ -1,11 +1,3 @@
--[[
/*
* IMPORTS
*/
--]]
local classes = require('libmodal/src/classes')
--[[
/*
* MODULE
@ -20,7 +12,7 @@ local Help = {['TYPE'] = 'libmodal-help'}
*/
--]]
local _metaHelp = classes.new(Help.TYPE)
local _metaHelp = require('libmodal/src/classes').new(Help.TYPE)
-------------------------
--[[ SUMMARY:

6
lua/libmodal/src/utils/WindowState.lua
Unescape Escape View File

@ -4,9 +4,7 @@
*/
--]]
local api = require('libmodal/src/utils/api')
local classes = require('libmodal/src/classes')
local globals = require('libmodal/src/globals')
local api = require('libmodal/src/utils/api')
--[[
/*
@ -25,7 +23,7 @@ local width = 'winwidth'
*/
--]]
local _metaWindowState = classes.new(WindowState.TYPE)
local _metaWindowState = require('libmodal/src/classes').new(WindowState.TYPE)
-----------------------------------
--[[ SUMMARY

12
lua/libmodal/src/utils/api.lua
Unescape Escape View File

@ -1,12 +1,3 @@
--[[
/*
* IMPORTS
*/
--]]
local globals = require('libmodal/src/globals')
local HighlightSegment = require('libmodal/src/Indicator/HighlightSegment')
--[[
/*
* MODULE
@ -34,7 +25,7 @@ end
]]
------------------------------------
function api.nvim_exists(scope, var)
return api.nvim_call_function('exists', {scope .. ':' .. var}) == globals.VIM_TRUE
return api.nvim_call_function('exists', {scope .. ':' .. var}) == require('libmodal/src/globals').VIM_TRUE
end
-------------------------
@ -114,6 +105,7 @@ end
--------------------------------------
-- local returnHighlightSegment = HighlightSegment.new('Question', '\nPress any key to return.')
function api.nvim_show_err(title, msg)
local HighlightSegment = require('libmodal/src/Indicator/HighlightSegment')
api.nvim_lecho({
HighlightSegment.new('Title', tostring(title) .. '\n'),
HighlightSegment.new('Error', tostring(msg)),

11
lua/libmodal/src/utils/init.lua
Unescape Escape View File

@ -1,12 +1,3 @@
--[[
/*
* IMPORTS
*/
--]]
local api = vim.api
local globals = require('libmodal/src/globals')
--[[
/*
* MODULE
@ -35,7 +26,7 @@ utils.WindowState = require('libmodal/src/utils/WindowState')
function utils.show_error(pcall_err)
utils.api.nvim_bell()
utils.api.nvim_show_err(
globals.DEFAULT_ERROR_TITLE,
require('libmodal/src/globals').DEFAULT_ERROR_TITLE,
api.nvim_get_vvar('throwpoint')
.. '\n' ..
api.nvim_get_vvar('exception')

Write Preview
Loading…
Cancel
Save