From 4083d9299b0798d93e887a18f649d8df0f0d8f95 Mon Sep 17 00:00:00 2001 From: Ingvar Stepanyan Date: Wed, 20 Aug 2014 23:20:50 +0300 Subject: [PATCH 1/2] Fixes #492 Conflicts: src/services/services.ts --- src/services/services.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/services/services.ts b/src/services/services.ts index 862ca387e8..4e7323e1b5 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -1411,10 +1411,7 @@ module ts { return { getSourceFile: (filename, languageVersion) => { var sourceFile = getSourceFile(filename); - - Debug.assert(!!sourceFile, "sourceFile can not be undefined"); - - return sourceFile; + return sourceFile ? sourceFile.getSourceFile() : null; }, getCancellationToken: () => cancellationToken, getCanonicalFileName: (filename) => useCaseSensitivefilenames ? filename : filename.toLowerCase(), From 797ab0146732dee5ff8fb64724f5d06c6c0db073 Mon Sep 17 00:00:00 2001 From: Ingvar Stepanyan Date: Fri, 22 Aug 2014 13:54:38 +0300 Subject: [PATCH 2/2] Return undefined instead of null. --- src/services/services.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/services.ts b/src/services/services.ts index 4e7323e1b5..0069f53922 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -1411,7 +1411,7 @@ module ts { return { getSourceFile: (filename, languageVersion) => { var sourceFile = getSourceFile(filename); - return sourceFile ? sourceFile.getSourceFile() : null; + return sourceFile && sourceFile.getSourceFile(); }, getCancellationToken: () => cancellationToken, getCanonicalFileName: (filename) => useCaseSensitivefilenames ? filename : filename.toLowerCase(),