Fix the rest of the end handlers, cleanup code, and put the asset menus after a separator

Author: shana

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

@@ -1,8 +1,10 @@
+using System;
 using GitHub.Logging;
 using System.Collections.Generic;
 using System.Linq;
 using UnityEditor;
 using UnityEngine;
+using Object = UnityEngine.Object;
 
 namespace GitHub.Unity
 {
@@ -81,138 +83,96 @@ private static void RepositoryOnLocksChanged(CacheUpdateEvent cacheUpdateEvent)
             }
         }
 
-        [MenuItem(AssetsMenuRequestLock, true)]
+        [MenuItem(AssetsMenuRequestLock, true, 10000)]
         private static bool ContextMenu_CanLock()
         {
             if (!EnsureInitialized())
                 return false;
             if (isBusy)
                 return false;
-
             return Selection.objects.Any(IsObjectUnlocked);
         }
 
-        private static bool IsObjectUnlocked(Object selected)
+        [MenuItem(AssetsMenuReleaseLock, true, 10001)]
+        private static bool ContextMenu_CanUnlock()
         {
-            if (selected == null)
+            if (!EnsureInitialized())
                 return false;
-
-            NPath assetPath = AssetDatabase.GetAssetPath(selected.GetInstanceID()).ToNPath();
-            NPath repositoryPath = manager.Environment.GetRepositoryPath(assetPath);
-
-            var alreadyLocked = locks.Any(x => repositoryPath == x.Path);
-            GitFileStatus status = GitFileStatus.None;
-            if (entries != null)
-            {
-                status = entries.FirstOrDefault(x => repositoryPath == x.Path.ToNPath()).Status;
-            }
-
-            return !alreadyLocked && status != GitFileStatus.Untracked && status != GitFileStatus.Ignored;
-        }
-
-        [MenuItem(AssetsMenuRequestLock)]
-        private static void ContextMenu_Lock()
-        {
-            isBusy = true;
-
-            var unlockedObjects = Selection.objects.Where(IsObjectUnlocked).ToArray();
-            var tasks = unlockedObjects.Select(CreateLockObjectTask).ToArray();
-
-            var taskQueue = new TaskQueue();
-            foreach (var task in tasks)
-            {
-                taskQueue.Queue(task);
-            }
-
-            taskQueue.FinallyInUI((success, exception) =>
-            {
-                if (!success)
-                {
-                    var error = exception.Message;
-                    if (error.Contains("exit status 255"))
-                        error = "Failed to lock: no permissions";
-                    EditorUtility.DisplayDialog(Localization.RequestLockActionTitle,
-                        error,
-                        Localization.Ok);
-                }
-
-                isBusy = false;
-                Selection.activeGameObject = null;
-            }).Start();
-        }
-
-        private static ITask CreateLockObjectTask(Object selected)
-        {
-            NPath assetPath = AssetDatabase.GetAssetPath(selected.GetInstanceID()).ToNPath();
-            NPath repositoryPath = manager.Environment.GetRepositoryPath(assetPath);
-
-            var task = Repository.RequestLock(repositoryPath);
-            task.OnEnd += (_, s, ___) => { if (s) manager.TaskManager.Run(manager.UsageTracker.IncrementUnityProjectViewContextLfsLock, null); };
-            return task;
+            if (isBusy)
+                return false;
+            return Selection.objects.Any(IsObjectLocked);
         }
 
-        [MenuItem(AssetsMenuReleaseLock, true, 1000)]
-        private static bool ContextMenu_CanUnlock()
+        [MenuItem(AssetsMenuReleaseLockForced, true, 10002)]
+        private static bool ContextMenu_CanUnlockForce()
         {
             if (!EnsureInitialized())
                 return false;
             if (isBusy)
                 return false;
-
             return Selection.objects.Any(IsObjectLocked);
         }
 
-        private static bool IsObjectLocked(Object selected)
+        [MenuItem(AssetsMenuRequestLock, false, 10000)]
+        private static void ContextMenu_Lock()
         {
-            if (selected == null)
-                return false;
-
-            NPath assetPath = AssetDatabase.GetAssetPath(selected.GetInstanceID()).ToNPath();
-            NPath repositoryPath = manager.Environment.GetRepositoryPath(assetPath);
-
-            return locks.Any(x => repositoryPath == x.Path);
+            RunLockUnlock(IsObjectUnlocked, CreateLockObjectTask, Localization.RequestLockActionTitle, "Failed to lock: no permissions");
         }
 
-        [MenuItem(AssetsMenuReleaseLock, false, 1000)]
+        [MenuItem(AssetsMenuReleaseLockForced, false, 10001)]
         private static void ContextMenu_Unlock()
         {
-            isBusy = true;
+            RunLockUnlock(IsObjectLocked, x => CreateUnlockObjectTask(x, false), Localization.ReleaseLockActionTitle, "Failed to unlock: no permissions");
+        }
 
