Skip to content
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

fix(qfwin): add nil check for object in winleave autocmd #120

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(qfwin): add nil check for object in winleave autocmd #120

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5174421
fix(qfwin): add nil check for object in winleave autocmd
Subjective Sep 9, 2023
cf8b8ce
Revert style changes
Subjective Nov 9, 2023
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
20 changes: 11 additions & 9 deletions lua/bqf/qfwin/session.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
local api = vim.api
local fn = vim.fn

local list = require('bqf.qfwin.list')
local utils = require('bqf.utils')
local list = require("bqf.qfwin.list")
local utils = require("bqf.utils")

local function isNormalWinType(winid)
return fn.win_gettype(winid) == ''
return fn.win_gettype(winid) == ""
end

---
Expand All @@ -14,14 +14,14 @@ end
---@return number
local function getPwinid(winid, qlist)
local pwinid
if qlist.type == 'loc' then
if qlist.type == "loc" then
pwinid = qlist.filewinid > 0 and qlist.filewinid or -1
else
local function isValid(wid)
return wid > 0 and isNormalWinType(wid)
end

pwinid = fn.win_getid(fn.winnr('#'))
pwinid = fn.win_getid(fn.winnr("#"))
if not isValid(pwinid) then
local tabpage = api.nvim_win_get_tabpage(winid)
for _, owinid in ipairs(api.nvim_tabpage_list_wins(tabpage)) do
Expand All @@ -44,22 +44,22 @@ end
---@field private _list BqfQfList
---@field private _pwinid number
---@field winid number
local QfSession = {pool = {}}
local QfSession = { pool = {} }

function QfSession:list()
return self._list
end

function QfSession:previousWinid()
if not utils.isWinValid(self._pwinid) or fn.win_gettype(self._pwinid) ~= '' then
if not utils.isWinValid(self._pwinid) or fn.win_gettype(self._pwinid) ~= "" then
self._pwinid = getPwinid(self.winid, self._list)
end
return utils.isWinValid(self._pwinid) and self._pwinid or -1
end

function QfSession:validate()
local winType = fn.win_gettype(self.winid)
return winType == 'quickfix' or winType == 'loclist'
return winType == "quickfix" or winType == "loclist"
end

---
Expand Down Expand Up @@ -92,7 +92,9 @@ function QfSession:saveWinView(winid)
if winid then
local obj = self.pool[winid]
local wv = utils.winCall(winid, fn.winsaveview)
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

winsaveview should be invoked after checking the nil condition.

obj:list():setWinView(wv)
if obj ~= nil then
obj:list():setWinView(wv)
end
end
end

Expand Down