fix: git markers disappearing from tabs when files are staged

Author: devvaannsh

src/extensions/default/Git/src/TabBarIntegration.js

@@ -28,13 +28,11 @@ define(function (require) {
         if (!status) {
             return false;
         }
-        return (
-            status.some(
-                (statusType) =>
-                    statusType === Git.FILE_STATUS.MODIFIED ||
-                    statusType === Git.FILE_STATUS.RENAMED ||
-                    statusType === Git.FILE_STATUS.COPIED
-            ) && !status.includes(Git.FILE_STATUS.STAGED)
+        return status.some(
+            (statusType) =>
+                statusType === Git.FILE_STATUS.MODIFIED ||
+                statusType === Git.FILE_STATUS.RENAMED ||
+                statusType === Git.FILE_STATUS.COPIED
         );
     }
 
@@ -50,7 +48,11 @@ define(function (require) {
             return false;
         }
 
-        return status.includes(Git.FILE_STATUS.UNTRACKED);
+        // return true if it's untracked or if it's newly added (which means it was untracked before staging)
+        return (
+            status.includes(Git.FILE_STATUS.UNTRACKED) ||
+            (status.includes(Git.FILE_STATUS.ADDED) && status.includes(Git.FILE_STATUS.STAGED))
+        );
     }
 
 

src/extensionsIntegrated/TabBar/main.js

@@ -133,7 +133,6 @@ define(function (require, exports, module) {
 
         let gitStatus = ""; // this will be shown in the tooltip when a tab is hovered
         let gitStatusClass = ""; // for styling
-        let gitStatusLetter = ""; // shown in the tab, either U or M
 
         if (window.phoenixGitEvents && window.phoenixGitEvents.TabBarIntegration) {
             const TabBarIntegration = window.phoenixGitEvents.TabBarIntegration;
@@ -144,11 +143,9 @@ define(function (require, exports, module) {
             if (TabBarIntegration.isUntracked(entry.path)) {
                 gitStatus = "Untracked";
                 gitStatusClass = "git-new";
-                gitStatusLetter = "U";
             } else if (TabBarIntegration.isModified(entry.path)) {
                 gitStatus = "Modified";
                 gitStatusClass = "git-modified";
-                gitStatusLetter = "M";
             }
         }