diff --git a/.github/workflows/panvimdoc.yml b/.github/workflows/panvimdoc.yml index 1ba4a61..4b7cc98 100644 --- a/.github/workflows/panvimdoc.yml +++ b/.github/workflows/panvimdoc.yml @@ -11,7 +11,7 @@ jobs: - name: panvimdoc uses: kdheepak/panvimdoc@main with: - vimdoc: symbols-outline + vimdoc: outline version: "NVIM v0.7.0" - uses: stefanzweifel/git-auto-commit-action@v4 with: diff --git a/README.md b/README.md index 0a166a6..10d09fa 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ # Fork status -[Skip to plugin readme](#symbols-outlinenvim) +[Skip to plugin readme](#outlinenvim) This is a fork of the original symbols-outline.nvim which fixes a lot of bugs from the original repo. @@ -45,7 +45,7 @@ I do not merge PRs from the original repo that I don't personally need. - simrat39/symbols-outline.nvim#178 - simrat39/symbols-outline.nvim#209 - Symbol preview empty (simrat39/symbols-outline.nvim#176) -- `SymbolsOutlineClose` crashing when already closed: simrat39/symbols-outline.nvim#163 +- `OutlineClose` crashing when already closed: simrat39/symbols-outline.nvim#163 - Symbols not showing by supporting Nerd fonts v3.0: simrat39/symbols-outline.nvim#225 - Newlines in symbols crash: simrat39/symbols-outline.nvim#204 (simrat39/symbols-outline.nvim#184) - `code_actions`: simrat39/symbols-outline.nvim#168 (simrat39/symbols-outline.nvim#123) @@ -59,6 +59,29 @@ outline. ## 🛑 Breaking changes +The fork has been renamed to outline.nvim for the following reasons: + +1. While `symbols-outline` is a great name, using `SymbolsOutline*` everywhere + as a prefix for commands and highlight groups is quite long to type. +1. I did not find existing plugins that use the `outline` import path. +1. The only plugin I could find named `outline.nvim` does not use this import + path. +1. This is a fork starting anew, it makes sense to undergo a + [rename](https://github.com/lewis6991/pckr.nvim). + +Regardless of this rename, I am eternally grateful to @simrat39 for their work +in the original symbols-outline.nvim. This plugin would not exist without it. + +What this means for you: + +- Commands and highlights that had the `SymbolsOutline*` prefix should now use + `Outline*` +- The import path should be changed from `symbols-outline` to `outline` + +That is all. + +Here are other breaking changes: + This section may be relevant to you if your existing config uses the mentioned features: @@ -114,7 +137,7 @@ and behaviour of outline window is now moved to `outline_window` table; ## Features -[Skip to plugin readme](#symbols-outlinenvim) +[Skip to plugin readme](#outlinenvim) Below is a list of features I've included in this fork which, at the time of writing, has not been included upstream (in the original repo). I try my best to @@ -126,7 +149,7 @@ Features/Changes: (simrat39/symbols-outline.nvim#194). - Control focus between outline and code window. - - New commands: SymbolsOutline`Focus,FocusOutline,FocusCode` (see + - New commands: Outline`Focus,FocusOutline,FocusCode` (see [commands](#commands)) - Fixed issues: - simrat39/symbols-outline.nvim#143 @@ -276,7 +299,7 @@ Key: ## TODO -[Skip to plugin readme](#symbols-outlinenvim) +[Skip to plugin readme](#outlinenvim) Key: ``` @@ -327,7 +350,7 @@ Key: --- -# symbols-outline.nvim +# outline.nvim @@ -368,19 +391,19 @@ Table of contents Packer: ```lua -use 'hedyhli/symbols-outline.nvim' +use 'hedyhli/outline.nvim' ``` Lazy: ```lua { - "hedyhli/symbols-outline.nvim", + "hedyhli/outline.nvim", config = function() -- Example mapping to toggle outline - vim.keymap.set("n", "tt", "SymbolsOutline", - { desc = "SymbolsOutline" }) + vim.keymap.set("n", "tt", "Outline", + { desc = "Toggle Outline" }) - require("symbols-outline").setup { + require("outline").setup { -- Your setup opts here (leave empty to use defaults) } end, @@ -390,11 +413,11 @@ Lazy: Lazy with lazy-loading: ```lua { - "hedyhli/symbols-outline.nvim", - cmd = { "SymbolsOutline", "SymbolsOutlineOpen" }, + "hedyhli/outline.nvim", + cmd = { "Outline", "OutlineOpen" }, keys = { -- Example mapping to toggle outline - { "tt", "SymbolsOutline", desc = "Toggle outline" }, + { "tt", "Outline", desc = "Toggle outline" }, }, opts = { -- Your setup opts here @@ -402,8 +425,8 @@ Lazy with lazy-loading: }, ``` -This allows Lazy.nvim to lazy load the plugin on commands `SymbolsOutline`, -`SymbolsOutlineOpen`, and your keybindings. +This allows Lazy.nvim to lazy load the plugin on commands `Outline`, +`OutlineOpen`, and your keybindings. ## Setup @@ -414,7 +437,7 @@ Note that a call to `.setup()` is *required* for this plugin to work (simrat39/symbols-outline.nvim#213). ```lua -require("symbols-outline").setup({}) +require("outline").setup({}) ``` ## Configuration @@ -494,7 +517,7 @@ Default values are shown: -- Only in this fork: -- Whether to focus on the outline window when it is opened. -- Set to false to remain focus on your previous buffer when opening - -- symbols-outline. + -- outline. focus_on_open = true, -- Only in this fork: -- Winhighlight option for outline window. @@ -502,7 +525,7 @@ Default values are shown: -- To change background color to "CustomHl" for example, append "Normal:CustomHl". -- Note that if you're adding highlight changes, you should append to this -- default value, otherwise details/lineno will not have highlights. - winhl = "SymbolsOutlineDetails:Comment,SymbolsOutlineLineno:LineNr", + winhl = "OutlineDetails:Comment,OutlineLineno:LineNr", }, outline_items = { @@ -682,39 +705,39 @@ string or a falsey value. ## Commands -- **:SymbolsOutline[!]** +- **:Outline[!]** - Toggle symbols outline. With bang (`!`) the cursor focus stays in your + Toggle outline. With bang (`!`) the cursor focus stays in your original window after opening the outline window. Set `focus_on_win = true` to always use this behaviour. -- **:SymbolsOutlineOpen[!]** +- **:OutlineOpen[!]** - Open symbols outline. With bang (`!`) the cursor focus stays in your original + Open outline. With bang (`!`) the cursor focus stays in your original window after opening the outline window. Set `focus_on_win = true` to always use this behaviour. -- **:SymbolsOutlineClose** +- **:OutlineClose** - Close symbols outline + Close outline -- **:SymbolsOutlineFocus** +- **:OutlineFocus** - Toggle focus on symbols outline + Toggle focus on outline -- **:SymbolsOutlineFocusOutline** +- **:OutlineFocusOutline** - Focus on symbols outline + Focus on outline -- **:SymbolsOutlineFocusCode** +- **:OutlineFocusCode** Focus on source window -- **:SymbolsOutlineStatus** +- **:OutlineStatus** Display current provider and outline window status in the messages area. -- **:SymbolsOutlineFollow[!]** +- **:OutlineFollow[!]** Go to corresponding node in outline based on cursor position in code, and focus on the outline window. @@ -763,18 +786,18 @@ Default: ```lua outline_window = { - winhl = "SymbolsOutlineDetails:Comment,SymbolsOutlineLineno:LineNr", + winhl = "OutlineDetails:Comment,OutlineLineno:LineNr", }, ``` -Possible highlight groups provided by symbols-outline to customize: +Possible highlight groups provided by outline.nvim to customize: -| Highlight | Purpose | -| ----------------------- | ---------------------------------------------- | -| SymbolsOutlineCurrent | Highlight of the focused symbol | -| SymbolsOutlineConnector | Highlight of the table connectors | -| SymbolsOutlineDetails | Highlight of the details info virtual text | -| SymbolsOutlineLineno | Highlight of the lineno column | +| Highlight | Purpose | +| ---------------- | ---------------------------------------------- | +| OutlineCurrent | Highlight of the focused symbol | +| OutlineConnector | Highlight of the table connectors | +| OutlineDetails | Highlight of the details info virtual text | +| OutlineLineno | Highlight of the lineno column | You can customize any other highlight groups using `winhl` too, this option is passed directly to the `winhl` vim option unprocessed. @@ -792,10 +815,10 @@ preview_window = { ## Lua API -Symbols-outline provides the following public API for use in lua. +Outline.nvim provides the following public API for use in lua. ```lua -require'symbols-outline' +require'outline' ``` - setup(opts) @@ -849,8 +872,8 @@ require'symbols-outline' ## Tips -- To open the outline but don't focus on it, you can use `:SymbolsOutline!` or -`:SymbolsOutlineOpen!`. +- To open the outline but don't focus on it, you can use `:Outline!` or +`:OutlineOpen!`. This is useful in autocmds, say you have a filetype that, whenever a buffer with that filetype is opened you want to open the outline. @@ -897,7 +920,7 @@ symbol_folding = { auto_unfold_hover = true, }, ``` -outline window showing auto fold depth +outline window showing auto fold depth - **Use outline window as a quick-jump window** @@ -908,7 +931,7 @@ preview_window = { }, ``` -https://github.com/hedyhli/symbols-outline.nvim/assets/50042066/a473d791-d1b9-48e9-917f-b816b564a645 +https://github.com/hedyhli/outline.nvim/assets/50042066/a473d791-d1b9-48e9-917f-b816b564a645 Note that in the recording I have `preview_window.open_hover_on_preview = false`. @@ -924,7 +947,7 @@ outline_window = { This feature was added by @stickperson in an upstream PR 🙌 -https://github.com/hedyhli/symbols-outline.nvim/assets/50042066/3d06e342-97ac-400c-8598-97a9235de66c +https://github.com/hedyhli/outline.nvim/assets/50042066/3d06e342-97ac-400c-8598-97a9235de66c Or, you can use keys `` and `` to achieve the same effect, whilst not having `auto_goto` on by default. @@ -952,7 +975,7 @@ outline_items = { The default highlight group for the line numbers is `LineNr`, you can customize it using `outline_window.winhl`: please see [highlights](#outline-window). -outline window showing lineno +outline window showing lineno - **Single cursorline** @@ -965,7 +988,7 @@ outline_window = { This will be how the outline window looks like when focused: -outline window showing hide_cursor +outline window showing hide_cursor Note that in the screenshot, `outline_items.show_symbol_lineno` is also enabled. @@ -989,7 +1012,7 @@ symbols = { The fetcher function, if provided, is checked first before using `icon_source` and `icons` as fallback. -outline with plain text icons +outline with plain text icons diff --git a/lua/symbols-outline/code_action.lua b/lua/outline/code_action.lua similarity index 89% rename from lua/symbols-outline/code_action.lua rename to lua/outline/code_action.lua index b7d7822..04daf13 100644 --- a/lua/symbols-outline/code_action.lua +++ b/lua/outline/code_action.lua @@ -1,4 +1,4 @@ -local main = require 'symbols-outline' +local main = require 'outline' local M = {} diff --git a/lua/symbols-outline/config.lua b/lua/outline/config.lua similarity index 96% rename from lua/symbols-outline/config.lua rename to lua/outline/config.lua index 25a321f..239d4f2 100644 --- a/lua/symbols-outline/config.lua +++ b/lua/outline/config.lua @@ -30,7 +30,7 @@ M.defaults = { show_relative_numbers = false, show_cursorline = true, hide_cursor = false, - winhl = "SymbolsOutlineDetails:Comment,SymbolsOutlineLineno:LineNr", + winhl = "OutlineDetails:Comment,OutlineLineno:LineNr", }, preview_window = { auto_preview = false, @@ -195,7 +195,7 @@ end function M.check_config() if M.o.outline_window.hide_cursor and not M.o.outline_window.show_cursorline then - vim.notify("[symbols-outline.config]: hide_cursor enabled WITHOUT cursorline enabled!", vim.log.levels.ERROR) + vim.notify("[outline.config]: hide_cursor enabled WITHOUT cursorline enabled!", vim.log.levels.ERROR) end end diff --git a/lua/symbols-outline/folding.lua b/lua/outline/folding.lua similarity index 92% rename from lua/symbols-outline/folding.lua rename to lua/outline/folding.lua index 20a22cd..0a2d0e5 100644 --- a/lua/symbols-outline/folding.lua +++ b/lua/outline/folding.lua @@ -1,5 +1,5 @@ local M = {} -local cfg = require 'symbols-outline.config' +local cfg = require 'outline.config' M.is_foldable = function(node) return node.children and #node.children > 0 diff --git a/lua/symbols-outline/hover.lua b/lua/outline/hover.lua similarity index 94% rename from lua/symbols-outline/hover.lua rename to lua/outline/hover.lua index 1fea67c..9d3467c 100644 --- a/lua/symbols-outline/hover.lua +++ b/lua/outline/hover.lua @@ -1,5 +1,5 @@ -local so = require 'symbols-outline' -local cfg = require 'symbols-outline.config' +local so = require 'outline' +local cfg = require 'outline.config' local util = vim.lsp.util local M = {} diff --git a/lua/symbols-outline/init.lua b/lua/outline/init.lua similarity index 92% rename from lua/symbols-outline/init.lua rename to lua/outline/init.lua index 7b8407e..ab44fa0 100644 --- a/lua/symbols-outline/init.lua +++ b/lua/outline/init.lua @@ -1,11 +1,11 @@ -local parser = require 'symbols-outline.parser' -local providers = require 'symbols-outline.providers.init' -local ui = require 'symbols-outline.ui' -local writer = require 'symbols-outline.writer' -local cfg = require 'symbols-outline.config' -local utils = require 'symbols-outline.utils.init' -local View = require 'symbols-outline.view' -local folding = require 'symbols-outline.folding' +local parser = require 'outline.parser' +local providers = require 'outline.providers.init' +local ui = require 'outline.ui' +local writer = require 'outline.writer' +local cfg = require 'outline.config' +local utils = require 'outline.utils.init' +local View = require 'outline.view' +local folding = require 'outline.folding' local M = {} @@ -35,7 +35,7 @@ local function setup_global_autocmd() vim.api.nvim_create_autocmd('WinEnter', { pattern = '*', - callback = require('symbols-outline.preview').close, + callback = require('outline.preview').close, }) end @@ -154,12 +154,12 @@ local function setup_buffer_autocmd() if cfg.o.preview_window.auto_preview then vim.api.nvim_create_autocmd('CursorMoved', { buffer = 0, - callback = require('symbols-outline.preview').show, + callback = require('outline.preview').show, }) else vim.api.nvim_create_autocmd('CursorMoved', { buffer = 0, - callback = require('symbols-outline.preview').close, + callback = require('outline.preview').close, }) end if cfg.o.outline_window.auto_goto then @@ -321,27 +321,27 @@ local function setup_keymaps(bufnr) -- hover symbol map( cfg.o.keymaps.hover_symbol, - require('symbols-outline.hover').show_hover + require('outline.hover').show_hover ) -- preview symbol map( cfg.o.keymaps.toggle_preview, - require('symbols-outline.preview').toggle + require('outline.preview').toggle ) -- rename symbol map( cfg.o.keymaps.rename_symbol, - require('symbols-outline.rename').rename + require('outline.rename').rename ) -- code actions map( cfg.o.keymaps.code_actions, - require('symbols-outline.code_action').show_code_actions + require('outline.code_action').show_code_actions ) -- show help map( cfg.o.keymaps.show_help, - require('symbols-outline.config').show_help + require('outline.config').show_help ) -- close outline map(cfg.o.keymaps.close, function() @@ -414,7 +414,7 @@ function M.follow_cursor(opts) return false end - if require('symbols-outline.preview').has_code_win() then + if require('outline.preview').has_code_win() then M._highlight_current_item(M.state.code_win) else return false @@ -461,7 +461,7 @@ function M.toggle_outline(opts) end end --- Used for SymbolsOutline user command +-- Used for Outline user command local function _cmd_toggle_outline(opts) if opts.bang then M.toggle_outline({ focus_outline = false }) @@ -479,7 +479,7 @@ function M.open_outline(opts) if not M.view:is_open() then local found = providers.request_symbols(handler, opts) if not found then - vim.notify("[symbols-outline]: No providers found for current buffer", vim.log.levels.WARN) + vim.notify("[outline]: No providers found for current buffer", vim.log.levels.WARN) -- else -- print("Using provider ".._G._symbols_outline_current_provider.name.."...") end @@ -512,7 +512,7 @@ end ---Set cursor to focus on the code window, return whether this operation was successful. ---@return boolean ok Whether it was successful. If unsuccessful, it might mean that the attached code window has been closed or is no longer valid. function M.focus_code() - if require('symbols-outline.preview').has_code_win() then + if require('outline.preview').has_code_win() then vim.fn.win_gotoid(M.state.code_win) return true end @@ -522,7 +522,7 @@ end ---Toggle focus between outline and code window, returns whether it was successful. ---@return boolean ok Whether it was successful. If `ok=false`, either the outline window is not open or the code window is no longer valid. function M.focus_toggle() - if M.view:is_open() and require('symbols-outline.preview').has_code_win() then + if M.view:is_open() and require('outline.preview').has_code_win() then local winid = vim.fn.win_getid() if winid == M.state.code_win then vim.fn.win_gotoid(M.view.winnr) @@ -550,7 +550,7 @@ function M.show_status() else print("Outline window is not open.") end - if require('symbols-outline.preview').has_code_win() then + if require('outline.preview').has_code_win() then print("Code window is active.") else print("Warning: code window is either closed or invalid. Please close and reopen the outline window.") @@ -572,7 +572,7 @@ end local function setup_commands() local cmd = function(n, c, o) - vim.api.nvim_create_user_command('SymbolsOutline'..n, c, o) + vim.api.nvim_create_user_command('Outline'..n, c, o) end cmd('', _cmd_toggle_outline, { @@ -602,7 +602,7 @@ With bang, don't switch cursor focus to outline window.", }) end ----Set up configuration options for symbols-outline. +---Set up configuration options for outline. function M.setup(opts) cfg.setup(opts) ui.setup_highlights() diff --git a/lua/symbols-outline/markdown.lua b/lua/outline/markdown.lua similarity index 100% rename from lua/symbols-outline/markdown.lua rename to lua/outline/markdown.lua diff --git a/lua/symbols-outline/parser.lua b/lua/outline/parser.lua similarity index 95% rename from lua/symbols-outline/parser.lua rename to lua/outline/parser.lua index 4c8b79f..32898f8 100644 --- a/lua/symbols-outline/parser.lua +++ b/lua/outline/parser.lua @@ -1,9 +1,9 @@ -local symbols = require 'symbols-outline.symbols' -local ui = require 'symbols-outline.ui' -local cfg = require 'symbols-outline.config' -local t_utils = require 'symbols-outline.utils.table' -local lsp_utils = require 'symbols-outline.utils.lsp_utils' -local folding = require 'symbols-outline.folding' +local symbols = require 'outline.symbols' +local ui = require 'outline.ui' +local cfg = require 'outline.config' +local t_utils = require 'outline.utils.table' +local lsp_utils = require 'outline.utils.lsp_utils' +local folding = require 'outline.folding' local M = {} @@ -113,7 +113,7 @@ function M.get_lines(flattened_outline_items) node_line, from, to, - 'SymbolsOutlineConnector', + 'OutlineConnector', }) end diff --git a/lua/symbols-outline/preview.lua b/lua/outline/preview.lua similarity index 97% rename from lua/symbols-outline/preview.lua rename to lua/outline/preview.lua index d097df9..b34c3b7 100644 --- a/lua/symbols-outline/preview.lua +++ b/lua/outline/preview.lua @@ -1,6 +1,6 @@ -local so = require 'symbols-outline' -local cfg = require 'symbols-outline.config' -local hover = require 'symbols-outline.hover' +local so = require 'outline' +local cfg = require 'outline.config' +local hover = require 'outline.hover' local M = {} diff --git a/lua/symbols-outline/providers/coc.lua b/lua/outline/providers/coc.lua similarity index 98% rename from lua/symbols-outline/providers/coc.lua rename to lua/outline/providers/coc.lua index c72e2c5..900deb1 100644 --- a/lua/symbols-outline/providers/coc.lua +++ b/lua/outline/providers/coc.lua @@ -28,7 +28,7 @@ local function convert_symbols(result) local s = {} local kinds_index = {} -- create a inverse indexing of symbols.kind - local symbols = require("symbols-outline.symbols") + local symbols = require("outline.symbols") for k, v in pairs(symbols.kinds) do kinds_index[v] = k end diff --git a/lua/symbols-outline/providers/init.lua b/lua/outline/providers/init.lua similarity index 86% rename from lua/symbols-outline/providers/init.lua rename to lua/outline/providers/init.lua index c61e8c2..1599c1b 100644 --- a/lua/symbols-outline/providers/init.lua +++ b/lua/outline/providers/init.lua @@ -1,9 +1,9 @@ local M = {} local providers = { - 'symbols-outline/providers/nvim-lsp', - 'symbols-outline/providers/coc', - 'symbols-outline/providers/markdown', + 'outline/providers/nvim-lsp', + 'outline/providers/coc', + 'outline/providers/markdown', } _G._symbols_outline_current_provider = nil diff --git a/lua/symbols-outline/providers/markdown.lua b/lua/outline/providers/markdown.lua similarity index 90% rename from lua/symbols-outline/providers/markdown.lua rename to lua/outline/providers/markdown.lua index 3e531fd..01bfa1f 100644 --- a/lua/symbols-outline/providers/markdown.lua +++ b/lua/outline/providers/markdown.lua @@ -1,4 +1,4 @@ -local md_parser = require 'symbols-outline.markdown' +local md_parser = require 'outline.markdown' local M = {} diff --git a/lua/symbols-outline/providers/nvim-lsp.lua b/lua/outline/providers/nvim-lsp.lua similarity index 91% rename from lua/symbols-outline/providers/nvim-lsp.lua rename to lua/outline/providers/nvim-lsp.lua index 05ff8cf..c6ccf64 100644 --- a/lua/symbols-outline/providers/nvim-lsp.lua +++ b/lua/outline/providers/nvim-lsp.lua @@ -1,6 +1,6 @@ -local config = require 'symbols-outline.config' -local lsp_utils = require 'symbols-outline.utils.lsp_utils' -local jsx = require 'symbols-outline.utils.jsx' +local config = require 'outline.config' +local lsp_utils = require 'outline.utils.lsp_utils' +local jsx = require 'outline.utils.jsx' local M = {} diff --git a/lua/symbols-outline/rename.lua b/lua/outline/rename.lua similarity index 96% rename from lua/symbols-outline/rename.lua rename to lua/outline/rename.lua index 9f626ac..c754dfd 100644 --- a/lua/symbols-outline/rename.lua +++ b/lua/outline/rename.lua @@ -1,4 +1,4 @@ -local so = require 'symbols-outline' +local so = require 'outline' local M = {} diff --git a/lua/symbols-outline/symbols.lua b/lua/outline/symbols.lua similarity index 89% rename from lua/symbols-outline/symbols.lua rename to lua/outline/symbols.lua index b8e6ed2..2b820b2 100644 --- a/lua/symbols-outline/symbols.lua +++ b/lua/outline/symbols.lua @@ -1,4 +1,4 @@ -local cfg = require 'symbols-outline.config' +local cfg = require 'outline.config' local M = {} @@ -59,7 +59,7 @@ function M.icon_from_kind(kind) if cfg.o.symbols.icon_source == 'lspkind' then local has_lspkind, lspkind = pcall(require, 'lspkind') if not has_lspkind then - vim.notify("[symbols-outline]: icon_source set to lspkind but failed to require lspkind!", vim.log.levels.ERROR) + vim.notify("[outline]: icon_source set to lspkind but failed to require lspkind!", vim.log.levels.ERROR) else local icon = lspkind.symbolic(kindstr, { with_text = false }) if icon and icon ~= "" then diff --git a/lua/symbols-outline/ui.lua b/lua/outline/ui.lua similarity index 75% rename from lua/symbols-outline/ui.lua rename to lua/outline/ui.lua index 25497b4..6892cda 100644 --- a/lua/symbols-outline/ui.lua +++ b/lua/outline/ui.lua @@ -10,7 +10,7 @@ function M.add_hover_highlight(bufnr, line, col_start) vim.api.nvim_buf_add_highlight( bufnr, M.hovered_hl_ns, - 'SymbolsOutlineCurrent', + 'OutlineCurrent', line, col_start, -1 @@ -18,15 +18,15 @@ function M.add_hover_highlight(bufnr, line, col_start) end function M.setup_highlights() - -- Setup the SymbolsOutlineCurrent highlight group if it hasn't been done already by + -- Setup the OutlineCurrent highlight group if it hasn't been done already by -- a theme or manually set - if vim.fn.hlexists 'SymbolsOutlineCurrent' == 0 then + if vim.fn.hlexists 'OutlineCurrent' == 0 then local cline_hl = vim.api.nvim_get_hl_by_name('CursorLine', true) local string_hl = vim.api.nvim_get_hl_by_name('String', true) vim.api.nvim_set_hl( 0, - 'SymbolsOutlineCurrent', + 'OutlineCurrent', { bg = cline_hl.background, fg = string_hl.foreground } ) end @@ -41,9 +41,9 @@ function M.setup_highlights() 'gui' ) - if vim.fn.hlexists 'SymbolsOutlineConnector' == 0 then + if vim.fn.hlexists 'OutlineConnector' == 0 then vim.cmd( - string.format('hi SymbolsOutlineConnector guifg=%s', comment_fg_gui) + string.format('hi OutlineConnector guifg=%s', comment_fg_gui) ) end end diff --git a/lua/symbols-outline/utils/init.lua b/lua/outline/utils/init.lua similarity index 100% rename from lua/symbols-outline/utils/init.lua rename to lua/outline/utils/init.lua diff --git a/lua/symbols-outline/utils/jsx.lua b/lua/outline/utils/jsx.lua similarity index 100% rename from lua/symbols-outline/utils/jsx.lua rename to lua/outline/utils/jsx.lua diff --git a/lua/symbols-outline/utils/lsp_utils.lua b/lua/outline/utils/lsp_utils.lua similarity index 97% rename from lua/symbols-outline/utils/lsp_utils.lua rename to lua/outline/utils/lsp_utils.lua index 8b5c10e..dc2e485 100644 --- a/lua/symbols-outline/utils/lsp_utils.lua +++ b/lua/outline/utils/lsp_utils.lua @@ -1,5 +1,5 @@ -local config = require 'symbols-outline.config' -local tbl_utils = require 'symbols-outline.utils.table' +local config = require 'outline.config' +local tbl_utils = require 'outline.utils.table' local M = {} diff --git a/lua/symbols-outline/utils/table.lua b/lua/outline/utils/table.lua similarity index 100% rename from lua/symbols-outline/utils/table.lua rename to lua/outline/utils/table.lua diff --git a/lua/symbols-outline/view.lua b/lua/outline/view.lua similarity index 98% rename from lua/symbols-outline/view.lua rename to lua/outline/view.lua index 5b3bd95..e0a75d3 100644 --- a/lua/symbols-outline/view.lua +++ b/lua/outline/view.lua @@ -1,4 +1,4 @@ -local cfg = require('symbols-outline.config') +local cfg = require('outline.config') local View = {} diff --git a/lua/symbols-outline/writer.lua b/lua/outline/writer.lua similarity index 88% rename from lua/symbols-outline/writer.lua rename to lua/outline/writer.lua index 4f58bde..04ede44 100644 --- a/lua/symbols-outline/writer.lua +++ b/lua/outline/writer.lua @@ -1,6 +1,6 @@ -local parser = require 'symbols-outline.parser' -local cfg = require('symbols-outline.config') -local ui = require 'symbols-outline.ui' +local parser = require 'outline.parser' +local cfg = require('outline.config') +local ui = require 'outline.ui' local M = {} @@ -13,7 +13,7 @@ local function is_buffer_outline(bufnr) return string.match(name, 'OUTLINE') ~= nil and ft == 'Outline' end -local hlns = vim.api.nvim_create_namespace 'symbols-outline-icon-highlight' +local hlns = vim.api.nvim_create_namespace 'outline-icon-highlight' function M.write_outline(bufnr, lines) if not is_buffer_outline(bufnr) then @@ -46,7 +46,7 @@ function M.add_highlights(bufnr, hl_info, nodes) M.add_hover_highlights(bufnr, nodes) end -local ns = vim.api.nvim_create_namespace 'symbols-outline-virt-text' +local ns = vim.api.nvim_create_namespace 'outline-virt-text' function M.write_details(bufnr, lines) if not is_buffer_outline(bufnr) then @@ -58,7 +58,7 @@ function M.write_details(bufnr, lines) for index, value in ipairs(lines) do vim.api.nvim_buf_set_extmark(bufnr, ns, index - 1, -1, { - virt_text = { { value, 'SymbolsOutlineDetails' } }, + virt_text = { { value, 'OutlineDetails' } }, virt_text_pos = 'eol', hl_mode = 'combine', }) @@ -77,7 +77,7 @@ function M.write_lineno(bufnr, lines, max) for index, value in ipairs(lines) do local leftpad = string.rep(' ', maxwidth-#value) vim.api.nvim_buf_set_extmark(bufnr, ns, index - 1, -1, { - virt_text = { {leftpad..value, 'SymbolsOutlineLineno' } }, + virt_text = { {leftpad..value, 'OutlineLineno' } }, virt_text_pos = 'overlay', virt_text_win_col = 0, hl_mode = 'combine',