From ddd555c5cab55f2f4fb47bb1a3fd64d5547b2825 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Thu, 13 Jun 2019 10:24:37 +0200
Subject: [PATCH] add svg/woff mime types to mime.ts, #75061

---
 src/vs/base/common/mime.ts                | 62 ++++++++++++-----------
 src/vs/workbench/browser/web.resources.ts | 10 ++--
 2 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/src/vs/base/common/mime.ts b/src/vs/base/common/mime.ts
index 83234f40ac5..d9451a64def 100644
--- a/src/vs/base/common/mime.ts
+++ b/src/vs/base/common/mime.ts
@@ -274,52 +274,54 @@ interface MapExtToMediaMimes {
 
 // Known media mimes that we can handle
 const mapExtToMediaMimes: MapExtToMediaMimes = {
+	'.aac': 'audio/x-aac',
+	'.avi': 'video/x-msvideo',
 	'.bmp': 'image/bmp',
+	'.flv': 'video/x-flv',
 	'.gif': 'image/gif',
-	'.jpg': 'image/jpg',
-	'.jpeg': 'image/jpg',
-	'.jpe': 'image/jpg',
-	'.png': 'image/png',
-	'.tiff': 'image/tiff',
-	'.tif': 'image/tiff',
 	'.ico': 'image/x-icon',
-	'.tga': 'image/x-tga',
-	'.psd': 'image/vnd.adobe.photoshop',
-	'.webp': 'image/webp',
+	'.jpe': 'image/jpg',
+	'.jpeg': 'image/jpg',
+	'.jpg': 'image/jpg',
+	'.m1v': 'video/mpeg',
+	'.m2a': 'audio/mpeg',
+	'.m2v': 'video/mpeg',
+	'.m3a': 'audio/mpeg',
 	'.mid': 'audio/midi',
 	'.midi': 'audio/midi',
-	'.mp4a': 'audio/mp4',
-	'.mpga': 'audio/mpeg',
+	'.mk3d': 'video/x-matroska',
+	'.mks': 'video/x-matroska',
+	'.mkv': 'video/x-matroska',
+	'.mov': 'video/quicktime',
+	'.movie': 'video/x-sgi-movie',
 	'.mp2': 'audio/mpeg',
 	'.mp2a': 'audio/mpeg',
 	'.mp3': 'audio/mpeg',
-	'.m2a': 'audio/mpeg',
-	'.m3a': 'audio/mpeg',
-	'.oga': 'audio/ogg',
-	'.ogg': 'audio/ogg',
-	'.spx': 'audio/ogg',
-	'.aac': 'audio/x-aac',
-	'.wav': 'audio/x-wav',
-	'.wma': 'audio/x-ms-wma',
 	'.mp4': 'video/mp4',
+	'.mp4a': 'audio/mp4',
 	'.mp4v': 'video/mp4',
-	'.mpg4': 'video/mp4',
+	'.mpe': 'video/mpeg',
 	'.mpeg': 'video/mpeg',
 	'.mpg': 'video/mpeg',
-	'.mpe': 'video/mpeg',
-	'.m1v': 'video/mpeg',
-	'.m2v': 'video/mpeg',
+	'.mpg4': 'video/mp4',
+	'.mpga': 'audio/mpeg',
+	'.oga': 'audio/ogg',
+	'.ogg': 'audio/ogg',
 	'.ogv': 'video/ogg',
+	'.png': 'image/png',
+	'.psd': 'image/vnd.adobe.photoshop',
 	'.qt': 'video/quicktime',
-	'.mov': 'video/quicktime',
+	'.spx': 'audio/ogg',
+	'.svg': 'image/svg+xml',
+	'.tga': 'image/x-tga',
+	'.tif': 'image/tiff',
+	'.tiff': 'image/tiff',
+	'.wav': 'audio/x-wav',
 	'.webm': 'video/webm',
-	'.mkv': 'video/x-matroska',
-	'.mk3d': 'video/x-matroska',
-	'.mks': 'video/x-matroska',
+	'.webp': 'image/webp',
+	'.wma': 'audio/x-ms-wma',
 	'.wmv': 'video/x-ms-wmv',
-	'.flv': 'video/x-flv',
-	'.avi': 'video/x-msvideo',
-	'.movie': 'video/x-sgi-movie'
+	'.woff': 'application/font-woff',
 };
 
 export function getMediaMime(path: string): string | undefined {
diff --git a/src/vs/workbench/browser/web.resources.ts b/src/vs/workbench/browser/web.resources.ts
index cb4fdfb20ab..3fb3daab88a 100644
--- a/src/vs/workbench/browser/web.resources.ts
+++ b/src/vs/workbench/browser/web.resources.ts
@@ -5,6 +5,7 @@
 
 import { IFileService } from 'vs/platform/files/common/files';
 import { URI } from 'vs/base/common/uri';
+import { getMediaMime } from 'vs/base/common/mime';
 
 export class WebResources {
 
@@ -62,10 +63,11 @@ export class WebResources {
 				promises.push(Promise.resolve());
 
 			} else {
-				promises.push(this._fileService.readFile(URI.parse(remoteUrl, true)).then(file => {
-					// todo@joh hack
-					const type = /\.woff$/.test(remoteUrl) ? 'application/font-woff' : 'image/svg+xml';
-					this._cache.set(remoteUrl, URL.createObjectURL(new Blob([file.value.buffer], { type })));
+				const uri = URI.parse(remoteUrl, true);
+				promises.push(this._fileService.readFile(uri).then(file => {
+					this._cache.set(remoteUrl, URL.createObjectURL(new Blob(
+						[file.value.buffer], { type: getMediaMime(uri.path) }
+					)));
 				}));
 			}
 		}
-- 
GitLab