dotnet · colombod · May 1, 2024 · Apr 30, 2024 · Apr 30, 2024 · May 1, 2024
diff --git a/Developer-guide.ipynb b/Developer-guide.ipynb
@@ -75,7 +75,7 @@
    },
    "outputs": [],
    "source": [
-    "Invoke-Expression \"$dotnetInteractiveRepoPath/repack.ps1\""
+    "Invoke-Expression \"$dotnetInteractiveRepoPath\\repack.ps1\""
    ]
   },
   {
@@ -102,6 +102,8 @@
    },
    "outputs": [],
    "source": [
+    "$tryDotnetRepoPath = Get-Location\n",
+    "\n",
     "$nugetConfigPath = Join-Path $tryDotnetRepoPath 'NuGet.config'\n",
     "[xml]$nugetConfig = Get-Content $nugetConfigPath\n",
     "\n",
@@ -183,7 +185,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "## 2.1: Clone and build Try .NET"
+    "## 2.1: Build Try .NET"
    ]
   },
   {

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -11,12 +11,12 @@
     <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.3" />
     <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.3" />
     <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.3" />
-    <PackageVersion Include="Microsoft.DotNet.Interactive.CSharpProject" Version="1.0.0-beta.24224.2" />
+    <PackageVersion Include="Microsoft.DotNet.Interactive.CSharpProject" Version="1.0.0-beta.24229.3" />
     <PackageVersion Include="Microsoft.Playwright" Version="1.42.0" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="peaky.client" Version="4.0.79" />
     <PackageVersion Include="peaky.xunit" Version="4.0.79" />
-    <PackageVersion Include="Peaky" Version="4.0.81-beta" />
+    <PackageVersion Include="Peaky" Version="4.0.83-beta" />
     <PackageVersion Include="Pocket.Disposable" Version="1.2.0" />
     <PackageVersion Include="PocketLogger.For.Xunit" Version="0.9.0" />
     <PackageVersion Include="PocketLogger.Subscribe" Version="0.9.0" />

diff --git a/PeakyTests.ipynb b/PeakyTests.ipynb
diff --git a/src/Microsoft.TryDotNet.IntegrationTests/EditorTests.cs b/src/Microsoft.TryDotNet.IntegrationTests/EditorTests.cs
@@ -656,7 +656,7 @@ static void Main() {{
             .GetProperty("output")
             .GetRawText()
             .Should()
-            .Contain($"[\"{randomValue}\\n\",\"{randomValue}a\\n\",\"{randomValue}b\\n\"]");
+            .Contain($"{randomValue}\\n{randomValue}a\\n{randomValue}b\\n");
     }
 
     [IntegrationTestFact]

diff --git a/src/Microsoft.TryDotNet/KernelDiagnostics.cs b/src/Microsoft.TryDotNet/KernelDiagnostics.cs
@@ -3,6 +3,7 @@
 
 using System.Diagnostics;
 using Microsoft.DotNet.Interactive;
+using Microsoft.DotNet.Interactive.Formatting;
 using Pocket;
 
 namespace Microsoft.TryDotNet;
@@ -34,9 +35,10 @@ public static T LogEventsToPocketLogger<T>(this T kernel)
             disposables.Add(
                 k.KernelEvents.Subscribe(e =>
                 {
-                    Logger.Log.Info("{kernel}: {event}",
-                                    k.Name,
-                                    e);
+                    Logger.Log.Info("{kernel}: {event} ({details})",
+                                        k.Name,
+                                        e,
+                                        e.ToDisplayString("text/plain"));
                 }));
         });
 

