Merge pull request #605 from github-for-unity/shana/kill-dead-code

Killing some unused code

Author: shana

src/GitHub.Api/Events/RepositoryWatcher.cs

@@ -169,12 +169,6 @@ private int ProcessEvents(Event[] fileEvents)
                 var eventDirectory = new NPath(fileEvent.Directory);
                 var fileA = eventDirectory.Combine(fileEvent.FileA);
 
-                NPath fileB = null;
-                if (fileEvent.FileB != null)
-                {
-                    fileB = eventDirectory.Combine(fileEvent.FileB);
-                }
-
                 // handling events in .git/*
                 if (fileA.IsChildOf(paths.DotGitPath))
                 {

src/GitHub.Api/Tasks/TaskBase.cs

@@ -33,8 +33,6 @@ public interface ITask : IAsyncResult
         ITask Start(TaskScheduler scheduler);
         ITask Progress(Action<IProgress> progressHandler);
 
-        void Wait();
-        bool Wait(int milliseconds);
         bool Successful { get; }
         string Errors { get; }
         Task Task { get; }
@@ -373,16 +371,6 @@ protected TaskBase GetTopMostTask(TaskBase ret, bool onlyCreatedState)
             return depends.GetTopMostTask(ret, onlyCreatedState);
         }
 
-        public virtual void Wait()
-        {
-            Task.Wait(Token);
-        }
-
-        public virtual bool Wait(int milliseconds)
-        {
-            return Task.Wait(milliseconds, Token);
-        }
-
         protected virtual void Run(bool success)
         {
         }
@@ -443,8 +431,8 @@ protected Exception GetThrownException()
 
             if (DependsOn.Task.Status == TaskStatus.Faulted)
             {
-                var exception = DependsOn.Task.Exception;
-                return exception?.InnerException ?? exception;
+                var ex = DependsOn.Task.Exception;
+                return ex?.InnerException ?? ex;
             }
             return DependsOn.GetThrownException();
         }
@@ -707,33 +695,6 @@ protected void RaiseOnData(TData data)
         }
     }
 
