From 7d0fe2e1759fe8fd196475b58462f0bc92e9c25a Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@yahoo.com>
Date: Wed, 4 Dec 2019 09:32:39 -0800
Subject: [PATCH] Remove IFileSystemUtils from IOC container

---
 src/client/common/platform/fileSystem.ts      | 1 -
 src/client/common/platform/serviceRegistry.ts | 5 ++---
 src/client/common/platform/types.ts           | 1 -
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/client/common/platform/fileSystem.ts b/src/client/common/platform/fileSystem.ts
index 24f26a1f13d5..0d39f30ea4f4 100644
--- a/src/client/common/platform/fileSystem.ts
+++ b/src/client/common/platform/fileSystem.ts
@@ -318,7 +318,6 @@ export class RawFileSystem implements IRawFileSystem {
 }
 
 // High-level filesystem operations used by the extension.
-@injectable()
 export class FileSystemUtils implements IFileSystemUtils {
     constructor(
         public readonly raw: IRawFileSystem,
diff --git a/src/client/common/platform/serviceRegistry.ts b/src/client/common/platform/serviceRegistry.ts
index c44422874a74..d15edf5fc388 100644
--- a/src/client/common/platform/serviceRegistry.ts
+++ b/src/client/common/platform/serviceRegistry.ts
@@ -3,14 +3,13 @@
 'use strict';
 
 import { IServiceManager } from '../../ioc/types';
-import { FileSystem, FileSystemUtils } from './fileSystem';
+import { FileSystem } from './fileSystem';
 import { PlatformService } from './platformService';
 import { RegistryImplementation } from './registry';
-import { IFileSystem, IFileSystemUtils, IPlatformService, IRegistry } from './types';
+import { IFileSystem, IPlatformService, IRegistry } from './types';
 
 export function registerTypes(serviceManager: IServiceManager) {
     serviceManager.addSingleton<IPlatformService>(IPlatformService, PlatformService);
     serviceManager.addSingleton<IFileSystem>(IFileSystem, FileSystem);
-    serviceManager.addSingletonInstance<IFileSystemUtils>(IFileSystemUtils, FileSystemUtils.withDefaults());
     serviceManager.addSingleton<IRegistry>(IRegistry, RegistryImplementation);
 }
diff --git a/src/client/common/platform/types.ts b/src/client/common/platform/types.ts
index 880f87b90175..a2a5ba2c575c 100644
--- a/src/client/common/platform/types.ts
+++ b/src/client/common/platform/types.ts
@@ -101,7 +101,6 @@ export interface IRawFileSystem {
 }
 
 // High-level filesystem operations used by the extension.
-export const IFileSystemUtils = Symbol('IFileSystemUtils');
 export interface IFileSystemUtils {
     readonly raw: IRawFileSystem;
     readonly paths: IFileSystemPaths;