This commit is contained in:
MarcHamamji 2023-04-05 13:40:43 +03:00
parent ce9ccbb77d
commit 8c1ed78cbf
8 changed files with 195 additions and 193 deletions

View File

@ -1,17 +1,17 @@
local M = {}
local defaults = {
position = 'right', -- options: top, left, right, bottom
width = 80, -- width of window when position is left or right
height = 10, -- height of window when position is top or bottom
position = "right", -- options: top, left, right, bottom
width = 80, -- width of window when position is left or right
height = 10, -- height of window when position is top or bottom
}
M.options = {}
M.setup = function(options)
M.options = vim.tbl_deep_extend('force', {}, defaults, options or {})
M.options = vim.tbl_deep_extend("force", {}, defaults, options or {})
end
M.setup()
return M;
return M

View File

@ -1,68 +1,71 @@
local pickers = require('telescope.pickers')
local finders = require('telescope.finders')
local actions = require('telescope.actions')
local action_state = require('telescope.actions.state')
local sorters = require('telescope.sorters')
local themes = require('telescope.themes')
local pickers = require("telescope.pickers")
local finders = require("telescope.finders")
local actions = require("telescope.actions")
local action_state = require("telescope.actions.state")
local sorters = require("telescope.sorters")
local themes = require("telescope.themes")
local utils = require('runner.handlers.utils')
local utils = require("runner.handlers.utils")
local M = {}
M.shell_handler = function(command, editable)
if editable == nil then
editable = false
end
return function(_)
if editable then
command = vim.fn.input('Command: ', command)
end
if editable == nil then
editable = false
end
return function(_)
if editable then
command = vim.fn.input("Command: ", command)
end
local output_buffer = utils.create_buffer()
local output_buffer = utils.create_buffer()
local output_window = utils.create_window()
vim.api.nvim_win_set_buf(output_window, output_buffer)
local output_window = utils.create_window()
vim.api.nvim_win_set_buf(output_window, output_buffer)
vim.fn.termopen(command, {
cwd = vim.fn.getcwd()
})
end
vim.fn.termopen(command, {
cwd = vim.fn.getcwd(),
})
end
end
M.command_handler = function(command)
return function()
vim.cmd(command)
end
return function()
vim.cmd(command)
end
end
-- handlers = { 'Run Tests' = test_handler, 'Run Code' = code_handler }
M.choice = function(handlers)
local handlers_count = vim.tbl_count(handlers)
if handlers_count == 0 then
print('No handler available right now')
return function() end
elseif handlers_count == 1 then
return vim.tbl_values(handlers)[1]
end
local handlers_count = vim.tbl_count(handlers)
if handlers_count == 0 then
print("No handler available right now")
return function() end
elseif handlers_count == 1 then
return vim.tbl_values(handlers)[1]
end
return function(buffer)
local picker = pickers.new({}, themes.get_dropdown({
prompt_title = "Runner",
finder = finders.new_table {
results = vim.tbl_keys(handlers)
},
sorter = sorters.get_generic_fuzzy_sorter(),
attach_mappings = function(prompt_bufnr)
actions.select_default:replace(function()
actions.close(prompt_bufnr)
local handler_name = action_state.get_selected_entry()[1]
handlers[handler_name](buffer)
end)
return true
end,
}))
picker:find()
end
return function(buffer)
local picker = pickers.new(
{},
themes.get_dropdown({
prompt_title = "Runner",
finder = finders.new_table({
results = vim.tbl_keys(handlers),
}),
sorter = sorters.get_generic_fuzzy_sorter(),
attach_mappings = function(prompt_bufnr)
actions.select_default:replace(function()
actions.close(prompt_bufnr)
local handler_name = action_state.get_selected_entry()[1]
handlers[handler_name](buffer)
end)
return true
end,
})
)
picker:find()
end
end
return M

View File

@ -1,12 +1,12 @@
local helpers = require('runner.handlers.helpers')
local helpers = require("runner.handlers.helpers")
local handlers = {
rust = require('runner.handlers.languages.rust'),
python = require('runner.handlers.languages.python'),
lua = helpers.command_handler('luafile %'),
javascript = require('runner.handlers.languages.nodejs'),
typescript = require('runner.handlers.languages.nodejs'),
vue = require('runner.handlers.languages.nodejs')
rust = require("runner.handlers.languages.rust"),
python = require("runner.handlers.languages.python"),
lua = helpers.command_handler("luafile %"),
javascript = require("runner.handlers.languages.nodejs"),
typescript = require("runner.handlers.languages.nodejs"),
vue = require("runner.handlers.languages.nodejs"),
}
return handlers

