Changing workflow to require explicit save after find git operation

Author: StanleyGoldman

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/GitPathView.cs

@@ -27,10 +27,12 @@ class GitPathView : Subview
         [SerializeField] private string gitExecParent;
         [SerializeField] private string gitExecExtension;
         [SerializeField] private string newGitExec;
+        [SerializeField] private bool isValueChanged;
+        [SerializeField] private bool isValueChangedAndFileExists;
+        [SerializeField] private string gitFileErrorMessage;
+        [SerializeField] private string gitVersionErrorMessage;
 
         [NonSerialized] private bool isBusy;
-        [NonSerialized] private string gitFileErrorMessage;
-        [NonSerialized] private string gitVersionErrorMessage;
         [NonSerialized] private bool gitExecHasChanged;
 
         public override void OnEnable()
@@ -61,7 +63,15 @@ public override void OnGUI()
                 // Install path field
                 GUILayout.BeginHorizontal();
                 {
-                    newGitExec = EditorGUILayout.TextField(PathToGit, newGitExec);
+                    EditorGUI.BeginChangeCheck();
+                    {
+                        newGitExec = EditorGUILayout.TextField(PathToGit, newGitExec);
+                    }
+
+                    if (EditorGUI.EndChangeCheck())
+                    {
+                        CheckEnteredGitPath();
+                    }
 
                     if (GUILayout.Button(BrowseButton, EditorStyles.miniButton, GUILayout.Width(25)))
                     {
@@ -89,20 +99,12 @@ public override void OnGUI()
 
                 GUILayout.BeginHorizontal();
                 {
-                    var isValueChanged = !string.IsNullOrEmpty(newGitExec)
-                        && newGitExec != gitExec;
-
-                    var isValueChangedAndFileExists = isValueChanged && newGitExec.ToNPath().FileExists();
-
-                    gitFileErrorMessage = isValueChanged && !isValueChangedAndFileExists
-                        ? ErrorInvalidPathMessage
-                        : null;
-
                     EditorGUI.BeginDisabledGroup(!isValueChangedAndFileExists);
                     {
                         if (GUILayout.Button(GitPathSaveButton, GUILayout.ExpandWidth(false)))
                         {
                             GUI.FocusControl(null);
+                            isBusy = true;
 
                             ValidateAndSetGitInstallPath(newGitExec);
                         }
@@ -115,6 +117,9 @@ public override void OnGUI()
                         GUI.FocusControl(null);
                         isBusy = true;
 
+                        newGitExec = gitExec;
+                        CheckEnteredGitPath();
+
                         new ProcessTask<NPath>(Manager.CancellationToken, new FirstLineIsPathOutputProcessor())
                             .Configure(Manager.ProcessManager, Environment.IsWindows ? "where" : "which", "git")
                             .FinallyInUI((success, ex, path) =>
@@ -137,8 +142,11 @@ public override void OnGUI()
 
                                 if (success)
                                 {
-                                    ValidateAndSetGitInstallPath(path);
+                                    newGitExec = path;
+                                    CheckEnteredGitPath();
                                 }
+
+                                isBusy = false;
                             }).Start();
                     }
                 }
@@ -165,6 +173,49 @@ public override void OnGUI()
             EditorGUI.EndDisabledGroup();
         }
 
+        private void MaybeUpdateData()
+        {
+            if (gitExecHasChanged)
+            {
+                if (Environment != null)
+                {
+                    if (gitExecExtension == null)
+                    {
+                        gitExecExtension = Environment.ExecutableExtension;
+
+                        if (Environment.IsWindows)
+                        {
+                            gitExecExtension = gitExecExtension.TrimStart('.');
+                        }
+                    }
+
+                    if (Environment.GitExecutablePath != null)
+                    {
+                        newGitExec = gitExec = Environment.GitExecutablePath.ToString();
+                        gitExecParent = Environment.GitExecutablePath.Parent.ToString();
+                    }
+
+                    if (gitExecParent == null)
+                    {
+                        gitExecParent = Environment.GitInstallPath;
+                    }
+                }
+
+                gitExecHasChanged = false;
+            }
+        }
+
+        private void CheckEnteredGitPath()
+        {
+            isValueChanged = !string.IsNullOrEmpty(newGitExec) && newGitExec != gitExec;
+
+            isValueChangedAndFileExists = isValueChanged && newGitExec.ToNPath().FileExists();
+
+            gitFileErrorMessage = isValueChanged && !isValueChangedAndFileExists ? ErrorInvalidPathMessage : null;
+
+            gitVersionErrorMessage = null;
+        }
+
         private void ValidateAndSetGitInstallPath(string value)
         {
             Logger.Trace("Validating Git Path:{0}", value);
@@ -225,37 +276,5 @@ private void ValidateAndSetGitInstallPath(string value)
 
             }).Start();
         }
-
-        private void MaybeUpdateData()
-        {
-            if (gitExecHasChanged)
-            {
-                if (Environment != null)
-                {
-                    if (gitExecExtension == null)
-                    {
-                        gitExecExtension = Environment.ExecutableExtension;
-
-                        if (Environment.IsWindows)
-                        {
-                            gitExecExtension = gitExecExtension.TrimStart('.');
-                        }
-                    }
-
-                    if (Environment.GitExecutablePath != null)
-                    {
-                        newGitExec = gitExec = Environment.GitExecutablePath.ToString();
-                        gitExecParent = Environment.GitExecutablePath.Parent.ToString();
-                    }
-
-                    if (gitExecParent == null)
-                    {
-                        gitExecParent = Environment.GitInstallPath;
-                    }
-                }
-
-                gitExecHasChanged = false;
-            }
-        }
     }
 }