barrett/canola.nvim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

lint: use more specific type for internal entries

Browse source
This commit is contained in:
Steven Arcangeli 2025-10-15 10:42:52 -07:00
parent f55ebb0079
commit 71948729cd
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lua/oil/adapters/trash/freedesktop.lua
View file

@ -447,7 +447,7 @@ M.render_action = function(action)
local entry = assert(cache.get_entry_by_url(action.url)) local entry = assert(cache.get_entry_by_url(action.url))
local meta = entry[FIELD_META] local meta = entry[FIELD_META]
---@type oil.TrashInfo ---@type oil.TrashInfo
local trash_info = meta and meta.trash_info local trash_info = assert(meta).trash_info
local short_path = fs.shorten_path(trash_info.original_path) local short_path = fs.shorten_path(trash_info.original_path)
return string.format(" PURGE %s", short_path) return string.format(" PURGE %s", short_path)
elseif action.type == "move" then elseif action.type == "move" then
@ -561,7 +561,7 @@ M.perform_action = function(action, cb)
local entry = assert(cache.get_entry_by_url(action.url)) local entry = assert(cache.get_entry_by_url(action.url))
local meta = entry[FIELD_META] local meta = entry[FIELD_META]
---@type oil.TrashInfo ---@type oil.TrashInfo
local trash_info = meta and meta.trash_info local trash_info = assert(meta).trash_info
purge(trash_info, cb) purge(trash_info, cb)
elseif action.type == "move" then elseif action.type == "move" then
local src_adapter = assert(config.get_adapter_by_scheme(action.src_url)) local src_adapter = assert(config.get_adapter_by_scheme(action.src_url))
@ -576,7 +576,7 @@ M.perform_action = function(action, cb)
local entry = assert(cache.get_entry_by_url(action.src_url)) local entry = assert(cache.get_entry_by_url(action.src_url))
local meta = entry[FIELD_META] local meta = entry[FIELD_META]
---@type oil.TrashInfo ---@type oil.TrashInfo
local trash_info = meta and meta.trash_info local trash_info = assert(meta).trash_info
fs.recursive_move(action.entry_type, trash_info.trash_file, dest_path, function(err) fs.recursive_move(action.entry_type, trash_info.trash_file, dest_path, function(err)
if err then if err then
return cb(err) return cb(err)
@ -607,7 +607,7 @@ M.perform_action = function(action, cb)
local entry = assert(cache.get_entry_by_url(action.src_url)) local entry = assert(cache.get_entry_by_url(action.src_url))
local meta = entry[FIELD_META] local meta = entry[FIELD_META]
---@type oil.TrashInfo ---@type oil.TrashInfo
local trash_info = meta and meta.trash_info local trash_info = assert(meta).trash_info
fs.recursive_copy(action.entry_type, trash_info.trash_file, dest_path, cb) fs.recursive_copy(action.entry_type, trash_info.trash_file, dest_path, cb)
else else
error("Must be moving files into or out of trash") error("Must be moving files into or out of trash")

2
lua/oil/adapters/trash/windows.lua
View file

@ -266,7 +266,7 @@ M.render_action = function(action)
local entry = assert(cache.get_entry_by_url(action.url)) local entry = assert(cache.get_entry_by_url(action.url))
local meta = entry[FIELD_META] local meta = entry[FIELD_META]
---@type oil.WindowsTrashInfo ---@type oil.WindowsTrashInfo
local trash_info = meta and meta.trash_info local trash_info = assert(meta).trash_info
local short_path = fs.shorten_path(trash_info.original_path) local short_path = fs.shorten_path(trash_info.original_path)
return string.format(" PURGE %s", short_path) return string.format(" PURGE %s", short_path)
elseif action.type == "move" then elseif action.type == "move" then

2
lua/oil/columns.lua
View file

@ -200,7 +200,7 @@ local function is_entry_directory(entry)
return true return true
elseif type == "link" then elseif type == "link" then
local meta = entry[FIELD_META] local meta = entry[FIELD_META]
return meta and meta.link_stat and meta.link_stat.type == "directory" return (meta and meta.link_stat and meta.link_stat.type == "directory") == true
else else
return false return false
end end

2
lua/oil/constants.lua
View file

@ -2,7 +2,7 @@ local M = {}
---Store entries as a list-like table for maximum space efficiency and retrieval speed. ---Store entries as a list-like table for maximum space efficiency and retrieval speed.
---We use the constants below to index into the table. ---We use the constants below to index into the table.
---@alias oil.InternalEntry any[] ---@alias oil.InternalEntry {[1]: integer, [2]: string, [3]: oil.EntryType, [4]: nil|table}
-- Indexes into oil.InternalEntry -- Indexes into oil.InternalEntry
M.FIELD_ID = 1 M.FIELD_ID = 1