Use file-scoped namespaces

Author: SteveDesmond-ca

.editorconfig

@@ -20,3 +20,4 @@ csharp_style_expression_bodied_indexers = true
 csharp_style_expression_bodied_accessors = true
 csharp_style_expression_bodied_lambdas = true
 csharp_style_expression_bodied_local_functions = true
+csharp_style_namespace_declarations = file_scoped:warning

src/App.cs

@@ -1,69 +1,68 @@
-using System;
+using System;
 using System.Security.Authentication;
 using System.Threading.Tasks;
 using Octokit;
 
-namespace GitHubLabelSync
+namespace GitHubLabelSync;
+
+public class App
 {
-	public class App
+	private readonly ISynchronizer _sync;
+	private readonly Action<string> _setStatus;
+	private readonly Action<string> _log;
+
+	public App(ISynchronizer sync, Action<string> setStatus, Action<string> log)
 	{
-		private readonly ISynchronizer _sync;
-		private readonly Action<string> _setStatus;
-		private readonly Action<string> _log;
+		_sync = sync;
+		_setStatus = setStatus;
+		_log = log;
+	}
 
-		public App(ISynchronizer sync, Action<string> setStatus, Action<string> log)
-		{
-			_sync = sync;
-			_setStatus = setStatus;
-			_log = log;
-		}
+	public async Task Run(Settings settings)
+	{
+		_setStatus($"Starting...");
+		_log(settings.Name);
 
-		public async Task Run(Settings settings)
-		{
-			_setStatus($"Starting...");
-			_log(settings.Name);
+		var account = await GetValidAccount(settings);
+		var repos = await _sync.GetRepositories(account);
+		var labels = await _sync.GetAccountLabels(account);
+		_log(string.Empty);
 
-			var account = await GetValidAccount(settings);
-			var repos = await _sync.GetRepositories(account);
-			var labels = await _sync.GetAccountLabels(account);
-			_log(string.Empty);
+		foreach (var repo in repos)
+		{
+			_log(repo.Name);
 
-			foreach (var repo in repos)
+			if (repo.Archived)
 			{
-				_log(repo.Name);
-
-				if (repo.Archived)
-				{
-					_log($"(skipping: repo is archived)");
-				}
-				else
-				{
-					await _sync.SyncRepo(repo, settings, labels);
-				}
-
-				_log(string.Empty);
+				_log($"(skipping: repo is archived)");
+			}
+			else
+			{
+				await _sync.SyncRepo(repo, settings, labels);
 			}
 
-			_log("Done!");
+			_log(string.Empty);
 		}
 
-		private async Task<Account> GetValidAccount(Settings settings)
-		{
-			var access = await _sync.ValidateAccess();
-			if (!access.Successful)
-			{
-				throw new AuthenticationException(access.Message);
-			}
+		_log("Done!");
+	}
 
-			var account = await _sync.GetAccount(settings.Name);
+	private async Task<Account> GetValidAccount(Settings settings)
+	{
+		var access = await _sync.ValidateAccess();
+		if (!access.Successful)
+		{
+			throw new AuthenticationException(access.Message);
+		}
 
-			var auth = await _sync.ValidateUser(account);
-			if (!auth.Successful)
-			{
-				throw new AuthenticationException(auth.Message);
-			}
+		var account = await _sync.GetAccount(settings.Name);
 
-			return account;
+		var auth = await _sync.ValidateUser(account);
+		if (!auth.Successful)
+		{
+			throw new AuthenticationException(auth.Message);
 		}
+
+		return account;
 	}
-}
+}

src/Command.cs

@@ -1,35 +1,34 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using Spectre.Console;
 using Spectre.Console.Cli;
 
-namespace GitHubLabelSync
+namespace GitHubLabelSync;
+
+public class Command : AsyncCommand<Settings>
 {
-	public class Command : AsyncCommand<Settings>
-	{
-		private readonly IAnsiConsole _console;
+	private readonly IAnsiConsole _console;
 
-		public Command(IAnsiConsole console)
-			=> _console = console;
+	public Command(IAnsiConsole console)
+		=> _console = console;
 
-		public override async Task<int> ExecuteAsync(CommandContext context, Settings settings)
+	public override async Task<int> ExecuteAsync(CommandContext context, Settings settings)
+	{
+		try
 		{
-			try
-			{
-				await _console.Status().StartAsync("Running...", Run(settings));
-				return 0;
-			}
-			catch (Exception e)
-			{
-				_console.WriteException(e, ExceptionFormats.ShortenEverything);
-				return 1;
-			}
+			await _console.Status().StartAsync("Running...", Run(settings));
+			return 0;
+		}
+		catch (Exception e)
+		{
+			_console.WriteException(e, ExceptionFormats.ShortenEverything);
+			return 1;
 		}
-
-		private Func<StatusContext, Task> Run(Settings settings)
-			=> async ctx
-				=> await Factory
-					.App(settings.APIKey, s => ctx.Status(s), s => _console.WriteLine(s))
-					.Run(settings);
 	}
-}
+
+	private Func<StatusContext, Task> Run(Settings settings)
+		=> async ctx
+			=> await Factory
+				.App(settings.APIKey, s => ctx.Status(s), s => _console.WriteLine(s))
+				.Run(settings);
+}

src/Factory.cs

@@ -1,20 +1,19 @@
-using System;
+using System;
 using System.Reflection;
 using Octokit;
 
-namespace GitHubLabelSync
+namespace GitHubLabelSync;
+
+public static class Factory
 {
-	public static class Factory
+	public static App App(string apiKey, Action<string> setStatus, Action<string> log)
 	{
-		public static App App(string apiKey, Action<string> setStatus, Action<string> log)
-		{
-			var name = Assembly.GetExecutingAssembly().GetName().Name;
-			var value = new ProductHeaderValue(name);
-			var client = new GitHubClient(value) { Credentials = new Credentials(apiKey) };
+		var name = Assembly.GetExecutingAssembly().GetName().Name;
+		var value = new ProductHeaderValue(name);
+		var client = new GitHubClient(value) { Credentials = new Credentials(apiKey) };
 
-			var gitHub = new GitHub(client, setStatus, log);
-			var sync = new Synchronizer(gitHub, setStatus, log);
-			return new App(sync, setStatus, log);
-		}
+		var gitHub = new GitHub(client, setStatus, log);
+		var sync = new Synchronizer(gitHub, setStatus, log);
+		return new App(sync, setStatus, log);
 	}
-}
+}