Clean up code

DanteDeRuwe · Nov 19, 2024 · 06e8bf4 · 06e8bf4
1 parent f419479
commit 06e8bf4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 77 deletions.
diff --git a/src/Dotty.CLI/Commands/SimpleCommands.cs b/src/Dotty.CLI/Commands/SimpleCommands.cs
@@ -1,8 +1,6 @@
 using Cocona.Application;
 using Cocona.Help;
-using Cocona.Help.DocumentModel;
 using Spectre.Console;
-using Spectre.Console.Rendering;
 
 namespace Dotty.CLI.Commands;
 
@@ -13,33 +11,14 @@ public void Register(ICoconaAppBuilder app)
         app.AddCommand("greet", ([Argument] string subject) => Panel($"Hello, {subject}!"));
 
         app.AddCommand(([FromService] ICoconaApplicationMetadataProvider metadataProvider, [FromService] ICoconaHelpMessageBuilder helpProvider) =>
-            {
-                Panel(new Rows(
-                    new FigletText("dotty").Color(Color.Aqua).Centered(),
-                    new Markup($"[bold][aqua]{metadataProvider.GetVersion()}[/][/]").Centered(),
-                    new Rule { Style = Style.Parse("gray") },
-                    new Text("\n"),
-                    new Text(helpProvider.BuildAndRenderForCurrentCommand())
-                ));
-            })
-            .OptionLikeCommand(x =>
-            {
-                x.Add("tree", () => Tree("Dotty CLI", t => t
-                    .WithChild("greet")
-                    .WithChild("convert", c => c
-                        .WithChild("units")
-                        .WithChild("tobase64")
-                        .WithChild("frombase64")
-                    )
-                    .WithChild("generate", g => g
-                        .WithChild("random", r => r
-                            .WithChild("guid")
-                            .WithChild("number")
-                            .WithChild("fromtemplate")
-                        )
-                        .WithChild("timestamp")
-                    )
-                ));
-            });
+        {
+            Panel(new Rows(
+                new FigletText("dotty").Color(Color.Aqua).Centered(),
+                new Markup($"[bold][aqua]{metadataProvider.GetVersion()}[/][/]").Centered(),
+                new Rule { Style = Style.Parse("gray") },
+                new Text("\n"),
+                new Text(helpProvider.BuildAndRenderForCurrentCommand())
+            ));
+        });
     }
 }
diff --git a/src/Dotty.CLI/Helpers/Output.cs b/src/Dotty.CLI/Helpers/Output.cs
@@ -27,51 +27,4 @@ public static T Select<T>(string title, params IEnumerable<T> choices) where T :
     public static void WriteItalic<T>(T value) => AnsiConsole.Markup($"[italic]{value}[/]");
 
     public static void WriteBold<T>(T value) => AnsiConsole.Markup($"[bold]{value}[/]");
-
-    public static void Tree(string root, Action<TreeBuilder> configure)
-    {
-        var builder = new TreeBuilder(root);
-        configure(builder);
-        AnsiConsole.Write(builder.Build());
-    }
-}
-
-internal class TreeNodeBuilder(string name)
-{
-    private readonly TreeNode _node = new(new Text(name));
-
-    public TreeNodeBuilder WithChild(string child, Action<TreeNodeBuilder>? configure = null)
-    {
-        var builder = new TreeNodeBuilder(child);
-        configure?.Invoke(builder);
-        return WithChild(builder.Build());
-    }
-
-    public TreeNodeBuilder WithChild(TreeNode node)
-    {
-        _node.AddNode(node);
-        return this;
-    }
-
-    public TreeNode Build() => _node;
-}
-
-internal class TreeBuilder(string rootName)
-{
-    private readonly Tree _tree = new(rootName);
-
-    public TreeBuilder WithChild(string child, Action<TreeNodeBuilder>? configure = null)
-    {
-        var builder = new TreeNodeBuilder(child);
-        configure?.Invoke(builder);
-        return WithChild(builder.Build());
-    }
-
-    public TreeBuilder WithChild(TreeNode node)
-    {
-        _tree.AddNode(node);
-        return this;
-    }
-
-    public Tree Build() => _tree;
 }