Skip to content

Commit 2325b1e

Browse files
OXY2DEVOXY2DEV
committed
chore: Rewrote various log messages
1 parent 5bec8ca commit 2325b1e

6 files changed

Lines changed: 102 additions & 31 deletions

File tree

‎lua/ui.lua‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,19 @@ ui.attach = function ()
6262
popup = require("ui.popup"),
6363
};
6464

65-
log.print("Setting up UI modules,");
65+
log.print("Setting up UI modules,", "ui.lua");
6666
log.level_inc();
6767

6868
for k, v in pairs(modules) do
69-
log.print("Module: " .. k);
69+
log.print("Module setup: " .. k, "ui.lua", "log");
70+
log.level_inc();
71+
7072
log.assert(
73+
"ui.lua",
7174
pcall(v["setup"])
7275
);
76+
77+
log.level_dec();
7378
end
7479

7580
log.level_dec();
@@ -80,14 +85,15 @@ ui.attach = function ()
8085

8186
ext_popupmenu = spec.config.popupmenu.enable == true,
8287
}, function (event, ...)
83-
log.print("Event, " .. event);
88+
log.print("Event: " .. event, "ui.lua", "log");
8489
log.level_inc();
8590

8691
local mod_name = ui.event_map[event];
8792
if not mod_name then return; end
8893

8994
---@type boolean, string?
9095
log.assert(
96+
"ui.lua",
9197
pcall(modules[mod_name].handle, event, ...)
9298
)
9399

‎lua/ui/cmdline.lua‎

Lines changed: 62 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -178,21 +178,39 @@ cmdline.__cursor = function ()
178178
---@type integer
179179
local tab = vim.api.nvim_get_current_tabpage();
180180

181-
vim.api.nvim_win_set_cursor(cmdline.window[tab], {
182-
vim.api.nvim_buf_line_count(cmdline.buffer), -- This is 1-indexed.
183-
pos
184-
})
181+
log.assert(
182+
"ui/cmdline.lua → nvim_win_set_cursor",
183+
pcall(
184+
vim.api.nvim_win_set_cursor,
185+
186+
cmdline.window[tab],
187+
{
188+
vim.api.nvim_buf_line_count(cmdline.buffer), -- This is 1-indexed.
189+
pos
190+
}
191+
)
192+
);
185193

186194
-- Clear previous cursor.
187195
vim.api.nvim_buf_clear_namespace(cmdline.buffer, cmdline.cursor_ns, 0, -1);
188196

189197
if cmdline.style.offset and pos >= cmdline.style.offset then
190198
-- If `offset` exists and the cursor position is >= to the offset
191199
-- we hide the leading part of the command-line(till `offset` characters).
192-
vim.api.nvim_buf_set_extmark(cmdline.buffer, cmdline.cursor_ns, #lines - 1, 0, {
193-
end_col = #vim.fn.strcharpart(line, 0, cmdline.style.offset),
194-
conceal = ""
195-
});
200+
log.assert(
201+
"ui/cmdline.lua → text_conceal",
202+
pcall(
203+
vim.api.nvim_buf_set_extmark,
204+
205+
cmdline.buffer, cmdline.cursor_ns,
206+
#lines - 1, 0,
207+
208+
{
209+
end_col = #vim.fn.strcharpart(line, 0, cmdline.style.offset),
210+
conceal = ""
211+
}
212+
)
213+
);
196214
end
197215

