fix: correct the glob pattern for the icons to fit the new matching a…

…lgorithm (#959)
sxyazi · Apr 26, 2024 · 681612f · 681612f
1 parent 42a0fcd
commit 681612f
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 27 deletions.
diff --git a/yazi-config/preset/theme.toml b/yazi-config/preset/theme.toml
@@ -304,36 +304,36 @@ rules = [
 	{ name = "*.pkg", text = "", fg = "#9F0500" },
 
 	# Dotfiles
-	{ name = ".DS_Store"     , text = "", fg = "#41535b" },
-	{ name = ".bashprofile"  , text = "", fg = "#89e051" },
-	{ name = ".bashrc"       , text = "", fg = "#89e051" },
-	{ name = ".gitattributes", text = "", fg = "#41535b" },
-	{ name = ".gitignore"    , text = "", fg = "#41535b" },
-	{ name = ".gitmodules"   , text = "", fg = "#41535b" },
-	{ name = ".vimrc"        , text = "", fg = "#019833" },
-	{ name = ".zprofile"     , text = "", fg = "#89e051" },
-	{ name = ".zshenv"       , text = "", fg = "#89e051" },
-	{ name = ".zshrc"        , text = "", fg = "#89e051" },
+	{ name = "*/.DS_Store"     , text = "", fg = "#41535b" },
+	{ name = "*/.bash_profile" , text = "", fg = "#89e051" },
+	{ name = "*/.bashrc"       , text = "", fg = "#89e051" },
+	{ name = "*/.gitattributes", text = "", fg = "#41535b" },
+	{ name = "*/.gitignore"    , text = "", fg = "#41535b" },
+	{ name = "*/.gitmodules"   , text = "", fg = "#41535b" },
+	{ name = "*/.vimrc"        , text = "", fg = "#019833" },
+	{ name = "*/.zprofile"     , text = "", fg = "#89e051" },
+	{ name = "*/.zshenv"       , text = "", fg = "#89e051" },
+	{ name = "*/.zshrc"        , text = "", fg = "#89e051" },
 
 	# Named files
-	{ name = "COPYING"      , text = "󰿃", fg = "#cbcb41" },
-	{ name = "Containerfile", text = "󰡨", fg = "#458ee6" },
-	{ name = "Dockerfile"   , text = "󰡨", fg = "#458ee6" },
-	{ name = "LICENSE"      , text = "󰿃", fg = "#d0bf41" },
+	{ name = "*/COPYING"      , text = "󰿃", fg = "#cbcb41" },
+	{ name = "*/Containerfile", text = "󰡨", fg = "#458ee6" },
+	{ name = "*/Dockerfile"   , text = "󰡨", fg = "#458ee6" },
+	{ name = "*/LICENSE"      , text = "󰿃", fg = "#d0bf41" },
 
 	# Directories
-	{ name = ".config/"    , text = "" },
-	{ name = ".git/"       , text = "" },
-	{ name = "Desktop/"    , text = "" },
-	{ name = "Development/", text = "" },
-	{ name = "Documents/"  , text = "" },
-	{ name = "Downloads/"  , text = "" },
-	{ name = "Library/"    , text = "" },
-	{ name = "Movies/"     , text = "" },
-	{ name = "Music/"      , text = "" },
-	{ name = "Pictures/"   , text = "" },
-	{ name = "Public/"     , text = "" },
-	{ name = "Videos/"     , text = "" },
+	{ name = "*/.config/"    , text = "" },
+	{ name = "*/.git/"       , text = "" },
+	{ name = "*/Desktop/"    , text = "" },
+	{ name = "*/Development/", text = "" },
+	{ name = "*/Documents/"  , text = "" },
+	{ name = "*/Downloads/"  , text = "" },
+	{ name = "*/Library/"    , text = "" },
+	{ name = "*/Movies/"     , text = "" },
+	{ name = "*/Music/"      , text = "" },
+	{ name = "*/Pictures/"   , text = "" },
+	{ name = "*/Public/"     , text = "" },
+	{ name = "*/Videos/"     , text = "" },
 
 	# Default
 	{ name = "*" , text = "" },

diff --git a/yazi-config/src/pattern.rs b/yazi-config/src/pattern.rs
@@ -36,7 +36,7 @@ impl TryFrom<&str> for Pattern {
 
 		let inner = GlobBuilder::new(b)
 			.case_insensitive(a.len() == s.len())
-			.literal_separator(b.contains('/'))
+			.literal_separator(false)
 			.backslash_escape(false)
 			.empty_alternates(false)
 			.build()?