typescript 4.2.0-dev.20210209 → 4.2.3

package/lib/tsserverlibrary.js

@@ -290,7 +290,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.20210209";
+    ts.version = "4.2.3";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -47238,13 +47238,17 @@ var ts;
             return result || ts.emptyArray;
         }
         function setStructuredTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo) {
-            type.members = members;
-            type.properties = members === emptySymbols ? ts.emptyArray : getNamedMembers(members);
-            type.callSignatures = callSignatures;
-            type.constructSignatures = constructSignatures;
-            type.stringIndexInfo = stringIndexInfo;
-            type.numberIndexInfo = numberIndexInfo;
-            return type;
+            var resolved = type;
+            resolved.members = members;
+            resolved.properties = ts.emptyArray;
+            resolved.callSignatures = callSignatures;
+            resolved.constructSignatures = constructSignatures;
+            resolved.stringIndexInfo = stringIndexInfo;
+            resolved.numberIndexInfo = numberIndexInfo;
+            // This can loop back to getPropertyOfType() which would crash if `callSignatures` & `constructSignatures` are not initialized.
+            if (members !== emptySymbols)
+                resolved.properties = getNamedMembers(members);
+            return resolved;
         }
         function createAnonymousType(symbol, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo) {
             return setStructuredTypeMembers(createObjectType(16 /* Anonymous */, symbol), members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
@@ -55871,7 +55875,7 @@ var ts;
             }
             return true;
         }
