files2 => files

build/gulpfile.vscode.js

@@ -76,8 +76,8 @@ const vscodeResources = [
 	'out-build/vs/**/markdown.css',
 	'out-build/vs/workbench/contrib/tasks/**/*.json',
 	'out-build/vs/workbench/contrib/welcome/walkThrough/**/*.md',
-	'out-build/vs/workbench/services/files2/**/*.exe',
-	'out-build/vs/workbench/services/files2/**/*.md',
+	'out-build/vs/workbench/services/files/**/*.exe',
+	'out-build/vs/workbench/services/files/**/*.md',
 	'out-build/vs/code/electron-browser/workbench/**',
 	'out-build/vs/code/electron-browser/sharedProcess/sharedProcess.js',
 	'out-build/vs/code/electron-browser/issue/issueReporter.js',

src/vs/workbench/browser/nodeless.main.ts

@@ -19,7 +19,7 @@ import { RemoteAuthorityResolverService } from 'vs/platform/remote/browser/remot
 import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver';
 import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
 import { IFileService } from 'vs/platform/files/common/files';
-import { FileService2 } from 'vs/workbench/services/files2/common/fileService2';
+import { FileService2 } from 'vs/workbench/services/files/common/fileService2';
 import { Schemas } from 'vs/base/common/network';
 
 class CodeRendererMain extends Disposable {

src/vs/workbench/buildfile.js

@@ -25,8 +25,8 @@ exports.collectModules = function () {
 
 		createModuleDescription('vs/workbench/services/search/node/searchApp', []),
 
-		createModuleDescription('vs/workbench/services/files2/node/watcher/unix/watcherApp', []),
-		createModuleDescription('vs/workbench/services/files2/node/watcher/nsfw/watcherApp', []),
+		createModuleDescription('vs/workbench/services/files/node/watcher/unix/watcherApp', []),
+		createModuleDescription('vs/workbench/services/files/node/watcher/nsfw/watcherApp', []),
 
 		createModuleDescription('vs/workbench/services/extensions/node/extensionHostProcess', []),
 	];

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

@@ -46,10 +46,10 @@ import { TestExperimentService } from 'vs/workbench/contrib/experiments/test/ele
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
 import { ExtensionType } from 'vs/platform/extensions/common/extensions';
 import { ISharedProcessService } from 'vs/platform/ipc/electron-browser/sharedProcessService';
-import { FileService2 } from 'vs/workbench/services/files2/common/fileService2';
+import { FileService2 } from 'vs/workbench/services/files/common/fileService2';
 import { NullLogService } from 'vs/platform/log/common/log';
 import { Schemas } from 'vs/base/common/network';
-import { DiskFileSystemProvider } from 'vs/workbench/services/files2/node/diskFileSystemProvider';
+import { DiskFileSystemProvider } from 'vs/workbench/services/files/node/diskFileSystemProvider';
 import { IFileService } from 'vs/platform/files/common/files';
 
 const mockExtensionGallery: IGalleryExtension[] = [

src/vs/workbench/electron-browser/main.ts

@@ -41,9 +41,9 @@ import { RemoteAuthorityResolverService } from 'vs/platform/remote/electron-brow
 import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver';
 import { RemoteAgentService } from 'vs/workbench/services/remote/electron-browser/remoteAgentServiceImpl';
 import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { FileService2 } from 'vs/workbench/services/files2/common/fileService2';
+import { FileService2 } from 'vs/workbench/services/files/common/fileService2';
 import { IFileService } from 'vs/platform/files/common/files';
-import { DiskFileSystemProvider } from 'vs/workbench/services/files2/electron-browser/diskFileSystemProvider';
+import { DiskFileSystemProvider } from 'vs/workbench/services/files/electron-browser/diskFileSystemProvider';
 import { IChannel } from 'vs/base/parts/ipc/common/ipc';
 import { REMOTE_FILE_SYSTEM_CHANNEL_NAME, RemoteExtensionsFileSystemProvider } from 'vs/platform/remote/common/remoteAgentFileSystemChannel';
 import { DefaultConfigurationExportHelper } from 'vs/workbench/services/configuration/node/configurationExportHelper';

src/vs/workbench/services/backup/test/electron-browser/backupFileService.test.ts

@@ -17,9 +17,9 @@ import { getRandomTestPath } from 'vs/base/test/node/testUtils';
 import { DefaultEndOfLine } from 'vs/editor/common/model';
 import { Schemas } from 'vs/base/common/network';
 import { IWindowConfiguration } from 'vs/platform/windows/common/windows';
-import { FileService2 } from 'vs/workbench/services/files2/common/fileService2';
+import { FileService2 } from 'vs/workbench/services/files/common/fileService2';
 import { NullLogService } from 'vs/platform/log/common/log';
-import { DiskFileSystemProvider } from 'vs/workbench/services/files2/node/diskFileSystemProvider';
+import { DiskFileSystemProvider } from 'vs/workbench/services/files/node/diskFileSystemProvider';
 import { WorkbenchEnvironmentService } from 'vs/workbench/services/environment/node/environmentService';
 import { parseArgs } from 'vs/platform/environment/node/argv';
 import { snapshotToString } from 'vs/workbench/services/textfile/common/textfiles';

src/vs/workbench/services/configuration/test/electron-browser/configurationEditingService.test.ts

@@ -33,10 +33,10 @@ import { URI } from 'vs/base/common/uri';
 import { createHash } from 'crypto';
 import { RemoteAgentService } from 'vs/workbench/services/remote/electron-browser/remoteAgentServiceImpl';
 import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { FileService2 } from 'vs/workbench/services/files2/common/fileService2';
+import { FileService2 } from 'vs/workbench/services/files/common/fileService2';
 import { NullLogService } from 'vs/platform/log/common/log';
 import { Schemas } from 'vs/base/common/network';
-import { DiskFileSystemProvider } from 'vs/workbench/services/files2/node/diskFileSystemProvider';
+import { DiskFileSystemProvider } from 'vs/workbench/services/files/node/diskFileSystemProvider';
 import { IFileService } from 'vs/platform/files/common/files';
 import { ConfigurationCache } from 'vs/workbench/services/configuration/node/configurationCache';
 import { ConfigurationFileService } from 'vs/workbench/services/configuration/node/configurationFileService';

src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts

@@ -37,9 +37,9 @@ import { IWindowConfiguration } from 'vs/platform/windows/common/windows';
 import { RemoteAgentService } from 'vs/workbench/services/remote/electron-browser/remoteAgentServiceImpl';
 import { RemoteAuthorityResolverService } from 'vs/platform/remote/electron-browser/remoteAuthorityResolverService';
 import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { FileService2 } from 'vs/workbench/services/files2/common/fileService2';
+import { FileService2 } from 'vs/workbench/services/files/common/fileService2';
 import { NullLogService } from 'vs/platform/log/common/log';
-import { DiskFileSystemProvider } from 'vs/workbench/services/files2/node/diskFileSystemProvider';
+import { DiskFileSystemProvider } from 'vs/workbench/services/files/node/diskFileSystemProvider';
 import { ConfigurationCache } from 'vs/workbench/services/configuration/node/configurationCache';
 import { ConfigurationFileService } from 'vs/workbench/services/configuration/node/configurationFileService';
 

src/vs/workbench/services/files/common/workspaceWatcher.ts

@@ -16,7 +16,7 @@ import { onUnexpectedError } from 'vs/base/common/errors';
 import { StorageScope, IStorageService } from 'vs/platform/storage/common/storage';
 import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
 import { localize } from 'vs/nls';
-import { FileService2 } from 'vs/workbench/services/files2/common/fileService2';
+import { FileService2 } from 'vs/workbench/services/files/common/fileService2';
 
 export class WorkspaceWatcher extends Disposable {
 

src/vs/workbench/services/files/electron-browser/diskFileSystemProvider.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { shell } from 'electron';
-import { DiskFileSystemProvider as NodeDiskFileSystemProvider } from 'vs/workbench/services/files2/node/diskFileSystemProvider';
+import { DiskFileSystemProvider as NodeDiskFileSystemProvider } from 'vs/workbench/services/files/node/diskFileSystemProvider';
 import { FileDeleteOptions, FileSystemProviderCapabilities } from 'vs/platform/files/common/files';
 import { isWindows } from 'vs/base/common/platform';
 import { localize } from 'vs/nls';

src/vs/workbench/services/files/node/diskFileSystemProvider.ts

@@ -17,11 +17,11 @@ import { isEqual } from 'vs/base/common/extpath';
 import { retry, ThrottledDelayer } from 'vs/base/common/async';
 import { ILogService, LogLevel } from 'vs/platform/log/common/log';
 import { localize } from 'vs/nls';
-import { IDiskFileChange, toFileChanges } from 'vs/workbench/services/files2/node/watcher/watcher';
-import { FileWatcher as UnixWatcherService } from 'vs/workbench/services/files2/node/watcher/unix/watcherService';
-import { FileWatcher as WindowsWatcherService } from 'vs/workbench/services/files2/node/watcher/win32/watcherService';
-import { FileWatcher as NsfwWatcherService } from 'vs/workbench/services/files2/node/watcher/nsfw/watcherService';
-import { FileWatcher as NodeJSWatcherService } from 'vs/workbench/services/files2/node/watcher/nodejs/watcherService';
+import { IDiskFileChange, toFileChanges } from 'vs/workbench/services/files/node/watcher/watcher';
+import { FileWatcher as UnixWatcherService } from 'vs/workbench/services/files/node/watcher/unix/watcherService';
+import { FileWatcher as WindowsWatcherService } from 'vs/workbench/services/files/node/watcher/win32/watcherService';
+import { FileWatcher as NsfwWatcherService } from 'vs/workbench/services/files/node/watcher/nsfw/watcherService';
+import { FileWatcher as NodeJSWatcherService } from 'vs/workbench/services/files/node/watcher/nodejs/watcherService';
 
 export class DiskFileSystemProvider extends Disposable implements IFileSystemProvider {
 

src/vs/workbench/services/files/node/watcher/nodejs/watcherService.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDiskFileChange, normalizeFileChanges } from 'vs/workbench/services/files2/node/watcher/watcher';
+import { IDiskFileChange, normalizeFileChanges } from 'vs/workbench/services/files/node/watcher/watcher';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { statLink, readlink } from 'vs/base/node/pfs';
 import { watchFolder, watchFile, CHANGE_BUFFER_DELAY } from 'vs/base/node/watcher';

src/vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService.ts

@@ -7,9 +7,9 @@ import * as glob from 'vs/base/common/glob';
 import * as extpath from 'vs/base/common/extpath';
 import * as path from 'vs/base/common/path';
 import * as platform from 'vs/base/common/platform';
-import { IDiskFileChange, normalizeFileChanges } from 'vs/workbench/services/files2/node/watcher/watcher';
+import { IDiskFileChange, normalizeFileChanges } from 'vs/workbench/services/files/node/watcher/watcher';
 import * as nsfw from 'vscode-nsfw';
-import { IWatcherService, IWatcherRequest, IWatcherOptions, IWatchError } from 'vs/workbench/services/files2/node/watcher/nsfw/watcher';
+import { IWatcherService, IWatcherRequest, IWatcherOptions, IWatchError } from 'vs/workbench/services/files/node/watcher/nsfw/watcher';
 import { ThrottledDelayer } from 'vs/base/common/async';
 import { FileChangeType } from 'vs/platform/files/common/files';
 import { normalizeNFC } from 'vs/base/common/normalization';

src/vs/workbench/services/files/node/watcher/nsfw/test/nsfwWatcherService.test.ts

@@ -6,8 +6,8 @@
 import * as assert from 'assert';
 import * as platform from 'vs/base/common/platform';
 
-import { NsfwWatcherService } from 'vs/workbench/services/files2/node/watcher/nsfw/nsfwWatcherService';
-import { IWatcherRequest } from 'vs/workbench/services/files2/node/watcher/nsfw/watcher';
+import { NsfwWatcherService } from 'vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService';
+import { IWatcherRequest } from 'vs/workbench/services/files/node/watcher/nsfw/watcher';
 
 class TestNsfwWatcherService extends NsfwWatcherService {
 	public normalizeRoots(roots: string[]): string[] {

src/vs/workbench/services/files/node/watcher/nsfw/watcher.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Event } from 'vs/base/common/event';
-import { IDiskFileChange } from 'vs/workbench/services/files2/node/watcher/watcher';
+import { IDiskFileChange } from 'vs/workbench/services/files/node/watcher/watcher';
 
 export interface IWatcherRequest {
 	path: string;

src/vs/workbench/services/files/node/watcher/nsfw/watcherApp.ts

@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Server } from 'vs/base/parts/ipc/node/ipc.cp';
-import { WatcherChannel } from 'vs/workbench/services/files2/node/watcher/nsfw/watcherIpc';
-import { NsfwWatcherService } from 'vs/workbench/services/files2/node/watcher/nsfw/nsfwWatcherService';
+import { WatcherChannel } from 'vs/workbench/services/files/node/watcher/nsfw/watcherIpc';
+import { NsfwWatcherService } from 'vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService';
 
 const server = new Server('watcher');
 const service = new NsfwWatcherService();

src/vs/workbench/services/files/node/watcher/nsfw/watcherIpc.ts

@@ -6,7 +6,7 @@
 import { IChannel, IServerChannel } from 'vs/base/parts/ipc/common/ipc';
 import { IWatcherRequest, IWatcherService, IWatcherOptions, IWatchError } from './watcher';
 import { Event } from 'vs/base/common/event';
-import { IDiskFileChange } from 'vs/workbench/services/files2/node/watcher/watcher';
+import { IDiskFileChange } from 'vs/workbench/services/files/node/watcher/watcher';
 
 export class WatcherChannel implements IServerChannel {
 

src/vs/workbench/services/files/node/watcher/nsfw/watcherService.ts

@@ -5,11 +5,11 @@
 
 import { getNextTickChannel } from 'vs/base/parts/ipc/common/ipc';
 import { Client } from 'vs/base/parts/ipc/node/ipc.cp';
-import { IDiskFileChange } from 'vs/workbench/services/files2/node/watcher/watcher';
-import { WatcherChannelClient } from 'vs/workbench/services/files2/node/watcher/nsfw/watcherIpc';
+import { IDiskFileChange } from 'vs/workbench/services/files/node/watcher/watcher';
+import { WatcherChannelClient } from 'vs/workbench/services/files/node/watcher/nsfw/watcherIpc';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { Event } from 'vs/base/common/event';
-import { IWatchError, IWatcherRequest } from 'vs/workbench/services/files2/node/watcher/nsfw/watcher';
+import { IWatchError, IWatcherRequest } from 'vs/workbench/services/files/node/watcher/nsfw/watcher';
 import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 export class FileWatcher extends Disposable {
@@ -40,7 +40,7 @@ export class FileWatcher extends Disposable {
 				serverName: 'File Watcher (nsfw)',
 				args: ['--type=watcherService'],
 				env: {
-					AMD_ENTRYPOINT: 'vs/workbench/services/files2/node/watcher/nsfw/watcherApp',
+					AMD_ENTRYPOINT: 'vs/workbench/services/files/node/watcher/nsfw/watcherApp',
 					PIPE_LOGGING: 'true',
 					VERBOSE_LOGGING: this.verboseLogging
 				}

src/vs/workbench/services/files/node/watcher/unix/chokidarWatcherService.ts

@@ -14,8 +14,8 @@ import { ThrottledDelayer } from 'vs/base/common/async';
 import { normalizeNFC } from 'vs/base/common/normalization';
 import { realcaseSync } from 'vs/base/node/extpath';
 import { isMacintosh } from 'vs/base/common/platform';
-import { IDiskFileChange, normalizeFileChanges } from 'vs/workbench/services/files2/node/watcher/watcher';
-import { IWatcherRequest, IWatcherService, IWatcherOptions, IWatchError } from 'vs/workbench/services/files2/node/watcher/unix/watcher';
+import { IDiskFileChange, normalizeFileChanges } from 'vs/workbench/services/files/node/watcher/watcher';
+import { IWatcherRequest, IWatcherService, IWatcherOptions, IWatchError } from 'vs/workbench/services/files/node/watcher/unix/watcher';
 import { Emitter, Event } from 'vs/base/common/event';
 
 interface IWatcher {

src/vs/workbench/services/files/node/watcher/unix/test/chockidarWatcherService.test.ts

@@ -11,7 +11,7 @@ import { normalizeRoots, ChokidarWatcherService } from '../chokidarWatcherServic
 import { IWatcherRequest } from '../watcher';
 import * as platform from 'vs/base/common/platform';
 import { Delayer } from 'vs/base/common/async';
-import { IDiskFileChange } from 'vs/workbench/services/files2/node/watcher/watcher';
+import { IDiskFileChange } from 'vs/workbench/services/files/node/watcher/watcher';
 import { FileChangeType } from 'vs/platform/files/common/files';
 
 function newRequest(basePath: string, ignored: string[] = []): IWatcherRequest {

src/vs/workbench/services/files/node/watcher/unix/watcher.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Event } from 'vs/base/common/event';
-import { IDiskFileChange } from 'vs/workbench/services/files2/node/watcher/watcher';
+import { IDiskFileChange } from 'vs/workbench/services/files/node/watcher/watcher';
 
 export interface IWatcherRequest {
 	path: string;

src/vs/workbench/services/files/node/watcher/unix/watcherApp.ts

@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Server } from 'vs/base/parts/ipc/node/ipc.cp';
-import { WatcherChannel } from 'vs/workbench/services/files2/node/watcher/unix/watcherIpc';
-import { ChokidarWatcherService } from 'vs/workbench/services/files2/node/watcher/unix/chokidarWatcherService';
+import { WatcherChannel } from 'vs/workbench/services/files/node/watcher/unix/watcherIpc';
+import { ChokidarWatcherService } from 'vs/workbench/services/files/node/watcher/unix/chokidarWatcherService';
 
 const server = new Server('watcher');
 const service = new ChokidarWatcherService();

src/vs/workbench/services/files/node/watcher/unix/watcherIpc.ts

@@ -6,7 +6,7 @@
 import { IChannel, IServerChannel } from 'vs/base/parts/ipc/common/ipc';
 import { IWatcherRequest, IWatcherService, IWatcherOptions, IWatchError } from './watcher';
 import { Event } from 'vs/base/common/event';
-import { IDiskFileChange } from 'vs/workbench/services/files2/node/watcher/watcher';
+import { IDiskFileChange } from 'vs/workbench/services/files/node/watcher/watcher';
 
 export class WatcherChannel implements IServerChannel {
 

src/vs/workbench/services/files/node/watcher/unix/watcherService.ts

@@ -5,11 +5,11 @@
 
 import { getNextTickChannel } from 'vs/base/parts/ipc/common/ipc';
 import { Client } from 'vs/base/parts/ipc/node/ipc.cp';
-import { IDiskFileChange } from 'vs/workbench/services/files2/node/watcher/watcher';
-import { WatcherChannelClient } from 'vs/workbench/services/files2/node/watcher/unix/watcherIpc';
+import { IDiskFileChange } from 'vs/workbench/services/files/node/watcher/watcher';
+import { WatcherChannelClient } from 'vs/workbench/services/files/node/watcher/unix/watcherIpc';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { Event } from 'vs/base/common/event';
-import { IWatchError, IWatcherRequest } from 'vs/workbench/services/files2/node/watcher/unix/watcher';
+import { IWatchError, IWatcherRequest } from 'vs/workbench/services/files/node/watcher/unix/watcher';
 import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 export class FileWatcher extends Disposable {
@@ -40,7 +40,7 @@ export class FileWatcher extends Disposable {
 				serverName: 'File Watcher (chokidar)',
 				args: ['--type=watcherService'],
 				env: {
-					AMD_ENTRYPOINT: 'vs/workbench/services/files2/node/watcher/unix/watcherApp',
+					AMD_ENTRYPOINT: 'vs/workbench/services/files/node/watcher/unix/watcherApp',
 					PIPE_LOGGING: 'true',
 					VERBOSE_LOGGING: this.verboseLogging
 				}

src/vs/workbench/services/files/node/watcher/win32/csharpWatcherService.ts

@@ -7,7 +7,7 @@ import * as cp from 'child_process';
 import { FileChangeType } from 'vs/platform/files/common/files';
 import * as decoder from 'vs/base/node/decoder';
 import * as glob from 'vs/base/common/glob';
-import { IDiskFileChange } from 'vs/workbench/services/files2/node/watcher/watcher';
+import { IDiskFileChange } from 'vs/workbench/services/files/node/watcher/watcher';
 import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 export class OutOfProcessWin32FolderWatcher {
@@ -50,7 +50,7 @@ export class OutOfProcessWin32FolderWatcher {
 			args.push('-verbose');
 		}
 
-		this.handle = cp.spawn(getPathFromAmdModule(require, 'vs/workbench/services/files2/node/watcher/win32/CodeHelper.exe'), args);
+		this.handle = cp.spawn(getPathFromAmdModule(require, 'vs/workbench/services/files/node/watcher/win32/CodeHelper.exe'), args);
 
 		const stdoutLineDecoder = new decoder.LineDecoder();
 

src/vs/workbench/services/files/node/watcher/win32/watcherService.ts

@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDiskFileChange } from 'vs/workbench/services/files2/node/watcher/watcher';
-import { OutOfProcessWin32FolderWatcher } from 'vs/workbench/services/files2/node/watcher/win32/csharpWatcherService';
+import { IDiskFileChange } from 'vs/workbench/services/files/node/watcher/watcher';
+import { OutOfProcessWin32FolderWatcher } from 'vs/workbench/services/files/node/watcher/win32/csharpWatcherService';
 import { posix } from 'vs/base/common/path';
 import { rtrim, endsWith } from 'vs/base/common/strings';
 import { Disposable } from 'vs/base/common/lifecycle';

src/vs/workbench/services/files/test/browser/fileService2.test.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import { FileService2 } from 'vs/workbench/services/files2/common/fileService2';
+import { FileService2 } from 'vs/workbench/services/files/common/fileService2';
 import { URI } from 'vs/base/common/uri';
 import { IFileSystemProviderRegistrationEvent, FileSystemProviderCapabilities } from 'vs/platform/files/common/files';
 import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';

src/vs/workbench/services/files/test/node/diskFileService.test.ts

@@ -5,9 +5,9 @@
 
 import * as assert from 'assert';
 import { tmpdir } from 'os';
-import { FileService2 } from 'vs/workbench/services/files2/common/fileService2';
+import { FileService2 } from 'vs/workbench/services/files/common/fileService2';
 import { Schemas } from 'vs/base/common/network';
-import { DiskFileSystemProvider } from 'vs/workbench/services/files2/node/diskFileSystemProvider';
+import { DiskFileSystemProvider } from 'vs/workbench/services/files/node/diskFileSystemProvider';
 import { getRandomTestPath } from 'vs/base/test/node/testUtils';
 import { generateUuid } from 'vs/base/common/uuid';
 import { join, basename, dirname, posix } from 'vs/base/common/path';

src/vs/workbench/services/files/test/node/normalizer.test.ts

@@ -7,7 +7,7 @@ import * as assert from 'assert';
 import * as platform from 'vs/base/common/platform';
 import { FileChangeType, FileChangesEvent } from 'vs/platform/files/common/files';
 import { URI as uri } from 'vs/base/common/uri';
-import { IDiskFileChange, normalizeFileChanges, toFileChanges } from 'vs/workbench/services/files2/node/watcher/watcher';
+import { IDiskFileChange, normalizeFileChanges, toFileChanges } from 'vs/workbench/services/files/node/watcher/watcher';
 import { Event, Emitter } from 'vs/base/common/event';
 
 function toFileChangesEvent(changes: IDiskFileChange[]): FileChangesEvent {

src/vs/workbench/services/keybinding/test/electron-browser/keybindingEditing.test.ts

@@ -41,9 +41,9 @@ import { ITextFileService } from 'vs/workbench/services/textfile/common/textfile
 import { TextModelResolverService } from 'vs/workbench/services/textmodelResolver/common/textModelResolverService';
 import { IUntitledEditorService, UntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
 import { TestBackupFileService, TestContextService, TestEditorGroupsService, TestEditorService, TestLifecycleService, TestLogService, TestTextFileService, TestTextResourcePropertiesService } from 'vs/workbench/test/workbenchTestServices';
-import { FileService2 } from 'vs/workbench/services/files2/common/fileService2';
+import { FileService2 } from 'vs/workbench/services/files/common/fileService2';
 import { Schemas } from 'vs/base/common/network';
-import { DiskFileSystemProvider } from 'vs/workbench/services/files2/node/diskFileSystemProvider';
+import { DiskFileSystemProvider } from 'vs/workbench/services/files/node/diskFileSystemProvider';
 
 interface Modifiers {
 	metaKey?: boolean;

src/vs/workbench/services/textfile/test/textFileService.io.test.ts

@@ -18,11 +18,11 @@ import { Schemas } from 'vs/base/common/network';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { rimraf, RimRafMode, copy, readFile, exists } from 'vs/base/node/pfs';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
-import { FileService2 } from 'vs/workbench/services/files2/common/fileService2';
+import { FileService2 } from 'vs/workbench/services/files/common/fileService2';
 import { NullLogService } from 'vs/platform/log/common/log';
 import { getRandomTestPath } from 'vs/base/test/node/testUtils';
 import { tmpdir } from 'os';
-import { DiskFileSystemProvider } from 'vs/workbench/services/files2/node/diskFileSystemProvider';
+import { DiskFileSystemProvider } from 'vs/workbench/services/files/node/diskFileSystemProvider';
 import { generateUuid } from 'vs/base/common/uuid';
 import { join, basename } from 'vs/base/common/path';
 import { getPathFromAmdModule } from 'vs/base/common/amd';

src/vs/workbench/workbench.main.ts

@@ -182,7 +182,7 @@ import 'vs/workbench/browser/parts/statusbar/statusbarPart';
 //#region --- workbench contributions
 
 // Workspace File Watching
-import 'vs/workbench/services/files2/common/workspaceWatcher';
+import 'vs/workbench/services/files/common/workspaceWatcher';
 
 // Telemetry
 import 'vs/workbench/contrib/telemetry/browser/telemetry.contribution';

src/vs/workbench/workbench.nodeless.main.ts

@@ -188,7 +188,7 @@ import 'vs/workbench/browser/parts/statusbar/statusbarPart';
 //#region --- workbench contributions
 
 // Workspace File Watching
-import 'vs/workbench/services/files2/common/workspaceWatcher';
+import 'vs/workbench/services/files/common/workspaceWatcher';
 
 // Telemetry
 import 'vs/workbench/contrib/telemetry/browser/telemetry.contribution';