-            var lockedObjects = Selection.objects.Where(IsObjectLocked).ToArray();
-            var tasks = lockedObjects.Select(o => CreateUnlockObjectTask(o, false)).ToArray();
+        [MenuItem(AssetsMenuReleaseLockForced, false, 10002)]
+        private static void ContextMenu_UnlockForce()
+        {
+            RunLockUnlock(IsObjectLocked, x => CreateUnlockObjectTask(x, true), Localization.ReleaseLockActionTitle, "Failed to unlock: no permissions");
+        }
 
+        private static void RunLockUnlock(Func<Object, bool> selector, Func<Object, ITask> creator, string title, string errorMessage)
+        {
+            isBusy = true;
             var taskQueue = new TaskQueue();
-            foreach (var task in tasks)
+            foreach (var lockedObject in Selection.objects.Where(selector))
             {
-                taskQueue.Queue(task);
+                taskQueue.Queue(creator(lockedObject));
             }
-
             taskQueue.FinallyInUI((success, exception) =>
             {
                 if (!success)
                 {
                     var error = exception.Message;
                     if (error.Contains("exit status 255"))
-                        error = "Failed to unlock: no permissions";
-                    EditorUtility.DisplayDialog(Localization.RequestLockActionTitle,
-                        error,
-                        Localization.Ok);
+                        error = errorMessage;
+                    EditorUtility.DisplayDialog(title, error, Localization.Ok);
                 }
-
                 isBusy = false;
-                Selection.activeGameObject = null;
-            }).Start();
+            });
+            taskQueue.Start();
         }
 
-        [MenuItem(AssetsMenuReleaseLockForced, true, 1000)]
-        private static bool ContextMenu_CanUnlockForce()
+        private static bool IsObjectUnlocked(Object selected)
         {
-            if (!EnsureInitialized())
-                return false;
-            if (isBusy)
+            if (selected == null)
                 return false;
 
-            var selected = Selection.activeObject;
+            NPath assetPath = AssetDatabase.GetAssetPath(selected.GetInstanceID()).ToNPath();
+            NPath repositoryPath = manager.Environment.GetRepositoryPath(assetPath);
+
+            var alreadyLocked = locks.Any(x => repositoryPath == x.Path);
+            GitFileStatus status = GitFileStatus.None;
+            if (entries != null)
+            {
+                status = entries.FirstOrDefault(x => repositoryPath == x.Path.ToNPath()).Status;
+            }
+
+            return !alreadyLocked && status != GitFileStatus.Untracked && status != GitFileStatus.Ignored;
+        }
+
+        private static bool IsObjectLocked(Object selected)
+        {
             if (selected == null)
                 return false;
 
@@ -222,40 +182,24 @@ private static bool ContextMenu_CanUnlockForce()
             return locks.Any(x => repositoryPath == x.Path);
         }
 
-        [MenuItem(AssetsMenuReleaseLockForced, false, 1000)]
-        private static void ContextMenu_UnlockForce()
+        private static ITask CreateUnlockObjectTask(Object selected, bool force)
         {
-            isBusy = true;
-
-            var lockedObjects = Selection.objects.Where(IsObjectLocked).ToArray();
-            var tasks = lockedObjects.Select(o => CreateUnlockObjectTask(o, true)).ToArray();
-
-            var taskQueue = new TaskQueue();
-            foreach (var task in tasks)
-            {
-                taskQueue.Queue(task);
-            }
+            NPath assetPath = AssetDatabase.GetAssetPath(selected.GetInstanceID()).ToNPath();
+            NPath repositoryPath = manager.Environment.GetRepositoryPath(assetPath);
 
-            taskQueue.FinallyInUI((success, exception) =>
-            {
-                isBusy = false;
-                Selection.activeGameObject = null;
-            }).Start();
+            var task = Repository.ReleaseLock(repositoryPath, force);
+            task.OnEnd += (_, s, __) => { if (s) manager.TaskManager.Run(manager.UsageTracker.IncrementUnityProjectViewContextLfsUnlock, null); };
+            return task;
         }
 
-        private static ITask CreateUnlockObjectTask(Object selected, bool force)
+        private static ITask CreateLockObjectTask(Object selected)
         {
             NPath assetPath = AssetDatabase.GetAssetPath(selected.GetInstanceID()).ToNPath();
             NPath repositoryPath = manager.Environment.GetRepositoryPath(assetPath);
 
-            return Repository.ReleaseLock(repositoryPath, force)
-                      .FinallyInUI((success, ex) =>
-                      {
-                          if (success)
-                          {
-                              manager.TaskManager.Run(manager.UsageTracker.IncrementUnityProjectViewContextLfsUnlock, null);
-                          }
-                      });
+            var task = Repository.RequestLock(repositoryPath);
+            task.OnEnd += (_, s, ___) => { if (s) manager.TaskManager.Run(manager.UsageTracker.IncrementUnityProjectViewContextLfsLock, null); };
+            return task;
         }
 
         private static void OnLocksUpdate()