From b4f1df2afa039e3c31fd833a2483de5124cb4f90 Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Wed, 3 Jun 2015 15:22:17 -0700
Subject: [PATCH] address PR feedback

---
 src/compiler/core.ts     | 38 +++++++++++++++++++++-----------------
 src/compiler/program.ts  |  2 +-
 src/compiler/types.ts    |  8 ++++++++
 src/services/services.ts |  6 +++---
 src/services/shims.ts    |  2 +-
 5 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index bba10a635e4..1f04f9968ca 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -15,35 +15,39 @@ module ts {
         True  = -1
     }
 
-    export class FileMap<T> {
-        private files: Map<T> = {};
-
-        constructor(private getCanonicalFileName: (fileName: string) => string) {
+    export function createFileMap<T>(getCanonicalFileName: (fileName: string) => string): FileMap<T> {
+        let files: Map<T> = {};
+        return {
+            get,
+            set,
+            contains,
+            delete: deleteItem,
+            forEachValue: forEachValueInMap
         }
 
-        public set(fileName: string, value: T) {
-            this.files[this.normalizeKey(fileName)] = value;
+        function set(fileName: string, value: T) {
+            files[normalizeKey(fileName)] = value;
         }
 
-        public get(fileName: string) {
-            return this.files[this.normalizeKey(fileName)];
+        function get(fileName: string) {
+            return files[normalizeKey(fileName)];
         }
 
-        public contains(fileName: string) {
-            return hasProperty(this.files, this.normalizeKey(fileName));
+        function contains(fileName: string) {
+            return hasProperty(files, normalizeKey(fileName));
         }
 
-        public delete(fileName: string) {
-            let key = this.normalizeKey(fileName);
-            delete this.files[key];
+        function deleteItem (fileName: string) {
+            let key = normalizeKey(fileName);
+            delete files[key];
         }
 
-        public forEachValue(f: (value: T) => void) {
-            forEachValue(this.files, f);
+        function forEachValueInMap(f: (value: T) => void) {
+            forEachValue(files, f);
         }
 
-        private normalizeKey(key: string) {
-            return this.getCanonicalFileName(normalizeSlashes(key));
+        function normalizeKey(key: string) {
+            return getCanonicalFileName(normalizeSlashes(key));
         }
     }
 
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index fa794bbb77e..5c40230484a 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -152,7 +152,7 @@ module ts {
         let start = new Date().getTime();
 
         host = host || createCompilerHost(options);
-        let filesByName: FileMap<SourceFile> = new FileMap<SourceFile>(host.getCanonicalFileName);
+        let filesByName = createFileMap<SourceFile>(host.getCanonicalFileName);
 
         forEach(rootNames, name => processRootFile(name, false));
         if (!seenNoDefaultLib) {
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 1a72e9fc94a..c3ce9d44ae3 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -3,6 +3,14 @@ module ts {
         [index: string]: T;
     }
 
+    export interface FileMap<T> {
+        get(fileName: string): T;
+        set(fileName: string, value: T): void;
+        contains(fileName: string): boolean;
+        delete(fileName: string): void;
+        forEachValue(f: (v: T) => void): void;
+    }
+
     export interface TextRange {
         pos: number;
         end: number;
diff --git a/src/services/services.ts b/src/services/services.ts
index b6f95c2f13a..2329eeb2e83 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -1636,7 +1636,7 @@ module ts {
 
         constructor(private host: LanguageServiceHost, getCanonicalFileName: (fileName: string) => string) {
             // script id => script index
-            this.fileNameToEntry = new FileMap<HostFileInformation>(getCanonicalFileName);
+            this.fileNameToEntry = createFileMap<HostFileInformation>(getCanonicalFileName);
 
             // Initialize the list with the root file names
             let rootFileNames = host.getScriptFileNames();
@@ -1893,7 +1893,7 @@ module ts {
         // Maps from compiler setting target (ES3, ES5, etc.) to all the cached documents we have
         // for those settings.
         let buckets: Map<FileMap<DocumentRegistryEntry>> = {};
-        let getCanonicalFileName = createGetCanonicalFileName(useCaseSensitiveFileNames || false);
+        let getCanonicalFileName = createGetCanonicalFileName(!!useCaseSensitiveFileNames);
 
         function getKeyFromCompilationSettings(settings: CompilerOptions): string {
             return "_" + settings.target; //  + "|" + settings.propagateEnumConstantoString()
@@ -1903,7 +1903,7 @@ module ts {
             let key = getKeyFromCompilationSettings(settings);
             let bucket = lookUp(buckets, key);
             if (!bucket && createIfMissing) {
-                buckets[key] = bucket = new FileMap<DocumentRegistryEntry>(getCanonicalFileName);
+                buckets[key] = bucket = createFileMap<DocumentRegistryEntry>(getCanonicalFileName);
             }
             return bucket;
         }
diff --git a/src/services/shims.ts b/src/services/shims.ts
index 4dfab444cde..004393fb3b5 100644
--- a/src/services/shims.ts
+++ b/src/services/shims.ts
@@ -272,7 +272,7 @@ module ts {
         }
 
         public useCaseSensitiveFileNames(): boolean {
-            return this.shimHost.useCaseSensitiveFileNames && this.useCaseSensitiveFileNames();
+            return this.shimHost.useCaseSensitiveFileNames ? this.shimHost.useCaseSensitiveFileNames() : false;
         }
 
         public getCompilationSettings(): CompilerOptions {