fail invocation context when user input is canceled

dotnet · Oct 8, 2024 · 68825f9 · 68825f9
1 parent e05e149
commit 68825f9
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/src/Microsoft.DotNet.Interactive/KeyValueStoreKernel.cs b/src/Microsoft.DotNet.Interactive/KeyValueStoreKernel.cs
@@ -95,6 +95,12 @@ Task<KernelCommand> TryGetKernelCommandAsync(
                 ExpressionBindingResult expressionBindingResult,
                 Kernel keyValueStoreKernel)
             {
+                if (expressionBindingResult.Diagnostics.FirstOrDefault(d => d.Severity == DiagnosticSeverity.Error) is { } diagnostic)
+                {
+                    directiveNode.AddDiagnostic(diagnostic);
+                    return Task.FromResult<KernelCommand>(null);
+                }
+
                 var parameterValues = directiveNode
                                       .GetParameterValues(directive, expressionBindingResult.BoundValues)
                                       .ToDictionary(t => t.Name, t => (t.Value, t.ParameterNode));

diff --git a/src/Microsoft.DotNet.Interactive/Parsing/DirectiveExpressionNode.cs b/src/Microsoft.DotNet.Interactive/Parsing/DirectiveExpressionNode.cs
@@ -16,6 +16,9 @@ internal DirectiveExpressionNode(SourceText sourceText, SyntaxTree syntaxTree) :
 
     public DirectiveExpressionParametersNode? ParametersNode { get; private set; }
 
+    public bool IsInputExpression => 
+        TypeNode?.Type is "input" or "password";
+
     public void Add(DirectiveExpressionTypeNode node)
     {
         AddInternal(node);

diff --git a/src/Microsoft.DotNet.Interactive/Parsing/SubmissionParser.cs b/src/Microsoft.DotNet.Interactive/Parsing/SubmissionParser.cs
@@ -784,7 +784,8 @@ await RequestSingleValueOrInputAsync(
                             sourceCommand,
                             directiveNode.TargetKernelName);
 
-                    if (expressionNode.Parent is { Parent: DirectiveParameterNode { NameNode.Text: { } parameterName } })
+                    if (bindingResult?.IsSuccessful == true &&
+                        expressionNode.Parent is { Parent: DirectiveParameterNode { NameNode.Text: { } parameterName } })
                     {
                         if (inputProduced is not null)
                         {
@@ -798,6 +799,14 @@ await RequestSingleValueOrInputAsync(
                             valuesProduced.Add(parameterName, valueProduced);
                         }
                     }
+                    else
+                    {
+                        if (directiveNode.DescendantNodesAndTokens().OfType<DirectiveExpressionNode>().Any(node => node.IsInputExpression) &&
+                            KernelInvocationContext.Current is { Command: SubmitCode } context)
+                        {
+                            context.Fail(sourceCommand, message: "Input not provided.");
+                        }
+                    }
 
                     return bindingResult;
                 });