address opening ipynb, not forcing markdown cells to have default language in cell metadata (#1326)

Author: colombod

src/dotnet-interactive-vscode/common/vscode/commands.ts

@@ -227,7 +227,7 @@ export function registerFileCommands(context: vscode.ExtensionContext, clientMap
             ? 'dotnet-interactive'
             : 'jupyter-notebook';
 
-        if (viewType === 'jupyter-notebook') {
+        if (viewType === 'jupyter-notebook' && uri.scheme === 'untitled') {
             await openNewNotebookWithJupyterEXtension();
         } else {
             await vscode.commands.executeCommand('vscode.openWith', uri, viewType);

src/dotnet-interactive-vscode/common/vscode/extension.ts

@@ -185,8 +185,11 @@ async function updateNotebookCellLanguageInMetadata(candidateNotebookCellDocumen
         isJupyterNotebookViewType(notebook.viewType) &&
         isDotnetInteractiveLanguage(candidateNotebookCellDocument.languageId)) {
         const cell = versionSpecificFunctions.getCells(notebook).find(c => c.document === candidateNotebookCellDocument);
-        if (cell && cell.kind === vscode.NotebookCellKind.Code) {
-            const cellLanguage = getSimpleLanguage(candidateNotebookCellDocument.languageId);
+        if (cell) {
+            const cellLanguage = cell.kind === vscode.NotebookCellKind.Code
+                ? getSimpleLanguage(candidateNotebookCellDocument.languageId)
+                : 'markdown';
+
             const dotnetMetadata = getDotNetMetadata(cell.metadata);
             if (dotnetMetadata.language !== cellLanguage) {
                 const newMetadata = cell.metadata.with({

src/dotnet-interactive-vscode/common/vscode/vscodeUtilities.ts

@@ -83,7 +83,9 @@ export function toNotebookDocument(document: vscode.NotebookDocument): NotebookD
 
 export function toNotebookCell(cell: vscode.NotebookCell): NotebookCell {
     return {
-        language: getSimpleLanguage(cell.document.languageId),
+        language: cell.kind === vscode.NotebookCellKind.Code
+            ? getSimpleLanguage(cell.document.languageId)
+            : 'markdown',
         contents: cell.document.getText(),
         outputs: cell.outputs.map(vsCodeCellOutputToContractCellOutput)
     };

src/dotnet-interactive-vscode/insiders/src/notebookControllers.ts

@@ -159,7 +159,9 @@ export async function updateCellLanguages(document: vscode.NotebookDocument): Pr
         const cell = document.cellAt(i);
         const cellMetadata = getDotNetMetadata(cell.metadata);
         const cellText = cell.document.getText();
-        const newLanguage = getCellLanguage(cellText, cellMetadata, documentLanguageInfo, cell.document.languageId);
+        const newLanguage = cell.kind === vscode.NotebookCellKind.Code
+            ? getCellLanguage(cellText, cellMetadata, documentLanguageInfo, cell.document.languageId)
+            : 'markdown';
         if (cell.document.languageId !== newLanguage) {
             const newCellData = new vscode.NotebookCellData(
                 cell.kind,

src/dotnet-interactive-vscode/stable/src/notebookControllers.ts

@@ -159,7 +159,9 @@ export async function updateCellLanguages(document: vscode.NotebookDocument): Pr
         const cell = document.cellAt(i);
         const cellMetadata = getDotNetMetadata(cell.metadata);
         const cellText = cell.document.getText();
-        const newLanguage = getCellLanguage(cellText, cellMetadata, documentLanguageInfo, cell.document.languageId);
+        const newLanguage = cell.kind === vscode.NotebookCellKind.Code
+            ? getCellLanguage(cellText, cellMetadata, documentLanguageInfo, cell.document.languageId)
+            : 'markdown';
         if (cell.document.languageId !== newLanguage) {
             const newCellData = new vscode.NotebookCellData(
                 cell.kind,