file access - merge asDomUri into

This commit is contained in:
Benjamin Pasero
2020-09-25 18:04:38 +02:00
parent dab1430be0
commit ee8378e806
7 changed files with 17 additions and 27 deletions

View File

@@ -7,8 +7,7 @@ import { URI } from 'vs/base/common/uri';
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
import { IFileService } from 'vs/platform/files/common/files';
import { IExtensionResourceLoaderService } from 'vs/workbench/services/extensionResourceLoader/common/extensionResourceLoader';
import * as dom from 'vs/base/browser/dom';
import { Schemas } from 'vs/base/common/network';
import { FileAccess, Schemas } from 'vs/base/common/network';
class ExtensionResourceLoaderService implements IExtensionResourceLoaderService {
@@ -19,7 +18,7 @@ class ExtensionResourceLoaderService implements IExtensionResourceLoaderService
) { }
async readExtensionResource(uri: URI): Promise<string> {
uri = dom.asDomUri(uri);
uri = FileAccess.asBrowserUri(uri);
if (uri.scheme !== Schemas.http && uri.scheme !== Schemas.https) {
const result = await this._fileService.readFile(uri);