-    static class TaskBaseExtensions
-    {
-        public static T Schedule<T>(this T task, ITaskManager taskManager)
-            where T : ITask
-        {
-            return taskManager.Schedule(task);
-        }
-
-        public static T ScheduleUI<T>(this T task, ITaskManager taskManager)
-            where T : ITask
-        {
-            return taskManager.ScheduleUI(task);
-        }
-
-        public static T ScheduleExclusive<T>(this T task, ITaskManager taskManager)
-            where T : ITask
-        {
-            return taskManager.ScheduleExclusive(task);
-        }
-
-        public static T ScheduleConcurrent<T>(this T task, ITaskManager taskManager)
-            where T : ITask
-        {
-            return taskManager.ScheduleConcurrent(task);
-        }
-    }
-
     public enum TaskAffinity
     {
         Concurrent,

src/GitHub.Api/Tasks/TaskExtensions.cs

@@ -1,61 +1,11 @@
 using GitHub.Logging;
 using System;
-using System.Threading;
 using System.Threading.Tasks;
 
 namespace GitHub.Unity
 {
     static class TaskExtensions
     {
-        private static Task completedTask;
-
-        public static Task CompletedTask
-        {
-            get
-            {
-                if (completedTask == null)
-                {
-                    completedTask = TaskEx.FromResult(true);
-                }
-                return completedTask;
-            }
-        }
-
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "task")]
-        public static void Forget(this Task task)
-        {
-        }
-
-        public static async Task SafeAwait(this Task source, Action<Exception> handler = null)
-        {
-            try
-            {
-                await source;
-            }
-            catch (Exception ex)
-            {
-                LogHelper.GetLogger().Error(ex);
-                if (handler == null)
-                    throw;
-                handler(ex);
-            }
-        }
-
-        public static async Task<T> SafeAwait<T>(this Task<T> source, Func<Exception, T> handler = null)
-        {
-            try
-            {
-                return await source;
-            }
-            catch (Exception ex)
-            {
-                LogHelper.GetLogger().Error(ex);
-                if (handler == null)
-                    throw;
-                return handler(ex);
-            }
-        }
-
         public static async Task StartAwait(this ITask source, Action<Exception> handler = null)
         {
             try
@@ -86,41 +36,6 @@ public static async Task<T> StartAwait<T>(this ITask<T> source, Func<Exception,
             }
         }
 
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "task")]
-        public static void Forget(this ITask task)
-        {
-            task.Task.Forget();
-        }
-
-        //http://stackoverflow.com/a/29491927
-        public static Action<T> Debounce<T>(this Action<T> func, int milliseconds = 300)
-        {
-            var last = 0;
-            return arg =>
-            {
-                var current = Interlocked.Increment(ref last);
-                TaskEx.Delay(milliseconds).ContinueWith(task =>
-                {
-                    if (current == last) func(arg);
-                    task.Dispose();
-                });
-            };
-        }
-
-        public static Action Debounce(this Action func, int milliseconds = 300)
-        {
-            var last = 0;
-            return () =>
-            {
-                var current = Interlocked.Increment(ref last);
-                TaskEx.Delay(milliseconds).ContinueWith(task =>
-                {
-                    if (current == last) func();
-                    task.Dispose();
-                });
-            };
-        }
-
         public static ITask Then(this ITask task, Action continuation, TaskAffinity affinity = TaskAffinity.Concurrent, TaskRunOptions runOptions = TaskRunOptions.OnSuccess)
         {
             Guard.ArgumentNotNull(continuation, "continuation");
@@ -133,13 +48,6 @@ public static ITask Then(this ITask task, Action<bool> continuation, TaskAffinit
             return task.Then(new ActionTask(task.Token, continuation) { Affinity = affinity, Name = "Then" }, runOptions);
         }
 
-        public static ITask Then<T>(this ITask task, ActionTask<T> nextTask, T valueForNextTask, TaskAffinity affinity = TaskAffinity.Concurrent, TaskRunOptions runOptions = TaskRunOptions.OnSuccess)
-        {
-            Guard.ArgumentNotNull(nextTask, nameof(nextTask));
-            nextTask.PreviousResult = valueForNextTask;
-            return task.Then(nextTask, runOptions);
-        }
-
         public static ITask Then<T>(this ITask<T> task, Action<bool, T> continuation, TaskAffinity affinity = TaskAffinity.Concurrent, TaskRunOptions runOptions = TaskRunOptions.OnSuccess)
         {
             Guard.ArgumentNotNull(continuation, "continuation");
@@ -164,11 +72,6 @@ public static ITask<T> Then<T>(this ITask task, Task<T> continuation, TaskAffini
             return task.Then(cont, runOptions);
         }
 
-        public static ITask<T> Then<T>(this ITask task, Func<Task<T>> continuation, TaskAffinity affinity = TaskAffinity.Concurrent, TaskRunOptions runOptions = TaskRunOptions.OnSuccess)
-        {
-            return task.Then(continuation(), affinity, runOptions);
-        }
-
         public static ITask ThenInUI(this ITask task, Action continuation, TaskRunOptions runOptions = TaskRunOptions.OnSuccess)
         {
             return task.Then(continuation, TaskAffinity.UI, runOptions);
@@ -184,11 +87,6 @@ public static ITask ThenInUI<T>(this ITask<T> task, Action<bool, T> continuation
             return task.Then(continuation, TaskAffinity.UI, runOptions);
         }
 
-        public static ITask<T> ThenInUI<T>(this ITask task, Func<bool, T> continuation, TaskRunOptions runOptions = TaskRunOptions.OnSuccess)
-        {
-            return task.Then(continuation, TaskAffinity.UI, runOptions);
-        }
-
         public static ITask<TRet> ThenInUI<T, TRet>(this ITask<T> task, Func<bool, T, TRet> continuation, TaskRunOptions runOptions = TaskRunOptions.OnSuccess)
         {
             return task.Then(continuation, TaskAffinity.UI, runOptions);
@@ -200,27 +98,11 @@ public static ITask FinallyInUI<T>(this T task, Action<bool, Exception> continua
             return task.Finally(continuation, TaskAffinity.UI);
         }
 
-        public static ITask FinallyInUI<T>(this T task, Action continuation)
-            where T : ITask
-        {
-            return task.Finally((s, e) => continuation(), TaskAffinity.UI);
-        }
-
         public static ITask FinallyInUI<T>(this ITask<T> task, Action<bool, Exception, T> continuation)
         {
             return task.Finally(continuation, TaskAffinity.UI);
         }
 
-        public static ITask<T> FinallyInUI<T>(this ITask<T> task, Func<T> continuation)
-        {
-            return task.Finally((s, e, r) => continuation(), TaskAffinity.UI);
-        }
-
-        public static ITask<T> FinallyInUI<T>(this ITask<T> task, Func<bool, Exception, T, T> continuation)
-        {
-            return task.Finally(continuation, TaskAffinity.UI);
-        }
-
         public static Task<T> StartAsAsync<T>(this ITask<T> task)
         {
             var tcs = new TaskCompletionSource<T>();

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

@@ -68,7 +68,7 @@ public override void OnGUI()
                         {
                             isBusy = true;
                             Manager.InitializeRepository()
-                                   .FinallyInUI(() => isBusy = false)
+                                   .FinallyInUI((s, e) => isBusy = false)
                                    .Start();
                         }
                     }