Fix file formattings

awaescher · Jan 2, 2021 · 41853aa · 41853aa
1 parent c324066
commit 41853aa
Show file tree

Hide file tree

Showing 29 changed files with 475 additions and 514 deletions.
diff --git a/RepoZ.Api.Common/Common/FileAppSettingsService.cs b/RepoZ.Api.Common/Common/FileAppSettingsService.cs
@@ -9,15 +9,15 @@ namespace RepoZ.Api.Common.Common
 {
 	public class FileAppSettingsService : IAppSettingsService
 	{
-        private AppSettings _settings;
-        private readonly List<Action> _invalidationHandlers = new List<Action>();
+		private AppSettings _settings;
+		private readonly List<Action> _invalidationHandlers = new List<Action>();
 
-        public FileAppSettingsService(IAppDataPathProvider appDataPathProvider)
+		public FileAppSettingsService(IAppDataPathProvider appDataPathProvider)
 		{
 			AppDataPathProvider = appDataPathProvider ?? throw new ArgumentNullException(nameof(appDataPathProvider));
 		}
 
-        private AppSettings Load()
+		private AppSettings Load()
 		{
 			string file = GetFileName();
 
@@ -49,7 +49,7 @@ private void Save()
 			catch { /* Our app settings are not critical. For our purposes, we want to ignore IO exceptions */ }
 		}
 
-		private string GetFileName() =>  Path.Combine(AppDataPathProvider.GetAppDataPath(), "appsettings.json");
+		private string GetFileName() => Path.Combine(AppDataPathProvider.GetAppDataPath(), "appsettings.json");
 
 		public IAppDataPathProvider AppDataPathProvider { get; }
 
@@ -69,25 +69,25 @@ public AutoFetchMode AutoFetchMode
 			get => Settings.AutoFetchMode;
 			set
 			{
-                if (value != Settings.AutoFetchMode)
-                {
-                    Settings.AutoFetchMode = value;
+				if (value != Settings.AutoFetchMode)
+				{
+					Settings.AutoFetchMode = value;
 
-                    NotifyChange();
-                    Save();
-                }
+					NotifyChange();
+					Save();
+				}
 			}
 		}
 
-        public void RegisterInvalidationHandler(Action handler)
-        {
-            _invalidationHandlers.Add(handler);
-        }
+		public void RegisterInvalidationHandler(Action handler)
+		{
+			_invalidationHandlers.Add(handler);
+		}
 
-        public void NotifyChange()
-        {
-            _invalidationHandlers.ForEach(h => h.Invoke());
-        }
+		public void NotifyChange()
+		{
+			_invalidationHandlers.ForEach(h => h.Invoke());
+		}
 
-    }
+	}
 }
diff --git a/RepoZ.Api.Common/Common/IAppSettingsService.cs b/RepoZ.Api.Common/Common/IAppSettingsService.cs
@@ -7,6 +7,6 @@ public interface IAppSettingsService
 	{
 		AutoFetchMode AutoFetchMode { get; set; }
 
-        void RegisterInvalidationHandler(Action handler);
+		void RegisterInvalidationHandler(Action handler);
 	}
 }
diff --git a/RepoZ.Api.Common/Common/ITranslationService.cs b/RepoZ.Api.Common/Common/ITranslationService.cs
@@ -1,12 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace RepoZ.Api.Common.Common
+namespace RepoZ.Api.Common.Common
 {
 	public interface ITranslationService
 	{
 		string Translate(string value);
-        string Translate(string value, params object[] args);
-    }
+		string Translate(string value, params object[] args);
+	}
 }