diff --git a/src/Microsoft.TryDotNet/PeakyTestPageRenderer.cs b/src/Microsoft.TryDotNet/PeakyTestPageRenderer.cs
diff --git a/src/Microsoft.TryDotNet/Program.cs b/src/Microsoft.TryDotNet/Program.cs
@@ -56,11 +56,6 @@ public static async Task<WebApplication> CreateWebApplicationAsync(WebApplicatio
 
         _consolePrebuild = await Prebuild.GetOrCreateConsolePrebuildAsync(enableBuild: false);
 
-        builder.Services.AddTransient<ITestPageRenderer>(provider =>
-        {
-            return new PeakyTestPageRenderer(provider);
-        });
-
         switch (Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT"))
         {
             case "Development":

diff --git a/src/microsoft-trydotnet-editor/src/EditorAdapter.ts b/src/microsoft-trydotnet-editor/src/EditorAdapter.ts
@@ -3,7 +3,7 @@
 
 import * as polyglotNotebooks from '@microsoft/polyglot-notebooks';
 import * as rxjs from 'rxjs';
-import { DebouncingKernel } from './decouncingKernel';
+import { DebouncingKernel } from './debouncingKernel';
 
 export enum MarkerSeverity {
     Hint = 1,

diff --git a/src/microsoft-trydotnet-editor/src/ProjectKernelWithWASMRunner.ts b/src/microsoft-trydotnet-editor/src/ProjectKernelWithWASMRunner.ts
@@ -177,11 +177,6 @@ export class ProjectKernelWithWASMRunner extends projectKernel.ProjectKernel {
   private forwardEvents(eventEnvelopes: Array<polyglotNotebooks.KernelEventEnvelope>, rootCommand: polyglotNotebooks.KernelCommandEnvelope, invocationContext: polyglotNotebooks.KernelInvocationContext) {
     for (let eventEnvelope of eventEnvelopes) {
       const eventType = eventEnvelope.eventType;
-      const eventCommandType = eventEnvelope.command.commandType;
-      const eventCommandToken = eventEnvelope.command.getOrCreateToken();
-
-      const rootCommandType = rootCommand.commandType;
-      const rootCommandToken = rootCommand.getOrCreateToken();
 
       if (eventType === polyglotNotebooks.CommandFailedType) {
         polyglotNotebooks.Logger.default.error(`[ProjectKernelWithWASMRunner] command failed: ${JSON.stringify(eventEnvelope)}`);
@@ -190,7 +185,7 @@ export class ProjectKernelWithWASMRunner extends projectKernel.ProjectKernel {
       else if (eventType === polyglotNotebooks.CommandSucceededType) {
         continue;
       }
-      else if (eventCommandType === rootCommandType) {
+      else {
         // todo: do we need processing this?
         const event = polyglotNotebooks.KernelEventEnvelope.fromJson({
           ...eventEnvelope.toJson

diff --git a/...-trydotnet-editor/src/decouncingKernel.ts → ...-trydotnet-editor/src/debouncingKernel.ts b/...-trydotnet-editor/src/decouncingKernel.ts → ...-trydotnet-editor/src/debouncingKernel.ts
@@ -21,7 +21,7 @@ class CommandOperation {
 
 export class DebouncingKernel {
 
-    private _langiageServicesCommandOperation: CommandOperation = null;
+    private _languageServicesCommandOperation: CommandOperation = null;
     private _commandOperations: CommandOperation[] = [];
     private _running: boolean = false;
 
@@ -49,22 +49,22 @@ export class DebouncingKernel {
             case polyglotNotebooks.RequestCompletionsType:
             case polyglotNotebooks.RequestHoverTextType:
             case polyglotNotebooks.RequestSignatureHelpType:
-                this._langiageServicesCommandOperation?.cancel();
-                this._langiageServicesCommandOperation = newOperation;
+                this._languageServicesCommandOperation?.cancel();
+                this._languageServicesCommandOperation = newOperation;
                 break;
             case polyglotNotebooks.RequestDiagnosticsType:
-                if (this._langiageServicesCommandOperation) {
-                    switch (this._langiageServicesCommandOperation.kernelCommandEnvelope.commandType) {
+                if (this._languageServicesCommandOperation) {
+                    switch (this._languageServicesCommandOperation.kernelCommandEnvelope.commandType) {
                         case polyglotNotebooks.RequestDiagnosticsType:
-                            this._langiageServicesCommandOperation?.cancel();
-                            this._langiageServicesCommandOperation = newOperation;
+                            this._languageServicesCommandOperation?.cancel();
+                            this._languageServicesCommandOperation = newOperation;
                             break;
                         default:
                             this._commandOperations.push(newOperation);
                             break;
                     }
                 } else {
-                    this._langiageServicesCommandOperation = newOperation;
+                    this._languageServicesCommandOperation = newOperation;
                 }
                 break;
             default:
@@ -81,11 +81,11 @@ export class DebouncingKernel {
     async executionLoop() {
         this._running = true;
 
-        while (this._langiageServicesCommandOperation || this._commandOperations.length > 0) {
+        while (this._languageServicesCommandOperation || this._commandOperations.length > 0) {
             {
-                if (this._langiageServicesCommandOperation) {
-                    const local = this._langiageServicesCommandOperation;
-                    this._langiageServicesCommandOperation = null;
+                if (this._languageServicesCommandOperation) {
+                    const local = this._languageServicesCommandOperation;
+                    this._languageServicesCommandOperation = null;
                     await this._kernel.send(local.kernelCommandEnvelope).then(() => {
                         local.complete();
                     }).catch(r => local.completionSource.reject(r));

diff --git a/src/microsoft-trydotnet-editor/src/tryDotNetEditor.ts b/src/microsoft-trydotnet-editor/src/tryDotNetEditor.ts
@@ -9,7 +9,7 @@ import * as polyglotNotebooks from '@microsoft/polyglot-notebooks';
 import * as newContract from './newContract';
 import { DocumentId } from './documentId';
 import { configureLogging } from './log';
-import { DebouncingKernel } from './decouncingKernel';
+import { DebouncingKernel } from './debouncingKernel';
 
 export class TryDotNetEditor {
   private _editor?: monaco.EditorAdapter;
@@ -180,7 +180,6 @@ export class TryDotNetEditor {
             message.regionName = documentOpened.regionName;
           }
           this._postMessage(message);
-
         }
         break;
       case messages.FOCUS_EDITOR_REQUEST:
@@ -240,18 +239,22 @@ export class TryDotNetEditor {
             };
 
             try {
-              if (event.eventType === polyglotNotebooks.CommandFailedType) {
-                response.exception = (<polyglotNotebooks.CommandFailed>event.event).message;
-              }
-              const stdOutEvents = events.filter(e => e.eventType === polyglotNotebooks.StandardOutputValueProducedType).map(e => (<polyglotNotebooks.StandardOutputValueProduced>e.event));
+              response.exception = [];
 
-              response.output = stdOutEvents.map(e => e.formattedValues[0].value);
+              const stdOutEvents = events
+                .filter(e => e.eventType === polyglotNotebooks.StandardOutputValueProducedType)
+                .map(e => (<polyglotNotebooks.StandardOutputValueProduced>e.event));
 
-              const diagnosticsEvents = events.filter(e => e.eventType === polyglotNotebooks.DiagnosticsProducedType).map(e => (<polyglotNotebooks.DiagnosticsProduced>e.event));
+              const diagnosticsEvents = events
+                .filter(e => e.eventType === polyglotNotebooks.DiagnosticsProducedType)
+                .map(e => (<polyglotNotebooks.DiagnosticsProduced>e.event));
+
+              response.output = [stdOutEvents.map(e => e.formattedValues[0].value).join('')];
 
               response.diagnostics = [];
               for (let diagnosticsEvent of diagnosticsEvents) {
                 for (let diagnostic of diagnosticsEvent.diagnostics) {
+                  response.exception.push(diagnostic.message);
                   response.diagnostics.push({
                     start: diagnostic.linePositionSpan.start,
                     end: diagnostic.linePositionSpan.end,
@@ -260,6 +263,10 @@ export class TryDotNetEditor {
                   });
                 }
               }
+
+              if (response.exception.length === 0) {
+                response.exception = null;
+              }
             }
             finally {
               this._postMessage(response);
@@ -271,9 +278,7 @@ export class TryDotNetEditor {
           }
           break;
         default:
-          if (event.command.commandType === polyglotNotebooks.SubmitCodeType) {
-            events.push(event);
-          }
+          events.push(event);
           break;
       }
     });

diff --git a/src/microsoft-trydotnet/src/internals/executionService.ts b/src/microsoft-trydotnet/src/internals/executionService.ts
@@ -13,7 +13,7 @@ enum executionServiceStates {
     ready,
     running
 }
-export class executionService implements Subscribable<OutputEvent>{
+export class executionService implements Subscribable<OutputEvent> {
     private state: executionServiceStates = executionServiceStates.ready;
     private outputEventChannel: Subject<OutputEvent> = new Subject<OutputEvent>();
     private currentRun: { requestId: string, request: Promise<RunResult> };

diff --git a/src/microsoft-trydotnet/src/internals/workspace.ts b/src/microsoft-trydotnet/src/internals/workspace.ts
@@ -92,8 +92,8 @@ export class Workspace {
                 requestId: requestId,
                 project: prjr.project,
             }
-            let messageBus = this.projectApiMessageBus;
 
+            let messageBus = this.projectApiMessageBus;
 
             let projectOpenedPromise = responseFor<newContract.ProjectOpened>(messageBus, polyglotNotebooks.ProjectOpenedType, requestId, response => {
 
@@ -182,7 +182,6 @@ export class Workspace {
             this._currentOpenDocument = document;
         }
 
-
         return document;
     }