From a51ce92500acc2949f1ea9e69e79965a7f209612 Mon Sep 17 00:00:00 2001
From: Jason Ramsay <jasonra@microsoft.com>
Date: Fri, 13 Feb 2015 11:56:39 -0800
Subject: [PATCH] switch to using host.getDefaultLibFileName(options)

---
 src/services/services.ts | 22 +++++++---------------
 src/services/shims.ts    |  5 +----
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/src/services/services.ts b/src/services/services.ts
index ad6643faf3c..6f6d4b869a1 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -5517,11 +5517,13 @@ module ts {
                     var declarations = symbol.getDeclarations();
                     if (declarations && declarations.length > 0) {
                         // Disallow rename for elements that are defined in the standard TypeScript library.
-                        var defaultLibFile = getDefaultLibFileName(host.getCompilationSettings());
-                        for (var i = 0; i < declarations.length; i++) {
-                            var sourceFile = declarations[i].getSourceFile();
-                            if (sourceFile && isDefaultLibFile(sourceFile.fileName, defaultLibFile)) {
-                                return getRenameInfoError(getLocaleSpecificMessage(Diagnostics.You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library.key));
+                        var defaultLibFileName = host.getDefaultLibFileName(host.getCompilationSettings());
+                        if (defaultLibFileName) {
+                            for (var i = 0; i < declarations.length; i++) {
+                                var sourceFile = declarations[i].getSourceFile();
+                                if (sourceFile && ts.normalizePath(sourceFile.fileName) === ts.normalizePath(defaultLibFileName)) {
+                                    return getRenameInfoError(getLocaleSpecificMessage(Diagnostics.You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library.key));
+                                }
                             }
                         }
 
@@ -5543,16 +5545,6 @@ module ts {
 
             return getRenameInfoError(getLocaleSpecificMessage(Diagnostics.You_cannot_rename_this_element.key));
 
-            function isDefaultLibFile(fileName: string, defaultLibFile: string): boolean {
-                var hasValidPrefix = true;
-                var index = fileName.lastIndexOf(defaultLibFile);
-                if (index - 1 >= 0) {
-                    var prefix = fileName[index - 1];
-                    hasValidPrefix = (prefix === "\\" || prefix === "/");
-                }
-                return index >= 0 && hasValidPrefix && (index + defaultLibFile.length === fileName.length);
-            }
-
             function getRenameInfoError(localizedErrorMessage: string): RenameInfo {
                 return {
                     canRename: false,
diff --git a/src/services/shims.ts b/src/services/shims.ts
index 0f9f1a12cd1..776fecf374e 100644
--- a/src/services/shims.ts
+++ b/src/services/shims.ts
@@ -274,10 +274,7 @@ module ts {
         }
 
         public getDefaultLibFileName(options: CompilerOptions): string {
-            // Shim the API changes for 1.5 release. This should be removed once
-            // TypeScript 1.5 has shipped.
-            return "";
-            //return this.shimHost.getDefaultLibFileName(JSON.stringify(options));
+            return this.shimHost.getDefaultLibFileName(JSON.stringify(options));
         }
     }