remove DisplayAsync method

Author: jonsequitur

src/Microsoft.DotNet.Interactive.ExtensionLab/DataFrameKernelExtension.cs

@@ -55,7 +55,7 @@ async Task CompileStuff(
 
                             if (showCode)
                             {
-                                await context.DisplayAsync(code);
+                                context.Display(code);
                             }
 
                             cSharpKernel.TryGetVariable(variableName, out DataFrame oldFrame);

src/Microsoft.DotNet.Interactive.ExtensionLab/SqlKernel.cs

@@ -36,7 +36,7 @@ public virtual async Task HandleAsync(
 
             var results = Execute(dbCommand);
 
-            await context.DisplayAsync(results);
+            context.Display(results);
         }
 
         protected abstract DbConnection OpenConnection();

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

@@ -205,7 +205,7 @@ private static Command lsmagic(Kernel kernel)
                     supportedDirectives.Commands.AddRange(
                         kernel.Directives.Where(d => !d.IsHidden));
 
-                    await context.DisplayAsync(supportedDirectives);
+                    context.Display(supportedDirectives);
 
                     await kernel.VisitSubkernelsAsync(async k =>
                     {

src/Microsoft.DotNet.Interactive.Tests/DirectiveTests.cs

@@ -172,13 +172,15 @@ public async Task OnComplete_can_be_used_to_act_on_completion_of_commands()
 
             kernel.AddDirective(new Command("#!wrap")
             {
-                Handler = CommandHandler.Create(async (KernelInvocationContext c) =>
-                {
-                    await c.DisplayAsync("hello!");
+                Handler = CommandHandler.Create((KernelInvocationContext c) =>
+                { 
+                    c.Display("hello!");
 
-                    c.OnComplete(async context =>
+                    c.OnComplete(context =>
                     {
-                        await context.DisplayAsync("goodbye!");
+                        context.Display("goodbye!");
+
+                        return Task.CompletedTask;
                     });
                 })
             });

src/Microsoft.DotNet.Interactive/Extensions/AssemblyBasedExtensionLoader.cs

@@ -122,7 +122,7 @@ private async Task LoadFromAssembly(
                 {
                     var extension = (IKernelExtension) Activator.CreateInstance(extensionType);
 
-                    var displayed = await context.DisplayAsync(
+                    var displayed = context.Display(
                                         $"Loading kernel extension \"{extensionType.Name}\" from assembly {assemblyFile.FullName}");
 
                     try

src/Microsoft.DotNet.Interactive/HtmlKernel.cs

@@ -18,11 +18,12 @@ public HtmlKernel() : base(DefaultKernelName)
         {
         }
 
-        public async Task HandleAsync(SubmitCode command, KernelInvocationContext context)
+        public Task HandleAsync(SubmitCode command, KernelInvocationContext context)
         {
-            await context.DisplayAsync(
+            context.Display(
                 new HtmlString(command.Code),
                 HtmlFormatter.MimeType);
+            return Task.CompletedTask;
         }
     }
 }

src/Microsoft.DotNet.Interactive/JavaScriptKernel.cs

@@ -15,13 +15,15 @@ public class JavaScriptKernel :
         public JavaScriptKernel() : base(DefaultKernelName)
         {
         }
-        public async Task HandleAsync(
+        public Task HandleAsync(
             SubmitCode command,
             KernelInvocationContext context)
         {
             var scriptContent = new ScriptContent(command.Code);
 
-            await context.DisplayAsync(scriptContent);
+            context.Display(scriptContent);
+
+            return Task.CompletedTask;
         }
     }
 }

src/Microsoft.DotNet.Interactive/Kernel.Static.cs

@@ -21,7 +21,7 @@ public static DisplayedValue display(
             object value,
             string mimeType = null)
         {
-            return Task.Run(() => KernelInvocationContext.Current.DisplayAsync(value, mimeType)).Result;
+            return KernelInvocationContext.Current.Display(value, mimeType);
         }
 
         public static IHtmlContent HTML(string content) => content.ToHtmlContent();

src/Microsoft.DotNet.Interactive/KernelInvocationContextExtensions.cs

@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Threading.Tasks;
 using Microsoft.DotNet.Interactive.Commands;
 using Microsoft.DotNet.Interactive.Events;
 using Microsoft.DotNet.Interactive.Formatting;
@@ -12,15 +11,6 @@ namespace Microsoft.DotNet.Interactive
 {
     public static class KernelInvocationContextExtensions
     {
-        public static Task<DisplayedValue> DisplayAsync(
-            this KernelInvocationContext context,
-            object value,
-            string mimeType = null)
-        {
-            DisplayedValue result = Display(context, value, mimeType);
-            return Task.FromResult(result);
-        }
-
         public static DisplayedValue Display(
             this KernelInvocationContext context,
             object value,

src/Microsoft.DotNet.Interactive/KernelSupportsNugetExtensions.cs

@@ -42,15 +42,17 @@ private static Command i()
             };
             iDirective.Handler = CommandHandler.Create<string, KernelInvocationContext>((source, context) =>
             {
-                var kernel = context.HandlingKernel as ISupportNuget;
-                kernel.AddRestoreSource(source.Replace("nuget:", ""));
+                if (context.HandlingKernel is ISupportNuget kernel)
+                {
+                    kernel.AddRestoreSource(source.Replace("nuget:", ""));
 
-                IHtmlContent content = div(
-                    strong("Restore sources"),
-                    ul(kernel.RestoreSources
-                             .Select(s => li(span(s)))));
+                    IHtmlContent content = div(
+                        strong("Restore sources"),
+                        ul(kernel.RestoreSources
+                                 .Select(s => li(span(s)))));
 
-                context.DisplayAsync(content);
+                    context.Display(content);
+                }
             });
             return iDirective;
         }