Port more escape fixes to point release (#14242)

* Fix two problems with escaping (#14228)

* Fixup changelog

Author: rchiodo

src/client/datascience/jupyter/jupyterDebugger.ts

@@ -474,7 +474,7 @@ export class JupyterDebugger implements IJupyterDebugger, ICellHashListener {
                 const data = outputs[0].data;
                 if (data && data.hasOwnProperty('text/plain')) {
                     // tslint:disable-next-line:no-any
-                    return (data as any)['text/plain'];
+                    return concatMultilineString((data as any)['text/plain']);
                 }
                 if (outputs[0].output_type === 'stream') {
                     const stream = outputs[0] as nbformat.IStream;

src/datascience-ui/interactive-common/cellOutput.tsx

@@ -316,22 +316,6 @@ export class CellOutput extends React.Component<ICellOutputProps> {
             input = JSON.stringify(output.data);
             renderWithScrollbars = true;
             isText = true;
-        } else if (
-            output.output_type === 'execute_result' &&
-            input &&
-            input.hasOwnProperty('text/plain') &&
-            !input.hasOwnProperty('text/html')
-        ) {
-            // Plain text should actually be shown as html so that escaped HTML shows up correctly
-            mimeType = 'text/html';
-            isText = true;
-            isError = false;
-            renderWithScrollbars = true;
-            // tslint:disable-next-line: no-any
-            const text = (input as any)['text/plain'];
-            input = {
-                'text/html': lodashEscape(concatMultilineString(text))
-            };
         } else if (output.output_type === 'stream') {
             mimeType = 'text/html';
             isText = true;
@@ -341,7 +325,7 @@ export class CellOutput extends React.Component<ICellOutputProps> {
             const stream = output as nbformat.IStream; // NOSONAR
             const concatted = lodashEscape(concatMultilineString(stream.text));
             input = {
-                'text/html': concatted // XML tags should have already been escaped.
+                'text/html': concatted
             };
 
             // Output may have ascii colorization chars in it.
@@ -401,12 +385,6 @@ export class CellOutput extends React.Component<ICellOutputProps> {
             data = fixMarkdown(concatMultilineString(data as nbformat.MultilineString, true), true);
         }
 
-        // Make sure text output is escaped (nteract texttransform won't)
-        if (mimeType === 'text/plain' && data) {
-            data = lodashEscape(data.toString());
-            mimeType = 'text/html';
-        }
-
         return {
             isText,
             isError,