-        function removeRedundantLiteralTypes(types, includes) {
+        function removeRedundantLiteralTypes(types, includes, reduceVoidUndefined) {
             var i = types.length;
             while (i > 0) {
                 i--;
@@ -55881,7 +55885,7 @@ var ts;
                     flags & 256 /* NumberLiteral */ && includes & 8 /* Number */ ||
                     flags & 2048 /* BigIntLiteral */ && includes & 64 /* BigInt */ ||
                     flags & 8192 /* UniqueESSymbol */ && includes & 4096 /* ESSymbol */ ||
-                    flags & 32768 /* Undefined */ && includes & 16384 /* Void */ ||
+                    reduceVoidUndefined && flags & 32768 /* Undefined */ && includes & 16384 /* Void */ ||
                     isFreshLiteralType(t) && containsType(types, t.regularType);
                 if (remove) {
                     ts.orderedRemoveItemAt(types, i);
@@ -55913,7 +55917,7 @@ var ts;
                 if (t.flags & 1048576 /* Union */) {
                     var origin = t.origin;
                     if (t.aliasSymbol || origin && !(origin.flags & 1048576 /* Union */)) {
-                        namedUnions.push(t);
+                        ts.pushIfUnique(namedUnions, t);
                     }
                     else if (origin && origin.flags & 1048576 /* Union */) {
                         addNamedUnions(namedUnions, origin.types);
@@ -55949,7 +55953,7 @@ var ts;
                 }
                 if (unionReduction & (1 /* Literal */ | 2 /* Subtype */)) {
                     if (includes & (2944 /* Literal */ | 8192 /* UniqueESSymbol */) || includes & 16384 /* Void */ && includes & 32768 /* Undefined */) {
-                        removeRedundantLiteralTypes(typeSet, includes);
+                        removeRedundantLiteralTypes(typeSet, includes, !!(unionReduction & 2 /* Subtype */));
                     }
                     if (includes & 128 /* StringLiteral */ && includes & 134217728 /* TemplateLiteral */) {
                         removeStringLiteralsMatchedByTemplateLiterals(typeSet);
@@ -63970,7 +63974,16 @@ var ts;
                         var type = getTypeOfDottedName(node.expression, diagnostic);
                         if (type) {
                             var name = node.name;
-                            var prop = getPropertyOfType(type, ts.isPrivateIdentifier(name) ? ts.getSymbolNameForPrivateIdentifier(type.symbol, name.escapedText) : name.escapedText);
+                            var prop = void 0;
+                            if (ts.isPrivateIdentifier(name)) {
+                                if (!type.symbol) {
+                                    return undefined;
+                                }
+                                prop = getPropertyOfType(type, ts.getSymbolNameForPrivateIdentifier(type.symbol, name.escapedText));
+                            }
+                            else {
+                                prop = getPropertyOfType(type, name.escapedText);
+                            }
                             return prop && getExplicitTypeOfSymbol(prop, diagnostic);
                         }
                         return undefined;
@@ -65036,10 +65049,15 @@ var ts;
                         return assignableType;
                     }
                 }
-                // If the candidate type is a subtype of the target type, narrow to the candidate type,
-                // if the target type is a subtype of the candidate type, narrow to the target type,
-                // otherwise, narrow to an intersection of the two types.
-                return isTypeSubtypeOf(candidate, type) ? candidate : isTypeSubtypeOf(type, candidate) ? type : getIntersectionType([type, candidate]);
+                // If the candidate type is a subtype of the target type, narrow to the candidate type.
+                // Otherwise, if the target type is assignable to the candidate type, keep the target type.
+                // Otherwise, if the candidate type is assignable to the target type, narrow to the candidate
+                // type. Otherwise, the types are completely unrelated, so narrow to an intersection of the
+                // two types.
+                return isTypeSubtypeOf(candidate, type) ? candidate :
+                    isTypeAssignableTo(type, candidate) ? type :
+                        isTypeAssignableTo(candidate, type) ? candidate :
+                            getIntersectionType([type, candidate]);
             }
             function narrowTypeByCallExpression(type, callExpression, assumeTrue) {
                 if (hasMatchingArgument(callExpression, reference)) {
@@ -75382,7 +75400,9 @@ var ts;
                 : ts.isPropertyAccessExpression(location) ? location.name
                     : ts.isBinaryExpression(location) && ts.isIdentifier(location.right) ? location.right
                         : undefined;
-            if (!testedNode) {
+            var isPropertyExpressionCast = ts.isPropertyAccessExpression(location)
+                && ts.isAssertionExpression(ts.skipParentheses(location.expression));
+            if (!testedNode || isPropertyExpressionCast) {
                 return;
             }
             var possiblyFalsy = getFalsyFlags(type);
@@ -77532,6 +77552,7 @@ var ts;
             return true;
         }
         function checkAliasSymbol(node) {
+            var _a;
             var symbol = getSymbolOfNode(node);
             var target = resolveAlias(symbol);
             if (target !== unknownSymbol) {
@@ -77559,7 +77580,7 @@ var ts;
                     && !(node.flags & 8388608 /* Ambient */)) {
                     error(node, ts.Diagnostics.Re_exporting_a_type_when_the_isolatedModules_flag_is_provided_requires_using_export_type);
                 }
-                if (ts.isImportSpecifier(node) && ts.every(target.declarations, function (d) { return !!(ts.getCombinedNodeFlags(d) & 134217728 /* Deprecated */); })) {
+                if (ts.isImportSpecifier(node) && ((_a = target.declarations) === null || _a === void 0 ? void 0 : _a.every(function (d) { return !!(ts.getCombinedNodeFlags(d) & 134217728 /* Deprecated */); }))) {
                     addDeprecatedSuggestion(node.name, target.declarations, symbol.escapedName);
                 }
             }
@@ -111664,10 +111685,11 @@ var ts;
             var redirects = host.redirectTargetsMap.get(importedPath) || ts.emptyArray;
             var importedFileNames = __spreadArray(__spreadArray(__spreadArray([], (referenceRedirect ? [referenceRedirect] : ts.emptyArray)), [importedFileName]), redirects);
             var targets = importedFileNames.map(function (f) { return ts.getNormalizedAbsolutePath(f, cwd); });
+            var shouldFilterIgnoredPaths = !ts.every(targets, ts.containsIgnoredPath);
             if (!preferSymlinks) {
                 // Symlinks inside ignored paths are already filtered out of the symlink cache,
                 // so we only need to remove them from the realpath filenames.
-                var result_15 = ts.forEach(targets, function (p) { return !ts.containsIgnoredPath(p) && cb(p, referenceRedirect === p); });
+                var result_15 = ts.forEach(targets, function (p) { return !(shouldFilterIgnoredPaths && ts.containsIgnoredPath(p)) && cb(p, referenceRedirect === p); });
                 if (result_15)
                     return result_15;
             }
@@ -111693,13 +111715,14 @@ var ts;
                         var symlinkDirectory = symlinkDirectories_1[_i];
                         var option = ts.resolvePath(symlinkDirectory, relative);
                         var result_16 = cb(option, target === referenceRedirect);
+                        shouldFilterIgnoredPaths = true; // We found a non-ignored path in symlinks, so we can reject ignored-path realpaths
                         if (result_16)
                             return result_16;
                     }
                 });
             });
             return result || (preferSymlinks
-                ? ts.forEach(targets, function (p) { return ts.containsIgnoredPath(p) ? undefined : cb(p, p === referenceRedirect); })
+                ? ts.forEach(targets, function (p) { return shouldFilterIgnoredPaths && ts.containsIgnoredPath(p) ? undefined : cb(p, p === referenceRedirect); })
                 : undefined);
         }
         moduleSpecifiers.forEachFileNameOfModule = forEachFileNameOfModule;
@@ -140149,7 +140172,7 @@ var ts;
         }
         function addFunctionDeclaration(changes, context, info) {
             var importAdder = codefix.createImportAdder(context.sourceFile, context.program, context.preferences, context.host);
-            var functionDeclaration = codefix.createSignatureDeclarationFromCallExpression(251 /* FunctionDeclaration */, context, importAdder, info.call, info.token, info.modifierFlags, info.parentDeclaration);
+            var functionDeclaration = codefix.createSignatureDeclarationFromCallExpression(251 /* FunctionDeclaration */, context, importAdder, info.call, ts.idText(info.token), info.modifierFlags, info.parentDeclaration);
             changes.insertNodeAtEndOfScope(info.sourceFile, info.parentDeclaration, functionDeclaration);
         }
     })(codefix = ts.codefix || (ts.codefix = {}));
