diff --git a/lua/navigator/diagnostics.lua b/lua/navigator/diagnostics.lua index ced7fa2..ae178a3 100644 --- a/lua/navigator/diagnostics.lua +++ b/lua/navigator/diagnostics.lua @@ -491,7 +491,8 @@ function M.treesitter_and_diag_panel() }) p:add_section({ header = 'diagnostic', - render = function(bufnr) + render = function(buf) + log(buf, diagnostic) if diagnostic_list[ft] ~= nil then local display_items = {} for _, client_items in pairs(results) do diff --git a/lua/navigator/formatting.lua b/lua/navigator/formatting.lua index 4da3393..d860120 100644 --- a/lua/navigator/formatting.lua +++ b/lua/navigator/formatting.lua @@ -32,6 +32,9 @@ return { end, 100) end, range_foramt = function(err, result, ctx, _) + if err then + print("failed to format", vim.inspect(result), vim.inspect(ctx)) + end local old_func = vim.go.operatorfunc _G.op_func_formatting = function() local start = vim.api.nvim_buf_get_mark(0, '[') diff --git a/lua/navigator/gui.lua b/lua/navigator/gui.lua index cf04994..519ea85 100644 --- a/lua/navigator/gui.lua +++ b/lua/navigator/gui.lua @@ -1,6 +1,6 @@ local M = {} -local ListView = require('guihua.listview') -local TextView = require('guihua.textview') +-- local ListView = require('guihua.listview') +-- local TextView = require('guihua.textview') local util = require('navigator.util') local log = util.log local trace = require('navigator.util').trace @@ -16,7 +16,7 @@ function M.new_list_view(opts) local winnr = active_list_view.win local bufnr = active_list_view.buf - if bufnr and vim.api.nvim_buf_is_valid(bufnr) and winnr and vim.api.nvim_win_is_valid(winnr) then + if bufnr and api.nvim_buf_is_valid(bufnr) and winnr and api.nvim_win_is_valid(winnr) then log('list view already present') return active_list_view end diff --git a/lua/navigator/hierarchy.lua b/lua/navigator/hierarchy.lua index da55047..51c9902 100644 --- a/lua/navigator/hierarchy.lua +++ b/lua/navigator/hierarchy.lua @@ -100,7 +100,7 @@ hierarchy_handler = function(dir, handler, show, api, err, result, ctx, cfg) trace(dir, handler, api, show, err, result, ctx, cfg) ctx = ctx or {} -- can be nil if it is async call cfg = cfg or {} - opts = ctx.opts or {} + local opts = ctx.opts or {} vim.validate({ handler = { handler, 'function' }, show = { show, 'function' }, api = { api, 'string' } }) local bufnr = ctx.bufnr or vim.api.nvim_get_current_buf() assert(next(vim.lsp.buf_get_clients(bufnr)), 'Must have a client running to use lsp hierarchy') @@ -142,11 +142,12 @@ local function display_panel(args) local Panel = require('guihua.panel') local bufnr = args.bufnr or vim.api.nvim_get_current_buf() - local ft = args.ft or vim.api.nvim_buf_get_option(bufnr, 'buftype') + -- local ft = args.ft or vim.api.nvim_buf_get_option(bufnr, 'buftype') local items = args.items local p = Panel:new({ header = args.header or 'Call Hierarchy', - render = function(bufnr) + render = function(buf) + log(buf) return items end, fold = function(panel, node) diff --git a/lua/navigator/lazyloader.lua b/lua/navigator/lazyloader.lua index 5c5e090..45521b5 100644 --- a/lua/navigator/lazyloader.lua +++ b/lua/navigator/lazyloader.lua @@ -1,7 +1,6 @@ return { init = function() local loader = nil - packer_plugins = packer_plugins or nil -- suppress warnings local log = require('navigator.util').log -- packer only if packer_plugins ~= nil then -- packer install diff --git a/lua/navigator/lspclient/config.lua b/lua/navigator/lspclient/config.lua index c930aba..71590d1 100644 --- a/lua/navigator/lspclient/config.lua +++ b/lua/navigator/lspclient/config.lua @@ -1,5 +1,3 @@ -local lsp = require("vim.lsp") - local M = {} local capabilities = vim.lsp.protocol.make_client_capabilities() capabilities.textDocument.completion.completionItem.snippetSupport = true diff --git a/lua/navigator/util.lua b/lua/navigator/util.lua index dd76a16..876d36d 100644 --- a/lua/navigator/util.lua +++ b/lua/navigator/util.lua @@ -61,7 +61,7 @@ function M.get_data_from_file(filename, startLine) return { data = data, line = displayLine } end -function M.io_read(filename, total) +function M.io_read(filename) local f = io.open(filename, 'r') if f == nil then return nil