Skip to content

Commit 9f337bc

Browse files
sheetalkamatsheetalkamat
committed
Merge branch 'master' into jsFileCompilation
2 parents 4d3457c + 16f69da commit 9f337bc

13 files changed

Lines changed: 211 additions & 122 deletions

‎src/compiler/checker.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12652,7 +12652,7 @@ namespace ts {
1265212652
error(node.expression, Diagnostics.Setters_cannot_return_a_value);
1265312653
}
1265412654
else if (func.kind === SyntaxKind.Constructor) {
12655-
if (!isTypeAssignableTo(exprType, returnType)) {
12655+
if (!checkTypeAssignableTo(exprType, returnType, node.expression)) {
1265612656
error(node.expression, Diagnostics.Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class);
1265712657
}
1265812658
}

‎src/compiler/core.ts‎

Lines changed: 29 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,45 +17,55 @@ namespace ts {
1717
True = -1
1818
}
1919

20-
export function createFileMap<T>(getCanonicalFileName: (fileName: string) => string): FileMap<T> {
20+
export function createFileMap<T>(keyMapper?: (key: string) => string): FileMap<T> {
2121
let files: Map<T> = {};
2222
return {
2323
get,
2424
set,
2525
contains,
2626
remove,
27-
clear,
28-
forEachValue: forEachValueInMap
27+
forEachValue: forEachValueInMap,
28+
clear
2929
};
3030

31-
function set(fileName: string, value: T) {
32-
files[normalizeKey(fileName)] = value;
31+
function forEachValueInMap(f: (key: Path, value: T) => void) {
32+
for (let key in files) {
33+
f(<Path>key, files[key]);
34+
}
3335
}
3436

35-
function get(fileName: string) {
36-
return files[normalizeKey(fileName)];
37+
// path should already be well-formed so it does not need to be normalized
38+
function get(path: Path): T {
39+
return files[toKey(path)];
3740
}
3841

39-
function contains(fileName: string) {
40-
return hasProperty(files, normalizeKey(fileName));
42+
function set(path: Path, value: T) {
43+
files[toKey(path)] = value;
4144
}
4245

43-
function remove (fileName: string) {
44-
let key = normalizeKey(fileName);
45-
delete files[key];
46+
function contains(path: Path) {
47+
return hasProperty(files, toKey(path));
4648
}
4749

48-
function forEachValueInMap(f: (value: T) => void) {
49-
forEachValue(files, f);
50-
}
51-
52-
function normalizeKey(key: string) {
53-
return getCanonicalFileName(normalizeSlashes(key));
50+
function remove(path: Path) {
51+
const key = toKey(path);
52+
delete files[key];
5453
}
5554

5655
function clear() {
5756
files = {};
5857
}
58+
59+
function toKey(path: Path): string {
60+
return keyMapper ? keyMapper(path) : path;
61+
}
62+
}
63+
64+
export function toPath(fileName: string, basePath: string, getCanonicalFileName: (path: string) => string): Path {
65+
const nonCanonicalizedPath = isRootedDiskPath(fileName)
66+
? normalizePath(fileName)
67+
: getNormalizedAbsolutePath(fileName, basePath);
68+
return <Path>getCanonicalFileName(nonCanonicalizedPath);
5969
}
6070

6171
export const enum Comparison {
@@ -849,4 +859,4 @@ namespace ts {
849859
}
850860
return copiedList;
851861
}
852-
}
862+
}

‎src/compiler/program.ts‎

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ namespace ts {
348348
? ((moduleNames: string[], containingFile: string) => host.resolveModuleNames(moduleNames, containingFile))
349349
: ((moduleNames: string[], containingFile: string) => map(moduleNames, moduleName => resolveModuleName(moduleName, containingFile, options, host).resolvedModule));
350350

351-
let filesByName = createFileMap<SourceFile>(getCanonicalFileName);
351+
let filesByName = createFileMap<SourceFile>();
352352
// stores 'filename -> file association' ignoring case
353353
// used to track cases when two file names differ only in casing
354354
let filesByNameIgnoreCase = host.useCaseSensitiveFileNames() ? createFileMap<SourceFile>(fileName => fileName.toLowerCase()) : undefined;
@@ -384,7 +384,7 @@ namespace ts {
384384

385385
program = {
386386
getRootFileNames: () => rootNames,
387-
getSourceFile: getSourceFile,
387+
getSourceFile,
388388
getSourceFiles: () => files,
389389
getCompilerOptions: () => options,
390390
getSyntacticDiagnostics,
@@ -440,7 +440,7 @@ namespace ts {
440440

441441
// check if program source files has changed in the way that can affect structure of the program
442442
let newSourceFiles: SourceFile[] = [];
443-
let normalizedAbsoluteFileNames: string[] = [];
443+
let filePaths: Path[] = [];
444444
let modifiedSourceFiles: SourceFile[] = [];
445445

446446
for (let oldSourceFile of oldProgram.getSourceFiles()) {
@@ -449,8 +449,8 @@ namespace ts {
449449
return false;
450450
}
451451

452-
const normalizedAbsolutePath = getNormalizedAbsolutePath(newSourceFile.fileName, currentDirectory);
453-
normalizedAbsoluteFileNames.push(normalizedAbsolutePath);
452+
newSourceFile.path = oldSourceFile.path;
453+
filePaths.push(newSourceFile.path);
454454

455455
if (oldSourceFile !== newSourceFile) {
456456
if (oldSourceFile.hasNoDefaultLib !== newSourceFile.hasNoDefaultLib) {
@@ -474,7 +474,7 @@ namespace ts {
474474

475475
if (resolveModuleNamesWorker) {
476476
let moduleNames = map(newSourceFile.imports, name => name.text);
477-
let resolutions = resolveModuleNamesWorker(moduleNames, normalizedAbsolutePath);
477+
let resolutions = resolveModuleNamesWorker(moduleNames, getNormalizedAbsolutePath(newSourceFile.fileName, currentDirectory));
478478
// ensure that module resolution results are still correct
479479
for (let i = 0; i < moduleNames.length; ++i) {
480480
let newResolution = resolutions[i];
@@ -505,7 +505,7 @@ namespace ts {
505505

506506
// update fileName -> file mapping
507507
for (let i = 0, len = newSourceFiles.length; i < len; ++i) {
508-
filesByName.set(normalizedAbsoluteFileNames[i], newSourceFiles[i]);
508+
filesByName.set(filePaths[i], newSourceFiles[i]);
509509
}
510510

511511
files = newSourceFiles;
@@ -580,7 +580,7 @@ namespace ts {
580580
}
581581

582582
function getSourceFile(fileName: string): SourceFile {
583-
return filesByName.get(getNormalizedAbsolutePath(fileName, currentDirectory));
583+
return filesByName.get(toPath(fileName, currentDirectory, getCanonicalFileName));
584584
}
585585

586586
function getDiagnosticsHelper(
@@ -920,7 +920,7 @@ namespace ts {
920920
diagnostic = Diagnostics.File_0_has_unsupported_extension_The_only_supported_extensions_are_1;
921921
diagnosticArgument = [fileName, "'" + supportedExtensions.join("', '") + "'"];
922922
}
923-
else if (!findSourceFile(fileName, getNormalizedAbsolutePath(fileName, currentDirectory), isDefaultLib, supportedExtensions, refFile, refPos, refEnd)) {
923+
else if (!findSourceFile(fileName, toPath(fileName, currentDirectory, getCanonicalFileName), isDefaultLib, supportedExtensions, refFile, refPos, refEnd)) {
924924
diagnostic = Diagnostics.File_0_not_found;
925925
diagnosticArgument = [fileName];
926926
}
@@ -930,13 +930,13 @@ namespace ts {
930930
}
931931
}
932932
else {
933-
let nonTsFile: SourceFile = options.allowNonTsExtensions && findSourceFile(fileName, getNormalizedAbsolutePath(fileName, currentDirectory), isDefaultLib, supportedExtensions, refFile, refPos, refEnd);
933+
let nonTsFile: SourceFile = options.allowNonTsExtensions && findSourceFile(fileName, toPath(fileName, currentDirectory, getCanonicalFileName), isDefaultLib, supportedExtensions, refFile, refPos, refEnd);
934934
if (!nonTsFile) {
935935
if (options.allowNonTsExtensions) {
936936
diagnostic = Diagnostics.File_0_not_found;
937937
diagnosticArgument = [fileName];
938938
}
939-
else if (!forEach(getSupportedExtensions(options), extension => findSourceFile(fileName + extension, getNormalizedAbsolutePath(fileName + extension, currentDirectory), isDefaultLib, supportedExtensions, refFile, refPos, refEnd))) {
939+
else if (!forEach(getSupportedExtensions(options), extension => findSourceFile(fileName + extension, toPath(fileName + extension, currentDirectory, getCanonicalFileName), isDefaultLib, supportedExtensions, refFile, refPos, refEnd))) {
940940
// (TODO: shkamat) Should this message be different given we support multiple extensions
941941
diagnostic = Diagnostics.File_0_not_found;
942942
fileName += ".ts";
@@ -966,7 +966,7 @@ namespace ts {
966966
}
967967

968968
// Get source file from normalized fileName
969-
function findSourceFile(fileName: string, normalizedAbsolutePath: string, isDefaultLib: boolean, supportedExtensions: string[], refFile?: SourceFile, refPos?: number, refEnd?: number): SourceFile {
969+
function findSourceFile(fileName: string, normalizedAbsolutePath: Path, isDefaultLib: boolean, supportedExtensions: string[], refFile?: SourceFile, refPos?: number, refEnd?: number): SourceFile {
970970
if (filesByName.contains(normalizedAbsolutePath)) {
971971
const file = filesByName.get(normalizedAbsolutePath);
972972
// try to check if we've already seen this file but with a different casing in path
@@ -991,6 +991,8 @@ namespace ts {
991991

992992
filesByName.set(normalizedAbsolutePath, file);
993993
if (file) {
994+
file.path = normalizedAbsolutePath;
995+
994996
if (host.useCaseSensitiveFileNames()) {
995997
// for case-sensitive file systems check if we've already seen some file with similar filename ignoring case
996998
const existingFile = filesByNameIgnoreCase.get(normalizedAbsolutePath);
@@ -1045,14 +1047,7 @@ namespace ts {
10451047
let resolution = resolutions[i];
10461048
setResolvedModule(file, moduleNames[i], resolution);
10471049
if (resolution && !options.noResolve) {
1048-
const absoluteImportPath = isRootedDiskPath(resolution.resolvedFileName)
1049-
? resolution.resolvedFileName
1050-
: getNormalizedAbsolutePath(resolution.resolvedFileName, currentDirectory);
1051-
1052-
// convert an absolute import path to path that is relative to current directory
1053-
// this was host still can locate it but files names in user output will be shorter (and thus look nicer).
1054-
const relativePath = getRelativePathToDirectoryOrUrl(currentDirectory, absoluteImportPath, currentDirectory, getCanonicalFileName, false);
1055-
const importedFile = findSourceFile(relativePath, absoluteImportPath, /* isDefaultLib */ false, supportedExtensions, file, skipTrivia(file.text, file.imports[i].pos), file.imports[i].end);
1050+
const importedFile = findSourceFile(resolution.resolvedFileName, toPath(resolution.resolvedFileName, currentDirectory, getCanonicalFileName), /* isDefaultLib */ false, supportedExtensions, file, skipTrivia(file.text, file.imports[i].pos), file.imports[i].end);
10561051

10571052
if (importedFile && resolution.isExternalLibraryImport) {
10581053
if (!isExternalModule(importedFile)) {

‎src/compiler/tsc.ts‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,16 @@ namespace ts {
8181
return <string>diagnostic.messageText;
8282
}
8383

84-
function reportDiagnostic(diagnostic: Diagnostic) {
84+
function reportDiagnostic(diagnostic: Diagnostic, host: CompilerHost) {
8585
let output = "";
8686

8787
if (diagnostic.file) {
8888
let loc = getLineAndCharacterOfPosition(diagnostic.file, diagnostic.start);
89-
output += `${ diagnostic.file.fileName }(${ loc.line + 1 },${ loc.character + 1 }): `;
89+
const relativeFileName = host
90+
? convertToRelativePath(diagnostic.file.fileName, host.getCurrentDirectory(), fileName => host.getCanonicalFileName(fileName))
91+
: diagnostic.file.fileName;
92+
93+
output += `${ relativeFileName }(${ loc.line + 1 },${ loc.character + 1 }): `;
9094
}
9195

9296
let category = DiagnosticCategory[diagnostic.category].toLowerCase();
@@ -95,9 +99,9 @@ namespace ts {
9599
sys.write(output);
96100
}
97101

98-
function reportDiagnostics(diagnostics: Diagnostic[]) {
102+
function reportDiagnostics(diagnostics: Diagnostic[], host: CompilerHost) {
99103
for (let i = 0; i < diagnostics.length; i++) {
100-
reportDiagnostic(diagnostics[i]);
104+
reportDiagnostic(diagnostics[i], host);
101105
}
102106
}
103107

@@ -166,7 +170,7 @@ namespace ts {
166170

167171
if (commandLine.options.locale) {
168172
if (!isJSONSupported()) {
169-
reportDiagnostic(createCompilerDiagnostic(Diagnostics.The_current_host_does_not_support_the_0_option, "--locale"));
173+
reportDiagnostic(createCompilerDiagnostic(Diagnostics.The_current_host_does_not_support_the_0_option, "--locale"), /* compilerHost */ undefined);
170174
return sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);
171175
}
172176
validateLocaleAndSetLanguage(commandLine.options.locale, commandLine.errors);
@@ -175,7 +179,7 @@ namespace ts {
175179
// If there are any errors due to command line parsing and/or
176180
// setting up localization, report them and quit.
177181
if (commandLine.errors.length > 0) {
178-
reportDiagnostics(commandLine.errors);
182+
reportDiagnostics(commandLine.errors, compilerHost);
179183
return sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);
180184
}
181185

@@ -185,7 +189,7 @@ namespace ts {
185189
}
186190

187191
if (commandLine.options.version) {
188-
reportDiagnostic(createCompilerDiagnostic(Diagnostics.Version_0, ts.version));
192+
reportDiagnostic(createCompilerDiagnostic(Diagnostics.Version_0, ts.version), /* compilerHost */ undefined);
189193
return sys.exit(ExitStatus.Success);
190194
}
191195

@@ -197,12 +201,12 @@ namespace ts {
197201

198202
if (commandLine.options.project) {
199203
if (!isJSONSupported()) {
200-
reportDiagnostic(createCompilerDiagnostic(Diagnostics.The_current_host_does_not_support_the_0_option, "--project"));
204+
reportDiagnostic(createCompilerDiagnostic(Diagnostics.The_current_host_does_not_support_the_0_option, "--project"), /* compilerHost */ undefined);
201205
return sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);
202206
}
203207
configFileName = normalizePath(combinePaths(commandLine.options.project, "tsconfig.json"));
204208
if (commandLine.fileNames.length !== 0) {
205-
reportDiagnostic(createCompilerDiagnostic(Diagnostics.Option_project_cannot_be_mixed_with_source_files_on_a_command_line));
209+
reportDiagnostic(createCompilerDiagnostic(Diagnostics.Option_project_cannot_be_mixed_with_source_files_on_a_command_line), /* compilerHost */ undefined);
206210
return sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);
207211
}
208212
}
@@ -220,7 +224,7 @@ namespace ts {
220224
// Firefox has Object.prototype.watch
221225
if (commandLine.options.watch && commandLine.options.hasOwnProperty("watch")) {
222226
if (!sys.watchFile) {
223-
reportDiagnostic(createCompilerDiagnostic(Diagnostics.The_current_host_does_not_support_the_0_option, "--watch"));
227+
reportDiagnostic(createCompilerDiagnostic(Diagnostics.The_current_host_does_not_support_the_0_option, "--watch"), /* compilerHost */ undefined);
224228
return sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);
225229
}
226230
if (configFileName) {
@@ -256,7 +260,7 @@ namespace ts {
256260
let configObject = result.config;
257261
let configParseResult = parseJsonConfigFileContent(configObject, sys, getDirectoryPath(configFileName), commandLine.options);
258262
if (configParseResult.errors.length > 0) {
259-
reportDiagnostics(configParseResult.errors);
263+
reportDiagnostics(configParseResult.errors, /* compilerHost */ undefined);
260264
sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);
261265
return;
262266
}
@@ -463,7 +467,7 @@ namespace ts {
463467
}
464468
}
465469

466-
reportDiagnostics(diagnostics);
470+
reportDiagnostics(diagnostics, compilerHost);
467471

468472
// If the user doesn't want us to emit, then we're done at this point.
469473
if (compilerOptions.noEmit) {
@@ -474,7 +478,7 @@ namespace ts {
474478

475479
// Otherwise, emit and report any errors we ran into.
476480
let emitOutput = program.emit();
477-
reportDiagnostics(emitOutput.diagnostics);
481+
reportDiagnostics(emitOutput.diagnostics, compilerHost);
478482

479483
// If the emitter didn't emit anything, then pass that value along.
480484
if (emitOutput.emitSkipped) {
@@ -587,7 +591,7 @@ namespace ts {
587591
let currentDirectory = sys.getCurrentDirectory();
588592
let file = normalizePath(combinePaths(currentDirectory, "tsconfig.json"));
589593
if (sys.fileExists(file)) {
590-
reportDiagnostic(createCompilerDiagnostic(Diagnostics.A_tsconfig_json_file_is_already_defined_at_Colon_0, file));
594+
reportDiagnostic(createCompilerDiagnostic(Diagnostics.A_tsconfig_json_file_is_already_defined_at_Colon_0, file), /* compilerHost */ undefined);
591595
}
592596
else {
593597
let compilerOptions = extend(options, defaultInitCompilerOptions);
@@ -602,7 +606,7 @@ namespace ts {
602606
}
603607

604608
sys.writeFile(file, JSON.stringify(configurations, undefined, 4));
605-
reportDiagnostic(createCompilerDiagnostic(Diagnostics.Successfully_created_a_tsconfig_json_file));
609+
reportDiagnostic(createCompilerDiagnostic(Diagnostics.Successfully_created_a_tsconfig_json_file), /* compilerHost */ undefined);
606610
}
607611

608612
return;

‎src/compiler/types.ts‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,17 @@ namespace ts {
33
[index: string]: T;
44
}
55

6+
// branded string type used to store absolute, normalized and canonicalized paths
7+
// arbitrary file name can be converted to Path via toPath function
8+
export type Path = string & { __pathBrand: any };
9+
610
export interface FileMap<T> {
7-
get(fileName: string): T;
8-
set(fileName: string, value: T): void;
9-
contains(fileName: string): boolean;
10-
remove(fileName: string): void;
11-
forEachValue(f: (v: T) => void): void;
11+
get(fileName: Path): T;
12+
set(fileName: Path, value: T): void;
13+
contains(fileName: Path): boolean;
14+
remove(fileName: Path): void;
15+
16+
forEachValue(f: (key: Path, v: T) => void): void;
1217
clear(): void;
1318
}
1419

@@ -1250,6 +1255,7 @@ namespace ts {
12501255
endOfFileToken: Node;
12511256

12521257
fileName: string;
1258+
/* internal */ path: Path;
12531259
text: string;
12541260

12551261
amdDependencies: {path: string; name: string}[];

0 commit comments

Comments
 (0)