Replaced EditorCoroutines with FileWatcher and GitStatus classes.

Author: neogeek

Assets/Plugins/CandyCoded.GitStatus/Scripts/CustomEditor/GitStatusPanel.cs

@@ -2,10 +2,7 @@
 
 #if UNITY_EDITOR
 using System;
-using System.Collections;
-using Unity.EditorCoroutines.Editor;
 using UnityEditor;
-using UnityEditorInternal;
 using UnityEngine;
 
 namespace CandyCoded.GitStatus
@@ -14,22 +11,6 @@ namespace CandyCoded.GitStatus
     public class GitStatusPanel : EditorWindow
     {
 
-        private readonly EditorWaitForSeconds _delayBetweenUpdates = new EditorWaitForSeconds(60);
-
-        private string _branch;
-
-        private string[] _branches;
-
-        private string[] _changedFiles;
-
-        private string[] _untrackedFiles;
-
-        private DateTime _lastUpdated;
-
-        private EditorCoroutine _coroutine;
-
-        private bool _isEditorFocused;
-
         [MenuItem("Git/Git Status")]
         public static void ShowWindow()
         {
@@ -38,120 +19,50 @@ public static void ShowWindow()
 
         }
 
-        private void Update()
-        {
-
-            if (InternalEditorUtility.isApplicationActive && !_isEditorFocused)
-            {
-
-                UpdateData();
-
-            }
-
-            _isEditorFocused = InternalEditorUtility.isApplicationActive;
-
-        }
-
         private void OnGUI()
         {
 
             GUILayout.Space(5);
 
-            var selectedBranch = Array.IndexOf(_branches, _branch);
+            var selectedBranch = Array.IndexOf(GitStatus.branches, GitStatus.branch);
 
-            selectedBranch = EditorGUILayout.Popup("Branch:", selectedBranch, _branches);
+            selectedBranch = EditorGUILayout.Popup("Branch:", selectedBranch, GitStatus.branches);
 
-            if (!_branches[selectedBranch].Equals(_branch))
+            if (!GitStatus.branches[selectedBranch].Equals(GitStatus.branch))
             {
 
-                if (_changedFiles?.Length > 0)
+                if (GitStatus.changedFiles?.Length > 0)
                 {
 
                     EditorUtility.DisplayDialog(
                         "Unable to checkout branch",
-                        $"Unable to checkout {_branches[selectedBranch]} as with {_changedFiles?.Length} changes. " +
+                        $"Unable to checkout {GitStatus.branches[selectedBranch]} as with {GitStatus.changedFiles?.Length} changes. " +
                         "Commit, discard or stash before checking out a different branch.",
                         "Ok");
 
                 }
                 else
                 {
 
-                    Git.CheckoutBranch(_branches[selectedBranch]);
-
-                    _branch = _branches[selectedBranch];
+                    Git.CheckoutBranch(GitStatus.branches[selectedBranch]);
 
                 }
 
             }
 
-            GUILayout.Label($"Number of Changes: {_changedFiles?.Length}");
-            GUILayout.Label($"Untracked Files: {_untrackedFiles?.Length}");
-            GUILayout.Label($"Last Updated: {_lastUpdated}");
+            GUILayout.Label($"Number of Changes: {GitStatus.changedFiles?.Length}");
+            GUILayout.Label($"Untracked Files: {GitStatus.untrackedFiles?.Length}");
+            GUILayout.Label($"Last Updated: {GitStatus.lastUpdated}");
 
             if (GUILayout.Button("Refresh"))
             {
 
-                UpdateData();
+                GitStatus.Update();
 
             }
 
         }
 
-        private void UpdateData()
-        {
-
-            _branch = Git.Branch();
-
-            _branches = Git.Branches();
-
-            _changedFiles = Git.ChangedFiles();
-
-            _untrackedFiles = Git.UntrackedFiles();
-
-            _lastUpdated = DateTime.Now;
-
-            Repaint();
-
-        }
-
-        private IEnumerator UpdateCoroutine()
-        {
-
-            while (true)
-            {
-
-                UpdateData();
-
-                yield return _delayBetweenUpdates;
-
-            }
-
-        }
-
-        private void OnEnable()
-        {
-
-            _coroutine = EditorCoroutineUtility.StartCoroutine(UpdateCoroutine(), this);
-
-        }
-
-        private void OnDisable()
-        {
-
-            EditorCoroutineUtility.StopCoroutine(_coroutine);
-
-            _coroutine = null;
-
-        }
-
-        private void OnFocus()
-        {
-
-            UpdateData();
-
-        }
-
     }
 
 }

Assets/Plugins/CandyCoded.GitStatus/Scripts/CustomEditor/ProjectPanel.cs

@@ -16,20 +16,12 @@ public class ProjectPanel : AssetPostprocessor
 
         private const float ICON_PADDING = 2;
 
-        private static string[] _changedFiles;
-
-        private static string[] _untrackedFiles;
-
         static ProjectPanel()
         {
 
             EditorApplication.projectWindowItemOnGUI -= ProjectWindowItemOnGui;
             EditorApplication.projectWindowItemOnGUI += ProjectWindowItemOnGui;
 
-            _changedFiles = Git.ChangedFiles();
-
-            _untrackedFiles = Git.UntrackedFiles();
-
         }
 
         private static void ProjectWindowItemOnGui(string guid, Rect selectionRect)
@@ -59,13 +51,13 @@ private static void ProjectWindowItemOnGui(string guid, Rect selectionRect)
                 iconSize - ICON_PADDING,
                 iconSize - ICON_PADDING);
 
-            if (_changedFiles.Contains(path))
+            if (GitStatus.changedFiles.Contains(path))
             {
 
                 GUI.DrawTexture(rect, GitIcons.Changed, ScaleMode.ScaleToFit);
 
             }
-            else if (_untrackedFiles.Contains(path))
+            else if (GitStatus.untrackedFiles.Contains(path))
             {
 
                 GUI.DrawTexture(rect, GitIcons.Untracked, ScaleMode.ScaleToFit);
@@ -74,19 +66,6 @@ private static void ProjectWindowItemOnGui(string guid, Rect selectionRect)
 
         }
 
-        private static void OnPostprocessAllAssets(
-            string[] importedAssets,
-            string[] deletedAssets,
-            string[] movedAssets,
-            string[] movedFromAssetPaths)
-        {
-
-            _changedFiles = Git.ChangedFiles();
-
-            _untrackedFiles = Git.UntrackedFiles();
-
-        }
-
     }
 
 }

Assets/Plugins/CandyCoded.GitStatus/package.json

@@ -6,9 +6,6 @@
   "unityRelease": "13f1",
   "description": "Unity editor panel that displays the current git status.",
   "license": "MIT",
-  "dependencies": {
-    "com.unity.editorcoroutines": "0.0.2-preview.1"
-  },
   "keywords": [
     "unity",
     "editor",

Packages/manifest.json

@@ -1,6 +1,5 @@
 {
   "dependencies": {
-    "com.unity.editorcoroutines": "0.0.2-preview.1",
     "com.unity.ide.rider": "1.1.1",
     "com.unity.test-framework": "1.1.3"
   }