Use vscode-file:// instead of file://

src/bootstrap-window.js

@@ -76,18 +76,16 @@
 
 		window.document.documentElement.setAttribute('lang', locale);
 
-		// do not advertise AMD to avoid confusing UMD modules loaded with nodejs
-		window['define'] = undefined;
-
 		// replace the patched electron fs with the original node fs for all AMD code
-		require.define('fs', ['original-fs'], function (originalFS) { return originalFS; });
+		require.define('fs', [], function () { return require.__$__nodeRequire('original-fs'); });
 
 		window['MonacoEnvironment'] = {};
 
 		const loaderConfig = {
-			baseUrl: `${bootstrap.uriFromPath(configuration.appRoot)}/out`,
+			baseUrl: 'vscode-file://localhost/' + `${bootstrap.uriFromPath(configuration.appRoot)}/out`.substr(8),
 			'vs/nls': nlsConfig,
 			amdModulesPattern: /^vs\//,
+			preferScriptTags: true,
 		};
 
 		// cached data config

src/main.js

@@ -102,6 +102,15 @@ protocol.registerSchemesAsPrivileged([
 			corsEnabled: true,
 		}
 	},
+	{
+		scheme: 'vscode-file',
+		privileges: {
+			secure: true,
+			standard: true,
+			supportFetchAPI: true,
+			corsEnabled: true
+		}
+	}
 ]);
 
 // Global app listeners
@@ -174,6 +183,24 @@ async function onReady() {
 	try {
 		const [cachedDataDir, nlsConfig] = await Promise.all([nodeCachedDataDir.ensureExists(), resolveNlsConfiguration()]);
 
+		protocol.registerFileProtocol('vscode-file', async (request, callback) => {
+			const uri = new URL(request.url);
+
+			if (uri.pathname.startsWith(app.getAppPath())) {
+				return callback({
+					path: uri.pathname
+				});
+			} else {
+				console.error('vscode-file: Cannot load resource outside of app root');
+				return callback({ error: -3 /* ABORTED */ });
+			}
+		});
+
+		protocol.interceptFileProtocol('file', async (request, callback) => {
+			console.error('file: protocol is not allowed in this app');
+			return callback({ error: -3 /* ABORTED */ });
+		});
+
 		startup(cachedDataDir, nlsConfig);
 	} catch (error) {
 		console.error(error);

src/vs/base/browser/dom.ts

@@ -1204,6 +1204,9 @@ export function asDomUri(uri: URI): URI {
 	if (Schemas.vscodeRemote === uri.scheme) {
 		return RemoteAuthorities.rewrite(uri);
 	}
+	if (platform.isNative && Schemas.file === uri.scheme) {
+		return uri.with({ scheme: 'vscode-file' });
+	}
 	return uri;
 }
 

src/vs/code/electron-main/sharedProcess.ts

@@ -61,7 +61,7 @@ export class SharedProcess implements ISharedProcess {
 		};
 
 		const url = `${require.toUrl('vs/code/electron-browser/sharedProcess/sharedProcess.html')}?config=${encodeURIComponent(JSON.stringify(config))}`;
-		this.window.loadURL(url);
+		this.window.loadURL('vscode-file://localhost' + url.slice(7));
 
 		// Prevent the window from dying
 		const onClose = (e: ElectronEvent) => {

src/vs/code/electron-main/window.ts

@@ -686,7 +686,7 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 
 		// Load URL
 		perf.mark('main:loadWindow');
-		this._win.loadURL(this.getUrl(configuration));
+		this._win.loadURL('vscode-file://localhost' + this.getUrl(configuration).slice(7));
 
 		// Make window visible if it did not open in N seconds because this indicates an error
 		// Only do this when running out of sources and not when running tests

src/vs/editor/test/browser/services/decorationRenderOptions.test.ts

@@ -149,25 +149,33 @@ suite('Decoration Render Options', () => {
 		assert(readStyleSheet(styleSheet).indexOf(`{background:url('data:image/svg+xml;base64,PHN2ZyB4b+') center center no-repeat;}`) > 0);
 		s.removeDecorationType('example');
 
+		function assertBackground(url1: string, url2: string) {
+			const actual = readStyleSheet(styleSheet);
+			assert(
+				actual.indexOf(`{background:url('${url1}') center center no-repeat;}`) > 0
+				|| actual.indexOf(`{background:url('${url2}') center center no-repeat;}`) > 0
+			);
+		}
+
 		if (platform.isWindows) {
 			// windows file path (used as string)
 			s.registerDecorationType('example', { gutterIconPath: URI.file('c:\\files\\miles\\more.png') });
-			assert(readStyleSheet(styleSheet).indexOf(`{background:url('file:///c:/files/miles/more.png') center center no-repeat;}`) > 0);
+			assertBackground('file:///c:/files/miles/more.png', 'vscode-file:/c:/files/miles/more.png');
 			s.removeDecorationType('example');
 
 			// single quote must always be escaped/encoded
 			s.registerDecorationType('example', { gutterIconPath: URI.file('c:\\files\\foo\\b\'ar.png') });
-			assert(readStyleSheet(styleSheet).indexOf(`{background:url('file:///c:/files/foo/b%27ar.png') center center no-repeat;}`) > 0);
+			assertBackground('file:///c:/files/foo/b%27ar.png', 'vscode-file:/c:/files/foo/b%27ar.png');
 			s.removeDecorationType('example');
 		} else {
 			// unix file path (used as string)
 			s.registerDecorationType('example', { gutterIconPath: URI.file('/Users/foo/bar.png') });
-			assert(readStyleSheet(styleSheet).indexOf(`{background:url('file:///Users/foo/bar.png') center center no-repeat;}`) > 0);
+			assertBackground('file:///Users/foo/bar.png', 'vscode-file:/Users/foo/bar.png');
 			s.removeDecorationType('example');
 
 			// single quote must always be escaped/encoded
 			s.registerDecorationType('example', { gutterIconPath: URI.file('/Users/foo/b\'ar.png') });
-			assert(readStyleSheet(styleSheet).indexOf(`{background:url('file:///Users/foo/b%27ar.png') center center no-repeat;}`) > 0);
+			assertBackground('file:///Users/foo/b%27ar.png', 'vscode-file:/Users/foo/b%27ar.png');
 			s.removeDecorationType('example');
 		}
 

src/vs/workbench/contrib/extensions/test/electron-browser/extensionsWorkbenchService.test.ts

@@ -223,8 +223,8 @@ suite('ExtensionsWorkbenchServiceTest', () => {
 		assert.equal('1.1.0', actual.version);
 		assert.equal('1.1.0', actual.latestVersion);
 		assert.equal('localDescription1', actual.description);
-		assert.equal('file:///localPath1/localIcon1', actual.iconUrl);
-		assert.equal('file:///localPath1/localIcon1', actual.iconUrlFallback);
+		assert.ok(actual.iconUrl === 'file:///localPath1/localIcon1' || actual.iconUrl === 'vscode-file:/localPath1/localIcon1');
+		assert.ok(actual.iconUrlFallback === 'file:///localPath1/localIcon1' || actual.iconUrlFallback === 'vscode-file:/localPath1/localIcon1');
 		assert.equal(null, actual.licenseUrl);
 		assert.equal(ExtensionState.Installed, actual.state);
 		assert.equal(null, actual.installCount);