diff --git a/lua/outline/hover.lua b/lua/outline/hover.lua index 9d3467c..44d5ed6 100644 --- a/lua/outline/hover.lua +++ b/lua/outline/hover.lua @@ -1,4 +1,4 @@ -local so = require 'outline' +local outline = require 'outline' local cfg = require 'outline.config' local util = vim.lsp.util @@ -17,10 +17,10 @@ end -- handler yoinked from the default implementation function M.show_hover() - local current_line = vim.api.nvim_win_get_cursor(so.view.winnr)[1] - local node = so.state.flattened_outline_items[current_line] + local current_line = vim.api.nvim_win_get_cursor(outline.view.winnr)[1] + local node = outline.state.flattened_outline_items[current_line] - local hover_params = get_hover_params(node, so.state.code_win) + local hover_params = get_hover_params(node, outline.state.code_win) vim.lsp.buf_request( hover_params.bufnr, diff --git a/lua/outline/preview.lua b/lua/outline/preview.lua index b34c3b7..bb24c55 100644 --- a/lua/outline/preview.lua +++ b/lua/outline/preview.lua @@ -1,4 +1,4 @@ -local so = require 'outline' +local outline = require 'outline' local cfg = require 'outline.config' local hover = require 'outline.hover' @@ -11,15 +11,15 @@ local state = { local function is_current_win_outline() local curwin = vim.api.nvim_get_current_win() - return curwin == so.view.winnr + return curwin == outline.view.winnr end local function has_code_win() - local isWinValid = vim.api.nvim_win_is_valid(so.state.code_win) + local isWinValid = vim.api.nvim_win_is_valid(outline.state.code_win) if not isWinValid then return false end - local bufnr = vim.api.nvim_win_get_buf(so.state.code_win) + local bufnr = vim.api.nvim_win_get_buf(outline.state.code_win) local isBufValid = vim.api.nvim_buf_is_valid(bufnr) return isBufValid end @@ -28,7 +28,7 @@ M.has_code_win = has_code_win local function get_width_offset() ---@type integer - local outline_winnr = so.view.winnr + local outline_winnr = outline.view.winnr local width = cfg.get_preview_width() + 3 local has_numbers = vim.api.nvim_win_get_option(outline_winnr, "number") has_numbers = has_numbers or vim.api.nvim_win_get_option(outline_winnr, "relativenumber") @@ -51,13 +51,13 @@ local function get_height() end local function get_hovered_node() - local hovered_line = vim.api.nvim_win_get_cursor(so.view.winnr)[1] - local node = so.state.flattened_outline_items[hovered_line] + local hovered_line = vim.api.nvim_win_get_cursor(outline.view.winnr)[1] + local node = outline.state.flattened_outline_items[hovered_line] return node end local function update_preview(code_buf) - code_buf = code_buf or vim.api.nvim_win_get_buf(so.state.code_win) + code_buf = code_buf or vim.api.nvim_win_get_buf(outline.state.code_win) local node = get_hovered_node() if not node then @@ -75,7 +75,7 @@ local function update_preview(code_buf) end local function setup_preview_buf() - local code_buf = vim.api.nvim_win_get_buf(so.state.code_win) + local code_buf = vim.api.nvim_win_get_buf(outline.state.code_win) local ft = vim.api.nvim_buf_get_option(code_buf, 'filetype') local function treesitter_attach() diff --git a/lua/outline/providers/init.lua b/lua/outline/providers/init.lua index e3adf16..5fe2cff 100644 --- a/lua/outline/providers/init.lua +++ b/lua/outline/providers/init.lua @@ -1,17 +1,17 @@ local M = {} +-- NOTE: There is in fact a markdown LSP that can provide symbols. However on +-- buffer open the LSP may not be attached immediately. Before the LSP is ready +-- if the user opens the outline, our own markdown provider will be used. After +-- refreshing/reopening, the provider will then switch to the LSP (if the user +-- has a markdown LSP). local providers = { 'outline/providers/nvim-lsp', 'outline/providers/coc', - -- NOTE: There is in fact a markdown LSP that can provide symbols. However - -- on buffer open the LSP may not be attached immediately. Before the LSP is - -- ready if the user opens the outline, our own markdown provider will be - -- used. After refreshing/reopening, the provider will then switch to the LSP - -- (if the user has a markdown LSP). 'outline/providers/markdown', } -_G._symbols_outline_current_provider = nil +_G._outline_current_provider = nil function M.has_provider() local ret = false diff --git a/lua/outline/rename.lua b/lua/outline/rename.lua index c754dfd..9876b6d 100644 --- a/lua/outline/rename.lua +++ b/lua/outline/rename.lua @@ -1,4 +1,4 @@ -local so = require 'outline' +local outline = require 'outline' local M = {} @@ -14,10 +14,10 @@ local function get_rename_params(node, winnr) end function M.rename() - local current_line = vim.api.nvim_win_get_cursor(so.view.winnr)[1] - local node = so.state.flattened_outline_items[current_line] + local current_line = vim.api.nvim_win_get_cursor(outline.view.winnr)[1] + local node = outline.state.flattened_outline_items[current_line] - local params = get_rename_params(node, so.state.code_win) + local params = get_rename_params(node, outline.state.code_win) local new_name = vim.fn.input({ prompt = 'New Name: ', default = node.name }) if not new_name or new_name == '' or new_name == node.name then