typescript 4.8.0-dev.20220717 → 4.8.0-dev.20220720

package/lib/tsserverlibrary.js

@@ -303,7 +303,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = ts.versionMajorMinor + ".0-dev.20220717";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220720";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -13411,6 +13411,12 @@ var ts;
     /**
      * Gets the effective type parameters. If the node was parsed in a
      * JavaScript file, gets the type parameters from the `@template` tag from JSDoc.
+     *
+     * This does *not* return type parameters from a jsdoc reference to a generic type, eg
+     *
+     * type Id = <T>(x: T) => T
+     * /** @type {Id} /
+     * function id(x) { return x }
      */
     function getEffectiveTypeParameterDeclarations(node) {
         if (ts.isJSDocSignature(node)) {
@@ -35671,6 +35677,9 @@ var ts;
                 var typeArguments = tryParse(parseTypeArgumentsInExpression);
                 if (typeArguments !== undefined) {
                     parseErrorAt(startPos, getNodePos(), ts.Diagnostics.super_may_not_use_type_arguments);
+                    if (!isTemplateStartOfTaggedTemplate()) {
+                        expression = factory.createExpressionWithTypeArguments(expression, typeArguments);
+                    }
                 }
             }
             if (token() === 20 /* OpenParenToken */ || token() === 24 /* DotToken */ || token() === 22 /* OpenBracketToken */) {
@@ -59388,6 +59397,9 @@ var ts;
                     else if (type.objectFlags & 32 /* Mapped */) {
                         resolveMappedTypeMembers(type);
                     }
+                    else {
+                        ts.Debug.fail("Unhandled object type " + ts.Debug.formatObjectFlags(type.objectFlags));
+                    }
                 }
                 else if (type.flags & 1048576 /* Union */) {
                     resolveUnionTypeMembers(type);
@@ -59395,6 +59407,9 @@ var ts;
                 else if (type.flags & 2097152 /* Intersection */) {
                     resolveIntersectionTypeMembers(type);
                 }
+                else {
+                    ts.Debug.fail("Unhandled type " + ts.Debug.formatTypeFlags(type.flags));
+                }
             }
             return type;
         }
