Bugfix for not showing badge/tooltip from parents

Author: j3lte

CHANGELOG.md

@@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 > Nothing at the moment
 
+## 0.1.2 - (2024-08-10)
+
+- Bugfix: Fixed issue where badge/tooltip are not shown from parent folders
+
 ## 0.1.1 - (2024-08-09)
 
 - Updated README, better documentation

package.json

@@ -3,7 +3,7 @@
   "displayName": "Folder Customization",
   "publisher": "j3lte",
   "description": "Customize your folder and subfolders based on a specific path. Set a color, text badge, emoji badge or tooltip for any folder in your workspace.",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "license": "MIT",
   "icon": "resources/images/icon.png",
   "galleryBanner": {

src/tools/folder-customization-provider.ts

@@ -84,17 +84,21 @@ export class FolderCustomizationProvider implements FileDecorationProvider {
       .sort((a, b) => b.path.length - a.path.length);
 
     const firstMatchWithColor = matchFolders.find((folder) => folder.color);
+    const firstMatchWithBadge = matchFolders.find((folder) => folder.badge);
+    const firstMatchWithTooltip = matchFolders.find((folder) => folder.tooltip);
+
     const firstMatch = matchFolders[0];
 
     if (firstMatch) {
-      // We find the color from the first match with a color
       const color = firstMatch.color && !isUriChanged ? firstMatch.color : undefined;
-      // We might have a color up the tree (parent)
-      const possibleColor = firstMatchWithColor?.color;
-      // We set the color to either the first match or the possible color, if the uri has not changed (git)
-      const fileDecorationColor = !isUriChanged ? color || possibleColor : undefined;
+      const fileDecorationColor = !isUriChanged ? color || firstMatchWithColor?.color : undefined;
       const themeColor = fileDecorationColor ? new ThemeColor(fileDecorationColor) : undefined;
-      return new FileDecoration(firstMatch.badge, firstMatch.tooltip, themeColor);
+
+      return new FileDecoration(
+        firstMatch.badge || firstMatchWithBadge?.badge,
+        firstMatch.tooltip || firstMatchWithTooltip?.tooltip,
+        themeColor,
+      );
     }
 
     return undefined;