Skip to content

fix: use vim.nonnil if available #1051

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MariaSolOs wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: use vim.nonnil if available #1051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lua/bufferline/highlights.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ local log = lazy.require("bufferline.utils.log") ---@module "bufferline.utils.lo

local api = vim.api
local visibility = constants.visibility
local if_nil = vim.nonnil or vim.F.if_nil
---------------------------------------------------------------------------//
-- Highlights
---------------------------------------------------------------------------//
Expand Down Expand Up @@ -63,7 +64,7 @@ end
function M.set(name, opts)
if not opts or vim.tbl_isempty(opts) then return end
local hl = filter_invalid_keys(opts)
hl.default = vim.F.if_nil(opts.default, config.options.themable)
hl.default = if_nil(opts.default, config.options.themable)
local ok, msg = pcall(api.nvim_set_hl, 0, name, hl)
if ok then return hl end
utils.notify(fmt("Failed setting %s highlight, something isn't configured correctly: %s", name, msg), "error")
Expand Down
9 changes: 5 additions & 4 deletions tests/utils.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
local M = {}

local fn = vim.fn
local if_nil = vim.nonnil or vim.F.if_nil

local MockBuffer = {}

Expand Down Expand Up @@ -39,15 +40,15 @@ function MockBuffer:new(o)
return o
end

function MockBuffer:is_end() return vim.F.if_nil(self.is_end, false) end
function MockBuffer:is_end() return if_nil(self.is_end, false) end

function MockBuffer:current() return vim.F.if_nil(self._is_current, true) end
function MockBuffer:current() return if_nil(self._is_current, true) end

function MockBuffer:as_element() return self end

function MockBuffer:visibility() return vim.F.if_nil(self._visiblity, 0) end
function MockBuffer:visibility() return if_nil(self._visiblity, 0) end

function MockBuffer:visible() return vim.F.if_nil(self._is_visible, true) end
function MockBuffer:visible() return if_nil(self._is_visible, true) end

---@param name string
---@param state bufferline.State
Expand Down