consolidate input block language options

Author: jankuca

src/notebooks/deepnote/deepnoteInputBlockEditProtection.ts

@@ -13,7 +13,7 @@ import {
     WorkspaceEdit
 } from 'vscode';
 import { ILogger } from '../../platform/logging/types';
-import { formatInputBlockCellContent } from './inputBlockContentFormatter';
+import { formatInputBlockCellContent, getInputBlockLanguage } from './inputBlockContentFormatter';
 
 /**
  * Protects readonly input blocks from being edited by reverting changes.
@@ -46,19 +46,6 @@ export class DeepnoteInputBlockEditProtection implements Disposable {
         'button'
     ]);
 
-    // Map of block types to their expected language IDs
-    private readonly expectedLanguages = new Map<string, string>([
-        ['input-text', 'plaintext'],
-        ['input-textarea', 'plaintext'],
-        ['input-select', 'python'],
-        ['input-slider', 'python'],
-        ['input-checkbox', 'python'],
-        ['input-date', 'python'],
-        ['input-date-range', 'python'],
-        ['input-file', 'python'],
-        ['button', 'python']
-    ]);
-
     constructor(@inject(ILogger) private readonly logger: ILogger) {
         // Listen for notebook document changes
         this.disposables.push(
@@ -99,7 +86,7 @@ export class DeepnoteInputBlockEditProtection implements Disposable {
             const blockType = cell.metadata?.__deepnotePocket?.type || cell.metadata?.type;
 
             if (blockType && this.allInputTypes.has(blockType)) {
-                const expectedLanguage = this.expectedLanguages.get(blockType);
+                const expectedLanguage = getInputBlockLanguage(blockType);
                 // Only add to fix list if language is actually wrong
                 if (expectedLanguage && cell.document.languageId !== expectedLanguage) {
                     cellsToFix.push({ cell, blockType });
@@ -149,7 +136,7 @@ export class DeepnoteInputBlockEditProtection implements Disposable {
         const editsByNotebook = new Map<string, { uri: Uri; edits: NotebookEdit[] }>();
 
         for (const { cell, blockType } of cellsToFix) {
-            const expectedLanguage = this.expectedLanguages.get(blockType);
+            const expectedLanguage = getInputBlockLanguage(blockType);
 
             if (!expectedLanguage) {
                 continue;

src/notebooks/deepnote/deepnoteNotebookCommandListener.ts

@@ -17,6 +17,7 @@ import { IExtensionSyncActivationService } from '../../platform/activation/types
 import { IDisposableRegistry } from '../../platform/common/types';
 import { Commands } from '../../platform/common/constants';
 import { chainWithPendingUpdates } from '../../kernels/execution/notebookUpdater';
+import { formatInputBlockCellContent, getInputBlockLanguage } from './inputBlockContentFormatter';
 import {
     DeepnoteBigNumberMetadataSchema,
     DeepnoteTextInputMetadataSchema,
@@ -281,15 +282,17 @@ export class DeepnoteNotebookCommandListener implements IExtensionSyncActivation
             __deepnotePocket: {
                 type: blockType,
                 ...defaultMetadata
-            }
+            },
+            ...defaultMetadata
         };
 
         const result = await chainWithPendingUpdates(document, (edit) => {
-            const newCell = new NotebookCellData(
-                NotebookCellKind.Code,
-                JSON.stringify(defaultMetadata, null, 2),
-                'json'
-            );
+            // Use the formatter to get the correct cell content based on block type and metadata
+            const cellContent = formatInputBlockCellContent(blockType, defaultMetadata);
+            // Get the correct language mode for this input block type
+            const languageMode = getInputBlockLanguage(blockType) ?? 'python';
+
+            const newCell = new NotebookCellData(NotebookCellKind.Code, cellContent, languageMode);
             newCell.metadata = metadata;
             const nbEdit = NotebookEdit.insertCells(insertIndex, [newCell]);
             edit.set(document.uri, [nbEdit]);

src/notebooks/deepnote/deepnoteNotebookCommandListener.unit.test.ts

@@ -18,6 +18,7 @@ import {
     getNextDeepnoteVariableName,
     InputBlockType
 } from './deepnoteNotebookCommandListener';
+import { formatInputBlockCellContent, getInputBlockLanguage } from './inputBlockContentFormatter';
 import { IDisposable } from '../../platform/common/types';
 import * as notebookUpdater from '../../kernels/execution/notebookUpdater';
 import { createMockedNotebookDocument } from '../../test/datascience/editor-integration/helpers';
@@ -605,20 +606,14 @@ suite('DeepnoteNotebookCommandListener', () => {
 
                     const newCell = notebookEdit.newCells[0];
                     assert.equal(newCell.kind, NotebookCellKind.Code, 'Should be a code cell');
-                    assert.equal(newCell.languageId, 'json', 'Should have json language');
 
-                    // Verify cell content is valid JSON with correct structure
-                    const content = JSON.parse(newCell.value);
-                    assert.equal(
-                        content.deepnote_variable_name,
-                        expectedVariableName,
-                        'Variable name should match expected'
-                    );
+                    // Verify language mode matches the expected language for this block type
+                    const expectedLanguage = getInputBlockLanguage(blockType);
+                    assert.equal(newCell.languageId, expectedLanguage, `Should have ${expectedLanguage} language`);
 
-                    // Verify all expected metadata keys are present in content
-                    expectedMetadataKeys.forEach((key) => {
-                        assert.property(content, key, `Content should have ${key} property`);
-                    });
+                    // Verify cell content is formatted correctly using the formatter
+                    const expectedContent = formatInputBlockCellContent(blockType, newCell.metadata);
+                    assert.equal(newCell.value, expectedContent, 'Cell content should match formatted content');
 
                     // Verify metadata structure
                     assert.property(newCell.metadata, '__deepnotePocket', 'Should have __deepnotePocket metadata');
@@ -629,11 +624,21 @@ suite('DeepnoteNotebookCommandListener', () => {
                         'Metadata should have correct variable name'
                     );
 
-                    // Verify metadata keys match content keys
+                    // Verify all expected metadata keys are present in __deepnotePocket
                     expectedMetadataKeys.forEach((key) => {
                         assert.property(newCell.metadata.__deepnotePocket, key, `Metadata should have ${key} property`);
                     });
 
+                    // Verify metadata is also at the top level
+                    assert.equal(
+                        newCell.metadata.deepnote_variable_name,
+                        expectedVariableName,
+                        'Top-level metadata should have correct variable name'
+                    );
+                    expectedMetadataKeys.forEach((key) => {
+                        assert.property(newCell.metadata, key, `Top-level metadata should have ${key} property`);
+                    });
+
                     // Verify reveal and selection were set
                     assert.isTrue(
                         (editor.revealRange as sinon.SinonStub).calledOnce,

src/notebooks/deepnote/inputBlockContentFormatter.ts

@@ -3,6 +3,25 @@
  * This is the single source of truth for how input block values are displayed in cells.
  */
 
+/**
+ * Gets the expected language ID for an input block type.
+ * This is the single source of truth for input block language modes.
+ */
+export function getInputBlockLanguage(blockType: string): string | undefined {
+    const languageMap: Record<string, string> = {
+        'input-text': 'plaintext',
+        'input-textarea': 'plaintext',
+        'input-select': 'python',
+        'input-slider': 'python',
+        'input-checkbox': 'python',
+        'input-date': 'python',
+        'input-date-range': 'python',
+        'input-file': 'python',
+        button: 'python'
+    };
+    return languageMap[blockType];
+}
+
 /**
  * Formats the cell content for an input block based on its type and metadata.
  * @param blockType The type of the input block (e.g., 'input-text', 'input-select')