@@ -147530,13 +147553,13 @@ var ts;
                 return { edits: [] }; // TODO: GH#30113
             }
             function doChange(sourceFile, program, host, changes, functionDeclaration, groupedReferences) {
-                var newParamDeclaration = ts.map(createNewParameters(functionDeclaration, program, host), function (param) { return ts.getSynthesizedDeepClone(param); });
-                changes.replaceNodeRangeWithNodes(sourceFile, ts.first(functionDeclaration.parameters), ts.last(functionDeclaration.parameters), newParamDeclaration, { joiner: ", ",
-                    // indentation is set to 0 because otherwise the object parameter will be indented if there is a `this` parameter
-                    indentation: 0,
-                    leadingTriviaOption: ts.textChanges.LeadingTriviaOption.IncludeAll,
-                    trailingTriviaOption: ts.textChanges.TrailingTriviaOption.Include
-                });
+                var signature = groupedReferences.signature;
+                var newFunctionDeclarationParams = ts.map(createNewParameters(functionDeclaration, program, host), function (param) { return ts.getSynthesizedDeepClone(param); });
+                if (signature) {
+                    var newSignatureParams = ts.map(createNewParameters(signature, program, host), function (param) { return ts.getSynthesizedDeepClone(param); });
+                    replaceParameters(signature, newSignatureParams);
+                }
+                replaceParameters(functionDeclaration, newFunctionDeclarationParams);
                 var functionCalls = ts.sortAndDeduplicate(groupedReferences.functionCalls, /*comparer*/ function (a, b) { return ts.compareValues(a.pos, b.pos); });
                 for (var _i = 0, functionCalls_1 = functionCalls; _i < functionCalls_1.length; _i++) {
                     var call = functionCalls_1[_i];
@@ -147545,6 +147568,15 @@ var ts;
                         changes.replaceNodeRange(ts.getSourceFileOfNode(call), ts.first(call.arguments), ts.last(call.arguments), newArgument, { leadingTriviaOption: ts.textChanges.LeadingTriviaOption.IncludeAll, trailingTriviaOption: ts.textChanges.TrailingTriviaOption.Include });
                     }
                 }
