Skip to content

Fixes to escaping of output in native notebooks #14199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DonJayamanne merged 1 commit into from
Oct 1, 2020
Merged

Fixes to escaping of output in native notebooks #14199

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions src/client/datascience/jupyter/kernels/cellExecution.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,12 +426,7 @@ export class CellExecution {
}

private async addToCellData(
output:
| nbformat.IUnrecognizedOutput
| nbformat.IExecuteResult
| nbformat.IDisplayData
| nbformat.IStream
| nbformat.IError,
output: nbformat.IExecuteResult | nbformat.IDisplayData | nbformat.IStream | nbformat.IError,
clearState: RefBool
) {
const converted = cellOutputToVSCCellOutput(output);
Expand Down Expand Up @@ -494,6 +489,7 @@ export class CellExecution {
output_type: 'stream',
// tslint:disable-next-line: no-any
text: (o.data as any)['text/plain'].toString(),
name: 'stdout',
metadata: {},
execution_count: reply.execution_count
},
Expand Down Expand Up @@ -533,7 +529,7 @@ export class CellExecution {
if (existing && 'text/plain' in existing.data) {
// tslint:disable-next-line:restrict-plus-operands
existing.data['text/plain'] = formatStreamText(
concatMultilineString(`${existing.data['text/plain']}${escape(msg.content.text)}`)
concatMultilineString(`${existing.data['text/plain']}${msg.content.text}`)
);
edit.replaceCellOutput(this.cellIndex, [...exitingCellOutput]); // This is necessary to get VS code to update (for now)
} else {
Expand Down