update System.CommandLine, simplify some code

Author: jonsequitur

src/Microsoft.DotNet.Interactive.Formatting/Microsoft.DotNet.Interactive.Formatting.csproj

@@ -18,7 +18,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Html.Abstractions" Version="2.2.0" />
     <PackageReference Include="microsoft.csharp" Version="4.7.0" />
-    <PackageReference Include="System.CommandLine.Rendering" Version="0.3.0-alpha.20359.2" />
+    <PackageReference Include="System.CommandLine.Rendering" Version="0.3.0-alpha.20371.2" />
   </ItemGroup>
 
   <ItemGroup>

src/Microsoft.DotNet.Interactive.Jupyter/KernelExtensions.cs

@@ -165,11 +165,11 @@ IEnumerable<IHtmlContent> Summary(ICommand command, double offset)
                 {
                     yield return new HtmlString("<pre>");
                     var level = indentLevel + offset;
-                    for (var i = 0; i < command.Aliases.Count; i++)
+                    foreach (var alias in command.Aliases)
                     {
-                        yield return span[style: $"text-indent:{level:##.#}em; color:#512bd4"](command.Aliases[i]);
+                        yield return span[style: $"text-indent:{level:##.#}em; color:#512bd4"](alias);
 
-                        if (i < command.Aliases.Count - 1)
+                        if (level < command.Aliases.Count - 1)
                         {
                             yield return span[style: $"text-indent:{level:##.#}em; color:darkgray"](", ");
                         }

src/Microsoft.DotNet.Interactive.Telemetry/Microsoft.DotNet.Interactive.Telemetry.csproj

@@ -9,6 +9,6 @@
     <PackageReference Include="Microsoft.ApplicationInsights" Version="2.14.0" />
     <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="4.6.0" />
-    <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20359.2" />
+    <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20371.2" />
   </ItemGroup>
 </Project>

src/Microsoft.DotNet.Interactive/Commands/SubmitCode.cs

@@ -38,7 +38,6 @@ internal SubmitCode(
 
         public string Code { get; }
 
-        // FIX: (SubmitCode) remove SubmissionType
         public SubmissionType SubmissionType { get; }
 
         public override string ToString() => $"{nameof(SubmitCode)}: {Code.TruncateForDisplay()}";

src/Microsoft.DotNet.Interactive/CompositeKernel.cs

@@ -98,7 +98,7 @@ private void AddChooseKernelDirective(
             Kernel kernel,
             IEnumerable<string> aliases = null)
         {
-            var chooseKernelCommand = kernel.CreateChooseKernelDirective();
+            var chooseKernelCommand = kernel.ChooseKernelDirective;
 
             if (aliases is {})
             {
@@ -108,8 +108,6 @@ private void AddChooseKernelDirective(
                 }
             }
 
-            kernel.ChooseKernelDirective = chooseKernelCommand;
-
             AddDirective(chooseKernelCommand);
         }
 

src/Microsoft.DotNet.Interactive/Kernel.cs

@@ -30,7 +30,8 @@ public abstract partial class Kernel : IDisposable
         private readonly ConcurrentQueue<KernelOperation> _commandQueue =
             new ConcurrentQueue<KernelOperation>();
         private FrontendEnvironment _frontendEnvironment;
-        
+        private ChooseKernelDirective _chooseKernelDirective;
+
         protected Kernel(string name)
         {
             if (string.IsNullOrWhiteSpace(name))
@@ -501,11 +502,11 @@ protected virtual void SetHandlingKernel(
 
         public void Dispose() => _disposables.Dispose();
 
-        protected internal virtual ChooseKernelDirective CreateChooseKernelDirective()
+        protected virtual ChooseKernelDirective CreateChooseKernelDirective()
         {
             return new ChooseKernelDirective(this);
         }
 
-        internal ChooseKernelDirective ChooseKernelDirective { get; set; }
+        internal ChooseKernelDirective ChooseKernelDirective => _chooseKernelDirective ??= CreateChooseKernelDirective();
     }
 }

src/Microsoft.DotNet.Interactive/KeyValueStoreKernel.cs

@@ -91,7 +91,7 @@ private async Task StoreValueAsync(
             }
         }
 
-        protected internal override ChooseKernelDirective CreateChooseKernelDirective()
+        protected override ChooseKernelDirective CreateChooseKernelDirective()
         {
             var nameOption = new Option<string>(
                 "--name",
@@ -111,11 +111,7 @@ protected internal override ChooseKernelDirective CreateChooseKernelDirective()
                 {
                     var filePath = result.Tokens.Single().Value;
 
-                    var fromUrlResult = result.Parent
-                                              .Parent
-                                              .Children
-                                              .OfType<OptionResult>()
-                                              .FirstOrDefault(c => c.Symbol == fromUrlOption);
+                    var fromUrlResult = result.FindResultFor(fromUrlOption);
 
                     if (fromUrlResult is {})
                     {

src/Microsoft.DotNet.Interactive/Microsoft.DotNet.Interactive.csproj

@@ -18,7 +18,7 @@
     <MicrosoftCodeAnalysisAnalyzersVersion>2.9.6</MicrosoftCodeAnalysisAnalyzersVersion>	
     <SystemRuntimeLoaderVersion>4.3.0</SystemRuntimeLoaderVersion>	
     <SystemReactiveVersion>4.3.2</SystemReactiveVersion>	
-    <SystemCommandLineVersion>2.0.0-beta1.20359.2</SystemCommandLineVersion>	
+    <SystemCommandLineVersion>2.0.0-beta1.20371.2</SystemCommandLineVersion>	
   </PropertyGroup>
 
   <ItemGroup>

src/Microsoft.DotNet.Interactive/Parsing/PolyglotSyntaxParser.cs

@@ -179,8 +179,7 @@ private bool IsDefinedInRootKernel(string directiveName)
 
         private bool IsChooseKernelDirective(DirectiveToken directiveToken)
         {
-            if (_kernelChooserDirectives is null &&
-                _subkernelDirectiveParsersByKernelName != null)
+            if (_kernelChooserDirectives is null)
             {
                 _kernelChooserDirectives = new HashSet<string>(
                     _rootKernelDirectiveParser

src/Microsoft.DotNet.Interactive/Parsing/SubmissionParser.cs

@@ -228,19 +228,17 @@ internal IDictionary<string, Func<Parser>> GetSubkernelDirectiveParsers()
 
             for (var i = 0; i < compositeKernel.ChildKernels.Count; i++)
             {
-                var kernel = compositeKernel.ChildKernels[i];
+                var childKernel = compositeKernel.ChildKernels[i];
 
-                if (kernel.ChooseKernelDirective is { } chooseKernelDirective)
+                if (childKernel.ChooseKernelDirective is { } chooseKernelDirective)
                 {
-                    for (var j = 0; j < chooseKernelDirective.Aliases.Count; j++)
+                    foreach (var alias in chooseKernelDirective.Aliases)
                     {
-                        var alias = chooseKernelDirective.Aliases[j][2..];
-
-                        dict.Add(alias, GetParser);
+                        dict.Add(alias[2..], GetParser);
                     }
                 }
 
-                Parser GetParser() => kernel.SubmissionParser.GetDirectiveParser();
+                Parser GetParser() => childKernel.SubmissionParser.GetDirectiveParser();
             }
 
             return dict;
@@ -294,7 +292,7 @@ public void AddDirective(Command command)
 
             _rootCommand.Add(command);
 
-            _directiveParser = null;
+            ResetParser();
         }
 
         internal void ResetParser()