From 67e9354280afb358c4fb6753666ddf0e34c353bb Mon Sep 17 00:00:00 2001 From: MarcHamamji Date: Wed, 5 Apr 2023 13:45:49 +0300 Subject: [PATCH] Lint --- lua/runner/config.lua | 2 +- lua/runner/handlers/helpers.lua | 54 +++++++-------- lua/runner/handlers/init.lua | 2 +- lua/runner/handlers/languages/nodejs/init.lua | 28 ++++---- lua/runner/handlers/languages/python.lua | 4 +- lua/runner/handlers/languages/rust/init.lua | 66 +++++++++---------- lua/runner/handlers/utils.lua | 36 +++++----- lua/runner/init.lua | 8 +-- 8 files changed, 100 insertions(+), 100 deletions(-) diff --git a/lua/runner/config.lua b/lua/runner/config.lua index f626b19..37bfcd5 100644 --- a/lua/runner/config.lua +++ b/lua/runner/config.lua @@ -9,7 +9,7 @@ local defaults = { 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() diff --git a/lua/runner/handlers/helpers.lua b/lua/runner/handlers/helpers.lua index bd02906..f787eed 100644 --- a/lua/runner/handlers/helpers.lua +++ b/lua/runner/handlers/helpers.lua @@ -1,27 +1,27 @@ -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(), @@ -30,20 +30,20 @@ M.shell_handler = function(command, editable) 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( diff --git a/lua/runner/handlers/init.lua b/lua/runner/handlers/init.lua index 386f147..e03d92b 100644 --- a/lua/runner/handlers/init.lua +++ b/lua/runner/handlers/init.lua @@ -1,4 +1,4 @@ -local helpers = require("runner.handlers.helpers") +local helpers = require('runner.handlers.helpers') local handlers = { rust = require('runner.handlers.languages.rust'), diff --git a/lua/runner/handlers/languages/nodejs/init.lua b/lua/runner/handlers/languages/nodejs/init.lua index e47bfba..0d9d065 100644 --- a/lua/runner/handlers/languages/nodejs/init.lua +++ b/lua/runner/handlers/languages/nodejs/init.lua @@ -2,25 +2,25 @@ 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('%')), } - 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 diff --git a/lua/runner/handlers/languages/python.lua b/lua/runner/handlers/languages/python.lua index 0f06ff7..993231e 100644 --- a/lua/runner/handlers/languages/python.lua +++ b/lua/runner/handlers/languages/python.lua @@ -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 diff --git a/lua/runner/handlers/languages/rust/init.lua b/lua/runner/handlers/languages/rust/init.lua index 033fb2b..98a7292 100644 --- a/lua/runner/handlers/languages/rust/init.lua +++ b/lua/runner/handlers/languages/rust/init.lua @@ -2,45 +2,45 @@ 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 diff --git a/lua/runner/handlers/utils.lua b/lua/runner/handlers/utils.lua index 9d70a8e..a824288 100644 --- a/lua/runner/handlers/utils.lua +++ b/lua/runner/handlers/utils.lua @@ -1,20 +1,20 @@ 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() @@ -71,22 +71,22 @@ M.run_command = function(command, callback) 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 diff --git a/lua/runner/init.lua b/lua/runner/init.lua index 0ebc0dd..b1634b6 100644 --- a/lua/runner/init.lua +++ b/lua/runner/init.lua @@ -1,16 +1,16 @@ -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)