microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-29 16:29:19 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Moved logic to another location where host was in scope so we could call

Browse Source 
getCanonicalFileName
This commit is contained in:
ChrisBubernak
2014-09-29 10:20:31 -07:00
parent 36b46291f2
commit ba61c63a1a
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/compiler/parser.ts
View File

@@ -3825,24 +3825,16 @@ module ts {
var start = range.pos;
var end = range.end;
var length = end - start;
if (!matchResult) {
errorAtPos(start, length, Diagnostics.Invalid_reference_directive_syntax);
}
else {
var referenceFilename = matchResult[3];
var basePath = getDirectoryPath(file.filename);
var referenceFullPath = normalizePath(combinePaths(basePath, referenceFilename));
if (file.filename.toLocaleLowerCase() === referenceFullPath.toLocaleLowerCase()) {
errorAtPos(start, length, Diagnostics.A_file_cannot_have_a_reference_to_itself);
}
else {
referencedFiles.push({
pos: start,
end: end,
filename: referenceFilename
});
}
referencedFiles.push({
pos: start,
end: end,
filename: matchResult[3]
});
}
}
}
@@ -3957,6 +3949,9 @@ module ts {
else if (!findSourceFile(filename, isDefaultLib, refFile, refPos, refEnd)) {
diagnostic = Diagnostics.File_0_not_found;
}
else if (refFile && host.getCanonicalFileName(filename) === host.getCanonicalFileName(refFile.filename)) {
diagnostic = Diagnostics.A_file_cannot_have_a_reference_to_itself;
}
}
else {
if (!(findSourceFile(filename + ".ts", isDefaultLib, refFile, refPos, refEnd) || findSourceFile(filename + ".d.ts", isDefaultLib, refFile, refPos, refEnd))) {
@@ -4015,7 +4010,7 @@ module ts {
function processReferencedFiles(file: SourceFile, basePath: string) {
forEach(file.referencedFiles, ref => {
processSourceFile(normalizePath(combinePaths(basePath, ref.filename)), /* isDefaultLib */ false, file, ref.pos, ref.end);
processSourceFile(normalizePath(combinePaths(basePath, ref.filename)), /* isDefaultLib */ false, file, ref.pos, ref.end);
});
}