TypeScript updates for contract changes

dotnet · Sep 14, 2022 · d80ec92 · d80ec92
1 parent a514522
commit d80ec92
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/src/Microsoft.DotNet.Interactive.Documents/CodeSubmission.cs b/src/Microsoft.DotNet.Interactive.Documents/CodeSubmission.cs
@@ -154,8 +154,6 @@ public static string ToCodeSubmissionContent(
             this InteractiveDocument document,
             string newline = "\n")
         {
-            // FIX: (ToCodeSubmissionContent) stringbuilderify this
-
             var lines = new List<string>();
 
             if (document.Metadata.Count > 0)

diff --git a/src/dotnet-interactive-vscode-common/src/notebookParserServer.ts b/src/dotnet-interactive-vscode-common/src/notebookParserServer.ts
@@ -32,7 +32,7 @@ export class NotebookParserServer {
                     // ensure at least one cell
                     notebookCells.push({
                         executionOrder: 0,
-                        language: defaultNotebookCellLanguage,
+                        kernelName: defaultNotebookCellLanguage,
                         contents: '',
                         outputs: [],
                     });

diff --git a/src/dotnet-interactive-vscode-common/src/vscodeUtilities.ts b/src/dotnet-interactive-vscode-common/src/vscodeUtilities.ts
@@ -85,7 +85,7 @@ export function toNotebookDocument(document: vscode.NotebookDocument): Interacti
 export function toInteractiveDocumentElement(cell: vscode.NotebookCell): InteractiveDocumentElement {
     return {
         executionOrder: cell.executionSummary?.executionOrder ?? 0,
-        language: cell.kind === vscode.NotebookCellKind.Code
+        kernelName: cell.kind === vscode.NotebookCellKind.Code
             ? getSimpleLanguage(cell.document.languageId)
             : 'markdown',
         contents: cell.document.getText(),

diff --git a/src/dotnet-interactive-vscode/src/notebookSerializers.ts b/src/dotnet-interactive-vscode/src/notebookSerializers.ts
@@ -14,7 +14,7 @@ function toInteractiveDocumentElement(cell: vscode.NotebookCellData): contracts.
     const outputs = cell.outputs || [];
     return {
         executionOrder: cell.executionSummary?.executionOrder ?? 0,
-        language: getSimpleLanguage(cell.languageId),
+        kernelName: getSimpleLanguage(cell.languageId),
         contents: cell.value,
         outputs: outputs.map(vsCodeCellOutputToContractCellOutput)
     };
@@ -61,9 +61,9 @@ export function createAndRegisterNotebookSerializers(context: vscode.ExtensionCo
 
 function toVsCodeNotebookCellData(cell: contracts.InteractiveDocumentElement): vscode.NotebookCellData {
     const cellData = new vscode.NotebookCellData(
-        <number>languageToCellKind(cell.language),
+        <number>languageToCellKind(cell.kernelName),
         cell.contents,
-        getNotebookSpecificLanguage(cell.language));
+        getNotebookSpecificLanguage(cell.kernelName));
     cellData.outputs = cell.outputs.map(outputElementToVsCodeCellOutput);
     return cellData;
 }

diff --git a/src/microsoft-dotnet-interactive/src/contracts.ts b/src/microsoft-dotnet-interactive/src/contracts.ts
@@ -442,7 +442,7 @@ export interface InteractiveDocument {
 
 export interface InteractiveDocumentElement {
     id?: string;
-    language?: string;
+    kernelName?: string;
     contents: string;
     outputs: Array<InteractiveDocumentOutputElement>;
     executionOrder: number;