+                function replaceParameters(declarationOrSignature, parameterDeclarations) {
+                    changes.replaceNodeRangeWithNodes(sourceFile, ts.first(declarationOrSignature.parameters), ts.last(declarationOrSignature.parameters), parameterDeclarations, {
+                        joiner: ", ",
+                        // indentation is set to 0 because otherwise the object parameter will be indented if there is a `this` parameter
+                        indentation: 0,
+                        leadingTriviaOption: ts.textChanges.LeadingTriviaOption.IncludeAll,
+                        trailingTriviaOption: ts.textChanges.TrailingTriviaOption.Include
+                    });
+                }
             }
             function getGroupedReferences(functionDeclaration, program, cancellationToken) {
                 var functionNames = getFunctionNames(functionDeclaration);
@@ -147563,12 +147595,38 @@ var ts;
                     var functionSymbols = ts.map(functionNames, getSymbolTargetAtLocation);
                     var classSymbols = ts.map(classNames, getSymbolTargetAtLocation);
                     var isConstructor = ts.isConstructorDeclaration(functionDeclaration);
+                    var contextualSymbols = ts.map(functionNames, function (name) { return getSymbolForContextualType(name, checker); });
                     for (var _i = 0, referenceEntries_1 = referenceEntries; _i < referenceEntries_1.length; _i++) {
                         var entry = referenceEntries_1[_i];
-                        if (entry.kind !== 1 /* Node */) {
+                        if (entry.kind === 0 /* Span */) {
                             groupedReferences.valid = false;
                             continue;
                         }
+                        /* Declarations in object literals may be implementations of method signatures which have a different symbol from the declaration
+                        For example:
+                            interface IFoo { m(a: number): void }
+                            const foo: IFoo = { m(a: number): void {} }
+                        In these cases we get the symbol for the signature from the contextual type.
+                        */
+                        if (ts.contains(contextualSymbols, getSymbolTargetAtLocation(entry.node))) {
+                            if (isValidMethodSignature(entry.node.parent)) {
+                                groupedReferences.signature = entry.node.parent;
+                                continue;
+                            }
+                            var call = entryToFunctionCall(entry);
+                            if (call) {
+                                groupedReferences.functionCalls.push(call);
+                                continue;
+                            }
+                        }
+                        var contextualSymbol = getSymbolForContextualType(entry.node, checker);
+                        if (contextualSymbol && ts.contains(contextualSymbols, contextualSymbol)) {
+                            var decl = entryToDeclaration(entry);
+                            if (decl) {
+                                groupedReferences.declarations.push(decl);
+                                continue;
+                            }
+                        }
                         /* We compare symbols because in some cases find all references wil return a reference that may or may not be to the refactored function.
                         Example from the refactorConvertParamsToDestructuredObject_methodCallUnion.ts test:
                             class A { foo(a: number, b: number) { return a + b; } }
@@ -147631,6 +147689,19 @@ var ts;
                     return symbol && ts.getSymbolTarget(symbol, checker);
                 }
             }
+            /**
+             * Gets the symbol for the contextual type of the node if it is not a union or intersection.
+             */
+            function getSymbolForContextualType(node, checker) {
+                var element = ts.getContainingObjectLiteralElement(node);
+                if (element) {
+                    var contextualType = checker.getContextualTypeForObjectLiteralElement(element);
+                    var symbol = contextualType === null || contextualType === void 0 ? void 0 : contextualType.getSymbol();
+                    if (symbol && !(ts.getCheckFlags(symbol) & 6 /* Synthetic */)) {
+                        return symbol;
+                    }
+                }
+            }
             function entryToImportOrExport(entry) {
                 var node = entry.node;
                 if (ts.isImportSpecifier(node.parent)
@@ -147738,6 +147809,9 @@ var ts;
                 }
                 return false;
             }
+            function isValidMethodSignature(node) {
+                return ts.isMethodSignature(node) && (ts.isInterfaceDeclaration(node.parent) || ts.isTypeLiteralNode(node.parent));
+            }
             function isValidFunctionDeclaration(functionDeclaration, checker) {
                 if (!isValidParameterNodeArray(functionDeclaration.parameters, checker))
                     return false;
@@ -147745,6 +147819,11 @@ var ts;
                     case 251 /* FunctionDeclaration */:
                         return hasNameOrDefault(functionDeclaration) && isSingleImplementation(functionDeclaration, checker);
                     case 165 /* MethodDeclaration */:
+                        if (ts.isObjectLiteralExpression(functionDeclaration.parent)) {
+                            var contextualSymbol = getSymbolForContextualType(functionDeclaration.name, checker);
+                            // don't offer the refactor when there are multiple signatures since we won't know which ones the user wants to change
+                            return (contextualSymbol === null || contextualSymbol === void 0 ? void 0 : contextualSymbol.declarations.length) === 1 && isSingleImplementation(functionDeclaration, checker);
+                        }
                         return isSingleImplementation(functionDeclaration, checker);
                     case 166 /* Constructor */:
                         if (ts.isClassDeclaration(functionDeclaration.parent)) {
@@ -152660,6 +152739,34 @@ var ts;
                 ScriptTarget["ES2020"] = "ES2020";
                 ScriptTarget["ESNext"] = "ESNext";
             })(ScriptTarget = protocol.ScriptTarget || (protocol.ScriptTarget = {}));
+            var ClassificationType;
+            (function (ClassificationType) {
+                ClassificationType[ClassificationType["comment"] = 1] = "comment";
+                ClassificationType[ClassificationType["identifier"] = 2] = "identifier";
+                ClassificationType[ClassificationType["keyword"] = 3] = "keyword";
+                ClassificationType[ClassificationType["numericLiteral"] = 4] = "numericLiteral";
+                ClassificationType[ClassificationType["operator"] = 5] = "operator";
+                ClassificationType[ClassificationType["stringLiteral"] = 6] = "stringLiteral";
+                ClassificationType[ClassificationType["regularExpressionLiteral"] = 7] = "regularExpressionLiteral";
+                ClassificationType[ClassificationType["whiteSpace"] = 8] = "whiteSpace";
+                ClassificationType[ClassificationType["text"] = 9] = "text";
+                ClassificationType[ClassificationType["punctuation"] = 10] = "punctuation";
+                ClassificationType[ClassificationType["className"] = 11] = "className";
+                ClassificationType[ClassificationType["enumName"] = 12] = "enumName";
+                ClassificationType[ClassificationType["interfaceName"] = 13] = "interfaceName";
+                ClassificationType[ClassificationType["moduleName"] = 14] = "moduleName";
+                ClassificationType[ClassificationType["typeParameterName"] = 15] = "typeParameterName";
+                ClassificationType[ClassificationType["typeAliasName"] = 16] = "typeAliasName";
+                ClassificationType[ClassificationType["parameterName"] = 17] = "parameterName";
+                ClassificationType[ClassificationType["docCommentTagName"] = 18] = "docCommentTagName";
+                ClassificationType[ClassificationType["jsxOpenTagName"] = 19] = "jsxOpenTagName";
+                ClassificationType[ClassificationType["jsxCloseTagName"] = 20] = "jsxCloseTagName";
+                ClassificationType[ClassificationType["jsxSelfClosingTagName"] = 21] = "jsxSelfClosingTagName";
+                ClassificationType[ClassificationType["jsxAttribute"] = 22] = "jsxAttribute";
+                ClassificationType[ClassificationType["jsxText"] = 23] = "jsxText";
+                ClassificationType[ClassificationType["jsxAttributeStringLiteralValue"] = 24] = "jsxAttributeStringLiteralValue";
+                ClassificationType[ClassificationType["bigintLiteral"] = 25] = "bigintLiteral";
+            })(ClassificationType = protocol.ClassificationType || (protocol.ClassificationType = {}));
         })(protocol = server.protocol || (server.protocol = {}));
     })(server = ts.server || (ts.server = {}));
 })(ts || (ts = {}));
