holm/LunarVim.LunarVim
1
0
Fork 0
mirror of https://github.com/LunarVim/LunarVim.git synced 2025-08-29 06:18:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: use the correct API for the log-viewer (#1564)

Browse source
This commit is contained in:
kylo252 2021-09-17 08:29:35 +02:00 • committed by GitHub
parent d610502f91
commit 9257e68c05
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lua/core/terminal.lua
View file

@ -1,5 +1,6 @@
local M = {} local M = {}
local utils = require "utils" local utils = require "utils"
local Log = require "core.log"
M.config = function() M.config = function()
lvim.builtin["terminal"] = { lvim.builtin["terminal"] = {
@ -81,7 +82,6 @@ end
M._exec_toggle = function(exec) M._exec_toggle = function(exec)
local binary = M._split(exec)[1] local binary = M._split(exec)[1]
if vim.fn.executable(binary) ~= 1 then if vim.fn.executable(binary) ~= 1 then
local Log = require "core.log"
Log:error("Unable to run executable " .. binary .. ". Please make sure it is installed properly.") Log:error("Unable to run executable " .. binary .. ". Please make sure it is installed properly.")
return return
end end
@ -92,12 +92,13 @@ end
local function get_log_path(name) local function get_log_path(name)
--handle custom paths not managed by Plenary.log --handle custom paths not managed by Plenary.log
local logger = require "core.log"
local file local file
if name == "nvim" then if name == "nvim" then
file = utils.join_paths(get_cache_dir(), "log") file = utils.join_paths(vim.fn.stdpath "cache", "log")
elseif name == "packer.nvim" then
file = utils.join_paths(vim.fn.stdpath "cache", "packer.nvim.log")
else else
file = logger:new({ plugin = name }):get_path() file = Log:get_path()
end end
if utils.is_file(file) then if utils.is_file(file) then
return file return file

8
lua/core/which-key.lua
View file

@ -198,16 +198,16 @@ M.config = function()
"<cmd>lua require('core.terminal').toggle_log_view('lunarvim')<cr>", "<cmd>lua require('core.terminal').toggle_log_view('lunarvim')<cr>",
"view default log", "view default log",
}, },
D = { "<cmd>edit ~/.cache/nvim/lunarvim.log<cr>", "Open the default logfile" }, D = { "<cmd>exe 'edit '.stdpath('cache').'/lunarvim.log'<cr>", "Open the default logfile" },
n = { "<cmd>lua require('core.terminal').toggle_log_view('lsp')<cr>", "view lsp log" }, n = { "<cmd>lua require('core.terminal').toggle_log_view('lsp')<cr>", "view lsp log" },
N = { "<cmd>edit ~/.cache/nvim/log<cr>", "Open the Neovim logfile" }, N = { "<cmd>edit $NVIM_LOG_FILE<cr>", "Open the Neovim logfile" },
l = { "<cmd>lua require('core.terminal').toggle_log_view('nvim')<cr>", "view neovim log" }, l = { "<cmd>lua require('core.terminal').toggle_log_view('nvim')<cr>", "view neovim log" },
L = { "<cmd>edit ~/.cache/nvim/lsp.log<cr>", "Open the LSP logfile" }, L = { "<cmd>exe 'edit '.stdpath('cache').'/lsp.log'<cr>", "Open the LSP logfile" },
p = { p = {
"<cmd>lua require('core.terminal').toggle_log_view('packer.nvim')<cr>", "<cmd>lua require('core.terminal').toggle_log_view('packer.nvim')<cr>",
"view packer log", "view packer log",
}, },
P = { "<cmd>edit ~/.cache/nvim/packer.nvim.log<cr>", "Open the Packer logfile" }, P = { "<cmd>exe 'edit '.stdpath('cache').'/packer.nvim.log'<cr>", "Open the Packer logfile" },
}, },
r = { "<cmd>lua require('utils').reload_lv_config()<cr>", "Reload configurations" }, r = { "<cmd>lua require('utils').reload_lv_config()<cr>", "Reload configurations" },
}, },