From b275066e238811aa1bf43b85eb728244cde1ea33 Mon Sep 17 00:00:00 2001 From: charburgx Date: Wed, 17 Aug 2022 16:14:47 -0500 Subject: [PATCH] style: Run stylua --- lua/symbols-outline.lua | 35 ++++++++++++++-------- lua/symbols-outline/folding.lua | 1 - lua/symbols-outline/hover.lua | 2 +- lua/symbols-outline/parser.lua | 8 +++-- lua/symbols-outline/providers/markdown.lua | 15 ++++------ lua/symbols-outline/providers/nvim-lsp.lua | 15 ++++------ lua/symbols-outline/utils/init.lua | 14 ++++++++- lua/symbols-outline/writer.lua | 8 +++-- 8 files changed, 60 insertions(+), 38 deletions(-) diff --git a/lua/symbols-outline.lua b/lua/symbols-outline.lua index fedeaa1..f01a3ca 100644 --- a/lua/symbols-outline.lua +++ b/lua/symbols-outline.lua @@ -10,7 +10,9 @@ local folding = require 'symbols-outline.folding' local M = {} local function setup_global_autocmd() - if config.options.highlight_hovered_item or config.options.auto_unfold_hover then + if + config.options.highlight_hovered_item or config.options.auto_unfold_hover + then vim.api.nvim_create_autocmd('CursorHold', { pattern = '*', callback = function() @@ -70,7 +72,10 @@ local function _update_lines() end local function _merge_items(items) - utils.merge_items_rec({ children = items }, { children = M.state.outline_items }) + utils.merge_items_rec( + { children = items }, + { children = M.state.outline_items } + ) end local function __refresh() @@ -192,7 +197,10 @@ function M._highlight_current_item(winnr) local cb = function(value) value.hovered = nil - if value.line == hovered_line or (hovered_line > value.range_start and hovered_line < value.range_end) then + if + value.line == hovered_line + or (hovered_line > value.range_start and hovered_line < value.range_end) + then value.hovered = true leaf_node = value end @@ -205,8 +213,8 @@ function M._highlight_current_item(winnr) if leaf_node then for index, node in ipairs(M.state.flattened_outline_items) do if node == leaf_node then - vim.api.nvim_win_set_cursor(M.view.winnr, { index, 1 }) - break + vim.api.nvim_win_set_cursor(M.view.winnr, { index, 1 }) + break end end end @@ -228,9 +236,12 @@ local function setup_keymaps(bufnr) map( config.options.keymaps.hover_symbol, require('symbols-outline.hover').show_hover - ) + ) -- preview symbol - map(config.options.keymaps.toggle_preview, require('symbols-outline.preview').toggle) + map( + config.options.keymaps.toggle_preview, + require('symbols-outline.preview').toggle + ) -- rename symbol map( config.options.keymaps.rename_symbol, @@ -251,23 +262,23 @@ local function setup_keymaps(bufnr) M.view:close() end) -- fold selection - map( config.options.keymaps.fold, function () + map(config.options.keymaps.fold, function() M._set_folded(true) end) -- unfold selection - map(config.options.keymaps.unfold, function () + map(config.options.keymaps.unfold, function() M._set_folded(false) end) -- fold all - map(config.options.keymaps.fold_all, function () + map(config.options.keymaps.fold_all, function() M._set_all_folded(true) end) -- unfold all - map(config.options.keymaps.unfold_all, function () + map(config.options.keymaps.unfold_all, function() M._set_all_folded(false) end) -- fold reset - map(config.options.keymaps.fold_reset,function () + map(config.options.keymaps.fold_reset, function() M._set_all_folded(nil) end) end diff --git a/lua/symbols-outline/folding.lua b/lua/symbols-outline/folding.lua index d2ce275..df1626c 100644 --- a/lua/symbols-outline/folding.lua +++ b/lua/symbols-outline/folding.lua @@ -25,4 +25,3 @@ M.is_folded = function(node) end return M - diff --git a/lua/symbols-outline/hover.lua b/lua/symbols-outline/hover.lua index 27f2a01..cc75e81 100644 --- a/lua/symbols-outline/hover.lua +++ b/lua/symbols-outline/hover.lua @@ -25,7 +25,7 @@ function M.show_hover() hover_params.bufnr, 'textDocument/hover', hover_params, ----@diagnostic disable-next-line: param-type-mismatch + ---@diagnostic disable-next-line: param-type-mismatch function(_, result, _, config) if not (result and result.contents) then -- return { 'No information available' } diff --git a/lua/symbols-outline/parser.lua b/lua/symbols-outline/parser.lua index 59cf924..9fa5f4c 100644 --- a/lua/symbols-outline/parser.lua +++ b/lua/symbols-outline/parser.lua @@ -65,7 +65,6 @@ local function parse_result(result, depth, hierarchy, parent) end node.children = children - end end return ret @@ -230,8 +229,11 @@ function M.get_lines(flattened_outline_items) elseif not node.hierarchy[index] and depth > 1 then line[index + marker_space] = ui.markers.vertical add_guide_hl( - running_length - 1 + 2*marker_space, - running_length + vim.fn.strlen(ui.markers.vertical) - 1 + 2 * marker_space + running_length - 1 + 2 * marker_space, + running_length + + vim.fn.strlen(ui.markers.vertical) + - 1 + + 2 * marker_space ) end end diff --git a/lua/symbols-outline/providers/markdown.lua b/lua/symbols-outline/providers/markdown.lua index 1123425..b1ffba3 100644 --- a/lua/symbols-outline/providers/markdown.lua +++ b/lua/symbols-outline/providers/markdown.lua @@ -8,15 +8,12 @@ function M.should_use_provider(bufnr) end function M.hover_info(_, _, on_info) - on_info( - nil, - { - contents = { - kind = 'markdown', - contents = { 'No extra information availaible!' }, - }, - } - ) + on_info(nil, { + contents = { + kind = 'markdown', + contents = { 'No extra information availaible!' }, + }, + }) end ---@param on_symbols function diff --git a/lua/symbols-outline/providers/nvim-lsp.lua b/lua/symbols-outline/providers/nvim-lsp.lua index cd2c544..a067872 100644 --- a/lua/symbols-outline/providers/nvim-lsp.lua +++ b/lua/symbols-outline/providers/nvim-lsp.lua @@ -23,15 +23,12 @@ function M.hover_info(bufnr, params, on_info) end if not used_client then - on_info( - nil, - { - contents = { - kind = 'markdown', - content = { 'No extra information availaible!' }, - }, - } - ) + on_info(nil, { + contents = { + kind = 'markdown', + content = { 'No extra information availaible!' }, + }, + }) end used_client.request('textDocument/hover', params, on_info, bufnr) diff --git a/lua/symbols-outline/utils/init.lua b/lua/symbols-outline/utils/init.lua index 879618c..15c1aae 100644 --- a/lua/symbols-outline/utils/init.lua +++ b/lua/symbols-outline/utils/init.lua @@ -52,7 +52,19 @@ M.merge_items_rec = function(new_node, old_node, index, parent) failed = true else for key, _ in pairs(new_node) do - if vim.tbl_contains({ 'parent', 'children', 'folded', 'hovered', 'line_in_outline', 'hierarchy' }, key) then + if + vim.tbl_contains( + { + 'parent', + 'children', + 'folded', + 'hovered', + 'line_in_outline', + 'hierarchy', + }, + key + ) + then goto continue end diff --git a/lua/symbols-outline/writer.lua b/lua/symbols-outline/writer.lua index 13df583..ce9eff6 100644 --- a/lua/symbols-outline/writer.lua +++ b/lua/symbols-outline/writer.lua @@ -72,9 +72,13 @@ M.add_hover_highlights = function(bufnr, nodes) if not node.hovered then goto continue end - + local marker_fac = (config.options.fold_markers and 1) or 0 - ui.add_hover_highlight(bufnr, node.line_in_outline - 1, (node.depth + marker_fac) * 2) + ui.add_hover_highlight( + bufnr, + node.line_in_outline - 1, + (node.depth + marker_fac) * 2 + ) ::continue:: end end