feat: `winfixbuf` support (#137)

* feat: add `winfixbuf` support

* feat(utils): `with_version`

* refactor: `cmd.menu()`

* feat(ui-utils): new utility

* fix(yank): check for `0.10`

Marcinauthored 1 year agocommitted by GitHub

parent 94c16d8commit e2e43b38085faf51c0b62d239f29eeac463161baBrowse files

+2-2lua/leetcode-ui/popup/info.lua

		@@ -134,12 +134,12 @@ function Info:mount()
134	134	local ui_utils = require("leetcode-ui.utils")
135	135	local winhighlight = "Normal:NormalSB,FloatBorder:FloatBorder"
136	136
137		- ui_utils.set_win_opts(self.winid, {
	137	+ ui_utils.win_set_opts(self.winid, {
138	138	winhighlight = winhighlight,
139	139	wrap = true,
140	140	})
141	141
142		- ui_utils.set_win_opts(self.border.winid, {
	142	+ ui_utils.win_set_opts(self.border.winid, {
143	143	winhighlight = winhighlight,
144	144	})
145	145

+4-2lua/leetcode-ui/question.lua

		@@ -5,6 +5,7 @@ local Object = require("nui.object")
5	5
6	6	local api_question = require("leetcode.api.question")
7	7	local utils = require("leetcode.utils")
	8	+local ui_utils = require("leetcode-ui.utils")
8	9	local config = require("leetcode.config")
9	10	local log = require("leetcode.logger")
10	11
		@@ -88,14 +89,15 @@ function Question:create_buffer()
88	89	vim.cmd("$tabe " .. path)
89	90	self.bufnr = vim.api.nvim_get_current_buf()
90	91	self.winid = vim.api.nvim_get_current_win()
	92	+ ui_utils.win_set_winfixbuf(self.winid)
91	93
92	94	self:open_buffer(existed)
93	95	end
94	96
95	97	---@param existed boolean
96	98	function Question:open_buffer(existed)
97		- vim.api.nvim_win_set_buf(self.winid, self.bufnr)
98		- vim.api.nvim_set_option_value("buflisted", true, { buf = self.bufnr })
	99	+ ui_utils.buf_set_opts(self.bufnr, { buflisted = true })
	100	+ ui_utils.win_set_buf(self.winid, self.bufnr, true)
99	101
100	102	local i = self:fold_range()
101	103	if i then

+3-3lua/leetcode-ui/renderer/init.lua

		@@ -37,7 +37,7 @@ function Renderer:draw(component)
37	37	self._.line_idx = 1
38	38
39	39	local c_ok, c = pcall(vim.api.nvim_win_get_cursor, self.winid)
40		- self:modifiable(function()
	40	+ self:with_modifiable(function()
41	41	vim.api.nvim_buf_set_lines(self.bufnr, 0, -1, false, {})
42	42	vim.api.nvim_buf_clear_namespace(self.bufnr, -1, 0, -1)
43	43
		@@ -51,7 +51,7 @@ end
51	51	---@private
52	52	---
53	53	---@param fn function
54		-function Renderer:modifiable(fn)
	54	+function Renderer:with_modifiable(fn)
55	55	local bufnr = self.bufnr
56	56	if not (bufnr and vim.api.nvim_buf_is_valid(bufnr)) then
57	57	return
		@@ -112,7 +112,7 @@ function Renderer:clear()
112	112	self._.line_idx = 1
113	113	self._.buttons = {}
114	114	self:clear_keymaps()
115		- self:modifiable(function()
	115	+ self:with_modifiable(function()
116	116	vim.api.nvim_buf_set_lines(self.bufnr, 0, -1, false, {})
117	117	end)
118	118	end

+6-4lua/leetcode-ui/renderer/menu.lua

		@@ -1,7 +1,8 @@
1	1	local log = require("leetcode.logger")
2	2	local cookie = require("leetcode.cache.cookie")
3	3	local config = require("leetcode.config")
4		-local utils = require("leetcode-ui.utils")
	4	+local ui_utils = require("leetcode-ui.utils")
	5	+local utils = require("leetcode.utils")
5	6	local Renderer = require("leetcode-ui.renderer")
6	7	local api = vim.api
7	8
		@@ -123,7 +124,7 @@ end
123	124	function Menu:apply_options()
124	125	api.nvim_buf_set_name(self.bufnr, "")
125	126
126		- utils.set_buf_opts(self.bufnr, {
	127	+ ui_utils.buf_set_opts(self.bufnr, {
127	128	modifiable = false,
128	129	buflisted = false,
129	130	matchpairs = "",
		@@ -132,7 +133,7 @@ function Menu:apply_options()
132	133	filetype = config.name,
133	134	synmaxcol = 0,
134	135	})
135		- utils.set_win_opts(self.winid, {
	136	+ ui_utils.win_set_opts(self.winid, {
136	137	wrap = false,
137	138	colorcolumn = "",
138	139	foldlevel = 999,
		@@ -145,6 +146,7 @@ function Menu:apply_options()
145	146	spell = false,
146	147	signcolumn = "no",
147	148	})
	149	+ ui_utils.win_set_winfixbuf(self.winid)
148	150	end
149	151
150	152	function Menu:unmount()
		@@ -173,7 +175,7 @@ function Menu:remount()
173	175	api.nvim_buf_delete(self.bufnr, { force = true })
174	176	end
175	177
176		- vim.cmd("$tabnew")
	178	+ vim.cmd("0tabnew")
177	179	self.bufnr = api.nvim_get_current_buf()
178	180	self.winid = api.nvim_get_current_win()
179	181

+4-2lua/leetcode-ui/split/description.lua

		@@ -34,7 +34,7 @@ function Description:mount()
34	34	self:populate()
35	35
36	36	local ui_utils = require("leetcode-ui.utils")
37		- ui_utils.set_buf_opts(self.bufnr, {
	37	+ ui_utils.buf_set_opts(self.bufnr, {
38	38	modifiable = false,
39	39	buflisted = false,
40	40	matchpairs = "",
		@@ -43,7 +43,7 @@ function Description:mount()
43	43	filetype = config.name,
44	44	synmaxcol = 0,
45	45	})
46		- ui_utils.set_win_opts(self.winid, {
	46	+ ui_utils.win_set_opts(self.winid, {
47	47	winhighlight = "Normal:NormalFloat,FloatBorder:FloatBorder",
48	48	wrap = not img_sup,
49	49	colorcolumn = "",
		@@ -58,6 +58,8 @@ function Description:mount()
58	58	signcolumn = "no",
59	59	linebreak = true,
60	60	})
	61	+ ui_utils.win_set_winfixbuf(self.winid)
	62	+
61	63	if not img_ok and config.user.image_support then
62	64	log.error("image.nvim not found but `image_support` is enabled")
63	65	end

+31-2lua/leetcode-ui/utils.lua

		@@ -103,7 +103,7 @@ function utils.get_padding(lines, layout)
103	103	return padding
104	104	end
105	105
106		-function utils.set_buf_opts(bufnr, options)
	106	+function utils.buf_set_opts(bufnr, options)
107	107	if not vim.api.nvim_buf_is_valid(bufnr) then
108	108	return
109	109	end
		@@ -116,7 +116,7 @@ function utils.set_buf_opts(bufnr, options)
116	116	end
117	117	end
118	118
119		-function utils.set_win_opts(winid, options)
	119	+function utils.win_set_opts(winid, options)
120	120	if not vim.api.nvim_win_is_valid(winid) then
121	121	return
122	122	end
		@@ -130,6 +130,35 @@ function utils.set_win_opts(winid, options)
130	130	end
131	131	end
132	132
	133	+---@param winid number
	134	+function utils.win_set_winfixbuf(winid)
	135	+ local u = require("leetcode.utils")
	136	+ u.with_version("0.10.0", function()
	137	+ utils.win_set_opts(winid, { winfixbuf = true })
	138	+ end)
	139	+end
	140	+
	141	+---@param winid number
	142	+---@param bufnr number
	143	+---@param force? boolean
	144	+function utils.win_set_buf(winid, bufnr, force)
	145	+ local u = require("leetcode.utils")
	146	+
	147	+ u.with_version("0.10.0", function()
	148	+ local wfb = vim.api.nvim_win_get_option(winid, "winfixbuf")
	149	+
	150	+ if not wfb then
	151	+ vim.api.nvim_win_set_buf(winid, bufnr)
	152	+ elseif force then
	153	+ utils.win_set_opts(winid, { winfixbuf = false })
	154	+ vim.api.nvim_win_set_buf(winid, bufnr)
	155	+ utils.win_set_opts(winid, { winfixbuf = true })
	156	+ end
	157	+ end, function()
	158	+ vim.api.nvim_win_set_buf(winid, bufnr)
	159	+ end)
	160	+end
	161	+
133	162	function utils.is_instance(instance, class)
134	163	return type(instance) == "table" and O.is_instance(instance, class)
135	164	end

+8-4lua/leetcode/command/init.lua

		@@ -177,10 +177,11 @@ end
177	177	function cmd.menu()
178	178	local winid, bufnr = _Lc_state.menu.winid, _Lc_state.menu.bufnr
179	179	local ok, tabp = pcall(api.nvim_win_get_tabpage, winid)
	180	+ local ui = require("leetcode-ui.utils")
180	181
181	182	if ok then
182	183	api.nvim_set_current_tabpage(tabp)
183		- api.nvim_win_set_buf(winid, bufnr)
	184	+ ui.win_set_buf(winid, bufnr)
184	185	else
185	186	_Lc_state.menu:remount()
186	187	end
		@@ -198,7 +199,9 @@ function cmd.yank()
198	199	and (q.winid and api.nvim_win_is_valid(q.winid))
199	200	then
200	201	api.nvim_set_current_win(q.winid)
201		- api.nvim_set_current_buf(q.bufnr)
	202	+ utils.with_version("0.10.0", nil, function()
	203	+ api.nvim_set_current_buf(q.bufnr)
	204	+ end)
202	205
203	206	local start_i, end_i, lines = q:range()
204	207	vim.cmd(("%d,%dyank"):format(start_i or 1, end_i or #lines))
		@@ -358,6 +361,7 @@ end
358	361
359	362	function cmd.restore()
360	363	local utils = require("leetcode.utils")
	364	+ local ui = require("leetcode-ui.utils")
361	365	local q = utils.curr_question()
362	366	if not q then
363	367	return
		@@ -367,7 +371,7 @@ function cmd.restore()
367	371	(q.winid and api.nvim_win_is_valid(q.winid))
368	372	and (q.bufnr and api.nvim_buf_is_valid(q.bufnr))
369	373	then
370		- api.nvim_win_set_buf(q.winid, q.bufnr)
	374	+ ui.win_set_buf(q.winid, q.bufnr)
371	375	end
372	376
373	377	q.description:show()
		@@ -377,7 +381,7 @@ function cmd.restore()
377	381	(winid and api.nvim_win_is_valid(winid)) --
378	382	and (bufnr and api.nvim_buf_is_valid(bufnr))
379	383	then
380		- api.nvim_win_set_buf(winid, bufnr)
	384	+ ui.win_set_buf(q.winid, q.bufnr)
381	385	end
382	386	end
383	387

+6-0lua/leetcode/utils.lua

		@@ -138,4 +138,10 @@ function utils.norm_ins(str)
138	138	return ins:sub(2, #ins - 1)
139	139	end
140	140
	141	+function utils.with_version(v, with, without)
	142	+ with = with or function() end
	143	+ without = without or function() end
	144	+ return (vim.fn.has("nvim-" .. v) == 1 and with or without)()
	145	+end
	146	+
141	147	return utils