subcrip
/
lazy.nvim
mirror of https://github.com/folke/lazy.nvim.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(ui): set wo options with local. don't use `vim.wo`. See #829

This commit is contained in:
Folke Lemaitre 2023-06-12 08:28:10 +02:00
parent 678179543e
commit 7f4da7d511
No known key found for this signature in database
GPG Key ID: 41F8B1FBACAE2040
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lua/lazy/util.lua
View File

@ -10,6 +10,14 @@ function M.float(opts)
return require("lazy.view.float")(opts) return require("lazy.view.float")(opts)
end end
function M.wo(win, k, v)
if vim.api.nvim_set_option_value then
vim.api.nvim_set_option_value(k, v, { scope = "local", win = win })
else
vim.wo[win][k] = v
end
end
function M.open(uri) function M.open(uri)
if M.file_exists(uri) then if M.file_exists(uri) then
return M.float({ style = "", file = uri }) return M.float({ style = "", file = uri })
@ -180,9 +188,9 @@ function M.markdown(msg, opts)
vim.tbl_deep_extend("force", { vim.tbl_deep_extend("force", {
title = "lazy.nvim", title = "lazy.nvim",
on_open = function(win) on_open = function(win)
vim.wo[win].conceallevel = 3 M.wo(win, "conceallevel", 3)
vim.wo[win].concealcursor = "n" M.wo(win, "concealcursor", "n")
vim.wo[win].spell = false M.wo(win, "spell", false)
vim.treesitter.start(vim.api.nvim_win_get_buf(win), "markdown") vim.treesitter.start(vim.api.nvim_win_get_buf(win), "markdown")
end, end,

13
lua/lazy/view/float.lua
View File

@ -1,5 +1,6 @@
local Config = require("lazy.core.config") local Config = require("lazy.core.config")
local ViewConfig = require("lazy.view.config") local ViewConfig = require("lazy.view.config")
local Util = require("lazy.util")
---@class LazyFloatOptions ---@class LazyFloatOptions
---@field buf? number ---@field buf? number
@ -124,12 +125,12 @@ function M:mount()
local function opts() local function opts()
vim.bo[self.buf].bufhidden = self.opts.persistent and "hide" or "wipe" vim.bo[self.buf].bufhidden = self.opts.persistent and "hide" or "wipe"
vim.wo[self.win].conceallevel = 3 Util.wo(self.win, "conceallevel", 3)
vim.wo[self.win].foldenable = false Util.wo(self.win, "foldenable", false)
vim.wo[self.win].spell = false Util.wo(self.win, "spell", false)
vim.wo[self.win].wrap = true Util.wo(self.win, "wrap", true)
vim.wo[self.win].winhighlight = "Normal:LazyNormal" Util.wo(self.win, "winhighlight", "Normal:LazyNormal")
vim.wo[self.win].colorcolumn = "" Util.wo(self.win, "colorcolumn", "")
end end
opts() opts()

9
lua/lazy/view/init.lua
View File

@ -57,12 +57,11 @@ function M.create()
}) })
if Config.options.ui.wrap then if Config.options.ui.wrap then
vim.wo[self.win].wrap = true Util.wo(self.win, "wrap", true)
vim.wo[self.win].linebreak = true Util.wo(self.win, "linebreak", true)
vim.wo[self.win].breakindent = true Util.wo(self.win, "breakindent", true)
-- vim.wo[self.win].breakindentopt = "shift:8"
else else
vim.wo[self.win].wrap = false Util.wo(self.win, "wrap", false)
end end
self.state = vim.deepcopy(default_state) self.state = vim.deepcopy(default_state)