diff --git a/RepoZ.Api.Common/Git/AutoFetch/DefaultAutoFetchHandler.cs b/RepoZ.Api.Common/Git/AutoFetch/DefaultAutoFetchHandler.cs
@@ -7,19 +7,19 @@
 
 namespace RepoZ.Api.Common.Git.AutoFetch
 {
-    public class DefaultAutoFetchHandler : IAutoFetchHandler
-    {
-        private bool _active;
-        private AutoFetchMode? _mode = null;
+	public class DefaultAutoFetchHandler : IAutoFetchHandler
+	{
+		private bool _active;
+		private AutoFetchMode? _mode = null;
 		private readonly Timer _timer;
 		private readonly Dictionary<AutoFetchMode, AutoFetchProfile> _profiles;
 		private int _lastFetchRepository = -1;
 
-        public DefaultAutoFetchHandler(IAppSettingsService appSettingsService,
+		public DefaultAutoFetchHandler(IAppSettingsService appSettingsService,
 			IRepositoryInformationAggregator repositoryInformationAggregator,
 			IRepositoryWriter repositoryWriter)
-        {
-            AppSettingsService = appSettingsService ?? throw new ArgumentNullException(nameof(appSettingsService));
+		{
+			AppSettingsService = appSettingsService ?? throw new ArgumentNullException(nameof(appSettingsService));
 			RepositoryInformationAggregator = repositoryInformationAggregator ?? throw new ArgumentNullException(nameof(repositoryInformationAggregator));
 			RepositoryWriter = repositoryWriter ?? throw new ArgumentNullException(nameof(repositoryWriter));
 			AppSettingsService.RegisterInvalidationHandler(() => Mode = AppSettingsService.AutoFetchMode);
@@ -99,34 +99,34 @@ private void FetchNext(object timerState)
 			}
 		}
 
-        public bool Active
-        {
-            get => _active;
-            set
-            {
-                _active = value;
+		public bool Active
+		{
+			get => _active;
+			set
+			{
+				_active = value;
 
 				if (value && _mode == null)
-                    Mode = AppSettingsService.AutoFetchMode;
+					Mode = AppSettingsService.AutoFetchMode;
 
 				UpdateBehavior();
 			}
-        }
+		}
 
-        public AutoFetchMode Mode
-        {
-            get => _mode ?? AutoFetchMode.Off;
-            set
-            {
-                if (value == _mode)
-                    return;
+		public AutoFetchMode Mode
+		{
+			get => _mode ?? AutoFetchMode.Off;
+			set
+			{
+				if (value == _mode)
+					return;
 
 				_mode = value;
 				Console.WriteLine("Auto fetch is: " + _mode.GetValueOrDefault().ToString());
 
-				UpdateBehavior(); 
-            }
-        }
+				UpdateBehavior();
+			}
+		}
 
 		public IAppSettingsService AppSettingsService { get; }
 

diff --git a/RepoZ.Api.Common/Git/AutoFetch/IAutoFetchHandler.cs b/RepoZ.Api.Common/Git/AutoFetch/IAutoFetchHandler.cs
@@ -1,7 +1,7 @@
 namespace RepoZ.Api.Common.Git.AutoFetch
 {
-    public interface IAutoFetchHandler
-    {
-        bool Active { get; set; }
-    }
+	public interface IAutoFetchHandler
+	{
+		bool Active { get; set; }
+	}
 }
diff --git a/RepoZ.Api.Common/Git/ProcessExecution/GitCommandException.cs b/RepoZ.Api.Common/Git/ProcessExecution/GitCommandException.cs
@@ -1,11 +1,10 @@
 using System;
-using System.Diagnostics;
 
 namespace RepoZ.Api.Common.Git.ProcessExecution
 {
 	public class GitCommandException : Exception
 	{
-        public GitCommandException() : base()
+		public GitCommandException() : base()
 		{
 		}
 

diff --git a/RepoZ.Api.Common/Git/ProcessExecution/ProcessExecutingGitCommander.cs b/RepoZ.Api.Common/Git/ProcessExecution/ProcessExecutingGitCommander.cs
@@ -128,8 +128,8 @@ protected virtual string Start(Api.Git.Repository repository, string[] command,
 			var error = new StringBuilder();
 
 			using (var outputWaitHandle = new AutoResetEvent(initialState: false))
-            using (var errorWaitHandle = new AutoResetEvent(initialState: false))
-            using (var process = new Process())
+			using (var errorWaitHandle = new AutoResetEvent(initialState: false))
+			using (var process = new Process())
 			{
 				process.StartInfo = psi;
 

diff --git a/RepoZ.Api.Win/Git/WindowsRepositoryActionProvider.cs b/RepoZ.Api.Win/Git/WindowsRepositoryActionProvider.cs
@@ -45,10 +45,10 @@ public RepositoryAction GetSecondaryAction(Repository repository)
 			return CreateProcessRunnerAction(_translationService.Translate("Open in Windows PowerShell"), "powershell.exe ", $"-executionpolicy bypass -noexit -command \"Set-Location '{repository.SafePath}'\"");
 		}
 
- 		public IEnumerable<RepositoryAction> GetContextMenuActions(IEnumerable<Repository> repositories)
-        {
-            return GetContextMenuActionsInternal(repositories.Where(r => Directory.Exists(r.SafePath))).Where(a => a != null);
-        }
+		public IEnumerable<RepositoryAction> GetContextMenuActions(IEnumerable<Repository> repositories)
+		{
+			return GetContextMenuActionsInternal(repositories.Where(r => Directory.Exists(r.SafePath))).Where(a => a != null);
+		}
 
 		private IEnumerable<RepositoryAction> GetContextMenuActionsInternal(IEnumerable<Repository> repositories)
 		{
@@ -84,15 +84,15 @@ private IEnumerable<RepositoryAction> GetContextMenuActionsInternal(IEnumerable<
 				yield return new RepositoryAction()
 				{
 					Name = _translationService.Translate("Checkout"),
-					DeferredSubActionsEnumerator =() => singleRepository.LocalBranches
-															.Take(50)
-															.Select(branch => new RepositoryAction()
-															{
-																Name = branch,
-																Action = (_, __) => _repositoryWriter.Checkout(singleRepository, branch),
-																CanExecute = !singleRepository.CurrentBranch.Equals(branch, StringComparison.OrdinalIgnoreCase)
-															})
-															.ToArray()
+					DeferredSubActionsEnumerator = () => singleRepository.LocalBranches
+															 .Take(50)
+															 .Select(branch => new RepositoryAction()
+															 {
+																 Name = branch,
+																 Action = (_, __) => _repositoryWriter.Checkout(singleRepository, branch),
+																 CanExecute = !singleRepository.CurrentBranch.Equals(branch, StringComparison.OrdinalIgnoreCase)
+															 })
+															 .ToArray()
 				};
 			}
 

diff --git a/RepoZ.Api.Win/PInvoke/Combridge.cs b/RepoZ.Api.Win/PInvoke/Combridge.cs
@@ -74,7 +74,7 @@ public T GetPropertyValue<T>(string propertyName)
 		/// <param name="flags">The binding flags to decide whether to invoke methods or to retrieve property values.</param>
 		/// <returns></returns>
 		protected T GetValueViaReflection<T>(string memberName, BindingFlags flags)
-			=>  (T)_comType.Value.InvokeMember(memberName, flags, null, ComObject, null);
+			=> (T)_comType.Value.InvokeMember(memberName, flags, null, ComObject, null);
 
 		/// <summary>
 		/// Gets the wrapped COM object for native access.

diff --git a/RepoZ.Api/Git/DefaultRepositoryInformationAggregator.cs b/RepoZ.Api/Git/DefaultRepositoryInformationAggregator.cs
@@ -3,8 +3,6 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace RepoZ.Api.Git
 {
@@ -79,10 +77,10 @@ public bool HasRepository(string path)
 			return GetRepositoryByPath(path) != null;
 		}
 
-        public void Reset()
-        {
-            _dataSource.Clear();  
-        }
+		public void Reset()
+		{
+			_dataSource.Clear();
+		}
 
 		public ObservableCollection<RepositoryView> Repositories => _dataSource;
 	}

diff --git a/RepoZ.Api/Git/IRepositoryActionProvider.cs b/RepoZ.Api/Git/IRepositoryActionProvider.cs
@@ -1,17 +1,13 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace RepoZ.Api.Git
 {
 	public interface IRepositoryActionProvider
 	{
-        RepositoryAction GetPrimaryAction(Repository repository);
+		RepositoryAction GetPrimaryAction(Repository repository);
 
-        RepositoryAction GetSecondaryAction(Repository repository);
+		RepositoryAction GetSecondaryAction(Repository repository);
 
-        IEnumerable<RepositoryAction> GetContextMenuActions(IEnumerable<Repository> repositories);
+		IEnumerable<RepositoryAction> GetContextMenuActions(IEnumerable<Repository> repositories);
 	}
 }
diff --git a/RepoZ.Api/Git/IRepositoryInformationAggregator.cs b/RepoZ.Api/Git/IRepositoryInformationAggregator.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
 
 namespace RepoZ.Api.Git
 {
@@ -13,7 +12,7 @@ public interface IRepositoryInformationAggregator
 
 		ObservableCollection<RepositoryView> Repositories { get; }
 
-        void Reset();
+		void Reset();
 
 		bool HasRepository(string path);
 	}

diff --git a/RepoZ.Api/Git/IRepositoryMonitor.cs b/RepoZ.Api/Git/IRepositoryMonitor.cs
@@ -9,13 +9,13 @@ public interface IRepositoryMonitor
 
 		event EventHandler<string> OnDeletionDetected;
 
-        event EventHandler<bool> OnScanStateChanged;
+		event EventHandler<bool> OnScanStateChanged;
 
 		void Stop();
 
 		void Observe();
 
-        void Reset();
+		void Reset();
 
 		Task ScanForLocalRepositoriesAsync();
 

diff --git a/RepoZ.Api/Git/IRepositoryObserver.cs b/RepoZ.Api/Git/IRepositoryObserver.cs
@@ -1,12 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace RepoZ.Api.Git
 {
-    public interface IRepositoryObserver : IDisposable
+	public interface IRepositoryObserver : IDisposable
 	{
 		void Setup(Repository repository, int detectionToAlertDelayMilliseconds);
 

diff --git a/RepoZ.Api/Git/StatusCompressor.cs b/RepoZ.Api/Git/StatusCompressor.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using RepoZ.Api.Git;
+using System.Text;
 
 namespace RepoZ.Api.Git
 {
@@ -45,14 +40,14 @@ public string Compress(Repository repository)
 				else
 				{
 					if (isBehind)
-                        builder.Append($"{_statusCharacterMap.ArrowDownSign}{repository.BehindBy.Value}");
+						builder.Append($"{_statusCharacterMap.ArrowDownSign}{repository.BehindBy.Value}");
 
-                    if (isAhead)
-                    {
-                        if (isBehind)
-                            builder.Append(" ");
+					if (isAhead)
+					{
+						if (isBehind)
+							builder.Append(" ");
 
-                        builder.Append($"{_statusCharacterMap.ArrowUpSign}{repository.AheadBy.Value}");
+						builder.Append($"{_statusCharacterMap.ArrowUpSign}{repository.AheadBy.Value}");
 					}
 				}
 			}