@@ -154609,6 +154716,10 @@ var ts;
             Project.prototype.enablePlugin = function (pluginConfigEntry, searchPaths, pluginConfigOverrides) {
                 var _this = this;
                 this.projectService.logger.info("Enabling plugin " + pluginConfigEntry.name + " from candidate paths: " + searchPaths.join(","));
+                if (!pluginConfigEntry.name || ts.parsePackageName(pluginConfigEntry.name).rest) {
+                    this.projectService.logger.info("Skipped loading plugin " + (pluginConfigEntry.name || JSON.stringify(pluginConfigEntry)) + " because only package name is allowed plugin name");
+                    return;
+                }
                 var log = function (message) { return _this.projectService.logger.info(message); };
                 var errorLogs;
                 var logError = function (message) { (errorLogs || (errorLogs = [])).push(message); };

package/lib/typescript.js

@@ -290,7 +290,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.20210209";
+    ts.version = "4.2.3";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -47238,13 +47238,17 @@ var ts;
             return result || ts.emptyArray;
         }
         function setStructuredTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo) {
-            type.members = members;
-            type.properties = members === emptySymbols ? ts.emptyArray : getNamedMembers(members);
-            type.callSignatures = callSignatures;
-            type.constructSignatures = constructSignatures;
-            type.stringIndexInfo = stringIndexInfo;
-            type.numberIndexInfo = numberIndexInfo;
-            return type;
+            var resolved = type;
+            resolved.members = members;
+            resolved.properties = ts.emptyArray;
+            resolved.callSignatures = callSignatures;
+            resolved.constructSignatures = constructSignatures;
+            resolved.stringIndexInfo = stringIndexInfo;
+            resolved.numberIndexInfo = numberIndexInfo;
+            // This can loop back to getPropertyOfType() which would crash if `callSignatures` & `constructSignatures` are not initialized.
+            if (members !== emptySymbols)
+                resolved.properties = getNamedMembers(members);
+            return resolved;
         }
         function createAnonymousType(symbol, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo) {
             return setStructuredTypeMembers(createObjectType(16 /* Anonymous */, symbol), members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
@@ -55871,7 +55875,7 @@ var ts;
             }
             return true;
         }
