Conflicts:
	src/services/services.ts
This commit is contained in:
Ingvar Stepanyan 2014-08-20 23:20:50 +03:00
parent 2f7429e887
commit 4083d9299b

View file

@ -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(),