OCram85/code-server
Archived
1
0
Fork 0
Code Pull Requests 2 Activity

Fix images not appearing (iconv encoding issue)

Browse Source 
Fixed by returning the original buffer from `fs.read` and then just
using whatever encoding was passed in to iconv, so this should all work
exactly the same now as it does on native Node.
This commit is contained in:
Asher
2019-02-27 14:40:57 -06:00
parent 20c0fc4c52
commit 3bacbca325
4 changed files with 51 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/ide/src/fill/fs.ts
View File

@ -407,13 +407,12 @@ class FS {
return util.promisify(fs.read)(fd, buffer, 0, length, position).then((resp) => {
return {
bytesRead: resp.bytesRead,
content: (resp.bytesRead < buffer.length ? buffer.slice(0, resp.bytesRead) : buffer).toString("utf8"),
content: resp.bytesRead < buffer.length ? buffer.slice(0, resp.bytesRead) : buffer,
};
});
}, fd, length, position).then((resp) => {
const newBuf = Buffer.from(resp.content, "utf8");
buffer.set(newBuf, offset);
callback(undefined!, resp.bytesRead, newBuf as TBuffer);
buffer.set(resp.content, offset);
callback(undefined!, resp.bytesRead, resp.content as TBuffer);
}).catch((ex) => {
callback(ex, undefined!, undefined!);
});