Misc

DonJayamanne · DonJayamanne · commit 245fffbce1b3 · 2021-09-21T10:17:33.000-07:00
diff --git a/extensions/ipynb/src/deserializers.ts b/extensions/ipynb/src/deserializers.ts
@@ -93,7 +93,7 @@ enum CellOutputMimeTypes {
 	stdout = 'application/vnd.code.notebook.stdout'
 }
 
-const textMimeTypes = ['text/plain', 'text/markdown', CellOutputMimeTypes.stderr, CellOutputMimeTypes.stdout];
+export const textMimeTypes = ['text/plain', 'text/markdown', 'text/latex', CellOutputMimeTypes.stderr, CellOutputMimeTypes.stdout];
 
 function concatMultilineString(str: string | string[], trim?: boolean): string {
 	const nonLineFeedWhiteSpaceTrim = /(^[\t\f\v\r ]+|[\t\f\v\r ]+$)/g;
diff --git a/extensions/ipynb/src/serializers.ts b/extensions/ipynb/src/serializers.ts
@@ -6,6 +6,7 @@
 import { nbformat } from '@jupyterlab/coreutils';
 import { NotebookCellData, NotebookCellKind, NotebookCellOutput } from 'vscode';
 import { CellOutputMetadata } from './common';
+import { textMimeTypes } from './deserializers';
 
 const textDecoder = new TextDecoder();
 
@@ -15,8 +16,6 @@ enum CellOutputMimeTypes {
 	stdout = 'application/vnd.code.notebook.stdout'
 }
 
-const textMimeTypes = ['text/plain', 'text/markdown', CellOutputMimeTypes.stderr, CellOutputMimeTypes.stdout];
-
 export function createJupyterCellFromNotebookCell(
 	vscCell: NotebookCellData
 ): nbformat.IRawCell | nbformat.IMarkdownCell | nbformat.ICodeCell {
diff --git a/src/vs/base/common/mime.ts b/src/vs/base/common/mime.ts
@@ -15,6 +15,7 @@ export namespace Mimes {
 	export const binary = 'application/octet-stream';
 	export const unknown = 'application/unknown';
 	export const markdown = 'text/markdown';
+	export const latex = 'text/latex';
 }
 
 export interface ITextMimeAssociation {
diff --git a/src/vs/workbench/contrib/notebook/browser/view/output/transforms/richTransform.ts b/src/vs/workbench/contrib/notebook/browser/view/output/transforms/richTransform.ts
@@ -217,7 +217,7 @@ class MdRendererContrib extends Disposable implements IOutputRendererContributio
 	}
 
 	getMimetypes() {
-		return [Mimes.markdown];
+		return [Mimes.markdown, Mimes.latex];
 	}
 
 	constructor(
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts
@@ -1155,7 +1155,7 @@ async function webviewPreloads(ctx: PreloadContext) {
 
 			await renderers.render(this, this.element);
 
-			if (this.mime === 'text/markdown') {
+			if (this.mime === 'text/markdown' || this.mime === 'text/latex') {
 				const root = this.element.shadowRoot;
 				if (root) {
 					if (!hasPostedRenderedMathTelemetry) {
diff --git a/src/vs/workbench/contrib/notebook/common/notebookCommon.ts b/src/vs/workbench/contrib/notebook/common/notebookCommon.ts
@@ -37,13 +37,15 @@ export const NOTEBOOK_DISPLAY_ORDER = [
 	'application/javascript',
 	'text/html',
 	'image/svg+xml',
+	Mimes.latex,
 	Mimes.markdown,
 	'image/png',
 	'image/jpeg',
 	Mimes.text
 ];
 
 export const ACCESSIBLE_NOTEBOOK_DISPLAY_ORDER = [
+	Mimes.latex,
 	Mimes.markdown,
 	'application/json',
 	Mimes.text,
@@ -567,6 +569,7 @@ const _mimeTypeInfo = new Map<string, MimeTypeInfo>([
 	['image/git', { alwaysSecure: true, supportedByCore: true }],
 	['image/svg+xml', { supportedByCore: true }],
 	['application/json', { alwaysSecure: true, supportedByCore: true }],
+	[Mimes.latex, { alwaysSecure: true, supportedByCore: true }],
 	[Mimes.markdown, { alwaysSecure: true, supportedByCore: true }],
 	[Mimes.text, { alwaysSecure: true, supportedByCore: true }],
 	['text/html', { supportedByCore: true }],
diff --git a/src/vs/workbench/contrib/notebook/test/notebookCommon.test.ts b/src/vs/workbench/contrib/notebook/test/notebookCommon.test.ts
@@ -24,6 +24,7 @@ suite('NotebookCommon', () => {
 				'application/javascript',
 				'text/html',
 				'image/svg+xml',
+				Mimes.latex,
 				Mimes.markdown,
 				'image/png',
 				'image/jpeg',
@@ -34,6 +35,7 @@ suite('NotebookCommon', () => {
 				'application/javascript',
 				'text/html',
 				'image/svg+xml',
+				Mimes.latex,
 				Mimes.markdown,
 				'image/png',
 				'image/jpeg',
@@ -44,6 +46,7 @@ suite('NotebookCommon', () => {
 		assert.deepStrictEqual(sortMimeTypes(
 			[
 				'application/json',
+				Mimes.latex,
 				Mimes.markdown,
 				'application/javascript',
 				'text/html',
@@ -57,6 +60,7 @@ suite('NotebookCommon', () => {
 				'application/javascript',
 				'text/html',
 				'image/svg+xml',
+				Mimes.latex,
 				Mimes.markdown,
 				'image/png',
 				'image/jpeg',

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ enum CellOutputMimeTypes {`
`93`	`93`	`stdout = 'application/vnd.code.notebook.stdout'`
`94`	`94`	`}`
`95`	`95`
`96`		`-const textMimeTypes = ['text/plain', 'text/markdown', CellOutputMimeTypes.stderr, CellOutputMimeTypes.stdout];`
	`96`	`+export const textMimeTypes = ['text/plain', 'text/markdown', 'text/latex', CellOutputMimeTypes.stderr, CellOutputMimeTypes.stdout];`
`97`	`97`
`98`	`98`	`function concatMultilineString(str: string \| string[], trim?: boolean): string {`
`99`	`99`	`const nonLineFeedWhiteSpaceTrim = /(^[\t\f\v\r ]+\|[\t\f\v\r ]+$)/g;`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ export namespace Mimes {`
`15`	`15`	`export const binary = 'application/octet-stream';`
`16`	`16`	`export const unknown = 'application/unknown';`
`17`	`17`	`export const markdown = 'text/markdown';`
	`18`	`+ export const latex = 'text/latex';`
`18`	`19`	`}`
`19`	`20`
`20`	`21`	`export interface ITextMimeAssociation {`
Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ class MdRendererContrib extends Disposable implements IOutputRendererContributio`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`getMimetypes() {`
`220`		`- return [Mimes.markdown];`
	`220`	`+ return [Mimes.markdown, Mimes.latex];`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`constructor(`