development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 13:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

re-use text encoder

Browse source
This commit is contained in:
Don Jayamanne 2021-07-23 16:29:23 -07:00
parent 739cc8974f
commit 7f43ac34a1
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
extensions/ipynb/src/helpers.ts
View file

@ -27,6 +27,7 @@ export function getPreferredLanguage(metadata?: nbformat.INotebookMetadata) {
return translateKernelLanguageToMonaco(jupyterLanguage || defaultLanguage);
}
const textDecoder = new TextDecoder();
function translateKernelLanguageToMonaco(language: string): string {
language = language.toLowerCase();
if (language.length === 2 && language.endsWith('#')) {
@ -336,7 +337,7 @@ function translateCellErrorOutput(output: NotebookCellOutput): nbformat.IError {
};
}
const originalError: undefined | nbformat.IError = output.metadata?.originalError;
const value: Error = JSON.parse(new TextDecoder().decode(firstItem.data.buffer.slice(firstItem.data.byteOffset)));
const value: Error = JSON.parse(textDecoder.decode(firstItem.data.buffer.slice(firstItem.data.byteOffset)));
return {
output_type: 'error',
ename: value.name,
@ -385,10 +386,11 @@ function convertOutputMimeToJupyterOutput(mime: string, value: Uint8Array) {
return '';
}
try {
const stringValue = new TextDecoder().decode(value.buffer.slice(value.byteOffset));
if (mime === CellOutputMimeTypes.error) {
const stringValue = textDecoder.decode(value.buffer.slice(value.byteOffset));
return JSON.parse(stringValue);
} else if (mime.startsWith('text/') || textMimeTypes.includes(mime)) {
const stringValue = textDecoder.decode(value.buffer.slice(value.byteOffset));
return splitMultilineString(stringValue);
} else if (mime.startsWith('image/') && mime !== 'image/svg+xml') {
// Images in Jupyter are stored in base64 encoded format.
@ -397,13 +399,16 @@ function convertOutputMimeToJupyterOutput(mime: string, value: Uint8Array) {
return Buffer.from(value).toString('base64');
} else {
// https://developer.mozilla.org/en-US/docs/Glossary/Base64#solution_1_%E2%80%93_escaping_the_string_before_encoding_it
const stringValue = textDecoder.decode(value.buffer.slice(value.byteOffset));
return btoa(encodeURIComponent(stringValue).replace(/%([0-9A-F]{2})/g, function (_match, p1) {
return String.fromCharCode(Number.parseInt('0x' + p1));
}));
}
} else if (mime.toLowerCase().includes('json')) {
const stringValue = textDecoder.decode(value.buffer.slice(value.byteOffset));
return stringValue.length > 0 ? JSON.parse(stringValue) : stringValue;
} else {
const stringValue = textDecoder.decode(value.buffer.slice(value.byteOffset));
return stringValue;
}
} catch (ex) {