From 678f84a859910103979af790cf6e8d4d4e259755 Mon Sep 17 00:00:00 2001 From: MarcHamamji Date: Mon, 3 Apr 2023 18:15:14 +0300 Subject: [PATCH 1/4] Add stylua configuration --- .stylua.toml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .stylua.toml diff --git a/.stylua.toml b/.stylua.toml new file mode 100644 index 0000000..72cb891 --- /dev/null +++ b/.stylua.toml @@ -0,0 +1,10 @@ +column_width = 120 +line_endings = "Unix" +indent_type = "Spaces" +indent_width = 2 +quote_style = "AutoPreferSingle" +call_parentheses = "NoSingleTable" +collapse_simple_statement = "Never" + +[sort_requires] +enabled = false From 127ddbcf6a5fe3ab679e2241d94e40dd0eb887f7 Mon Sep 17 00:00:00 2001 From: MarcHamamji Date: Mon, 3 Apr 2023 18:34:09 +0300 Subject: [PATCH 2/4] Add pre-commit configuration --- .pre-commit-config.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .pre-commit-config.yaml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000..79b58bc --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,5 @@ +repos: +- repo: https://github.com/JohnnyMorganz/StyLua + rev: v0.17.1 + hooks: + - id: stylua-github From e09de414c76a6e9574c8805dc65c014b135ba329 Mon Sep 17 00:00:00 2001 From: MarcHamamji Date: Mon, 3 Apr 2023 19:01:05 +0300 Subject: [PATCH 3/4] Run StyLua --- lua/runner/handlers/helpers.lua | 35 ++++++++++--------- lua/runner/handlers/init.lua | 2 +- lua/runner/handlers/languages/nodejs/init.lua | 4 +-- lua/runner/handlers/languages/rust/init.lua | 2 +- lua/runner/handlers/utils.lua | 10 +++--- lua/runner/init.lua | 4 +-- 6 files changed, 29 insertions(+), 28 deletions(-) diff --git a/lua/runner/handlers/helpers.lua b/lua/runner/handlers/helpers.lua index 09e1644..f787eed 100644 --- a/lua/runner/handlers/helpers.lua +++ b/lua/runner/handlers/helpers.lua @@ -24,7 +24,7 @@ M.shell_handler = function(command, editable) vim.api.nvim_win_set_buf(output_window, output_buffer) vim.fn.termopen(command, { - cwd = vim.fn.getcwd() + cwd = vim.fn.getcwd(), }) end end @@ -46,21 +46,24 @@ M.choice = function(handlers) 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, - })) + 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 diff --git a/lua/runner/handlers/init.lua b/lua/runner/handlers/init.lua index 67dde6c..e03d92b 100644 --- a/lua/runner/handlers/init.lua +++ b/lua/runner/handlers/init.lua @@ -6,7 +6,7 @@ local handlers = { lua = helpers.command_handler('luafile %'), javascript = require('runner.handlers.languages.nodejs'), typescript = require('runner.handlers.languages.nodejs'), - vue = require('runner.handlers.languages.nodejs') + vue = require('runner.handlers.languages.nodejs'), } return handlers diff --git a/lua/runner/handlers/languages/nodejs/init.lua b/lua/runner/handlers/languages/nodejs/init.lua index 1f8fbb6..0d9d065 100644 --- a/lua/runner/handlers/languages/nodejs/init.lua +++ b/lua/runner/handlers/languages/nodejs/init.lua @@ -1,5 +1,5 @@ local helpers = require('runner.handlers.helpers') -local utils = require('runner.handlers.utils') +local utils = require('runner.handlers.utils') return function(buffer) utils.run_command(utils.script_path() .. 'get-scripts.sh', function(output) @@ -14,7 +14,7 @@ return function(buffer) end local handlers = { - ['Run current file'] = helpers.shell_handler('node ' .. vim.fn.expand('%')) + ['Run current file'] = helpers.shell_handler('node ' .. vim.fn.expand('%')), } for _, bin in pairs(bins) do diff --git a/lua/runner/handlers/languages/rust/init.lua b/lua/runner/handlers/languages/rust/init.lua index 0273f02..98a7292 100644 --- a/lua/runner/handlers/languages/rust/init.lua +++ b/lua/runner/handlers/languages/rust/init.lua @@ -1,5 +1,5 @@ local helpers = require('runner.handlers.helpers') -local utils = require('runner.handlers.utils') +local utils = require('runner.handlers.utils') return function(buffer) utils.run_command(utils.script_path() .. 'get-bins.sh', function(output) diff --git a/lua/runner/handlers/utils.lua b/lua/runner/handlers/utils.lua index f4a4be8..bb7ff7c 100644 --- a/lua/runner/handlers/utils.lua +++ b/lua/runner/handlers/utils.lua @@ -21,7 +21,7 @@ M.create_window = function() return M._window end - vim.cmd [[ vsplit ]] + vim.cmd([[ vsplit ]]) local window = vim.api.nvim_get_current_win() local window_opts = { @@ -30,8 +30,8 @@ M.create_window = function() wrap = true, spell = false, foldenable = false, - signcolumn = "no", - colorcolumn = "", + signcolumn = 'no', + colorcolumn = '', cursorline = true, } @@ -55,12 +55,10 @@ M.run_command = function(command, callback) on_stdout = add_line, on_exit = function() callback(output) - end + end, }) - end - local is_win = function() return package.config:sub(1, 1) == '\\' end diff --git a/lua/runner/init.lua b/lua/runner/init.lua index f2cbf3f..f25d78a 100644 --- a/lua/runner/init.lua +++ b/lua/runner/init.lua @@ -15,12 +15,12 @@ M.run = function(bufnr) else buffer = bufnr end - local filetype = vim.filetype.match({ buf = buffer }) + local filetype = vim.filetype.match { buf = buffer } local handler = M._handlers[filetype] if not handler then - print(string.format('No handler defined for filetype \'%s\'', filetype)) + print(string.format("No handler defined for filetype '%s'", filetype)) return end From c15d5702dd530a40374bb6aaa13b4295d5b61af0 Mon Sep 17 00:00:00 2001 From: MarcHamamji Date: Wed, 5 Apr 2023 13:28:57 +0300 Subject: [PATCH 4/4] Format config.lua --- lua/runner/config.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lua/runner/config.lua b/lua/runner/config.lua index 3757e09..37bfcd5 100644 --- a/lua/runner/config.lua +++ b/lua/runner/config.lua @@ -2,8 +2,8 @@ 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 + width = 80, -- width of window when position is left or right + height = 10, -- height of window when position is top or bottom } M.options = {} @@ -14,4 +14,4 @@ end M.setup() -return M; +return M