refactor(CommandFactory.cs): simplify ApplyExtensions method by remov…

…ing nested try-catch and redundant checks
JasperFx · Sep 4, 2024 · 0134fb9 · 0134fb9
1 parent 093625d
commit 0134fb9
Showing 1 changed file with 19 additions and 19 deletions.
diff --git a/src/Oakton/CommandFactory.cs b/src/Oakton/CommandFactory.cs
@@ -144,35 +144,35 @@ public IEnumerable<IOaktonCommand> BuildAllCommands()
 
     public void ApplyExtensions(IServiceCollection services)
     {
-        if (_extensionTypes.Any())
+        try
         {
-            try
+            foreach (var extensionType in _extensionTypes)
             {
-                foreach (var extensionType in _extensionTypes)
-                {
-                    var extension = Activator.CreateInstance(extensionType) as IServiceRegistrations;
-                    extension?.Configure(services);
-                }
-
-                _hasAppliedExtensions = true;
+                var extension = Activator.CreateInstance(extensionType) as IServiceRegistrations;
+                extension?.Configure(services);
             }
-            catch (Exception)
+
+            _hasAppliedExtensions = true;
+        }
+        catch (Exception)
+        {
+            // Swallow the error
+            if (_hasAppliedExtensions)
             {
-                // Swallow the error
-                if (_hasAppliedExtensions)
-                {
-                    return;
-                }
-
-                AnsiConsole.MarkupLine(
-                    $"[red]Unable to apply Oakton extensions. Try adding IHostBuilder.{nameof(CommandLineHostingExtensions.ApplyOaktonExtensions)}(); to your bootstrapping code to apply Oakton extension loading[/]");
+                return;
             }
+
+            AnsiConsole.MarkupLine(
+                $"[red]Unable to apply Oakton extensions. Try adding IHostBuilder.{nameof(CommandLineHostingExtensions.ApplyOaktonExtensions)}(); to your bootstrapping code to apply Oakton extension loading[/]");
         }
     }
 
     public void ApplyExtensions(IHostBuilder builder)
     {
-        builder.ConfigureServices(ApplyExtensions);
+        if (_extensionTypes.Any())
+        {
+            builder.ConfigureServices(ApplyExtensions);
+        }
     }
 
     public IEnumerable<Type> AllCommandTypes()