Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 03e93d8

Browse filesBrowse files
aozgaaaozgaa
committed
Merge branch 'master' into dev/aozgaa/tsserverVersion
2 parents 0e75c5c + 18a7c3f commit 03e93d8
Copy full SHA for 03e93d8

98 files changed

+4,597-1,572Lines changed: 4597 additions & 1572 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎Jakefile.js‎

Copy file name to clipboardExpand all lines: Jakefile.js
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -795,7 +795,7 @@ compileFile(
795795
/*prereqs*/[builtLocalDirectory, tscFile, tsserverLibraryFile].concat(libraryTargets).concat(servicesSources).concat(harnessSources),
796796
/*prefixes*/[],
797797
/*useBuiltCompiler:*/ true,
798-
/*opts*/ { types: ["node", "mocha", "chai"], lib: "es6" });
798+
/*opts*/ { types: ["node", "mocha"], lib: "es6" });
799799

800800
var internalTests = "internal/";
801801

Collapse file

‎package-lock.json‎

Copy file name to clipboardExpand all lines: package-lock.json
+299-264Lines changed: 299 additions & 264 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Collapse file

‎package.json‎

Copy file name to clipboardExpand all lines: package.json
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
},
3131
"devDependencies": {
3232
"@types/browserify": "latest",
33-
"@types/chai": "latest",
3433
"@types/colors": "latest",
3534
"@types/convert-source-map": "latest",
3635
"@types/del": "latest",
@@ -53,7 +52,6 @@
5352
"xml2js": "^0.4.19",
5453
"browser-resolve": "^1.11.2",
5554
"browserify": "latest",
56-
"chai": "latest",
5755
"convert-source-map": "latest",
5856
"del": "latest",
5957
"gulp": "3.X",
Collapse file

‎src/compiler/binder.ts‎

Copy file name to clipboardExpand all lines: src/compiler/binder.ts
+6Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -749,6 +749,10 @@ namespace ts {
749749
return expr1.kind === SyntaxKind.TypeOfExpression && isNarrowableOperand((<TypeOfExpression>expr1).expression) && expr2.kind === SyntaxKind.StringLiteral;
750750
}
751751

752+
function isNarrowableInOperands(left: Expression, right: Expression) {
753+
return left.kind === SyntaxKind.StringLiteral && isNarrowingExpression(right);
754+
}
755+
752756
function isNarrowingBinaryExpression(expr: BinaryExpression) {
753757
switch (expr.operatorToken.kind) {
754758
case SyntaxKind.EqualsToken:
@@ -761,6 +765,8 @@ namespace ts {
761765
isNarrowingTypeofOperands(expr.right, expr.left) || isNarrowingTypeofOperands(expr.left, expr.right);
762766
case SyntaxKind.InstanceOfKeyword:
763767
return isNarrowableOperand(expr.left);
768+
case SyntaxKind.InKeyword:
769+
return isNarrowableInOperands(expr.left, expr.right);
764770
case SyntaxKind.CommaToken:
765771
return isNarrowingExpression(expr.right);
766772
}
Collapse file

‎src/compiler/builder.ts‎

Copy file name to clipboardExpand all lines: src/compiler/builder.ts
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -468,9 +468,9 @@ namespace ts {
468468
}
469469

470470
function getReferencedByPaths(referencedFilePath: Path) {
471-
return mapDefinedIter(references.entries(), ([filePath, referencesInFile]) =>
471+
return arrayFrom(mapDefinedIterator(references.entries(), ([filePath, referencesInFile]) =>
472472
referencesInFile.has(referencedFilePath) ? filePath as Path : undefined
473-
);
473+
));
474474
}
475475

476476
function getFilesAffectedByUpdatedShape(program: Program, sourceFile: SourceFile): ReadonlyArray<SourceFile> {
@@ -504,7 +504,7 @@ namespace ts {
504504
}
505505

506506
// Return array of values that needs emit
507-
return flatMapIter(seenFileNamesMap.values(), value => value);
507+
return arrayFrom(mapDefinedIterator(seenFileNamesMap.values(), value => value));
508508
}
509509
}
510510
}
Collapse file

‎src/compiler/checker.ts‎

Copy file name to clipboardExpand all lines: src/compiler/checker.ts
+180-65Lines changed: 180 additions & 65 deletions
Large diffs are not rendered by default.
Collapse file

‎src/compiler/core.ts‎

Copy file name to clipboardExpand all lines: src/compiler/core.ts
+65-25Lines changed: 65 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,19 @@ namespace ts {
191191
return undefined;
192192
}
193193

194+
export function firstDefinedIterator<T, U>(iter: Iterator<T>, callback: (element: T) => U | undefined): U | undefined {
195+
while (true) {
196+
const { value, done } = iter.next();
197+
if (done) {
198+
return undefined;
199+
}
200+
const result = callback(value);
201+
if (result !== undefined) {
202+
return result;
203+
}
204+
}
205+
}
206+
194207
/**
195208
* Iterates through the parent chain of a node and performs the callback on each parent until the callback
196209
* returns a truthy value, then returns that value.
@@ -474,22 +487,32 @@ namespace ts {
474487
return result;
475488
}
476489

477-
export function flatMapIter<T, U>(iter: Iterator<T>, mapfn: (x: T) => U | U[] | undefined): U[] {
478-
const result: U[] = [];
479-
while (true) {
480-
const { value, done } = iter.next();
481-
if (done) break;
482-
const res = mapfn(value);
483-
if (res) {
484-
if (isArray(res)) {
485-
result.push(...res);
486-
}
487-
else {
488-
result.push(res);
490+
export function flatMapIterator<T, U>(iter: Iterator<T>, mapfn: (x: T) => U[] | Iterator<U> | undefined): Iterator<U> {
491+
const first = iter.next();
492+
if (first.done) {
493+
return emptyIterator;
494+
}
495+
let currentIter = getIterator(first.value);
496+
return {
497+
next() {
498+
while (true) {
499+
const currentRes = currentIter.next();
500+
if (!currentRes.done) {
501+
return currentRes;
502+
}
503+
const iterRes = iter.next();
504+
if (iterRes.done) {
505+
return iterRes;
506+
}
507+
currentIter = getIterator(iterRes.value);
489508
}
490-
}
509+
},
510+
};
511+
512+
function getIterator(x: T): Iterator<U> {
513+
const res = mapfn(x);
514+
return res === undefined ? emptyIterator : isArray(res) ? arrayIterator(res) : res;
491515
}
492-
return result;
493516
}
494517

495518
/**
@@ -537,17 +560,34 @@ namespace ts {
537560
return result;
538561
}
539562

540-
export function mapDefinedIter<T, U>(iter: Iterator<T>, mapFn: (x: T) => U | undefined): U[] {
541-
const result: U[] = [];
542-
while (true) {
543-
const { value, done } = iter.next();
544-
if (done) break;
545-
const res = mapFn(value);
546-
if (res !== undefined) {
547-
result.push(res);
563+
export function mapDefinedIterator<T, U>(iter: Iterator<T>, mapFn: (x: T) => U | undefined): Iterator<U> {
564+
return {
565+
next() {
566+
while (true) {
567+
const res = iter.next();
568+
if (res.done) {
569+
return res;
570+
}
571+
const value = mapFn(res.value);
572+
if (value !== undefined) {
573+
return { value, done: false };
574+
}
575+
}
548576
}
549-
}
550-
return result;
577+
};
578+
}
579+
580+
export const emptyIterator: Iterator<never> = { next: () => ({ value: undefined as never, done: true }) };
581+
582+
export function singleIterator<T>(value: T): Iterator<T> {
583+
let done = false;
584+
return {
585+
next() {
586+
const wasDone = done;
587+
done = true;
588+
return wasDone ? { value: undefined as never, done: true } : { value, done: false };
589+
}
590+
};
551591
}
552592

553593
/**
@@ -1360,7 +1400,7 @@ namespace ts {
13601400
/**
13611401
* Tests whether a value is an array.
13621402
*/
1363-
export function isArray(value: any): value is ReadonlyArray<any> {
1403+
export function isArray(value: any): value is ReadonlyArray<{}> {
13641404
return Array.isArray ? Array.isArray(value) : value instanceof Array;
13651405
}
13661406

Collapse file

‎src/compiler/diagnosticMessages.json‎

Copy file name to clipboardExpand all lines: src/compiler/diagnosticMessages.json
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2828,6 +2828,10 @@
28282828
"category": "Message",
28292829
"code": 6030
28302830
},
2831+
"Starting compilation in watch mode...": {
2832+
"category": "Message",
2833+
"code": 6031
2834+
},
28312835
"File change detected. Starting incremental compilation...": {
28322836
"category": "Message",
28332837
"code": 6032
Collapse file

‎src/compiler/moduleNameResolver.ts‎

Copy file name to clipboardExpand all lines: src/compiler/moduleNameResolver.ts
+17-10Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ namespace ts {
6464
return { fileName: resolved.path, packageId: resolved.packageId };
6565
}
6666

67-
function createResolvedModuleWithFailedLookupLocations(resolved: Resolved | undefined, isExternalLibraryImport: boolean, failedLookupLocations: string[]): ResolvedModuleWithFailedLookupLocations {
67+
function createResolvedModuleWithFailedLookupLocations(resolved: Resolved | undefined, originalPath: string | undefined, isExternalLibraryImport: boolean, failedLookupLocations: string[]): ResolvedModuleWithFailedLookupLocations {
6868
return {
69-
resolvedModule: resolved && { resolvedFileName: resolved.path, extension: resolved.extension, isExternalLibraryImport, packageId: resolved.packageId },
69+
resolvedModule: resolved && { resolvedFileName: resolved.path, originalPath, extension: resolved.extension, isExternalLibraryImport, packageId: resolved.packageId },
7070
failedLookupLocations
7171
};
7272
}
@@ -732,12 +732,12 @@ namespace ts {
732732

733733
const result = jsOnly ? tryResolve(Extensions.JavaScript) : (tryResolve(Extensions.TypeScript) || tryResolve(Extensions.JavaScript));
734734
if (result && result.value) {
735-
const { resolved, isExternalLibraryImport } = result.value;
736-
return createResolvedModuleWithFailedLookupLocations(resolved, isExternalLibraryImport, failedLookupLocations);
735+
const { resolved, originalPath, isExternalLibraryImport } = result.value;
736+
return createResolvedModuleWithFailedLookupLocations(resolved, originalPath, isExternalLibraryImport, failedLookupLocations);
737737
}
738738
return { resolvedModule: undefined, failedLookupLocations };
739739

740-
function tryResolve(extensions: Extensions): SearchResult<{ resolved: Resolved, isExternalLibraryImport: boolean }> {
740+
function tryResolve(extensions: Extensions): SearchResult<{ resolved: Resolved, originalPath?: string, isExternalLibraryImport: boolean }> {
741741
const loader: ResolutionKindSpecificLoader = (extensions, candidate, failedLookupLocations, onlyRecordFailures, state) => nodeLoadModuleByRelativeName(extensions, candidate, failedLookupLocations, onlyRecordFailures, state, /*considerPackageJson*/ true);
742742
const resolved = tryLoadModuleUsingOptionalResolutionSettings(extensions, moduleName, containingDirectory, loader, failedLookupLocations, state);
743743
if (resolved) {
@@ -752,11 +752,17 @@ namespace ts {
752752
if (!resolved) return undefined;
753753

754754
let resolvedValue = resolved.value;
755-
if (!compilerOptions.preserveSymlinks) {
756-
resolvedValue = resolvedValue && { ...resolved.value, path: realPath(resolved.value.path, host, traceEnabled), extension: resolved.value.extension };
755+
let originalPath: string | undefined;
756+
if (!compilerOptions.preserveSymlinks && resolvedValue) {
757+
originalPath = resolvedValue.path;
758+
const path = realPath(resolved.value.path, host, traceEnabled);
759+
if (path === originalPath) {
760+
originalPath = undefined;
761+
}
762+
resolvedValue = { ...resolvedValue, path };
757763
}
758764
// For node_modules lookups, get the real path so that multiple accesses to an `npm link`-ed module do not create duplicate files.
759-
return { value: resolvedValue && { resolved: resolvedValue, isExternalLibraryImport: true } };
765+
return { value: resolvedValue && { resolved: resolvedValue, originalPath, isExternalLibraryImport: true } };
760766
}
761767
else {
762768
const { path: candidate, parts } = normalizePathAndParts(combinePaths(containingDirectory, moduleName));
@@ -1115,7 +1121,8 @@ namespace ts {
11151121
const containingDirectory = getDirectoryPath(containingFile);
11161122

11171123
const resolved = tryResolve(Extensions.TypeScript) || tryResolve(Extensions.JavaScript);
1118-
return createResolvedModuleWithFailedLookupLocations(resolved && resolved.value, /*isExternalLibraryImport*/ false, failedLookupLocations);
1124+
// No originalPath because classic resolution doesn't resolve realPath
1125+
return createResolvedModuleWithFailedLookupLocations(resolved && resolved.value, /*originalPath*/ undefined, /*isExternalLibraryImport*/ false, failedLookupLocations);
11191126

11201127
function tryResolve(extensions: Extensions): SearchResult<Resolved> {
11211128
const resolvedUsingSettings = tryLoadModuleUsingOptionalResolutionSettings(extensions, moduleName, containingDirectory, loadModuleFromFileNoPackageId, failedLookupLocations, state);
@@ -1162,7 +1169,7 @@ namespace ts {
11621169
const state: ModuleResolutionState = { compilerOptions, host, traceEnabled };
11631170
const failedLookupLocations: string[] = [];
11641171
const resolved = loadModuleFromNodeModulesOneLevel(Extensions.DtsOnly, moduleName, globalCache, failedLookupLocations, state);
1165-
return createResolvedModuleWithFailedLookupLocations(resolved, /*isExternalLibraryImport*/ true, failedLookupLocations);
1172+
return createResolvedModuleWithFailedLookupLocations(resolved, /*originalPath*/ undefined, /*isExternalLibraryImport*/ true, failedLookupLocations);
11661173
}
11671174

11681175
/**
Collapse file

‎src/compiler/symbolWalker.ts‎

Copy file name to clipboardExpand all lines: src/compiler/symbolWalker.ts
+4-2Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
namespace ts {
33
export function createGetSymbolWalker(
44
getRestTypeOfSignature: (sig: Signature) => Type,
5+
getTypePredicateOfSignature: (sig: Signature) => TypePredicate | undefined,
56
getReturnTypeOfSignature: (sig: Signature) => Type,
67
getBaseTypes: (type: Type) => Type[],
78
resolveStructuredTypeMembers: (type: ObjectType) => ResolvedType,
@@ -117,8 +118,9 @@ namespace ts {
117118
}
118119

119120
function visitSignature(signature: Signature): void {
120-
if (signature.typePredicate) {
121-
visitType(signature.typePredicate.type);
121+
const typePredicate = getTypePredicateOfSignature(signature);
122+
if (typePredicate) {
123+
visitType(typePredicate.type);
122124
}
123125
forEach(signature.typeParameters, visitType);
124126

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.