fix microsoft#104581

rebornix · rebornix · commit 061122ba104d · 2020-08-13T11:59:53.000-07:00
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/coreActions.ts b/src/vs/workbench/contrib/notebook/browser/contrib/coreActions.ts
@@ -1308,7 +1308,7 @@ export class ChangeCellLanguageAction extends NotebookCellAction {
 		const providerLanguages = [...context.notebookEditor.viewModel!.notebookDocument.languages, 'markdown'];
 		providerLanguages.forEach(languageId => {
 			let description: string;
-			if (languageId === context.cell.language) {
+			if (context.cell.cellKind === CellKind.Markdown ? (languageId === 'markdown') : (languageId === context.cell.language)) {
 				description = localize('languageDescription', "({0}) - Current Language", languageId);
 			} else {
 				description = localize('languageDescriptionConfigured', "({0})", languageId);
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts
@@ -813,7 +813,7 @@ export class CellLanguageStatusBarItem extends Disposable {
 	}
 
 	private render(): void {
-		const modeId = this.modeService.getModeIdForLanguageName(this.cell!.language) || this.cell!.language;
+		const modeId = this.cell?.cellKind === CellKind.Markdown ? 'markdown' : this.modeService.getModeIdForLanguageName(this.cell!.language) || this.cell!.language;
 		this.labelElement.textContent = this.modeService.getLanguageName(modeId) || this.modeService.getLanguageName('plaintext');
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -813,7 +813,7 @@ export class CellLanguageStatusBarItem extends Disposable {`
`813`	`813`	`}`
`814`	`814`
`815`	`815`	`private render(): void {`
`816`		`- const modeId = this.modeService.getModeIdForLanguageName(this.cell!.language) \|\| this.cell!.language;`
	`816`	`+ const modeId = this.cell?.cellKind === CellKind.Markdown ? 'markdown' : this.modeService.getModeIdForLanguageName(this.cell!.language) \|\| this.cell!.language;`
`817`	`817`	`this.labelElement.textContent = this.modeService.getLanguageName(modeId) \|\| this.modeService.getLanguageName('plaintext');`
`818`	`818`	`}`
`819`	`819`	`}`