esm - remove getPathFromAmdModule, replace its usages with FileAccess.asFileUri and AppResourcePath

src/vs/base/parts/ipc/test/node/ipc.cp.integrationTest.ts

@@ -7,11 +7,11 @@ import * as assert from 'assert';
 import { Event } from 'vs/base/common/event';
 import { IChannel } from 'vs/base/parts/ipc/common/ipc';
 import { Client } from 'vs/base/parts/ipc/node/ipc.cp';
-import { getPathFromAmdModule } from 'vs/base/test/node/testUtils';
 import { ITestService, TestServiceClient } from './testService';
+import { FileAccess } from 'vs/base/common/network';
 
 function createClient(): Client {
-	return new Client(getPathFromAmdModule(require, 'bootstrap-fork'), {
+	return new Client(FileAccess.asFileUri('bootstrap-fork').fsPath, {
 		serverName: 'TestServer',
 		env: { VSCODE_AMD_ENTRYPOINT: 'vs/base/parts/ipc/test/node/testApp', verbose: true }
 	});

src/vs/base/test/node/pfs/pfs.test.ts

@@ -9,10 +9,11 @@ import { tmpdir } from 'os';
 import { timeout } from 'vs/base/common/async';
 import { VSBuffer } from 'vs/base/common/buffer';
 import { randomPath } from 'vs/base/common/extpath';
+import { FileAccess } from 'vs/base/common/network';
 import { join, sep } from 'vs/base/common/path';
 import { isWindows } from 'vs/base/common/platform';
 import { configureFlushOnWrite, Promises, RimRafMode, rimrafSync, SymlinkSupport, writeFileSync } from 'vs/base/node/pfs';
-import { flakySuite, getPathFromAmdModule, getRandomTestPath } from 'vs/base/test/node/testUtils';
+import { flakySuite, getRandomTestPath } from 'vs/base/test/node/testUtils';
 
 configureFlushOnWrite(false); // speed up all unit tests by disabling flush on write
 
@@ -165,7 +166,7 @@ flakySuite('PFS', function () {
 	});
 
 	test('copy, move and delete', async () => {
-		const sourceDir = getPathFromAmdModule(require, './fixtures');
+		const sourceDir = FileAccess.asFileUri('vs/base/test/node/pfs/fixtures').fsPath;
 		const parentDir = join(tmpdir(), 'vsctests', 'pfs');
 		const targetDir = randomPath(parentDir);
 		const targetDir2 = randomPath(parentDir);

src/vs/base/test/node/processes/processes.integrationTest.ts

@@ -5,10 +5,10 @@
 
 import * as assert from 'assert';
 import * as cp from 'child_process';
+import { FileAccess } from 'vs/base/common/network';
 import * as objects from 'vs/base/common/objects';
 import * as platform from 'vs/base/common/platform';
 import * as processes from 'vs/base/node/processes';
-import { getPathFromAmdModule } from 'vs/base/test/node/testUtils';
 
 function fork(id: string): cp.ChildProcess {
 	const opts: any = {
@@ -19,7 +19,7 @@ function fork(id: string): cp.ChildProcess {
 		})
 	};
 
-	return cp.fork(getPathFromAmdModule(require, 'bootstrap-fork'), ['--type=processTests'], opts);
+	return cp.fork(FileAccess.asFileUri('bootstrap-fork').fsPath, ['--type=processTests'], opts);
 }
 
 suite('Processes', () => {

src/vs/base/test/node/testUtils.ts

@@ -5,15 +5,10 @@
 
 import { randomPath } from 'vs/base/common/extpath';
 import { join } from 'vs/base/common/path';
-import { URI } from 'vs/base/common/uri';
 import * as testUtils from 'vs/base/test/common/testUtils';
 
 export function getRandomTestPath(tmpdir: string, ...segments: string[]): string {
 	return randomPath(join(tmpdir, ...segments));
 }
 
-export function getPathFromAmdModule(requirefn: typeof require, relativePath: string): string {
-	return URI.parse(requirefn.toUrl(relativePath)).fsPath;
-}
-
 export import flakySuite = testUtils.flakySuite;

src/vs/base/test/node/uri.test.perf.ts

@@ -5,15 +5,15 @@
 
 import * as assert from 'assert';
 import { readFileSync } from 'fs';
+import { FileAccess } from 'vs/base/common/network';
 import { URI } from 'vs/base/common/uri';
-import { getPathFromAmdModule } from 'vs/base/test/node/testUtils';
 
 suite('URI - perf', function () {
 
 	let manyFileUris: URI[];
 	setup(function () {
 		manyFileUris = [];
-		const data = readFileSync(getPathFromAmdModule(require, './uri.test.data.txt')).toString();
+		const data = readFileSync(FileAccess.asFileUri('vs/base/test/node/uri.test.data.txt').fsPath).toString();
 		const lines = data.split('\n');
 		for (const line of lines) {
 			manyFileUris.push(URI.file(line));

src/vs/base/test/node/zip/zip.test.ts

@@ -6,10 +6,11 @@
 import * as assert from 'assert';
 import { tmpdir } from 'os';
 import { createCancelablePromise } from 'vs/base/common/async';
+import { FileAccess } from 'vs/base/common/network';
 import * as path from 'vs/base/common/path';
 import { Promises } from 'vs/base/node/pfs';
 import { extract } from 'vs/base/node/zip';
-import { getPathFromAmdModule, getRandomTestPath } from 'vs/base/test/node/testUtils';
+import { getRandomTestPath } from 'vs/base/test/node/testUtils';
 
 suite('Zip', () => {
 
@@ -26,7 +27,7 @@ suite('Zip', () => {
 	});
 
 	test('extract should handle directories', async () => {
-		const fixtures = getPathFromAmdModule(require, './fixtures');
+		const fixtures = FileAccess.asFileUri('vs/base/test/node/zip/fixtures').fsPath;
 		const fixture = path.join(fixtures, 'extract.zip');
 
 		await createCancelablePromise(token => extract(fixture, testDir, {}, token));

src/vs/platform/checksum/test/node/checksumService.test.ts

@@ -4,9 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import { Schemas } from 'vs/base/common/network';
+import { FileAccess, Schemas } from 'vs/base/common/network';
 import { URI } from 'vs/base/common/uri';
-import { getPathFromAmdModule } from 'vs/base/test/node/testUtils';
 import { ChecksumService } from 'vs/platform/checksum/node/checksumService';
 import { IFileService } from 'vs/platform/files/common/files';
 import { FileService } from 'vs/platform/files/common/fileService';
@@ -34,7 +33,7 @@ suite('Checksum Service', () => {
 	test('checksum', async () => {
 		const checksumService = new ChecksumService(fileService);
 
-		const checksum = await checksumService.checksum(URI.file(getPathFromAmdModule(require, './fixtures/lorem.txt')));
+		const checksum = await checksumService.checksum(URI.file(FileAccess.asFileUri('vs/platform/checksum/test/node/fixtures/lorem.txt').fsPath));
 		assert.ok(checksum === '8mi5KF8kcb817zmlal1kZA' || checksum === 'DnUKbJ1bHPPNZoHgHV25sg'); // depends on line endings git config
 	});
 });

src/vs/platform/files/test/node/diskFileService.test.ts

@@ -9,13 +9,13 @@ import { tmpdir } from 'os';
 import { timeout } from 'vs/base/common/async';
 import { bufferToReadable, bufferToStream, streamToBuffer, streamToBufferReadableStream, VSBuffer, VSBufferReadable, VSBufferReadableStream } from 'vs/base/common/buffer';
 import { DisposableStore } from 'vs/base/common/lifecycle';
-import { Schemas } from 'vs/base/common/network';
+import { FileAccess, Schemas } from 'vs/base/common/network';
 import { basename, dirname, join, posix } from 'vs/base/common/path';
 import { isLinux, isWindows } from 'vs/base/common/platform';
 import { joinPath } from 'vs/base/common/resources';
 import { URI } from 'vs/base/common/uri';
 import { Promises } from 'vs/base/node/pfs';
-import { flakySuite, getPathFromAmdModule, getRandomTestPath } from 'vs/base/test/node/testUtils';
+import { flakySuite, getRandomTestPath } from 'vs/base/test/node/testUtils';
 import { etag, IFileAtomicReadOptions, FileOperation, FileOperationError, FileOperationEvent, FileOperationResult, FilePermission, FileSystemProviderCapabilities, hasFileAtomicReadCapability, hasOpenReadWriteCloseCapability, IFileStat, IFileStatWithMetadata, IReadFileOptions, IStat, NotModifiedSinceFileOperationError, TooLargeFileOperationError } from 'vs/platform/files/common/files';
 import { FileService } from 'vs/platform/files/common/fileService';
 import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider';
@@ -157,7 +157,7 @@ flakySuite('Disk File Service', function () {
 
 		testDir = getRandomTestPath(tmpdir(), 'vsctests', 'diskfileservice');
 
-		const sourceDir = getPathFromAmdModule(require, './fixtures/service');
+		const sourceDir = FileAccess.asFileUri('vs/platform/files/test/node/fixtures/service').fsPath;
 
 		await Promises.copy(sourceDir, testDir, { preserveSymlinks: false });
 	});
@@ -219,7 +219,7 @@ flakySuite('Disk File Service', function () {
 	});
 
 	test('resolve - file', async () => {
-		const resource = URI.file(getPathFromAmdModule(require, './fixtures/resolver/index.html'));
+		const resource = FileAccess.asFileUri('vs/platform/files/test/node/fixtures/resolver/index.html');
 		const resolved = await service.resolve(resource);
 
 		assert.strictEqual(resolved.name, 'index.html');
@@ -237,7 +237,7 @@ flakySuite('Disk File Service', function () {
 	test('resolve - directory', async () => {
 		const testsElements = ['examples', 'other', 'index.html', 'site.css'];
 
-		const resource = URI.file(getPathFromAmdModule(require, './fixtures/resolver'));
+		const resource = FileAccess.asFileUri('vs/platform/files/test/node/fixtures/resolver');
 		const result = await service.resolve(resource);
 
 		assert.ok(result);
@@ -282,7 +282,7 @@ flakySuite('Disk File Service', function () {
 	test('resolve - directory - with metadata', async () => {
 		const testsElements = ['examples', 'other', 'index.html', 'site.css'];
 
-		const result = await service.resolve(URI.file(getPathFromAmdModule(require, './fixtures/resolver')), { resolveMetadata: true });
+		const result = await service.resolve(FileAccess.asFileUri('vs/platform/files/test/node/fixtures/resolver'), { resolveMetadata: true });
 
 		assert.ok(result);
 		assert.strictEqual(result.name, 'resolver');
@@ -332,7 +332,7 @@ flakySuite('Disk File Service', function () {
 	});
 
 	test('resolve - directory - resolveTo single directory', async () => {
-		const resolverFixturesPath = getPathFromAmdModule(require, './fixtures/resolver');
+		const resolverFixturesPath = FileAccess.asFileUri('vs/platform/files/test/node/fixtures/resolver').fsPath;
 		const result = await service.resolve(URI.file(resolverFixturesPath), { resolveTo: [URI.file(join(resolverFixturesPath, 'other/deep'))] });
 
 		assert.ok(result);
@@ -362,7 +362,7 @@ flakySuite('Disk File Service', function () {
 	});
 
 	async function testResolveDirectoryWithTarget(withQueryParam: boolean): Promise<void> {
-		const resolverFixturesPath = getPathFromAmdModule(require, './fixtures/resolver');
+		const resolverFixturesPath = FileAccess.asFileUri('vs/platform/files/test/node/fixtures/resolver').fsPath;
 		const result = await service.resolve(URI.file(resolverFixturesPath).with({ query: withQueryParam ? 'test' : undefined }), {
 			resolveTo: [
 				URI.file(join(resolverFixturesPath, 'other/deep')).with({ query: withQueryParam ? 'test' : undefined }),
@@ -394,7 +394,7 @@ flakySuite('Disk File Service', function () {
 	}
 
 	test('resolve directory - resolveSingleChildFolders', async () => {
-		const resolverFixturesPath = getPathFromAmdModule(require, './fixtures/resolver/other');
+		const resolverFixturesPath = FileAccess.asFileUri('vs/platform/files/test/node/fixtures/resolver/other').fsPath;
 		const result = await service.resolve(URI.file(resolverFixturesPath), { resolveSingleChildDescendants: true });
 
 		assert.ok(result);
@@ -462,7 +462,7 @@ flakySuite('Disk File Service', function () {
 	});
 
 	test('stat - file', async () => {
-		const resource = URI.file(getPathFromAmdModule(require, './fixtures/resolver/index.html'));
+		const resource = FileAccess.asFileUri('vs/platform/files/test/node/fixtures/resolver/index.html');
 		const resolved = await service.stat(resource);
 
 		assert.strictEqual(resolved.name, 'index.html');
@@ -477,7 +477,7 @@ flakySuite('Disk File Service', function () {
 	});
 
 	test('stat - directory', async () => {
-		const resource = URI.file(getPathFromAmdModule(require, './fixtures/resolver'));
+		const resource = FileAccess.asFileUri('vs/platform/files/test/node/fixtures/resolver');
 		const result = await service.stat(resource);
 
 		assert.ok(result);

src/vs/platform/files/test/node/nodejsWatcher.integrationTest.ts

@@ -6,7 +6,7 @@
 import { tmpdir } from 'os';
 import { basename, dirname, join } from 'vs/base/common/path';
 import { Promises, RimRafMode } from 'vs/base/node/pfs';
-import { flakySuite, getPathFromAmdModule, getRandomTestPath } from 'vs/base/test/node/testUtils';
+import { flakySuite, getRandomTestPath } from 'vs/base/test/node/testUtils';
 import { FileChangeType } from 'vs/platform/files/common/files';
 import { INonRecursiveWatchRequest } from 'vs/platform/files/common/watcher';
 import { NodeJSFileWatcherLibrary, watchFileContents } from 'vs/platform/files/node/watcher/nodejs/nodejsWatcherLib';
@@ -16,6 +16,7 @@ import { ltrim } from 'vs/base/common/strings';
 import { DeferredPromise } from 'vs/base/common/async';
 import { CancellationTokenSource } from 'vs/base/common/cancellation';
 import { NodeJSWatcher } from 'vs/platform/files/node/watcher/nodejs/nodejsWatcher';
+import { FileAccess } from 'vs/base/common/network';
 
 // this suite has shown flaky runs in Azure pipelines where
 // tasks would just hang and timeout after a while (not in
@@ -80,7 +81,7 @@ import { NodeJSWatcher } from 'vs/platform/files/node/watcher/nodejs/nodejsWatch
 
 		testDir = getRandomTestPath(tmpdir(), 'vsctests', 'filewatcher');
 
-		const sourceDir = getPathFromAmdModule(require, './fixtures/service');
+		const sourceDir = FileAccess.asFileUri('vs/platform/files/test/node/fixtures/service').fsPath;
 
 		await Promises.copy(sourceDir, testDir, { preserveSymlinks: false });
 	});

src/vs/platform/files/test/node/parcelWatcher.integrationTest.ts

@@ -10,12 +10,13 @@ import { timeout } from 'vs/base/common/async';
 import { join } from 'vs/base/common/path';
 import { isLinux, isMacintosh, isWindows } from 'vs/base/common/platform';
 import { Promises, RimRafMode } from 'vs/base/node/pfs';
-import { flakySuite, getPathFromAmdModule, getRandomTestPath } from 'vs/base/test/node/testUtils';
+import { flakySuite, getRandomTestPath } from 'vs/base/test/node/testUtils';
 import { FileChangeType } from 'vs/platform/files/common/files';
 import { ParcelWatcher } from 'vs/platform/files/node/watcher/parcel/parcelWatcher';
 import { IDiskFileChange, IRecursiveWatchRequest } from 'vs/platform/files/common/watcher';
 import { getDriveLetter } from 'vs/base/common/extpath';
 import { ltrim } from 'vs/base/common/strings';
+import { FileAccess } from 'vs/base/common/network';
 
 // this suite has shown flaky runs in Azure pipelines where
 // tasks would just hang and timeout after a while (not in
@@ -78,7 +79,7 @@ import { ltrim } from 'vs/base/common/strings';
 
 		testDir = getRandomTestPath(tmpdir(), 'vsctests', 'filewatcher');
 
-		const sourceDir = getPathFromAmdModule(require, './fixtures/service');
+		const sourceDir = FileAccess.asFileUri('vs/platform/files/test/node/fixtures/service').fsPath;
 
 		await Promises.copy(sourceDir, testDir, { preserveSymlinks: false });
 	});

src/vs/platform/windows/test/electron-main/windowsFinder.test.ts

@@ -9,18 +9,18 @@ import { Event } from 'vs/base/common/event';
 import { join } from 'vs/base/common/path';
 import { extUriBiasedIgnorePathCase } from 'vs/base/common/resources';
 import { URI, UriDto } from 'vs/base/common/uri';
-import { getPathFromAmdModule } from 'vs/base/test/node/testUtils';
 import { ICommandAction } from 'vs/platform/action/common/action';
 import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
 import { INativeWindowConfiguration } from 'vs/platform/window/common/window';
 import { ICodeWindow, ILoadEvent, IWindowState } from 'vs/platform/window/electron-main/window';
 import { findWindowOnFile } from 'vs/platform/windows/electron-main/windowsFinder';
 import { toWorkspaceFolders } from 'vs/platform/workspaces/common/workspaces';
 import { IWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
+import { FileAccess } from 'vs/base/common/network';
 
 suite('WindowsFinder', () => {
 
-	const fixturesFolder = getPathFromAmdModule(require, './fixtures');
+	const fixturesFolder = FileAccess.asFileUri('vs/platform/windows/test/electron-main/fixtures').fsPath;
 
 	const testWorkspace: IWorkspaceIdentifier = {
 		id: Date.now().toString(),

src/vs/workbench/contrib/themes/test/electron-browser/colorRegistry.releaseTest.ts

@@ -9,7 +9,6 @@ import { asTextOrError } from 'vs/platform/request/common/request';
 import * as pfs from 'vs/base/node/pfs';
 import * as path from 'vs/base/common/path';
 import * as assert from 'assert';
-import { getPathFromAmdModule } from 'vs/base/test/node/testUtils';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { RequestService } from 'vs/platform/request/node/requestService';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
@@ -18,6 +17,7 @@ import 'vs/workbench/workbench.desktop.main';
 import { NullLogService } from 'vs/platform/log/common/log';
 import { mock } from 'vs/base/test/common/mock';
 import { INativeEnvironmentService } from 'vs/platform/environment/common/environment';
+import { FileAccess } from 'vs/base/common/network';
 
 interface ColorInfo {
 	description: string;
@@ -115,7 +115,7 @@ function getDescription(color: ColorContribution) {
 }
 
 async function getColorsFromExtension(): Promise<{ [id: string]: string }> {
-	const extPath = getPathFromAmdModule(require, '../../../../../../../extensions');
+	const extPath = FileAccess.asFileUri('vs/../../extensions').fsPath;
 	const extFolders = await pfs.Promises.readDirsInDir(extPath);
 	const result: { [id: string]: string } = Object.create(null);
 	for (const folder of extFolders) {

src/vs/workbench/services/keybinding/test/node/keyboardMapperTestUtils.ts

@@ -5,11 +5,11 @@
 
 import * as assert from 'assert';
 import * as path from 'vs/base/common/path';
-import { getPathFromAmdModule } from 'vs/base/test/node/testUtils';
 import { SingleModifierChord, ResolvedKeybinding, Keybinding } from 'vs/base/common/keybindings';
 import { Promises } from 'vs/base/node/pfs';
 import { IKeyboardEvent } from 'vs/platform/keybinding/common/keybinding';
 import { IKeyboardMapper } from 'vs/platform/keyboardLayout/common/keyboardMapper';
+import { FileAccess } from 'vs/base/common/network';
 
 export interface IResolvedKeybinding {
 	label: string | null;
@@ -46,7 +46,7 @@ export function assertResolveKeybinding(mapper: IKeyboardMapper, keybinding: Key
 }
 
 export function readRawMapping<T>(file: string): Promise<T> {
-	return Promises.readFile(getPathFromAmdModule(require, `vs/workbench/services/keybinding/test/node/${file}.js`)).then((buff) => {
+	return Promises.readFile(FileAccess.asFileUri(`vs/workbench/services/keybinding/test/node/${file}.js`).fsPath).then((buff) => {
 		const contents = buff.toString();
 		const func = new Function('define', contents);
 		let rawMappings: T | null = null;
@@ -58,7 +58,7 @@ export function readRawMapping<T>(file: string): Promise<T> {
 }
 
 export function assertMapping(writeFileIfDifferent: boolean, mapper: IKeyboardMapper, file: string): Promise<void> {
-	const filePath = path.normalize(getPathFromAmdModule(require, `vs/workbench/services/keybinding/test/node/${file}`));
+	const filePath = path.normalize(FileAccess.asFileUri(`vs/workbench/services/keybinding/test/node/${file}`).fsPath);
 
 	return Promises.readFile(filePath).then((buff) => {
 		const expected = buff.toString().replace(/\r\n/g, '\n');

src/vs/workbench/services/search/test/electron-browser/rawSearchService.integrationTest.ts

@@ -7,17 +7,18 @@ import * as assert from 'assert';
 import { CancelablePromise, createCancelablePromise } from 'vs/base/common/async';
 import { Emitter, Event } from 'vs/base/common/event';
 import { IDisposable } from 'vs/base/common/lifecycle';
+import { FileAccess } from 'vs/base/common/network';
 import * as path from 'vs/base/common/path';
 import { URI } from 'vs/base/common/uri';
-import { flakySuite, getPathFromAmdModule } from 'vs/base/test/node/testUtils';
+import { flakySuite } from 'vs/base/test/node/testUtils';
 import { IFileQuery, IFileSearchStats, IFolderQuery, IProgressMessage, IRawFileMatch, ISearchEngine, ISearchEngineStats, ISearchEngineSuccess, ISerializedFileMatch, ISerializedSearchComplete, ISerializedSearchProgressItem, ISerializedSearchSuccess, isSerializedSearchComplete, isSerializedSearchSuccess, QueryType } from 'vs/workbench/services/search/common/search';
 import { IProgressCallback, SearchService as RawSearchService } from 'vs/workbench/services/search/node/rawSearchService';
 
 const TEST_FOLDER_QUERIES = [
 	{ folder: URI.file(path.normalize('/some/where')) }
 ];
 
-const TEST_FIXTURES = path.normalize(getPathFromAmdModule(require, '../node/fixtures'));
+const TEST_FIXTURES = path.normalize(FileAccess.asFileUri('vs/workbench/services/search/test/node/fixtures').fsPath);
 const MULTIROOT_QUERIES: IFolderQuery[] = [
 	{ folder: URI.file(path.join(TEST_FIXTURES, 'examples')) },
 	{ folder: URI.file(path.join(TEST_FIXTURES, 'more')) }