tk/spectre.console
1
0
Fork 0
mirror of https://github.com/nsnail/spectre.console.git synced 2025-04-16 08:52:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

(#1313) removed the default registration of the IHelpProvider

Browse Source
This commit is contained in:
Nils Andresen 2023-11-10 21:04:20 +01:00 committed by Patrik Svensson
parent 4219bbbf61
commit 1fd028942f
1 changed files with 66 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Spectre.Console.Cli/Internal/CommandExecutor.cs
View File

@ -22,10 +22,6 @@ internal sealed class CommandExecutor
_registrar.RegisterInstance(typeof(IConfiguration), configuration); _registrar.RegisterInstance(typeof(IConfiguration), configuration);
_registrar.RegisterLazy(typeof(IAnsiConsole), () => configuration.Settings.Console.GetConsole()); _registrar.RegisterLazy(typeof(IAnsiConsole), () => configuration.Settings.Console.GetConsole());
// Register the help provider
var defaultHelpProvider = new HelpProvider(configuration.Settings);
_registrar.RegisterInstance(typeof(IHelpProvider), defaultHelpProvider);
// Create the command model. // Create the command model.
var model = CommandModelBuilder.Build(configuration); var model = CommandModelBuilder.Build(configuration);
_registrar.RegisterInstance(typeof(CommandModel), model); _registrar.RegisterInstance(typeof(CommandModel), model);
@ -51,8 +47,9 @@ internal sealed class CommandExecutor
using (var resolver = new TypeResolverAdapter(_registrar.Build())) using (var resolver = new TypeResolverAdapter(_registrar.Build()))
{ {
// Get the registered help provider, falling back to the default provider // Get the registered help provider, falling back to the default provider
// registered above if no custom implementations have been registered. // if no custom implementations have been registered.
var helpProvider = resolver.Resolve(typeof(IHelpProvider)) as IHelpProvider ?? defaultHelpProvider; var helpProviders = resolver.Resolve(typeof(IEnumerable<IHelpProvider>)) as IEnumerable<IHelpProvider>;
var helpProvider = helpProviders?.LastOrDefault() ?? new HelpProvider(configuration.Settings);
// Currently the root? // Currently the root?
if (parsedResult?.Tree == null) if (parsedResult?.Tree == null)