198216
local char = cmdline.get_state("c", "");
@@ -201,6 +219,7 @@ cmdline.__cursor = function ()
201219
-- Add a fake Cursor.
202220
if char ~= "" then
203221
log.assert(
222+
"ui/cmdline.lua → fake_cursor_char",
204223
pcall(vim.api.nvim_buf_set_extmark,
205224

206225
cmdline.buffer,
@@ -225,6 +244,7 @@ cmdline.__cursor = function ()
225244
});
226245
else
227246
log.assert(
247+
"ui/cmdline.lua → fake_cursor",
228248
pcall(vim.api.nvim_buf_set_extmark,
229249

230250
cmdline.buffer,
@@ -248,7 +268,10 @@ end
248268
cmdline.__render = function ()
249269
---|fS
250270

251-
cmdline.__prepare();
271+
log.assert(
272+
"ui/cmdline.lua → __prepare",
273+
pcall(cmdline.__prepare)
274+
);
252275

253276
local lines, extmarks, stat = cmdline.__lines();
254277
local H = #lines;
@@ -337,16 +360,10 @@ cmdline.__render = function ()
337360
---@type integer
338361
local tab = vim.api.nvim_get_current_tabpage();
339362

340-
if not cmdline.window[tab] or vim.api.nvim_win_is_valid(cmdline.window[tab]) == false then
341-
cmdline.window[tab] = vim.api.nvim_open_win(cmdline.buffer, false, win_config);
342-
343-
vim.api.nvim_win_set_var(cmdline.window[tab], "ui_window", true);
344-
vim.wo[cmdline.window[tab]].sidescrolloff = math.floor(vim.o.columns * 0.5) or 36;
345-
else
346-
log.assert(
347-
pcall(vim.api.nvim_win_set_config, cmdline.window[tab], win_config)
348-
);
349-
end
363+
log.assert(
364+
"ui/cmdline.lua → window",
365+
pcall(vim.api.nvim_win_set_config, cmdline.window[tab], win_config)
366+
);
350367

351368
cmdline.__cursor();
352369

@@ -357,10 +374,12 @@ cmdline.__render = function ()
357374

358375
if package.loaded["ui.message"] then
359376
log.assert(
377+
"ui/cmdline.lua → message_refresh",
360378
pcall(package.loaded["ui.message"].__render)
361379
);
362380

363381
log.assert(
382+
"ui/cmdline.lua → showcmd_refresh",
364383
pcall(package.loaded["ui.message"].__showcmd)
365384
);
366385
end
@@ -468,6 +487,7 @@ cmdline.cmdline_hide = function ()
468487
-- But, we can hide them here.
469488
for _, win in pairs(cmdline.window) do
470489
log.assert(
490+
"ui/cmdline.lua",
471491
pcall(vim.api.nvim_win_set_config, win, { hide = true })
472492
);
473493
end
@@ -476,6 +496,7 @@ cmdline.cmdline_hide = function ()
476496
--- position.
477497
if package.loaded["ui.message"] then
478498
log.assert(
499+
"ui/cmdline.lua",
479500
pcall(package.loaded["ui.message"].__render)
480501
);
481502
end
@@ -539,20 +560,40 @@ end
539560
---@param event string
540561
---@param ... any
541562
cmdline.handle = function (event, ...)
563+
---|fS
564+
565+
log.level_inc();
566+
542567
log.assert(
568+
"ui/cmdline.lua",
543569
pcall(cmdline[event], ...)
544570
);
571+
572+
log.level_dec();
573+
log.print(vim.inspect(cmdline.state), "ui/cmdline.lua", "debug");
574+
575+
---|fE
545576
end
546577

547578
--- Sets up the cmdline module.
548579
cmdline.setup = function ()
580+
---|fS
581+
549582
vim.api.nvim_create_autocmd("TabEnter", {
550583
callback = function ()
551-
cmdline.__prepare();
584+
log.assert(
585+
"ui/cmdline.lua",
586+
pcall(cmdline.__prepare)
587+
);
552588
end
553589
});
554590

555-
cmdline.__prepare();
591+
log.assert(
592+
"ui/cmdline.lua",
593+
pcall(cmdline.__prepare)
594+
);
595+
596+
---|fE
556597
end
557598

558599
return cmdline;

‎lua/ui/linegrid.lua‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
--- Custom linegrid for
2-
--- Neovim.
31
local linegrid = {};
42

53
--- Handles linegrid events.

‎lua/ui/message.lua‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,7 @@ message.__remove = function (id)
223223

224224
vim.schedule(function ()
225225
log.assert(
226+
"ui/message.lua → remove_render",
226227
pcall(message.__render)
227228
)
228229
end)
@@ -259,6 +260,7 @@ message.__add = function (kind, content)
259260
-- If the message is a list message,
260261
-- pass it to the list renderer.
261262
log.assert(
263+
"ui/message.lua → add_list",
262264
pcall(message.__list, {
263265
kind = kind,
264266
content = content
@@ -292,6 +294,7 @@ message.__add = function (kind, content)
292294
message.id = message.id + 1;
293295

294296
log.assert(
297+
"ui/message.lua → add_render",
295298
pcall(message.__render)
296299
);
297300

@@ -319,6 +322,7 @@ message.__replace = function (kind, content)
319322
-- If a list message for some reason gets here then
320323
-- we redirect it.
321324
log.assert(
325+
"ui/message.lua → replace_list",
322326
pcall(message.__list, {
323327
kind = kind,
324328
content = content
@@ -359,6 +363,7 @@ message.__replace = function (kind, content)
359363
end));
360364

361365
log.assert(
366+
"ui/message.lua → replace_render",
362367
pcall(message.__render)
363368
);
364369
end);
@@ -523,6 +528,7 @@ message.__list = function (obj)
523528
for l, line in ipairs(exts) do
524529
for _, ext in ipairs(line) do
525530
log.assert(
531+
"ui/message.lua → list_highlights",
526532
pcall(
527533
vim.api.nvim_buf_set_extmark,
528534
message.list_buffer,
@@ -722,6 +728,7 @@ message.__history = function (entries)
722728
utils.last_win()
723729
);
724730
log.assert(
731+
"ui/message.lua → history_quit",
725732
pcall(vim.api.nvim_win_set_config, message.history_window[tab], {
726733
relative = "editor",
727734

@@ -967,6 +974,7 @@ message.msg_show = function (kind, content, replace_last)
967974

968975
if kind == "confirm" then
969976
log.assert(
977+
"ui/message.lua → __confirm",
970978
pcall(message.__confirm, {
971979
kind = kind,
972980
content = content,
@@ -996,6 +1004,7 @@ message.msg_history_show = function (entries)
9961004
vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes("<CR>", true, false, true), "n", false);
9971005

9981006
log.assert(
1007+
"ui/message.lua → history_show",
9991008
pcall(message.__history, entries)
10001009
);
10011010

@@ -1035,14 +1044,16 @@ end
10351044
message.handle = function (event, ...)
10361045
---|fS
10371046

1038-
if not message[event] then
1039-
return;
1040-
end
1047+
log.level_inc();
10411048

10421049
log.assert(
1050+
"ui/message.lua",
10431051
pcall(message[event], ...)
10441052
);
10451053

1054+
log.level_dec();
1055+
log.print(vim.inspect({ ... }), "ui/message.lua", "debug");
1056+
10461057
---|fE
10471058
end
10481059

‎lua/ui/popup.lua‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ popup.__strip_renderer = function ()
222222

223223
for _, hl in ipairs(hls) do
224224
log.assert(
225+
"ui/popup.lua → strip_window_config",
225226
pcall(
226227
vim.api.nvim_buf_set_extmark,
227228

@@ -475,20 +476,34 @@ end
475476
---@param event string
476477
---@param ... any
477478
popup.handle = function (event, ...)
479+
---|fS
480+
481+
log.level_inc();
482+
478483
log.assert(
484+
"ui/popup.lua",
479485
pcall(popup[event], ...)
480486
);
487+
488+
log.level_dec();
489+
log.print(vim.inspect({ ... }), "ui/popup.lua", "debug");
490+
491+
---|fE
481492
end
482493

483494
--- Sets up the popup module.
484495
popup.setup = function ()
496+
---|fS
497+
485498
vim.api.nvim_create_autocmd("TabEnter", {
486499
callback = function ()
487500
popup.__prepare();
488501
end
489502
});
490503

491504
popup.__prepare();
505+
506+
---|fE
492507
end
493508

494509
return popup;

‎plugin/ui.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ vim.api.nvim_create_autocmd("VimEnter", {
88
local log = require("ui.log");
99
-- vim.g.__ui_dev = true;
1010

11-
log.print("Attached to UI");
11+
log.print("Attached to UI!", "plugin/ui.lua", "log");
1212
log.level_inc();
1313
end
1414
});
@@ -18,7 +18,7 @@ vim.api.nvim_create_autocmd("VimLeave", {
1818
local log = require("ui.log");
1919

2020
log.level_dec();
21-
log.print("Exporting log");
21+
log.print("Exporting log!", "plugin/ui.lua", "log");
2222

2323
if vim.g.__ui_dev then
2424
log.export();

0 commit comments

Comments
 (0)