@@ -60186,12 +60201,15 @@ var ts;
         // Return list of type parameters with duplicates removed (duplicate identifier errors are generated in the actual
         // type checking functions).
         function getTypeParametersFromDeclaration(declaration) {
+            var _a;
             var result;
-            for (var _i = 0, _a = ts.getEffectiveTypeParameterDeclarations(declaration); _i < _a.length; _i++) {
-                var node = _a[_i];
+            for (var _i = 0, _b = ts.getEffectiveTypeParameterDeclarations(declaration); _i < _b.length; _i++) {
+                var node = _b[_i];
                 result = ts.appendIfUnique(result, getDeclaredTypeOfTypeParameter(node.symbol));
             }
-            return result;
+            return (result === null || result === void 0 ? void 0 : result.length) ? result
+                : ts.isFunctionDeclaration(declaration) ? (_a = getSignatureOfTypeTag(declaration)) === null || _a === void 0 ? void 0 : _a.typeParameters
+                    : undefined;
         }
         function symbolsToArray(symbols) {
             var result = [];
@@ -69412,15 +69430,11 @@ var ts;
                     inferFromTypeArguments(getTypeArguments(source), getTypeArguments(target), getVariances(source.target));
                 }
                 else if (source.flags & 4194304 /* Index */ && target.flags & 4194304 /* Index */) {
-                    contravariant = !contravariant;
-                    inferFromTypes(source.type, target.type);
-                    contravariant = !contravariant;
+                    inferFromContravariantTypes(source.type, target.type);
                 }
                 else if ((isLiteralType(source) || source.flags & 4 /* String */) && target.flags & 4194304 /* Index */) {
                     var empty = createEmptyObjectTypeFromStringLiteral(source);
-                    contravariant = !contravariant;
-                    inferWithPriority(empty, target.type, 256 /* LiteralKeyof */);
-                    contravariant = !contravariant;
+                    inferFromContravariantTypesWithPriority(empty, target.type, 256 /* LiteralKeyof */);
                 }
                 else if (source.flags & 8388608 /* IndexedAccess */ && target.flags & 8388608 /* IndexedAccess */) {
                     inferFromTypes(source.objectType, target.objectType);
@@ -69433,10 +69447,7 @@ var ts;
                 }
                 else if (source.flags & 33554432 /* Substitution */) {
                     inferFromTypes(source.baseType, target);
-                    var oldPriority = priority;
-                    priority |= 4 /* SubstituteSource */;
-                    inferFromTypes(source.substitute, target); // Make substitute inference at a lower priority
-                    priority = oldPriority;
+                    inferWithPriority(source.substitute, target, 4 /* SubstituteSource */); // Make substitute inference at a lower priority
                 }
                 else if (target.flags & 16777216 /* Conditional */) {
                     invokeOnce(source, target, inferToConditionalType);
@@ -69486,6 +69497,18 @@ var ts;
                 inferFromTypes(source, target);
                 priority = savePriority;
             }
+            function inferFromContravariantTypesWithPriority(source, target, newPriority) {
+                var savePriority = priority;
+                priority |= newPriority;
+                inferFromContravariantTypes(source, target);
+                priority = savePriority;
+            }
+            function inferToMultipleTypesWithPriority(source, targets, targetFlags, newPriority) {
+                var savePriority = priority;
+                priority |= newPriority;
+                inferToMultipleTypes(source, targets, targetFlags);
+                priority = savePriority;
+            }
             function invokeOnce(source, target, action) {
                 var key = source.id + "," + target.id;
                 var status = visited && visited.get(key);
@@ -69550,10 +69573,13 @@ var ts;
                 }
             }
             function inferFromContravariantTypes(source, target) {
+                contravariant = !contravariant;
+                inferFromTypes(source, target);
+                contravariant = !contravariant;
+            }
+            function inferFromContravariantTypesIfStrictFunctionTypes(source, target) {
                 if (strictFunctionTypes || priority & 1024 /* AlwaysStrict */) {
-                    contravariant = !contravariant;
-                    inferFromTypes(source, target);
-                    contravariant = !contravariant;
+                    inferFromContravariantTypes(source, target);
                 }
                 else {
                     inferFromTypes(source, target);
@@ -69717,11 +69743,8 @@ var ts;
                     inferFromTypes(getFalseTypeFromConditionalType(source), getFalseTypeFromConditionalType(target));
                 }
                 else {
-                    var savePriority = priority;
-                    priority |= contravariant ? 64 /* ContravariantConditional */ : 0;
                     var targetTypes = [getTrueTypeFromConditionalType(target), getFalseTypeFromConditionalType(target)];
-                    inferToMultipleTypes(source, targetTypes, target.flags);
-                    priority = savePriority;
+                    inferToMultipleTypesWithPriority(source, targetTypes, target.flags, contravariant ? 64 /* ContravariantConditional */ : 0);
                 }
             }
             function inferToTemplateLiteralType(source, target) {
@@ -69907,7 +69930,7 @@ var ts;
                 var kind = target.declaration ? target.declaration.kind : 0 /* Unknown */;
                 // Once we descend into a bivariant signature we remain bivariant for all nested inferences
                 bivariant = bivariant || kind === 169 /* MethodDeclaration */ || kind === 168 /* MethodSignature */ || kind === 171 /* Constructor */;
-                applyToParameterTypes(source, target, inferFromContravariantTypes);
+                applyToParameterTypes(source, target, inferFromContravariantTypesIfStrictFunctionTypes);
                 bivariant = saveBivariant;
                 applyToReturnTypes(source, target, inferFromTypes);
             }
@@ -71360,7 +71383,7 @@ var ts;
                 }
                 // for (const _ in ref) acts as a nonnull on ref
                 if (ts.isVariableDeclaration(node) && node.parent.parent.kind === 243 /* ForInStatement */ && isMatchingReference(reference, node.parent.parent.expression)) {
-                    return getNonNullableTypeIfNeeded(getTypeFromFlowType(getTypeAtFlowNode(flow.antecedent)));
+                    return getNonNullableTypeIfNeeded(finalizeEvolvingArrayType(getTypeFromFlowType(getTypeAtFlowNode(flow.antecedent))));
                 }
                 // Assignment doesn't affect reference
                 return undefined;