View File

@ -1,26 +1,26 @@
local helpers = require('runner.handlers.helpers')
local utils = require('runner.handlers.utils')
local helpers = require("runner.handlers.helpers")
local utils = require("runner.handlers.utils")
return function(buffer)
utils.run_command(utils.script_path() .. 'get-scripts.sh', function(output)
local bins = {}
utils.run_command(utils.script_path() .. "get-scripts.sh", function(output)
local bins = {}
for _, line in pairs(output) do
for _, data in pairs(line) do
if vim.trim(data) ~= '' then
bins[#bins + 1] = data
end
end
end
for _, line in pairs(output) do
for _, data in pairs(line) do
if vim.trim(data) ~= "" then
bins[#bins + 1] = data
end
end
end
local handlers = {
['Run current file'] = helpers.shell_handler('node ' .. vim.fn.expand('%'))
}
local handlers = {
["Run current file"] = helpers.shell_handler("node " .. vim.fn.expand("%")),
}
for _, bin in pairs(bins) do
handlers['Run "' .. bin .. '"'] = helpers.shell_handler('npm run ' .. bin)
end
for _, bin in pairs(bins) do
handlers['Run "' .. bin .. '"'] = helpers.shell_handler("npm run " .. bin)
end
helpers.choice(handlers)(buffer)
end)
helpers.choice(handlers)(buffer)
end)
end

View File

@ -1,5 +1,5 @@
local helpers = require('runner.handlers.helpers')
local helpers = require("runner.handlers.helpers")
return function(buffer)
helpers.shell_handler('python ' .. vim.fn.expand('%'))(buffer)
helpers.shell_handler("python " .. vim.fn.expand("%"))(buffer)
end

View File

@ -1,46 +1,46 @@
local helpers = require('runner.handlers.helpers')
local utils = require('runner.handlers.utils')
local helpers = require("runner.handlers.helpers")
local utils = require("runner.handlers.utils")
return function(buffer)
utils.run_command(utils.script_path() .. 'get-bins.sh', function(output)
local bins = {}
utils.run_command(utils.script_path() .. "get-bins.sh", function(output)
local bins = {}
for _, line in pairs(output) do
for _, data in pairs(line) do
if vim.trim(data) ~= '' then
bins[#bins + 1] = data
end
end
end
for _, line in pairs(output) do
for _, data in pairs(line) do
if vim.trim(data) ~= "" then
bins[#bins + 1] = data
end
end
end
local run_handlers = {}
local run_handlers = {}
for _, bin in pairs(bins) do
run_handlers['Run "' .. bin .. '"'] = helpers.shell_handler('cargo run --bin ' .. bin)
end
for _, bin in pairs(bins) do
run_handlers['Run "' .. bin .. '"'] = helpers.shell_handler("cargo run --bin " .. bin)
end
utils.run_command(utils.script_path() .. 'get-tests.sh', function(output)
local bins = {}
utils.run_command(utils.script_path() .. "get-tests.sh", function(output)
local bins = {}
for _, line in pairs(output) do
for _, data in pairs(line) do
if vim.trim(data) ~= '' then
bins[#bins + 1] = data
end
end
end
for _, line in pairs(output) do
for _, data in pairs(line) do
if vim.trim(data) ~= "" then
bins[#bins + 1] = data
end
end
end
local handlers = {
unpack(run_handlers),
['Custom'] = helpers.shell_handler('cargo ', true),
['Test all'] = helpers.shell_handler('cargo test'),
}
local handlers = {
unpack(run_handlers),
["Custom"] = helpers.shell_handler("cargo ", true),
["Test all"] = helpers.shell_handler("cargo test"),
}
for _, bin in pairs(bins) do
handlers['Test "' .. bin .. '"'] = helpers.shell_handler('cargo test --test ' .. bin)
end
for _, bin in pairs(bins) do
handlers['Test "' .. bin .. '"'] = helpers.shell_handler("cargo test --test " .. bin)
end
helpers.choice(handlers)(buffer)
end)
end)
helpers.choice(handlers)(buffer)
end)
end)
end

View File

@ -1,93 +1,92 @@
local M = {}
local config = require('runner.config')
local config = require("runner.config")
M._buffer = nil
M._window = nil
M.create_buffer = function()
if M._buffer then
vim.api.nvim_buf_delete(M._buffer, {})
end
if M._buffer then
vim.api.nvim_buf_delete(M._buffer, {})
end
local buffer = vim.api.nvim_create_buf(true, true)
vim.api.nvim_buf_set_option(buffer, 'modifiable', false)
local buffer = vim.api.nvim_create_buf(true, true)
vim.api.nvim_buf_set_option(buffer, "modifiable", false)
M._buffer = buffer
return buffer
M._buffer = buffer
return buffer
end
M.create_window = function()
if M._window and vim.api.nvim_win_is_valid(M._window) then
vim.api.nvim_set_current_win(M._window)
return M._window
end
if M._window and vim.api.nvim_win_is_valid(M._window) then
vim.api.nvim_set_current_win(M._window)
return M._window
end
if (config.options.position == 'right') then
vim.cmd('botright ' .. config.options.width .. ' vsplit')
elseif (config.options.position == 'left') then
vim.cmd('topleft ' .. config.options.width .. ' vsplit')
elseif (config.options.position == 'bottom') then
vim.cmd('botright ' .. config.options.height .. 'split')
elseif (config.options.position == 'top') then
vim.cmd('topleft ' .. config.options.height .. 'split')
end
if config.options.position == "right" then
vim.cmd("botright " .. config.options.width .. " vsplit")
elseif config.options.position == "left" then
vim.cmd("topleft " .. config.options.width .. " vsplit")
elseif config.options.position == "bottom" then
vim.cmd("botright " .. config.options.height .. "split")
elseif config.options.position == "top" then
vim.cmd("topleft " .. config.options.height .. "split")
end
local window = vim.api.nvim_get_current_win()
local window = vim.api.nvim_get_current_win()
local window_opts = {
number = false,
relativenumber = false,
wrap = true,
spell = false,
foldenable = false,
signcolumn = "no",
colorcolumn = "",
cursorline = true,
}
local window_opts = {
number = false,
relativenumber = false,
wrap = true,
spell = false,
foldenable = false,
signcolumn = "no",
colorcolumn = "",
cursorline = true,
}
for key, value in pairs(window_opts) do
vim.api.nvim_win_set_option(window, key, value)
end
for key, value in pairs(window_opts) do
vim.api.nvim_win_set_option(window, key, value)
end
M._window = window
return window
M._window = window
return window
end
M.run_command = function(command, callback)
local output = {}
local output = {}
local add_line = function(_, data)
output[#output + 1] = data
end
local add_line = function(_, data)
output[#output + 1] = data
end
vim.fn.jobstart(command, {
cwd = vim.fn.getcwd(),
on_stdout = add_line,
on_exit = function()
callback(output)
end
})
vim.fn.jobstart(command, {
cwd = vim.fn.getcwd(),
on_stdout = add_line,
on_exit = function()
callback(output)
end,
})
end
local is_win = function()
return package.config:sub(1, 1) == '\\'
return package.config:sub(1, 1) == "\\"
end
local get_path_separator = function()
if package.config:sub(1, 1) == '\\' then
return '\\'
end
return '/'
if package.config:sub(1, 1) == "\\" then
return "\\"
end
return "/"
end
M.script_path = function()
local str = debug.getinfo(2, 'S').source:sub(2)
if is_win() then
str = str:gsub('/', '\\')
end
return str:match('(.*' .. get_path_separator() .. ')')
local str = debug.getinfo(2, "S").source:sub(2)
if is_win() then
str = str:gsub("/", "\\")
end
return str:match("(.*" .. get_path_separator() .. ")")
end
return M

View File

@ -1,35 +1,35 @@
local handlers = require('runner.handlers')
local config = require('runner.config')
local handlers = require("runner.handlers")
local config = require("runner.config")
local M = {}
M._handlers = handlers
M.setup = function(options)
config.setup(options)
config.setup(options)
end
M.set_handler = function(filetype, handler)
M._handlers[filetype] = handler
M._handlers[filetype] = handler
end
M.run = function(bufnr)
local buffer
if bufnr == nil or bufnr == 0 then
buffer = vim.api.nvim_get_current_buf()
else
buffer = bufnr
end
local filetype = vim.filetype.match({ buf = buffer })
local buffer
if bufnr == nil or bufnr == 0 then
buffer = vim.api.nvim_get_current_buf()
else
buffer = bufnr
end
local filetype = vim.filetype.match({ buf = buffer })
local handler = M._handlers[filetype]
local handler = M._handlers[filetype]
if not handler then
print(string.format('No handler defined for filetype \'%s\'', filetype))
return
end
if not handler then
print(string.format("No handler defined for filetype '%s'", filetype))
return
end
handler(buffer)
handler(buffer)
end
return M