-        function removeRedundantLiteralTypes(types, includes) {
+        function removeRedundantLiteralTypes(types, includes, reduceVoidUndefined) {
             var i = types.length;
             while (i > 0) {
                 i--;
@@ -55881,7 +55885,7 @@ var ts;
                     flags & 256 /* NumberLiteral */ && includes & 8 /* Number */ ||
                     flags & 2048 /* BigIntLiteral */ && includes & 64 /* BigInt */ ||
                     flags & 8192 /* UniqueESSymbol */ && includes & 4096 /* ESSymbol */ ||
-                    flags & 32768 /* Undefined */ && includes & 16384 /* Void */ ||
+                    reduceVoidUndefined && flags & 32768 /* Undefined */ && includes & 16384 /* Void */ ||
                     isFreshLiteralType(t) && containsType(types, t.regularType);
                 if (remove) {
                     ts.orderedRemoveItemAt(types, i);
@@ -55913,7 +55917,7 @@ var ts;
                 if (t.flags & 1048576 /* Union */) {
                     var origin = t.origin;
                     if (t.aliasSymbol || origin && !(origin.flags & 1048576 /* Union */)) {
-                        namedUnions.push(t);
+                        ts.pushIfUnique(namedUnions, t);
                     }
                     else if (origin && origin.flags & 1048576 /* Union */) {
                         addNamedUnions(namedUnions, origin.types);
@@ -55949,7 +55953,7 @@ var ts;
                 }
                 if (unionReduction & (1 /* Literal */ | 2 /* Subtype */)) {
                     if (includes & (2944 /* Literal */ | 8192 /* UniqueESSymbol */) || includes & 16384 /* Void */ && includes & 32768 /* Undefined */) {
-                        removeRedundantLiteralTypes(typeSet, includes);
+                        removeRedundantLiteralTypes(typeSet, includes, !!(unionReduction & 2 /* Subtype */));
                     }
                     if (includes & 128 /* StringLiteral */ && includes & 134217728 /* TemplateLiteral */) {
                         removeStringLiteralsMatchedByTemplateLiterals(typeSet);
@@ -63970,7 +63974,16 @@ var ts;
                         var type = getTypeOfDottedName(node.expression, diagnostic);
                         if (type) {
                             var name = node.name;
-                            var prop = getPropertyOfType(type, ts.isPrivateIdentifier(name) ? ts.getSymbolNameForPrivateIdentifier(type.symbol, name.escapedText) : name.escapedText);
+                            var prop = void 0;
+                            if (ts.isPrivateIdentifier(name)) {
+                                if (!type.symbol) {
+                                    return undefined;
+                                }
+                                prop = getPropertyOfType(type, ts.getSymbolNameForPrivateIdentifier(type.symbol, name.escapedText));
+                            }
+                            else {
+                                prop = getPropertyOfType(type, name.escapedText);
+                            }
                             return prop && getExplicitTypeOfSymbol(prop, diagnostic);
                         }
                         return undefined;
@@ -65036,10 +65049,15 @@ var ts;
                         return assignableType;
                     }
                 }
-                // If the candidate type is a subtype of the target type, narrow to the candidate type,
-                // if the target type is a subtype of the candidate type, narrow to the target type,
-                // otherwise, narrow to an intersection of the two types.
-                return isTypeSubtypeOf(candidate, type) ? candidate : isTypeSubtypeOf(type, candidate) ? type : getIntersectionType([type, candidate]);
+                // If the candidate type is a subtype of the target type, narrow to the candidate type.
+                // Otherwise, if the target type is assignable to the candidate type, keep the target type.
+                // Otherwise, if the candidate type is assignable to the target type, narrow to the candidate
+                // type. Otherwise, the types are completely unrelated, so narrow to an intersection of the
+                // two types.
+                return isTypeSubtypeOf(candidate, type) ? candidate :
+                    isTypeAssignableTo(type, candidate) ? type :
+                        isTypeAssignableTo(candidate, type) ? candidate :
+                            getIntersectionType([type, candidate]);
             }
             function narrowTypeByCallExpression(type, callExpression, assumeTrue) {
                 if (hasMatchingArgument(callExpression, reference)) {
@@ -75382,7 +75400,9 @@ var ts;
                 : ts.isPropertyAccessExpression(location) ? location.name
                     : ts.isBinaryExpression(location) && ts.isIdentifier(location.right) ? location.right
                         : undefined;
-            if (!testedNode) {
+            var isPropertyExpressionCast = ts.isPropertyAccessExpression(location)
+                && ts.isAssertionExpression(ts.skipParentheses(location.expression));
+            if (!testedNode || isPropertyExpressionCast) {
                 return;
             }
             var possiblyFalsy = getFalsyFlags(type);
@@ -77532,6 +77552,7 @@ var ts;
             return true;
         }
         function checkAliasSymbol(node) {
+            var _a;
             var symbol = getSymbolOfNode(node);
             var target = resolveAlias(symbol);
             if (target !== unknownSymbol) {
@@ -77559,7 +77580,7 @@ var ts;
                     && !(node.flags & 8388608 /* Ambient */)) {
                     error(node, ts.Diagnostics.Re_exporting_a_type_when_the_isolatedModules_flag_is_provided_requires_using_export_type);
                 }
-                if (ts.isImportSpecifier(node) && ts.every(target.declarations, function (d) { return !!(ts.getCombinedNodeFlags(d) & 134217728 /* Deprecated */); })) {
+                if (ts.isImportSpecifier(node) && ((_a = target.declarations) === null || _a === void 0 ? void 0 : _a.every(function (d) { return !!(ts.getCombinedNodeFlags(d) & 134217728 /* Deprecated */); }))) {
                     addDeprecatedSuggestion(node.name, target.declarations, symbol.escapedName);
                 }
             }
@@ -111664,10 +111685,11 @@ var ts;
             var redirects = host.redirectTargetsMap.get(importedPath) || ts.emptyArray;
             var importedFileNames = __spreadArray(__spreadArray(__spreadArray([], (referenceRedirect ? [referenceRedirect] : ts.emptyArray)), [importedFileName]), redirects);
             var targets = importedFileNames.map(function (f) { return ts.getNormalizedAbsolutePath(f, cwd); });
+            var shouldFilterIgnoredPaths = !ts.every(targets, ts.containsIgnoredPath);
             if (!preferSymlinks) {
                 // Symlinks inside ignored paths are already filtered out of the symlink cache,
                 // so we only need to remove them from the realpath filenames.
-                var result_15 = ts.forEach(targets, function (p) { return !ts.containsIgnoredPath(p) && cb(p, referenceRedirect === p); });
+                var result_15 = ts.forEach(targets, function (p) { return !(shouldFilterIgnoredPaths && ts.containsIgnoredPath(p)) && cb(p, referenceRedirect === p); });
                 if (result_15)
                     return result_15;
             }
@@ -111693,13 +111715,14 @@ var ts;
                         var symlinkDirectory = symlinkDirectories_1[_i];
                         var option = ts.resolvePath(symlinkDirectory, relative);
                         var result_16 = cb(option, target === referenceRedirect);
+                        shouldFilterIgnoredPaths = true; // We found a non-ignored path in symlinks, so we can reject ignored-path realpaths
                         if (result_16)
                             return result_16;
                     }
                 });
             });
             return result || (preferSymlinks
-                ? ts.forEach(targets, function (p) { return ts.containsIgnoredPath(p) ? undefined : cb(p, p === referenceRedirect); })
+                ? ts.forEach(targets, function (p) { return shouldFilterIgnoredPaths && ts.containsIgnoredPath(p) ? undefined : cb(p, p === referenceRedirect); })
                 : undefined);
         }
         moduleSpecifiers.forEachFileNameOfModule = forEachFileNameOfModule;
@@ -140149,7 +140172,7 @@ var ts;
         }
         function addFunctionDeclaration(changes, context, info) {
             var importAdder = codefix.createImportAdder(context.sourceFile, context.program, context.preferences, context.host);
-            var functionDeclaration = codefix.createSignatureDeclarationFromCallExpression(251 /* FunctionDeclaration */, context, importAdder, info.call, info.token, info.modifierFlags, info.parentDeclaration);
+            var functionDeclaration = codefix.createSignatureDeclarationFromCallExpression(251 /* FunctionDeclaration */, context, importAdder, info.call, ts.idText(info.token), info.modifierFlags, info.parentDeclaration);
             changes.insertNodeAtEndOfScope(info.sourceFile, info.parentDeclaration, functionDeclaration);
         }
     })(codefix = ts.codefix || (ts.codefix = {}));
