Merge remote-tracking branch 'upstream/master' into fix41977

Author: RyanCavanaugh

package-lock.json

@@ -337,7 +337,6 @@ namespace ts {
         let totalInstantiationCount = 0;
         let instantiationCount = 0;
         let instantiationDepth = 0;
-        let constraintDepth = 0;
         let currentNode: Node | undefined;
 
         const typeCatalog: Type[] = []; // NB: id is index + 1
@@ -11073,7 +11072,6 @@ namespace ts {
             if (type.resolvedBaseConstraint) {
                 return type.resolvedBaseConstraint;
             }
-            let nonTerminating = false;
             const stack: Type[] = [];
             return type.resolvedBaseConstraint = getTypeWithThisArgument(getImmediateBaseConstraint(type), type);
 
@@ -11082,22 +11080,16 @@ namespace ts {
                     if (!pushTypeResolution(t, TypeSystemPropertyName.ImmediateBaseConstraint)) {
                         return circularConstraintType;
                     }
-                    if (constraintDepth >= 50) {
-                        // We have reached 50 recursive invocations of getImmediateBaseConstraint and there is a
-                        // very high likelihood we're dealing with an infinite generic type that perpetually generates
-                        // new type identities as we descend into it. We stop the recursion here and mark this type
-                        // and the outer types as having circular constraints.
-                        tracing.instant(tracing.Phase.CheckTypes, "getImmediateBaseConstraint_DepthLimit", { typeId: t.id, originalTypeId: type.id, depth: constraintDepth });
-                        error(currentNode, Diagnostics.Type_instantiation_is_excessively_deep_and_possibly_infinite);
-                        nonTerminating = true;
-                        return t.immediateBaseConstraint = noConstraintType;
-                    }
                     let result;
-                    if (!isDeeplyNestedType(t, stack, stack.length)) {
+                    // We always explore at least 10 levels of nested constraints. Thereafter, we continue to explore
+                    // up to 50 levels of nested constraints provided there are no "deeply nested" types on the stack
+                    // (i.e. no types for which five instantiations have been recorded on the stack). If we reach 50
+                    // levels of nesting, we are presumably exploring a repeating pattern with a long cycle that hasn't
+                    // yet triggered the deeply nested limiter. We have no test cases that actually get to 50 levels of
+                    // nesting, so it is effectively just a safety stop.
+                    if (stack.length < 10 || stack.length < 50 && !isDeeplyNestedType(t, stack, stack.length)) {
                         stack.push(t);
-                        constraintDepth++;
                         result = computeBaseConstraint(getSimplifiedType(t, /*writing*/ false));
-                        constraintDepth--;
                         stack.pop();
                     }
                     if (!popTypeResolution()) {
@@ -11112,9 +11104,6 @@ namespace ts {
                         }
                         result = circularConstraintType;
                     }
-                    if (nonTerminating) {
-                        result = circularConstraintType;
-                    }
                     t.immediateBaseConstraint = result || noConstraintType;
                 }
                 return t.immediateBaseConstraint;
@@ -11165,10 +11154,7 @@ namespace ts {
                 }
                 if (t.flags & TypeFlags.Conditional) {
                     const constraint = getConstraintFromConditionalType(<ConditionalType>t);
-                    constraintDepth++; // Penalize repeating conditional types (this captures the recursion within getConstraintFromConditionalType and carries it forward)
-                    const result = constraint && getBaseConstraint(constraint);
-                    constraintDepth--;
-                    return result;
+                    return constraint && getBaseConstraint(constraint);
                 }
                 if (t.flags & TypeFlags.Substitution) {
                     return getBaseConstraint((<SubstitutionType>t).substitute);

src/compiler/checker.ts

@@ -787,8 +787,12 @@ namespace ts {
 
     export function isJSDocDeprecatedTag(node: Node): node is JSDocDeprecatedTag {
         return node.kind === SyntaxKind.JSDocDeprecatedTag;
+    }
 
+    export function isJSDocSeeTag(node: Node): node is JSDocSeeTag {
+        return node.kind === SyntaxKind.JSDocSeeTag;
     }
+
     export function isJSDocEnumTag(node: Node): node is JSDocEnumTag {
         return node.kind === SyntaxKind.JSDocEnumTag;
     }

src/compiler/factory/nodeTests.ts

@@ -1391,7 +1391,23 @@ namespace ts {
         return isInsideJsxElementTraversal(getTokenAtPosition(sourceFile, position));
     }
 
-    export function findPrecedingMatchingToken(token: Node, matchingTokenKind: SyntaxKind, sourceFile: SourceFile) {
+    export function findPrecedingMatchingToken(token: Node, matchingTokenKind: SyntaxKind.OpenBraceToken | SyntaxKind.OpenParenToken | SyntaxKind.OpenBracketToken, sourceFile: SourceFile) {
+        const closeTokenText = tokenToString(token.kind)!;
+        const matchingTokenText = tokenToString(matchingTokenKind)!;
+        const tokenFullStart = token.getFullStart();
+        // Text-scan based fast path - can be bamboozled by comments and other trivia, but often provides
+        // a good, fast approximation without too much extra work in the cases where it fails.
+        const bestGuessIndex = sourceFile.text.lastIndexOf(matchingTokenText, tokenFullStart);
+        if (bestGuessIndex === -1) {
+            return undefined; // if the token text doesn't appear in the file, there can't be a match - super fast bail
+        }
+        // we can only use the textual result directly if we didn't have to count any close tokens within the range
+        if (sourceFile.text.lastIndexOf(closeTokenText, tokenFullStart - 1) < bestGuessIndex) {
+            const nodeAtGuess = findPrecedingToken(bestGuessIndex + 1, sourceFile);
+            if (nodeAtGuess && nodeAtGuess.kind === matchingTokenKind) {
+                return nodeAtGuess;
+            }
+        }
         const tokenKind = token.kind;
         let remainingMatchingTokens = 0;
         while (true) {
@@ -1447,7 +1463,14 @@ namespace ts {
     }
 
     // Get info for an expression like `f <` that may be the start of type arguments.
-    export function getPossibleTypeArgumentsInfo(tokenIn: Node, sourceFile: SourceFile): PossibleTypeArgumentInfo | undefined {
+    export function getPossibleTypeArgumentsInfo(tokenIn: Node | undefined, sourceFile: SourceFile): PossibleTypeArgumentInfo | undefined {
+        // This is a rare case, but one that saves on a _lot_ of work if true - if the source file has _no_ `<` character,
+        // then there obviously can't be any type arguments - no expensive brace-matching backwards scanning required
+
+        if (sourceFile.text.lastIndexOf("<", tokenIn ? tokenIn.pos : sourceFile.text.length) === -1) {
+            return undefined;
+        }
+
         let token: Node | undefined = tokenIn;
         // This function determines if the node could be type argument position
         // Since during editing, when type argument list is not complete,

src/services/utilities.ts

@@ -4507,6 +4507,7 @@ declare namespace ts {
     function isJSDocProtectedTag(node: Node): node is JSDocProtectedTag;
     function isJSDocReadonlyTag(node: Node): node is JSDocReadonlyTag;
     function isJSDocDeprecatedTag(node: Node): node is JSDocDeprecatedTag;
+    function isJSDocSeeTag(node: Node): node is JSDocSeeTag;
     function isJSDocEnumTag(node: Node): node is JSDocEnumTag;
     function isJSDocParameterTag(node: Node): node is JSDocParameterTag;
     function isJSDocReturnTag(node: Node): node is JSDocReturnTag;

tests/baselines/reference/api/tsserverlibrary.d.ts

@@ -4507,6 +4507,7 @@ declare namespace ts {
     function isJSDocProtectedTag(node: Node): node is JSDocProtectedTag;
     function isJSDocReadonlyTag(node: Node): node is JSDocReadonlyTag;
     function isJSDocDeprecatedTag(node: Node): node is JSDocDeprecatedTag;
+    function isJSDocSeeTag(node: Node): node is JSDocSeeTag;
     function isJSDocEnumTag(node: Node): node is JSDocEnumTag;
     function isJSDocParameterTag(node: Node): node is JSDocParameterTag;
     function isJSDocReturnTag(node: Node): node is JSDocReturnTag;

tests/baselines/reference/api/typescript.d.ts

@@ -0,0 +1,35 @@
+//// [deeplyNestedConstraints.ts]
+// Repro from #41931
+
+type Enum = Record<string, string | number>;
+
+type TypeMap<E extends Enum> = { [key in E[keyof E]]: number | boolean | string | number[] };
+
+class BufferPool<E extends Enum, M extends TypeMap<E>> {
+    setArray2<K extends E[keyof E]>(_: K, array: Extract<M[K], ArrayLike<any>>) {
+        array.length; // Requires exploration of >5 levels of constraints
+    }
+}
+
+
+//// [deeplyNestedConstraints.js]
+"use strict";
+// Repro from #41931
+var BufferPool = /** @class */ (function () {
+    function BufferPool() {
+    }
+    BufferPool.prototype.setArray2 = function (_, array) {
+        array.length; // Requires exploration of >5 levels of constraints
+    };
+    return BufferPool;
+}());
+
+
+//// [deeplyNestedConstraints.d.ts]
+declare type Enum = Record<string, string | number>;
+declare type TypeMap<E extends Enum> = {
+    [key in E[keyof E]]: number | boolean | string | number[];
+};
+declare class BufferPool<E extends Enum, M extends TypeMap<E>> {
+    setArray2<K extends E[keyof E]>(_: K, array: Extract<M[K], ArrayLike<any>>): void;
+}

tests/baselines/reference/deeplyNestedConstraints.js

@@ -0,0 +1,43 @@
+=== tests/cases/compiler/deeplyNestedConstraints.ts ===
+// Repro from #41931
+
+type Enum = Record<string, string | number>;
+>Enum : Symbol(Enum, Decl(deeplyNestedConstraints.ts, 0, 0))
+>Record : Symbol(Record, Decl(lib.es5.d.ts, --, --))
+
+type TypeMap<E extends Enum> = { [key in E[keyof E]]: number | boolean | string | number[] };
+>TypeMap : Symbol(TypeMap, Decl(deeplyNestedConstraints.ts, 2, 44))
+>E : Symbol(E, Decl(deeplyNestedConstraints.ts, 4, 13))
+>Enum : Symbol(Enum, Decl(deeplyNestedConstraints.ts, 0, 0))
+>key : Symbol(key, Decl(deeplyNestedConstraints.ts, 4, 34))
+>E : Symbol(E, Decl(deeplyNestedConstraints.ts, 4, 13))
+>E : Symbol(E, Decl(deeplyNestedConstraints.ts, 4, 13))
+
+class BufferPool<E extends Enum, M extends TypeMap<E>> {
+>BufferPool : Symbol(BufferPool, Decl(deeplyNestedConstraints.ts, 4, 93))
+>E : Symbol(E, Decl(deeplyNestedConstraints.ts, 6, 17))
+>Enum : Symbol(Enum, Decl(deeplyNestedConstraints.ts, 0, 0))
+>M : Symbol(M, Decl(deeplyNestedConstraints.ts, 6, 32))
+>TypeMap : Symbol(TypeMap, Decl(deeplyNestedConstraints.ts, 2, 44))
+>E : Symbol(E, Decl(deeplyNestedConstraints.ts, 6, 17))
+
+    setArray2<K extends E[keyof E]>(_: K, array: Extract<M[K], ArrayLike<any>>) {
+>setArray2 : Symbol(BufferPool.setArray2, Decl(deeplyNestedConstraints.ts, 6, 56))
+>K : Symbol(K, Decl(deeplyNestedConstraints.ts, 7, 14))
+>E : Symbol(E, Decl(deeplyNestedConstraints.ts, 6, 17))
+>E : Symbol(E, Decl(deeplyNestedConstraints.ts, 6, 17))
+>_ : Symbol(_, Decl(deeplyNestedConstraints.ts, 7, 36))
+>K : Symbol(K, Decl(deeplyNestedConstraints.ts, 7, 14))
+>array : Symbol(array, Decl(deeplyNestedConstraints.ts, 7, 41))
+>Extract : Symbol(Extract, Decl(lib.es5.d.ts, --, --))
+>M : Symbol(M, Decl(deeplyNestedConstraints.ts, 6, 32))
+>K : Symbol(K, Decl(deeplyNestedConstraints.ts, 7, 14))
+>ArrayLike : Symbol(ArrayLike, Decl(lib.es5.d.ts, --, --))
+
+        array.length; // Requires exploration of >5 levels of constraints
+>array.length : Symbol(length, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>array : Symbol(array, Decl(deeplyNestedConstraints.ts, 7, 41))
+>length : Symbol(length, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+    }
+}
+

tests/baselines/reference/deeplyNestedConstraints.symbols

@@ -0,0 +1,24 @@
+=== tests/cases/compiler/deeplyNestedConstraints.ts ===
+// Repro from #41931
+
+type Enum = Record<string, string | number>;
+>Enum : Record<string, string | number>
+
+type TypeMap<E extends Enum> = { [key in E[keyof E]]: number | boolean | string | number[] };
+>TypeMap : TypeMap<E>
+
+class BufferPool<E extends Enum, M extends TypeMap<E>> {
+>BufferPool : BufferPool<E, M>
+
+    setArray2<K extends E[keyof E]>(_: K, array: Extract<M[K], ArrayLike<any>>) {
+>setArray2 : <K extends E[keyof E]>(_: K, array: Extract<M[K], ArrayLike<any>>) => void
+>_ : K
+>array : Extract<M[K], ArrayLike<any>>
+
+        array.length; // Requires exploration of >5 levels of constraints
+>array.length : number
+>array : Extract<M[K], ArrayLike<any>>
+>length : number
+    }
+}
+

tests/baselines/reference/deeplyNestedConstraints.types

@@ -0,0 +1,14 @@
+// @strict: true
+// @declaration: true
+
+// Repro from #41931
+
+type Enum = Record<string, string | number>;
+
+type TypeMap<E extends Enum> = { [key in E[keyof E]]: number | boolean | string | number[] };
+
+class BufferPool<E extends Enum, M extends TypeMap<E>> {
+    setArray2<K extends E[keyof E]>(_: K, array: Extract<M[K], ArrayLike<any>>) {
+        array.length; // Requires exploration of >5 levels of constraints
+    }
+}