Skip to content
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

Jump to bottom

remote: fix first half of svg icons not loading #185711

Merged
merged 1 commit into from
Jun 20, 2023
Merged

remote: fix first half of svg icons not loading #185711

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/vs/workbench/browser/web.api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,5 +826,5 @@ export interface IRemoteResourceRequest {
/**
* A method called by the editor to issue a response to the request.
*/
respondWith(statusCode: number, body: Uint8Array): void;
respondWith(statusCode: number, body: Uint8Array, headers: Record<string, string>): void;
}
10 changes: 6 additions & 4 deletions src/vs/workbench/services/remote/browser/browserRemoteResourceHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import { VSBuffer } from 'vs/base/common/buffer';
import { Disposable } from 'vs/base/common/lifecycle';
import { getMediaOrTextMime } from 'vs/base/common/mime';
import { URI, UriComponents } from 'vs/base/common/uri';
import { FileOperationError, FileOperationResult, IFileContent, IFileService } from 'vs/platform/files/common/files';
import { IRemoteResourceProvider, IResourceUriProvider } from 'vs/workbench/browser/web.api';
Expand All @@ -21,7 +22,7 @@ export class BrowserRemoteResourceLoader extends Disposable {
try {
uri = JSON.parse(decodeURIComponent(request.uri.query));
} catch {
return request.respondWith(404, new Uint8Array());
return request.respondWith(404, new Uint8Array(), {});
}

let content: IFileContent;
Expand All @@ -30,13 +31,14 @@ export class BrowserRemoteResourceLoader extends Disposable {
} catch (e) {
const str = VSBuffer.fromString(e.message).buffer;
if (e instanceof FileOperationError && e.fileOperationResult === FileOperationResult.FILE_NOT_FOUND) {
return request.respondWith(404, str);
return request.respondWith(404, str, {});
} else {
return request.respondWith(500, str);
return request.respondWith(500, str, {});
}
}

request.respondWith(200, content.value.buffer);
const mime = uri.path && getMediaOrTextMime(uri.path);
request.respondWith(200, content.value.buffer, mime ? { 'content-type': mime } : {});
}));
}

Expand Down