@@ -147530,13 +147553,13 @@ var ts;
                 return { edits: [] }; // TODO: GH#30113
             }
             function doChange(sourceFile, program, host, changes, functionDeclaration, groupedReferences) {
-                var newParamDeclaration = ts.map(createNewParameters(functionDeclaration, program, host), function (param) { return ts.getSynthesizedDeepClone(param); });
-                changes.replaceNodeRangeWithNodes(sourceFile, ts.first(functionDeclaration.parameters), ts.last(functionDeclaration.parameters), newParamDeclaration, { joiner: ", ",
-                    // indentation is set to 0 because otherwise the object parameter will be indented if there is a `this` parameter
-                    indentation: 0,
-                    leadingTriviaOption: ts.textChanges.LeadingTriviaOption.IncludeAll,
-                    trailingTriviaOption: ts.textChanges.TrailingTriviaOption.Include
-                });
+                var signature = groupedReferences.signature;
+                var newFunctionDeclarationParams = ts.map(createNewParameters(functionDeclaration, program, host), function (param) { return ts.getSynthesizedDeepClone(param); });
+                if (signature) {
+                    var newSignatureParams = ts.map(createNewParameters(signature, program, host), function (param) { return ts.getSynthesizedDeepClone(param); });
+                    replaceParameters(signature, newSignatureParams);
+                }
+                replaceParameters(functionDeclaration, newFunctionDeclarationParams);
                 var functionCalls = ts.sortAndDeduplicate(groupedReferences.functionCalls, /*comparer*/ function (a, b) { return ts.compareValues(a.pos, b.pos); });
                 for (var _i = 0, functionCalls_1 = functionCalls; _i < functionCalls_1.length; _i++) {
                     var call = functionCalls_1[_i];
@@ -147545,6 +147568,15 @@ var ts;
                         changes.replaceNodeRange(ts.getSourceFileOfNode(call), ts.first(call.arguments), ts.last(call.arguments), newArgument, { leadingTriviaOption: ts.textChanges.LeadingTriviaOption.IncludeAll, trailingTriviaOption: ts.textChanges.TrailingTriviaOption.Include });
                     }
                 }