@@ -76949,7 +76972,7 @@ var ts;
             var isJsxOpeningOrSelfClosingElement = ts.isJsxOpeningLikeElement(node);
             var reportErrors = !candidatesOutArray;
             var typeArguments;
-            if (!isDecorator) {
+            if (!isDecorator && !ts.isSuperCall(node)) {
                 typeArguments = node.typeArguments;
                 // We already perform checking on the type arguments on the class declaration itself.
                 if (isTaggedTemplate || isJsxOpeningOrSelfClosingElement || node.expression.kind !== 106 /* SuperKeyword */) {
@@ -79365,7 +79388,7 @@ var ts;
                         error(node.operand, ts.Diagnostics.The_0_operator_cannot_be_applied_to_type_symbol, ts.tokenToString(node.operator));
                     }
                     if (node.operator === 39 /* PlusToken */) {
-                        if (maybeTypeOfKind(operandType, 2112 /* BigIntLike */)) {
+                        if (maybeTypeOfKindConsideringBaseConstraint(operandType, 2112 /* BigIntLike */)) {
                             error(node.operand, ts.Diagnostics.Operator_0_cannot_be_applied_to_type_1, ts.tokenToString(node.operator), typeToString(getBaseTypeOfLiteralType(operandType)));
                         }
                         return numberType;
@@ -133141,11 +133164,11 @@ var ts;
                 var parent = walkUpParentheses(node.parent);
                 switch (parent.kind) {
                     case 196 /* LiteralType */: {
-                        var grandParent = walkUpParentheses(parent.parent);
-                        switch (grandParent.kind) {
+                        var grandParent_1 = walkUpParentheses(parent.parent);
+                        switch (grandParent_1.kind) {
+                            case 228 /* ExpressionWithTypeArguments */:
                             case 178 /* TypeReference */: {
-                                var typeReference_1 = grandParent;
-                                var typeArgument = ts.findAncestor(parent, function (n) { return n.parent === typeReference_1; });
+                                var typeArgument = ts.findAncestor(parent, function (n) { return n.parent === grandParent_1; });
                                 if (typeArgument) {
                                     return { kind: 2 /* Types */, types: getStringLiteralTypes(typeChecker.getTypeArgumentConstraint(typeArgument)), isNewIdentifier: false };
                                 }
@@ -133158,7 +133181,7 @@ var ts;
                                 //          bar: string;
                                 //      }
                                 //      let x: Foo["/*completion position*/"]
-                                var _a = grandParent, indexType = _a.indexType, objectType = _a.objectType;
+                                var _a = grandParent_1, indexType = _a.indexType, objectType = _a.objectType;
                                 if (!ts.rangeContainsPosition(indexType, position)) {
                                     return undefined;
                                 }
@@ -133166,11 +133189,11 @@ var ts;
                             case 200 /* ImportType */:
                                 return { kind: 0 /* Paths */, paths: getStringLiteralCompletionsFromModuleNames(sourceFile, node, compilerOptions, host, typeChecker, preferences) };
                             case 187 /* UnionType */: {
-                                if (!ts.isTypeReferenceNode(grandParent.parent)) {
+                                if (!ts.isTypeReferenceNode(grandParent_1.parent)) {
                                     return undefined;
                                 }
-                                var alreadyUsedTypes_1 = getAlreadyUsedTypesInStringLiteralUnion(grandParent, parent);
-                                var types = getStringLiteralTypes(typeChecker.getTypeArgumentConstraint(grandParent)).filter(function (t) { return !ts.contains(alreadyUsedTypes_1, t.value); });
+                                var alreadyUsedTypes_1 = getAlreadyUsedTypesInStringLiteralUnion(grandParent_1, parent);
+                                var types = getStringLiteralTypes(typeChecker.getTypeArgumentConstraint(grandParent_1)).filter(function (t) { return !ts.contains(alreadyUsedTypes_1, t.value); });
                                 return { kind: 2 /* Types */, types: types, isNewIdentifier: false };
                             }
                             default:
@@ -159781,7 +159804,7 @@ var ts;
                     // If there is more than one overload but no implementation signature
                     // (eg: an abstract method or interface declaration), there is a 1-1
                     // correspondence of declarations and signatures.
-                    var signatures = checker.getSignaturesOfType(type, 0 /* Call */);
+                    var signatures = type.isUnion() ? ts.flatMap(type.types, function (t) { return t.getCallSignatures(); }) : type.getCallSignatures();
                     if (!ts.some(signatures)) {
                         break;
                     }
@@ -162474,7 +162497,7 @@ var ts;
                         var savedPermittedJumps = permittedJumps;
                         switch (node.kind) {
                             case 239 /* IfStatement */:
-                                permittedJumps = 0 /* None */;
+                                permittedJumps &= ~4 /* Return */;
                                 break;
                             case 252 /* TryStatement */:
                                 // forbid all jumps inside try blocks
@@ -177188,6 +177211,8 @@ var ts;
         function getDefinitionLocation(defaultProject, initialLocation, isForRename) {
             var infos = defaultProject.getLanguageService().getDefinitionAtPosition(initialLocation.fileName, initialLocation.pos, /*searchOtherFilesOnly*/ false, /*stopAtAlias*/ isForRename);
             var info = infos && ts.firstOrUndefined(infos);
+            // Note that the value of `isLocal` may depend on whether or not the checker has run on the containing file
+            // (implying that FAR cascading behavior may depend on request order)
             return info && !info.isLocal ? { fileName: info.fileName, pos: info.textSpan.start } : undefined;
         }
         function getReferencesWorker(projects, defaultProject, initialLocation, logger) {

package/lib/typescript.d.ts

@@ -4464,6 +4464,12 @@ declare namespace ts {
     /**
      * Gets the effective type parameters. If the node was parsed in a
      * JavaScript file, gets the type parameters from the `@template` tag from JSDoc.
+     *
+     * This does *not* return type parameters from a jsdoc reference to a generic type, eg
+     *
+     * type Id = <T>(x: T) => T
+     * /** @type {Id} /
+     * function id(x) { return x }
      */
     function getEffectiveTypeParameterDeclarations(node: DeclarationWithTypeParameters): readonly TypeParameterDeclaration[];
     function getEffectiveConstraintOfTypeParameter(node: TypeParameterDeclaration): TypeNode | undefined;

package/lib/typescript.js

@@ -294,7 +294,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = ts.versionMajorMinor + ".0-dev.20220717";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220720";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -13402,6 +13402,12 @@ var ts;
     /**
      * Gets the effective type parameters. If the node was parsed in a
      * JavaScript file, gets the type parameters from the `@template` tag from JSDoc.
+     *
+     * This does *not* return type parameters from a jsdoc reference to a generic type, eg
+     *
+     * type Id = <T>(x: T) => T
+     * /** @type {Id} /
+     * function id(x) { return x }
      */
     function getEffectiveTypeParameterDeclarations(node) {
         if (ts.isJSDocSignature(node)) {
@@ -35662,6 +35668,9 @@ var ts;
                 var typeArguments = tryParse(parseTypeArgumentsInExpression);
                 if (typeArguments !== undefined) {
                     parseErrorAt(startPos, getNodePos(), ts.Diagnostics.super_may_not_use_type_arguments);
+                    if (!isTemplateStartOfTaggedTemplate()) {
+                        expression = factory.createExpressionWithTypeArguments(expression, typeArguments);
+                    }
                 }
             }
             if (token() === 20 /* OpenParenToken */ || token() === 24 /* DotToken */ || token() === 22 /* OpenBracketToken */) {
@@ -59379,6 +59388,9 @@ var ts;
                     else if (type.objectFlags & 32 /* Mapped */) {
                         resolveMappedTypeMembers(type);
                     }
+                    else {
+                        ts.Debug.fail("Unhandled object type " + ts.Debug.formatObjectFlags(type.objectFlags));
+                    }
                 }
                 else if (type.flags & 1048576 /* Union */) {
                     resolveUnionTypeMembers(type);
@@ -59386,6 +59398,9 @@ var ts;
                 else if (type.flags & 2097152 /* Intersection */) {
                     resolveIntersectionTypeMembers(type);
                 }
+                else {
+                    ts.Debug.fail("Unhandled type " + ts.Debug.formatTypeFlags(type.flags));
+                }
             }
             return type;
         }
@@ -60177,12 +60192,15 @@ var ts;
         // Return list of type parameters with duplicates removed (duplicate identifier errors are generated in the actual
         // type checking functions).
         function getTypeParametersFromDeclaration(declaration) {
+            var _a;
             var result;
-            for (var _i = 0, _a = ts.getEffectiveTypeParameterDeclarations(declaration); _i < _a.length; _i++) {
-                var node = _a[_i];
+            for (var _i = 0, _b = ts.getEffectiveTypeParameterDeclarations(declaration); _i < _b.length; _i++) {
+                var node = _b[_i];
                 result = ts.appendIfUnique(result, getDeclaredTypeOfTypeParameter(node.symbol));
             }
-            return result;
+            return (result === null || result === void 0 ? void 0 : result.length) ? result
+                : ts.isFunctionDeclaration(declaration) ? (_a = getSignatureOfTypeTag(declaration)) === null || _a === void 0 ? void 0 : _a.typeParameters
+                    : undefined;
         }
         function symbolsToArray(symbols) {
             var result = [];
@@ -69403,15 +69421,11 @@ var ts;
                     inferFromTypeArguments(getTypeArguments(source), getTypeArguments(target), getVariances(source.target));
                 }
                 else if (source.flags & 4194304 /* Index */ && target.flags & 4194304 /* Index */) {
-                    contravariant = !contravariant;
-                    inferFromTypes(source.type, target.type);
-                    contravariant = !contravariant;
+                    inferFromContravariantTypes(source.type, target.type);
                 }
                 else if ((isLiteralType(source) || source.flags & 4 /* String */) && target.flags & 4194304 /* Index */) {
                     var empty = createEmptyObjectTypeFromStringLiteral(source);
-                    contravariant = !contravariant;
-                    inferWithPriority(empty, target.type, 256 /* LiteralKeyof */);
-                    contravariant = !contravariant;
+                    inferFromContravariantTypesWithPriority(empty, target.type, 256 /* LiteralKeyof */);
                 }
                 else if (source.flags & 8388608 /* IndexedAccess */ && target.flags & 8388608 /* IndexedAccess */) {
                     inferFromTypes(source.objectType, target.objectType);
@@ -69424,10 +69438,7 @@ var ts;
                 }
                 else if (source.flags & 33554432 /* Substitution */) {
                     inferFromTypes(source.baseType, target);
-                    var oldPriority = priority;
-                    priority |= 4 /* SubstituteSource */;
-                    inferFromTypes(source.substitute, target); // Make substitute inference at a lower priority
-                    priority = oldPriority;
+                    inferWithPriority(source.substitute, target, 4 /* SubstituteSource */); // Make substitute inference at a lower priority
                 }
                 else if (target.flags & 16777216 /* Conditional */) {
                     invokeOnce(source, target, inferToConditionalType);
@@ -69477,6 +69488,18 @@ var ts;
                 inferFromTypes(source, target);
                 priority = savePriority;
             }
+            function inferFromContravariantTypesWithPriority(source, target, newPriority) {
+                var savePriority = priority;
+                priority |= newPriority;
+                inferFromContravariantTypes(source, target);
+                priority = savePriority;
+            }
+            function inferToMultipleTypesWithPriority(source, targets, targetFlags, newPriority) {
+                var savePriority = priority;
+                priority |= newPriority;
+                inferToMultipleTypes(source, targets, targetFlags);
+                priority = savePriority;
+            }
             function invokeOnce(source, target, action) {
                 var key = source.id + "," + target.id;
                 var status = visited && visited.get(key);
@@ -69541,10 +69564,13 @@ var ts;
                 }
             }
             function inferFromContravariantTypes(source, target) {
+                contravariant = !contravariant;
+                inferFromTypes(source, target);
+                contravariant = !contravariant;
+            }
+            function inferFromContravariantTypesIfStrictFunctionTypes(source, target) {
                 if (strictFunctionTypes || priority & 1024 /* AlwaysStrict */) {
-                    contravariant = !contravariant;
-                    inferFromTypes(source, target);
-                    contravariant = !contravariant;
+                    inferFromContravariantTypes(source, target);
                 }
                 else {
                     inferFromTypes(source, target);
@@ -69708,11 +69734,8 @@ var ts;
                     inferFromTypes(getFalseTypeFromConditionalType(source), getFalseTypeFromConditionalType(target));
                 }
                 else {
-                    var savePriority = priority;
-                    priority |= contravariant ? 64 /* ContravariantConditional */ : 0;
                     var targetTypes = [getTrueTypeFromConditionalType(target), getFalseTypeFromConditionalType(target)];
-                    inferToMultipleTypes(source, targetTypes, target.flags);
-                    priority = savePriority;
+                    inferToMultipleTypesWithPriority(source, targetTypes, target.flags, contravariant ? 64 /* ContravariantConditional */ : 0);
                 }
             }
             function inferToTemplateLiteralType(source, target) {
@@ -69898,7 +69921,7 @@ var ts;
                 var kind = target.declaration ? target.declaration.kind : 0 /* Unknown */;
                 // Once we descend into a bivariant signature we remain bivariant for all nested inferences
                 bivariant = bivariant || kind === 169 /* MethodDeclaration */ || kind === 168 /* MethodSignature */ || kind === 171 /* Constructor */;
-                applyToParameterTypes(source, target, inferFromContravariantTypes);
+                applyToParameterTypes(source, target, inferFromContravariantTypesIfStrictFunctionTypes);
                 bivariant = saveBivariant;
                 applyToReturnTypes(source, target, inferFromTypes);
             }
@@ -71351,7 +71374,7 @@ var ts;
                 }
                 // for (const _ in ref) acts as a nonnull on ref
                 if (ts.isVariableDeclaration(node) && node.parent.parent.kind === 243 /* ForInStatement */ && isMatchingReference(reference, node.parent.parent.expression)) {
-                    return getNonNullableTypeIfNeeded(getTypeFromFlowType(getTypeAtFlowNode(flow.antecedent)));
+                    return getNonNullableTypeIfNeeded(finalizeEvolvingArrayType(getTypeFromFlowType(getTypeAtFlowNode(flow.antecedent))));
                 }
                 // Assignment doesn't affect reference
                 return undefined;
@@ -76940,7 +76963,7 @@ var ts;
             var isJsxOpeningOrSelfClosingElement = ts.isJsxOpeningLikeElement(node);
             var reportErrors = !candidatesOutArray;
             var typeArguments;
-            if (!isDecorator) {
+            if (!isDecorator && !ts.isSuperCall(node)) {
                 typeArguments = node.typeArguments;
                 // We already perform checking on the type arguments on the class declaration itself.
                 if (isTaggedTemplate || isJsxOpeningOrSelfClosingElement || node.expression.kind !== 106 /* SuperKeyword */) {
@@ -79356,7 +79379,7 @@ var ts;
                         error(node.operand, ts.Diagnostics.The_0_operator_cannot_be_applied_to_type_symbol, ts.tokenToString(node.operator));
                     }
                     if (node.operator === 39 /* PlusToken */) {
-                        if (maybeTypeOfKind(operandType, 2112 /* BigIntLike */)) {
+                        if (maybeTypeOfKindConsideringBaseConstraint(operandType, 2112 /* BigIntLike */)) {
                             error(node.operand, ts.Diagnostics.Operator_0_cannot_be_applied_to_type_1, ts.tokenToString(node.operator), typeToString(getBaseTypeOfLiteralType(operandType)));
                         }
                         return numberType;
@@ -133132,11 +133155,11 @@ var ts;
                 var parent = walkUpParentheses(node.parent);
                 switch (parent.kind) {
                     case 196 /* LiteralType */: {
-                        var grandParent = walkUpParentheses(parent.parent);
-                        switch (grandParent.kind) {
+                        var grandParent_1 = walkUpParentheses(parent.parent);
+                        switch (grandParent_1.kind) {
+                            case 228 /* ExpressionWithTypeArguments */:
                             case 178 /* TypeReference */: {
-                                var typeReference_1 = grandParent;
-                                var typeArgument = ts.findAncestor(parent, function (n) { return n.parent === typeReference_1; });
+                                var typeArgument = ts.findAncestor(parent, function (n) { return n.parent === grandParent_1; });
                                 if (typeArgument) {
                                     return { kind: 2 /* Types */, types: getStringLiteralTypes(typeChecker.getTypeArgumentConstraint(typeArgument)), isNewIdentifier: false };
                                 }
@@ -133149,7 +133172,7 @@ var ts;
                                 //          bar: string;
                                 //      }
                                 //      let x: Foo["/*completion position*/"]
-                                var _a = grandParent, indexType = _a.indexType, objectType = _a.objectType;
+                                var _a = grandParent_1, indexType = _a.indexType, objectType = _a.objectType;
                                 if (!ts.rangeContainsPosition(indexType, position)) {
                                     return undefined;
                                 }
@@ -133157,11 +133180,11 @@ var ts;
                             case 200 /* ImportType */:
                                 return { kind: 0 /* Paths */, paths: getStringLiteralCompletionsFromModuleNames(sourceFile, node, compilerOptions, host, typeChecker, preferences) };
                             case 187 /* UnionType */: {
-                                if (!ts.isTypeReferenceNode(grandParent.parent)) {
+                                if (!ts.isTypeReferenceNode(grandParent_1.parent)) {
                                     return undefined;
                                 }
-                                var alreadyUsedTypes_1 = getAlreadyUsedTypesInStringLiteralUnion(grandParent, parent);
-                                var types = getStringLiteralTypes(typeChecker.getTypeArgumentConstraint(grandParent)).filter(function (t) { return !ts.contains(alreadyUsedTypes_1, t.value); });
+                                var alreadyUsedTypes_1 = getAlreadyUsedTypesInStringLiteralUnion(grandParent_1, parent);
+                                var types = getStringLiteralTypes(typeChecker.getTypeArgumentConstraint(grandParent_1)).filter(function (t) { return !ts.contains(alreadyUsedTypes_1, t.value); });
                                 return { kind: 2 /* Types */, types: types, isNewIdentifier: false };
                             }
                             default:
@@ -159772,7 +159795,7 @@ var ts;
                     // If there is more than one overload but no implementation signature
                     // (eg: an abstract method or interface declaration), there is a 1-1
                     // correspondence of declarations and signatures.
-                    var signatures = checker.getSignaturesOfType(type, 0 /* Call */);
+                    var signatures = type.isUnion() ? ts.flatMap(type.types, function (t) { return t.getCallSignatures(); }) : type.getCallSignatures();
                     if (!ts.some(signatures)) {
                         break;
                     }
@@ -162465,7 +162488,7 @@ var ts;
                         var savedPermittedJumps = permittedJumps;
                         switch (node.kind) {
                             case 239 /* IfStatement */:
-                                permittedJumps = 0 /* None */;
+                                permittedJumps &= ~4 /* Return */;
                                 break;
                             case 252 /* TryStatement */:
                                 // forbid all jumps inside try blocks

package/lib/typescriptServices.d.ts

@@ -4464,6 +4464,12 @@ declare namespace ts {
     /**
      * Gets the effective type parameters. If the node was parsed in a
      * JavaScript file, gets the type parameters from the `@template` tag from JSDoc.
+     *
+     * This does *not* return type parameters from a jsdoc reference to a generic type, eg
+     *
+     * type Id = <T>(x: T) => T
+     * /** @type {Id} /
+     * function id(x) { return x }
      */
     function getEffectiveTypeParameterDeclarations(node: DeclarationWithTypeParameters): readonly TypeParameterDeclaration[];
     function getEffectiveConstraintOfTypeParameter(node: TypeParameterDeclaration): TypeNode | undefined;