Update yazi and its plugins

dot_config/yazi/plugins/git.yazi/readonly_README.md

@@ -1,7 +1,7 @@
 # git.yazi
 
 > [!NOTE]
-> Yazi v25.2.7 or later is required for this plugin to work.
+> Yazi v25.2.26 or later is required for this plugin to work.
 
 Show the status of Git file changes as linemode in the file list.
 
@@ -39,38 +39,38 @@ run  = "git"
 
 You can customize the [Style](https://yazi-rs.github.io/docs/plugins/layout#style) of the status sign with:
 
-- `THEME.git.modified`
-- `THEME.git.added`
-- `THEME.git.untracked`
-- `THEME.git.ignored`
-- `THEME.git.deleted`
-- `THEME.git.updated`
+- `th.git.modified`
+- `th.git.added`
+- `th.git.untracked`
+- `th.git.ignored`
+- `th.git.deleted`
+- `th.git.updated`
 
 For example:
 
 ```lua
 -- ~/.config/yazi/init.lua
-THEME.git = THEME.git or {}
-THEME.git.modified = ui.Style():fg("blue")
-THEME.git.deleted = ui.Style():fg("red"):bold()
+th.git = th.git or {}
+th.git.modified = ui.Style():fg("blue")
+th.git.deleted = ui.Style():fg("red"):bold()
 ```
 
 You can also customize the text of the status sign with:
 
-- `THEME.git.modified_sign`
-- `THEME.git.added_sign`
-- `THEME.git.untracked_sign`
-- `THEME.git.ignored_sign`
-- `THEME.git.deleted_sign`
-- `THEME.git.updated_sign`
+- `th.git.modified_sign`
+- `th.git.added_sign`
+- `th.git.untracked_sign`
+- `th.git.ignored_sign`
+- `th.git.deleted_sign`
+- `th.git.updated_sign`
 
 For example:
 
 ```lua
 -- ~/.config/yazi/init.lua
-THEME.git = THEME.git or {}
-THEME.git.modified_sign = "M"
-THEME.git.deleted_sign = "D"
+th.git = th.git or {}
+th.git.modified_sign = "M"
+th.git.deleted_sign = "D"
 ```
 
 ## License

dot_config/yazi/plugins/git.yazi/readonly_main.lua

@@ -1,29 +1,45 @@
---- @since 25.2.7
+--- @since 25.4.4
 
-local WIN = ya.target_family() == "windows"
-local PATS = {
-	{ "[MT]", 6 }, -- Modified
-	{ "[AC]", 5 }, -- Added
-	{ "?$", 4 }, -- Untracked
-	{ "!$", 3 }, -- Ignored
-	{ "D", 2 }, -- Deleted
-	{ "U", 1 }, -- Updated
-	{ "[AD][AD]", 1 }, -- Updated
+local WINDOWS = ya.target_family() == "windows"
+
+-- The code of supported git status,
+-- also used to determine which status to show for directories when they contain different statuses
+-- see `bubble_up`
+local CODES = {
+	excluded = 100, -- ignored directory
+	ignored = 6, -- ignored file
+	untracked = 5,
+	modified = 4,
+	added = 3,
+	deleted = 2,
+	updated = 1,
+	unknown = 0,
+}
+
+local PATTERNS = {
+	{ "!$", CODES.ignored },
+	{ "?$", CODES.untracked },
+	{ "[MT]", CODES.modified },
+	{ "[AC]", CODES.added },
+	{ "D", CODES.deleted },
+	{ "U", CODES.updated },
+	{ "[AD][AD]", CODES.updated },
 }
 
 local function match(line)
 	local signs = line:sub(1, 2)
-	for _, p in ipairs(PATS) do
-		local path
-		if signs:find(p[1]) then
+	for _, p in ipairs(PATTERNS) do
+		local path, pattern, code = nil, p[1], p[2]
+		if signs:find(pattern) then
 			path = line:sub(4, 4) == '"' and line:sub(5, -2) or line:sub(4)
-			path = WIN and path:gsub("/", "\\") or path
+			path = WINDOWS and path:gsub("/", "\\") or path
 		end
 		if not path then
 		elseif path:find("[/\\]$") then
-			return p[2] == 3 and 30 or p[2], path:sub(1, -2)
+			-- Mark the ignored directory as `excluded`, so we can process it further within `propagate_down`
+			return code == CODES.ignored and CODES.excluded or code, path:sub(1, -2)
 		else
-			return p[2], path
+			return code, path
 		end
 	end
 end
@@ -44,34 +60,36 @@ local function root(cwd)
 		if cha and (cha.is_dir or is_worktree(next)) then
 			return tostring(cwd)
 		end
-		cwd = cwd:parent()
+		cwd = cwd.parent
 	until not cwd
 end
 
 local function bubble_up(changed)
 	local new, empty = {}, Url("")
-	for k, v in pairs(changed) do
-		if v ~= 3 and v ~= 30 then
-			local url = Url(k):parent()
+	for path, code in pairs(changed) do
+		if code ~= CODES.ignored then
+			local url = Url(path).parent
 			while url and url ~= empty do
 				local s = tostring(url)
-				new[s] = (new[s] or 0) > v and new[s] or v
-				url = url:parent()
+				new[s] = (new[s] or CODES.unknown) > code and new[s] or code
+				url = url.parent
 			end
 		end
 	end
 	return new
 end
 
-local function propagate_down(ignored, cwd, repo)
+local function propagate_down(excluded, cwd, repo)
 	local new, rel = {}, cwd:strip_prefix(repo)
-	for k, v in pairs(ignored) do
-		if v == 30 then
-			if rel:starts_with(k) then
-				new[tostring(repo:join(rel))] = 30
-			elseif cwd == repo:join(k):parent() then
-				new[k] = 3
-			end
+	for _, path in ipairs(excluded) do
+		if rel:starts_with(path) then
+			-- If `cwd` is a subdirectory of an excluded directory, also mark it as `excluded`
+			new[tostring(cwd)] = CODES.excluded
+		elseif cwd == repo:join(path).parent then
+			-- If `path` is a direct subdirectory of `cwd`, mark it as `ignored`
+			new[path] = CODES.ignored
+		else
+			-- Skipping, we only care about `cwd` itself and its direct subdirectories for maximum performance
 		end
 	end
 	return new
@@ -80,84 +98,84 @@ end
 local add = ya.sync(function(st, cwd, repo, changed)
 	st.dirs[cwd] = repo
 	st.repos[repo] = st.repos[repo] or {}
-	for k, v in pairs(changed) do
-		if v == 0 then
-			st.repos[repo][k] = nil
-		elseif v == 30 then
-			st.dirs[k] = ""
+	for path, code in pairs(changed) do
+		if code == CODES.unknown then
+			st.repos[repo][path] = nil
+		elseif code == CODES.excluded then
+			-- Mark the directory with a special value `excluded` so that it can be distinguished during UI rendering
+			st.dirs[path] = CODES.excluded
 		else
-			st.repos[repo][k] = v
+			st.repos[repo][path] = code
 		end
 	end
 	ya.render()
 end)
 
 local remove = ya.sync(function(st, cwd)
-	local dir = st.dirs[cwd]
-	if not dir then
+	local repo = st.dirs[cwd]
+	if not repo then
 		return
 	end
 
 	ya.render()
 	st.dirs[cwd] = nil
-	if not st.repos[dir] then
+	if not st.repos[repo] then
 		return
 	end
 
 	for _, r in pairs(st.dirs) do
-		if r == dir then
+		if r == repo then
 			return
 		end
 	end
-	st.repos[dir] = nil
+	st.repos[repo] = nil
 end)
 
 local function setup(st, opts)
-	st.dirs = {}
-	st.repos = {}
+	st.dirs = {} -- Mapping between a directory and its corresponding repository
+	st.repos = {} -- Mapping between a repository and the status of each of its files
 
 	opts = opts or {}
 	opts.order = opts.order or 1500
 
-	-- Chosen by ChatGPT fairly, PRs are welcome to adjust them
-	local t = THEME.git or {}
+	local t = th.git or {}
 	local styles = {
-		[6] = t.modified and ui.Style(t.modified) or ui.Style():fg("#ffa500"),
-		[5] = t.added and ui.Style(t.added) or ui.Style():fg("#32cd32"),
-		[4] = t.untracked and ui.Style(t.untracked) or ui.Style():fg("#a9a9a9"),
-		[3] = t.ignored and ui.Style(t.ignored) or ui.Style():fg("#696969"),
-		[2] = t.deleted and ui.Style(t.deleted) or ui.Style():fg("#ff4500"),
-		[1] = t.updated and ui.Style(t.updated) or ui.Style():fg("#1e90ff"),
+		[CODES.ignored] = t.ignored and ui.Style(t.ignored) or ui.Style():fg("darkgray"),
+		[CODES.untracked] = t.untracked and ui.Style(t.untracked) or ui.Style():fg("magenta"),
+		[CODES.modified] = t.modified and ui.Style(t.modified) or ui.Style():fg("yellow"),
+		[CODES.added] = t.added and ui.Style(t.added) or ui.Style():fg("green"),
+		[CODES.deleted] = t.deleted and ui.Style(t.deleted) or ui.Style():fg("red"),
+		[CODES.updated] = t.updated and ui.Style(t.updated) or ui.Style():fg("yellow"),
 	}
 	local signs = {
-		[6] = t.modified_sign and t.modified_sign or "",
-		[5] = t.added_sign and t.added_sign or "",
-		[4] = t.untracked_sign and t.untracked_sign or "",
-		[3] = t.ignored_sign and t.ignored_sign or "",
-		[2] = t.deleted_sign and t.deleted_sign or "",
-		[1] = t.updated_sign and t.updated_sign or "U",
+		[CODES.ignored] = t.ignored_sign or "",
+		[CODES.untracked] = t.untracked_sign or "?",
+		[CODES.modified] = t.modified_sign or "",
+		[CODES.added] = t.added_sign or "",
+		[CODES.deleted] = t.deleted_sign or "",
+		[CODES.updated] = t.updated_sign or "",
 	}
 
 	Linemode:children_add(function(self)
 		local url = self._file.url
-		local dir = st.dirs[tostring(url:parent())]
-		local change
-		if dir then
-			change = dir == "" and 3 or st.repos[dir][tostring(url):sub(#dir + 2)]
+		local repo = st.dirs[tostring(url.base)]
+		local code
+		if repo then
+			code = repo == CODES.excluded and CODES.ignored or st.repos[repo][tostring(url):sub(#repo + 2)]
 		end
 
-		if not change or signs[change] == "" then
+		if not code or signs[code] == "" then
 			return ""
-		elseif self._file:is_hovered() then
-			return ui.Line { " ", signs[change] }
+		elseif self._file.is_hovered then
+			return ui.Line { " ", signs[code] }
 		else
-			return ui.Line { " ", ui.Span(signs[change]):style(styles[change]) }
+			return ui.Line { " ", ui.Span(signs[code]):style(styles[code]) }
 		end
 	end, opts.order)
 end
 
 local function fetch(_, job)
-	local cwd = job.files[1].url:parent()
+	local cwd = job.files[1].url.base
 	local repo = root(cwd)
 	if not repo then
 		remove(tostring(cwd))
@@ -165,8 +183,8 @@ local function fetch(_, job)
 	end
 
 	local paths = {}
-	for _, f in ipairs(job.files) do
-		paths[#paths + 1] = tostring(f.url)
+	for _, file in ipairs(job.files) do
+		paths[#paths + 1] = tostring(file.url)
 	end
 
 	-- stylua: ignore
@@ -180,27 +198,28 @@ local function fetch(_, job)
 		return true, Err("Cannot spawn `git` command, error: %s", err)
 	end
 
-	local changed, ignored = {}, {}
+	local changed, excluded = {}, {}
 	for line in output.stdout:gmatch("[^\r\n]+") do
-		local sign, path = match(line)
-		if sign == 30 then
-			ignored[path] = sign
+		local code, path = match(line)
+		if code == CODES.excluded then
+			excluded[#excluded + 1] = path
 		else
-			changed[path] = sign
+			changed[path] = code
 		end
 	end
 
 	if job.files[1].cha.is_dir then
 		ya.dict_merge(changed, bubble_up(changed))
-		ya.dict_merge(changed, propagate_down(ignored, cwd, Url(repo)))
-	else
-		ya.dict_merge(changed, propagate_down(ignored, cwd, Url(repo)))
+	end
+	ya.dict_merge(changed, propagate_down(excluded, cwd, Url(repo)))
+
+	-- Reset the status of any files that don't appear in the output of `git status` to `unknown`,
+	-- so that cleaning up outdated statuses from `st.repos`
+	for _, path in ipairs(paths) do
+		local s = path:sub(#repo + 2)
+		changed[s] = changed[s] or CODES.unknown
 	end
 
-	for _, p in ipairs(paths) do
-		local s = p:sub(#repo + 2)
-		changed[s] = changed[s] or 0
-	end
 	add(tostring(cwd), repo, changed)
 
 	return false