+                function replaceParameters(declarationOrSignature, parameterDeclarations) {
+                    changes.replaceNodeRangeWithNodes(sourceFile, ts.first(declarationOrSignature.parameters), ts.last(declarationOrSignature.parameters), parameterDeclarations, {
+                        joiner: ", ",
+                        // indentation is set to 0 because otherwise the object parameter will be indented if there is a `this` parameter
+                        indentation: 0,
+                        leadingTriviaOption: ts.textChanges.LeadingTriviaOption.IncludeAll,
+                        trailingTriviaOption: ts.textChanges.TrailingTriviaOption.Include
+                    });
+                }
             }
             function getGroupedReferences(functionDeclaration, program, cancellationToken) {
                 var functionNames = getFunctionNames(functionDeclaration);
@@ -147563,12 +147595,38 @@ var ts;
                     var functionSymbols = ts.map(functionNames, getSymbolTargetAtLocation);
                     var classSymbols = ts.map(classNames, getSymbolTargetAtLocation);
                     var isConstructor = ts.isConstructorDeclaration(functionDeclaration);
+                    var contextualSymbols = ts.map(functionNames, function (name) { return getSymbolForContextualType(name, checker); });
                     for (var _i = 0, referenceEntries_1 = referenceEntries; _i < referenceEntries_1.length; _i++) {
                         var entry = referenceEntries_1[_i];
-                        if (entry.kind !== 1 /* Node */) {
+                        if (entry.kind === 0 /* Span */) {
                             groupedReferences.valid = false;
                             continue;
                         }
+                        /* Declarations in object literals may be implementations of method signatures which have a different symbol from the declaration
+                        For example:
+                            interface IFoo { m(a: number): void }
+                            const foo: IFoo = { m(a: number): void {} }
+                        In these cases we get the symbol for the signature from the contextual type.
+                        */
+                        if (ts.contains(contextualSymbols, getSymbolTargetAtLocation(entry.node))) {
+                            if (isValidMethodSignature(entry.node.parent)) {
+                                groupedReferences.signature = entry.node.parent;
+                                continue;
+                            }
+                            var call = entryToFunctionCall(entry);
+                            if (call) {
+                                groupedReferences.functionCalls.push(call);
+                                continue;
+                            }
+                        }
+                        var contextualSymbol = getSymbolForContextualType(entry.node, checker);
+                        if (contextualSymbol && ts.contains(contextualSymbols, contextualSymbol)) {
+                            var decl = entryToDeclaration(entry);
+                            if (decl) {
+                                groupedReferences.declarations.push(decl);
+                                continue;
+                            }
+                        }
                         /* We compare symbols because in some cases find all references wil return a reference that may or may not be to the refactored function.
                         Example from the refactorConvertParamsToDestructuredObject_methodCallUnion.ts test:
                             class A { foo(a: number, b: number) { return a + b; } }
@@ -147631,6 +147689,19 @@ var ts;
                     return symbol && ts.getSymbolTarget(symbol, checker);
                 }
             }
+            /**
+             * Gets the symbol for the contextual type of the node if it is not a union or intersection.
+             */
+            function getSymbolForContextualType(node, checker) {
+                var element = ts.getContainingObjectLiteralElement(node);
+                if (element) {
+                    var contextualType = checker.getContextualTypeForObjectLiteralElement(element);
+                    var symbol = contextualType === null || contextualType === void 0 ? void 0 : contextualType.getSymbol();
+                    if (symbol && !(ts.getCheckFlags(symbol) & 6 /* Synthetic */)) {
+                        return symbol;
+                    }
+                }
+            }
             function entryToImportOrExport(entry) {
                 var node = entry.node;
                 if (ts.isImportSpecifier(node.parent)
@@ -147738,6 +147809,9 @@ var ts;
                 }
                 return false;
             }
+            function isValidMethodSignature(node) {
+                return ts.isMethodSignature(node) && (ts.isInterfaceDeclaration(node.parent) || ts.isTypeLiteralNode(node.parent));
+            }
             function isValidFunctionDeclaration(functionDeclaration, checker) {
                 if (!isValidParameterNodeArray(functionDeclaration.parameters, checker))
                     return false;
@@ -147745,6 +147819,11 @@ var ts;
                     case 251 /* FunctionDeclaration */:
                         return hasNameOrDefault(functionDeclaration) && isSingleImplementation(functionDeclaration, checker);
                     case 165 /* MethodDeclaration */:
+                        if (ts.isObjectLiteralExpression(functionDeclaration.parent)) {
+                            var contextualSymbol = getSymbolForContextualType(functionDeclaration.name, checker);
+                            // don't offer the refactor when there are multiple signatures since we won't know which ones the user wants to change
+                            return (contextualSymbol === null || contextualSymbol === void 0 ? void 0 : contextualSymbol.declarations.length) === 1 && isSingleImplementation(functionDeclaration, checker);
+                        }
                         return isSingleImplementation(functionDeclaration, checker);
                     case 166 /* Constructor */:
                         if (ts.isClassDeclaration(functionDeclaration.parent)) {