From 2374c696d38a55f99b8bdc7e79d2261d71cb2920 Mon Sep 17 00:00:00 2001 From: ThePrimeagen Date: Tue, 11 May 2021 10:33:18 -0600 Subject: [PATCH] chore(lint): ... so much of it --- .stylua.toml | 2 +- lua/harpoon/init.lua | 10 ++++++++-- lua/harpoon/mark.lua | 11 +++++++++-- lua/harpoon/term.lua | 19 ------------------- lua/harpoon/ui.lua | 43 +++++++++++++++++++++++++++++++++++-------- 5 files changed, 53 insertions(+), 32 deletions(-) diff --git a/.stylua.toml b/.stylua.toml index c537618..0b2e146 100644 --- a/.stylua.toml +++ b/.stylua.toml @@ -1,4 +1,4 @@ -column_width = 120 +column_width = 80 line_endings = "Unix" indent_type = "Spaces" indent_width = 4 diff --git a/lua/harpoon/init.lua b/lua/harpoon/init.lua index c122a54..69bf98c 100644 --- a/lua/harpoon/init.lua +++ b/lua/harpoon/init.lua @@ -59,7 +59,10 @@ local function ensure_correct_config(config) log.trace("_ensure_correct_config()") local projects = config.projects if projects[vim.loop.cwd()] == nil then - log.debug("ensure_correct_config(): No config found for:", vim.loop.cwd()) + log.debug( + "ensure_correct_config(): No config found for:", + vim.loop.cwd() + ) projects[vim.loop.cwd()] = { mark = { marks = {}, @@ -77,7 +80,10 @@ local function ensure_correct_config(config) end if proj.term == nil then - log.debug("ensure_correct_config(): No terminal commands found for", vim.loop.cwd()) + log.debug( + "ensure_correct_config(): No terminal commands found for", + vim.loop.cwd() + ) proj.term = { cmds = {} } end diff --git a/lua/harpoon/mark.lua b/lua/harpoon/mark.lua index c822638..fbbb7c5 100644 --- a/lua/harpoon/mark.lua +++ b/lua/harpoon/mark.lua @@ -21,7 +21,10 @@ local function emit_changed() end for idx, cb in pairs(callbacks["changed"]) do - log.trace(string.format("_emit_changed(): Running callback #%d for 'changed'", idx)) + log.trace(string.format( + "_emit_changed(): Running callback #%d for 'changed'", + idx + )) cb() end end @@ -208,7 +211,11 @@ M.store_offset = function() end local cursor_pos = vim.fn.getcurpos() - log.debug(string.format("store_offset(): Stored row: %d, col: %d", cursor_pos[2], cursor_pos[3])) + log.debug(string.format( + "store_offset(): Stored row: %d, col: %d", + cursor_pos[2], + cursor_pos[3] + )) harpoon.get_mark_config().marks[idx].row = cursor_pos[2] harpoon.get_mark_config().marks[idx].col = cursor_pos[3] end) diff --git a/lua/harpoon/term.lua b/lua/harpoon/term.lua index 405d90a..90c4268 100644 --- a/lua/harpoon/term.lua +++ b/lua/harpoon/term.lua @@ -27,25 +27,6 @@ local function create_terminal() return buf_id, term_id end -<<<<<<< HEAD -======= -M.getCmd = function(idx) - log.trace("getCmd()") - local cmd - if type(idx) == "number" then - cmd = harpoon.get_term_config().cmds[idx] - else - log.error("getCmd(): Index is expected to be a number.") - end - - if cmd then - return cmd - else - error("Command does not exist for that id.") - end -end - ->>>>>>> 2d37262466380a38ba9d54bdf6754d005d801030 local function find_terminal(idx) log.trace("_find_terminal(): Terminal:", idx) local term_handle = terminals[idx] diff --git a/lua/harpoon/ui.lua b/lua/harpoon/ui.lua index 78c331a..afd0059 100644 --- a/lua/harpoon/ui.lua +++ b/lua/harpoon/ui.lua @@ -29,7 +29,8 @@ local function create_window() local config = harpoon.get_menu_config() local width = config.width or 60 local height = config.height or 10 - local borderchars = config.borderchars or { "─", "│", "─", "│", "╭", "╮", "╯", "╰" } + local borderchars = config.borderchars + or { "─", "│", "─", "│", "╭", "╮", "╯", "╰" } local bufnr = vim.api.nvim_create_buf(false, false) local Harpoon_win_id, win = popup.create(bufnr, { @@ -42,7 +43,11 @@ local function create_window() borderchars = borderchars, }) - vim.api.nvim_win_set_option(win.border.win_id, "winhl", "Normal:HarpoonBorder") + vim.api.nvim_win_set_option( + win.border.win_id, + "winhl", + "Normal:HarpoonBorder" + ) return { bufnr = bufnr, @@ -93,13 +98,25 @@ M.toggle_quick_menu = function() vim.api.nvim_buf_set_option(Harpoon_bufh, "filetype", "harpoon") vim.api.nvim_buf_set_option(Harpoon_bufh, "buftype", "acwrite") vim.api.nvim_buf_set_option(Harpoon_bufh, "bufhidden", "delete") - vim.api.nvim_buf_set_keymap(Harpoon_bufh, "n", "", ":lua require('harpoon.ui').select_menu_item()", {}) - vim.cmd(string.format("autocmd BufWriteCmd :lua require('harpoon.ui').on_menu_save()", Harpoon_bufh)) - vim.cmd(string.format("autocmd BufModifiedSet set nomodified", Harpoon_bufh)) + vim.api.nvim_buf_set_keymap( + Harpoon_bufh, + "n", + "", + ":lua require('harpoon.ui').select_menu_item()", + {} + ) + vim.cmd(string.format( + "autocmd BufWriteCmd :lua require('harpoon.ui').on_menu_save()", + Harpoon_bufh + )) + vim.cmd(string.format( + "autocmd BufModifiedSet set nomodified", + Harpoon_bufh + )) end M.select_menu_item = function() - local idx = vim.fn.line('.') + local idx = vim.fn.line(".") close_menu(true) M.nav_file(idx) end @@ -124,7 +141,11 @@ M.nav_file = function(id) vim.api.nvim_set_current_buf(buf_id) if set_row and mark.row and mark.col then vim.cmd(string.format(":call cursor(%d, %d)", mark.row, mark.col)) - log.debug(string.format("nav_file(): Setting cursor to row: %d, col: %d", mark.row, mark.col)) + log.debug(string.format( + "nav_file(): Setting cursor to row: %d, col: %d", + mark.row, + mark.col + )) end end @@ -161,7 +182,13 @@ function M.notification(text) col = win_width - 21, }) - vim.api.nvim_buf_set_lines(info.bufnr, 0, 5, false, { "!!! Notification", text }) + vim.api.nvim_buf_set_lines( + info.bufnr, + 0, + 5, + false, + { "!!! Notification", text } + ) vim.api.nvim_set_current_win(prev_win) return {