Updates based on CI issues

Author: KathleenDollard

src/System.CommandLine.Subsystems/Directives/DiagramSubsystem.cs

@@ -66,10 +66,10 @@ private static void Diagram(
             builder.Append('!');
         }
 
+        // TODO: Directives
+        /*
         switch (symbolResult)
         {
-            // TODO: Directives
-            /*
             case DirectiveResult { Directive: not DiagramDirective }:
                 break;
             */
@@ -174,7 +174,7 @@ private static void Diagram(
                     break;
                 }
             }
-            */
         }
+        */
     }
 }

src/System.CommandLine.Subsystems/ValueSubsystem.cs

@@ -26,10 +26,11 @@ AnnotationAccessor<object> Explicit
 
     void SetCalculated(CliSymbol symbol, Func<ValueResult, object?> factory)
         => SetAnnotation(symbol, ValueAnnotations.Calculated, factory);
-    Func<ValueResult, object?> GetCalculated(CliSymbol symbol)
-      => TryGetAnnotation<Func<ValueResult, object?>>(symbol, ValueAnnotations.Calculated, out var value)
-                ? value
-                : null;
+    Func<ValueResult, object?>? GetCalculatedValue(CliSymbol symbol) 
+        => TryGetAnnotation<Func<ValueResult, object?>>(symbol, ValueAnnotations.Calculated, out var value)
+                    ? value
+                    : null;
+
     AnnotationAccessor<Func<ValueResult, object?>> Calculated
       => new(this, ValueAnnotations.Calculated);