Skip to content

Commit e281ec2

Browse files
committed
refactor: Updated annotations & cleaned up code
1 parent 68bdc49 commit e281ec2

7 files changed

Lines changed: 134 additions & 373 deletions

File tree

lua/helpview.lua

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ helpview.strict_render = {
2323
---@type integer[]
2424
on = {},
2525

26-
--- Renders to {buffer}.
26+
--- Renders to `buffer`.
2727
--- Disables rendering when the line count
28-
--- is >= {max_lines}
28+
--- is >= `max_lines`
2929
---@param self table
3030
---@param buffer integer
3131
---@param max_lines integer
@@ -52,7 +52,7 @@ helpview.strict_render = {
5252
table.insert(self.on, buffer)
5353
end,
5454

55-
--- Clears the preview of {buffer}.
55+
--- Clears the preview of `buffer`.
5656
--- Also frees it yp to be rendered again.
5757
---@param self table
5858
---@param buffer integer
@@ -102,8 +102,8 @@ helpview.clean = function ()
102102
end
103103
end
104104

105-
--- Checks if {buffer} is safe.
106-
---@param buffer integer?
105+
--- Checks if `buffer` is safe.
106+
---@param buffer? integer
107107
---@return boolean
108108
helpview.buf_is_safe = function (buffer)
109109
if type(buffer) ~= "number" then
@@ -117,8 +117,8 @@ helpview.buf_is_safe = function (buffer)
117117
return true;
118118
end
119119

120-
--- Checks if {window} is safe.
121-
---@param window integer?
120+
--- Checks if `window` is safe.
121+
---@param window? integer
122122
---@return boolean
123123
helpview.win_is_safe = function (window)
124124
if type(window) ~= "number" then
@@ -132,8 +132,8 @@ helpview.win_is_safe = function (window)
132132
return true;
133133
end
134134

135-
--- Can we attach to {buffer}?
136-
---@param buffer integer?
135+
--- Can we attach to `buffer`?
136+
---@param buffer? integer
137137
---@return boolean
138138
helpview.can_attach = function (buffer)
139139
helpview.clean();
@@ -147,7 +147,7 @@ helpview.can_attach = function (buffer)
147147
return true;
148148
end
149149

150-
--- Can we draw on {buffer}?
150+
--- Can we draw on `buffer`?
151151
---@param buffer integer
152152
---@return boolean
153153
helpview.can_draw = function (buffer)
@@ -162,14 +162,14 @@ helpview.can_draw = function (buffer)
162162
return true;
163163
end
164164

165-
--- Clears all previews from {buffer}.
165+
--- Clears all previews from `buffer`.
166166
---@param buffer integer
167167
helpview.clear = function (buffer)
168168
buffer = buffer or vim.api.nvim_get_current_buf();
169169
require("helpview.renderer").clear(buffer, 0, -1);
170170
end
171171

172-
--- Renders preview to {buffer}.
172+
--- Renders preview to `buffer`.
173173
---@param buffer integer
174174
---@param state? { enable: boolean, hybrid_mode: boolean }
175175
helpview.render = function (buffer, state)
@@ -358,7 +358,7 @@ helpview.splitview_render = function ()
358358
end
359359

360360
--- Actions for helpview.
361-
---@type { [string]: function }
361+
---@type table<string, function>
362362
helpview.actions = {
363363
["__exec_callback"] = function (callback, ...)
364364
if vim.list_contains({ "string", "integer" }, type(callback)) == false then
@@ -508,9 +508,9 @@ helpview.actions = {
508508
end,
509509

510510

511-
--- Attaches previewer to a {buffer}.
511+
--- Attaches previewer to a `buffer`.
512512
---
513-
--- Optionally allows setting a {state} for
513+
--- Optionally allows setting a `state` for
514514
--- that buffer.
515515
---@param buffer integer?
516516
---@param state? { enable: boolean, hybrid_mode: boolean, y: integer }
@@ -558,7 +558,7 @@ helpview.actions = {
558558
health.__child_indent_de();
559559
end,
560560

561-
--- Detaches previewer from a {buffer}.
561+
--- Detaches previewer from a `buffer`.
562562
---@param buffer integer?
563563
["detach"] = function (buffer)
564564
---@type integer
@@ -595,7 +595,7 @@ helpview.actions = {
595595
health.__child_indent_de()
596596
end,
597597

598-
--- Disables preview of {buffer}.
598+
--- Disables preview of `buffer`.
599599
---@param buffer integer?
600600
["disable"] = function (buffer)
601601
---@type integer
@@ -639,7 +639,7 @@ helpview.actions = {
639639
health.__child_indent_de();
640640
end,
641641

642-
--- Enables preview of {buffer}.
642+
--- Enables preview of `buffer`.
643643
---@param buffer integer?
644644
["enable"] = function (buffer)
645645
---@type integer
@@ -691,7 +691,7 @@ helpview.actions = {
691691
health.__child_indent_de();
692692
end,
693693

694-
--- Enables hybrid mode of {buffer}.
694+
--- Enables hybrid mode of `buffer`.
695695
---@param buffer integer?
696696
["hybridEnable"] = function (buffer)
697697
buffer = buffer or vim.api.nvim_get_current_buf();
@@ -722,7 +722,7 @@ helpview.actions = {
722722
end
723723
end,
724724

725-
--- Disables hybrid mode of {buffer}.
725+
--- Disables hybrid mode of `buffer`.
726726
---@param buffer integer?
727727
["hybridDisable"] = function (buffer)
728728
buffer = buffer or vim.api.nvim_get_current_buf();
@@ -753,7 +753,7 @@ helpview.actions = {
753753
end
754754
end,
755755

756-
--- Opens split view for {buffer}.
756+
--- Opens split view for `buffer`.
757757
---@param buffer integer?
758758
["splitOpen"] = function (buffer)
759759
---@type integer
@@ -1109,15 +1109,19 @@ helpview.help = {
11091109
end,
11101110

11111111
--- Opens help window
1112+
---@param self table
1113+
---@param tag? string
11121114
open = function (self, tag)
11131115
tag = tag or "";
11141116

11151117
local overlay_opts = spec.get({ "preview", "overlay_winopts" }, { fallback = {} });
11161118
local preview_opts = spec.get({ "preview", "preview_winopts" }, { fallback = {} });
11171119

1120+
---@return integer
1121+
---@return integer
11181122
local function get_size()
11191123
local w = preview_opts.width or 78;
1120-
local h = preview_opts.height or vim.o.lines - vim.o.cmdheight;
1124+
local h = preview_opts.height or (vim.o.lines - vim.o.cmdheight);
11211125

11221126
if w <= 1 then
11231127
w = math.floor(w * vim.o.columns);
@@ -1201,7 +1205,6 @@ helpview.help = {
12011205
});
12021206

12031207
helpview.actions.__exec_callback("on_help_open", self.preview_buffer, self.preview_window, self.overlay_preview, self.overlay_window);
1204-
12051208
vim.cmd("help " .. tag);
12061209

12071210
helpview.actions.attach(self.preview_buffer);
@@ -1220,3 +1223,4 @@ helpview.setup = function (user_config)
12201223
end
12211224

12221225
return helpview;
1226+
-- vim:foldmethod=indent:

lua/helpview/filetypes.lua

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,21 @@
1+
---@class helpview.icon Icon.
2+
---
3+
---@field name? string Filetype name(`nil` for default).
4+
---
5+
---@field sign string
6+
---@field sign_hl string
7+
---
8+
---@field icon string
9+
---@field icon_hl string
10+
---
11+
---@field border_hl string
12+
13+
------------------------------------------------------------------------------
14+
115
local fts = {};
216

17+
---@type table<string, helpview.icon>
318
fts.styles = {
4-
---+${class}
519
["default"] = { name = nil, sign = "󰻺 ", sign_hl = "HelpviewPalette0Sign", icon = "󰻺 ", icon_hl = "HelpviewIcon0", border_hl = "HelpviewPalette0Fg" },
620
["nosyntax"] = { name = "Unknown", sign = "󰡯 ", sign_hl = "HelpviewPalette0Sign", icon = "󰡯 ", icon_hl = "HelpviewIcon0", border_hl = "HelpviewPalette0Fg" },
721

@@ -713,12 +727,11 @@ fts.styles = {
713727
["zir"] = { name = "Zir", sign = "󰯂 ", sign_hl = "HelpviewPalette6Sign", icon = "󰯂 ", icon_hl = "HelpviewIcon6", border_hl = "HelpviewPalette6Fg" },
714728
["zserio"] = { name = "Zserio", sign = "󰯂 ", sign_hl = "HelpviewPalette6Sign", icon = "󰯂 ", icon_hl = "HelpviewIcon6", border_hl = "HelpviewPalette6Fg" },
715729
["zsh"] = { name = "Zsh", sign = "", sign_hl = "HelpviewPalette4Sign", icon = "", icon_hl = "HelpviewIcon4", border_hl = "HelpviewPalette4Fg" }
716-
---_
717730
};
718731

719732
--- Gets Icons
720-
---@param ft string?
721-
---@return { name: string, sign: string, sign_hl: string, icon: string, icon_hl: string, border_hl: string }
733+
---@param ft? string
734+
---@return helpview.icon
722735
fts.get = function (ft)
723736
local _ft = ft;
724737

@@ -764,3 +777,4 @@ fts.get = function (ft)
764777
end
765778

766779
return fts;
780+
--- vim:foldmethod=indent:

0 commit comments

Comments
 (0)