typescript 4.7.0-dev.20220406 → 4.7.0-dev.20220408

package/lib/tsc.js

@@ -69,7 +69,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var ts;
 (function (ts) {
     ts.versionMajorMinor = "4.7";
-    ts.version = ts.versionMajorMinor + ".0-dev.20220406";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220408";
     var NativeCollections;
     (function (NativeCollections) {
         var globals = typeof globalThis !== "undefined" ? globalThis :
@@ -5901,6 +5901,7 @@ var ts;
         _0_index_signatures_are_incompatible: diag(2634, ts.DiagnosticCategory.Error, "_0_index_signatures_are_incompatible_2634", "'{0}' index signatures are incompatible."),
         Type_0_has_no_signatures_for_which_the_type_argument_list_is_applicable: diag(2635, ts.DiagnosticCategory.Error, "Type_0_has_no_signatures_for_which_the_type_argument_list_is_applicable_2635", "Type '{0}' has no signatures for which the type argument list is applicable."),
         Type_0_is_not_assignable_to_type_1_as_implied_by_variance_annotation: diag(2636, ts.DiagnosticCategory.Error, "Type_0_is_not_assignable_to_type_1_as_implied_by_variance_annotation_2636", "Type '{0}' is not assignable to type '{1}' as implied by variance annotation."),
+        Variance_annotations_are_only_supported_in_type_aliases_for_object_function_constructor_and_mapped_types: diag(2637, ts.DiagnosticCategory.Error, "Variance_annotations_are_only_supported_in_type_aliases_for_object_function_constructor_and_mapped_t_2637", "Variance annotations are only supported in type aliases for object, function, constructor, and mapped types."),
         Cannot_augment_module_0_with_value_exports_because_it_resolves_to_a_non_module_entity: diag(2649, ts.DiagnosticCategory.Error, "Cannot_augment_module_0_with_value_exports_because_it_resolves_to_a_non_module_entity_2649", "Cannot augment module '{0}' with value exports because it resolves to a non-module entity."),
         A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_members_defined_in_other_enums: diag(2651, ts.DiagnosticCategory.Error, "A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_memb_2651", "A member initializer in a enum declaration cannot reference members declared after it, including members defined in other enums."),
         Merged_declaration_0_cannot_include_a_default_export_declaration_Consider_adding_a_separate_export_default_0_declaration_instead: diag(2652, ts.DiagnosticCategory.Error, "Merged_declaration_0_cannot_include_a_default_export_declaration_Consider_adding_a_separate_export_d_2652", "Merged declaration '{0}' cannot include a default export declaration. Consider adding a separate 'export default {0}' declaration instead."),
@@ -37492,6 +37493,7 @@ var ts;
                 case 261:
                 case 259:
                 case 195:
+                case 176:
                     return 1 | 32;
                 case 305:
                     return 1 | 4 | 32;
@@ -37509,7 +37511,6 @@ var ts;
                 case 317:
                 case 179:
                 case 175:
-                case 176:
                 case 180:
                 case 170:
                     return 1 | 4 | 32 | 8;
@@ -41330,27 +41331,27 @@ var ts;
         function resolveAlias(symbol) {
             ts.Debug.assert((symbol.flags & 2097152) !== 0, "Should only get Alias here.");
             var links = getSymbolLinks(symbol);
-            if (!links.target) {
-                links.target = resolvingSymbol;
+            if (!links.aliasTarget) {
+                links.aliasTarget = resolvingSymbol;
                 var node = getDeclarationOfAliasSymbol(symbol);
                 if (!node)
                     return ts.Debug.fail();
                 var target = getTargetOfAliasDeclaration(node);
-                if (links.target === resolvingSymbol) {
-                    links.target = target || unknownSymbol;
+                if (links.aliasTarget === resolvingSymbol) {
+                    links.aliasTarget = target || unknownSymbol;
                 }
                 else {
                     error(node, ts.Diagnostics.Circular_definition_of_import_alias_0, symbolToString(symbol));
                 }
             }
-            else if (links.target === resolvingSymbol) {
-                links.target = unknownSymbol;
+            else if (links.aliasTarget === resolvingSymbol) {
+                links.aliasTarget = unknownSymbol;
             }
-            return links.target;
+            return links.aliasTarget;
         }
         function tryResolveAlias(symbol) {
             var links = getSymbolLinks(symbol);
-            if (links.target !== resolvingSymbol) {
+            if (links.aliasTarget !== resolvingSymbol) {
                 return resolveAlias(symbol);
             }
             return undefined;
@@ -42937,13 +42938,27 @@ var ts;
                 return ts.Debug.fail("Should be unreachable.");
                 function conditionalTypeToTypeNode(type) {
                     var checkTypeNode = typeToTypeNodeHelper(type.checkType, context);
+                    context.approximateLength += 15;
+                    if (context.flags & 4 && type.root.isDistributive && !(type.checkType.flags & 262144)) {
+                        var newParam = createTypeParameter(createSymbol(262144, "T"));
+                        var name = typeParameterToName(newParam, context);
+                        var newTypeVariable = ts.factory.createTypeReferenceNode(name);
+                        context.approximateLength += 37;
+                        var newMapper = prependTypeMapping(type.root.checkType, newParam, type.combinedMapper || type.mapper);
+                        var saveInferTypeParameters_1 = context.inferTypeParameters;
+                        context.inferTypeParameters = type.root.inferTypeParameters;
+                        var extendsTypeNode_1 = typeToTypeNodeHelper(instantiateType(type.root.extendsType, newMapper), context);
+                        context.inferTypeParameters = saveInferTypeParameters_1;
+                        var trueTypeNode_1 = typeToTypeNodeOrCircularityElision(instantiateType(getTypeFromTypeNode(type.root.node.trueType), newMapper));
+                        var falseTypeNode_1 = typeToTypeNodeOrCircularityElision(instantiateType(getTypeFromTypeNode(type.root.node.falseType), newMapper));
+                        return ts.factory.createConditionalTypeNode(checkTypeNode, ts.factory.createInferTypeNode(ts.factory.createTypeParameterDeclaration(undefined, ts.factory.cloneNode(newTypeVariable.typeName))), ts.factory.createConditionalTypeNode(ts.factory.createTypeReferenceNode(ts.factory.cloneNode(name)), typeToTypeNodeHelper(type.checkType, context), ts.factory.createConditionalTypeNode(newTypeVariable, extendsTypeNode_1, trueTypeNode_1, falseTypeNode_1), ts.factory.createKeywordTypeNode(143)), ts.factory.createKeywordTypeNode(143));
+                    }
                     var saveInferTypeParameters = context.inferTypeParameters;
                     context.inferTypeParameters = type.root.inferTypeParameters;
                     var extendsTypeNode = typeToTypeNodeHelper(type.extendsType, context);
                     context.inferTypeParameters = saveInferTypeParameters;
                     var trueTypeNode = typeToTypeNodeOrCircularityElision(getTrueTypeFromConditionalType(type));
                     var falseTypeNode = typeToTypeNodeOrCircularityElision(getFalseTypeFromConditionalType(type));
-                    context.approximateLength += 15;
                     return ts.factory.createConditionalTypeNode(checkTypeNode, extendsTypeNode, trueTypeNode, falseTypeNode);
                 }
                 function typeToTypeNodeOrCircularityElision(type) {
@@ -64063,7 +64078,7 @@ var ts;
             var newSymbol = createSymbol(2097152, "default");
             newSymbol.parent = originalSymbol;
             newSymbol.nameType = getStringLiteralType("default");
-            newSymbol.target = resolveSymbol(symbol);
+            newSymbol.aliasTarget = resolveSymbol(symbol);
             memberTable.set("default", newSymbol);
             return createAnonymousType(anonymousSymbol, memberTable, ts.emptyArray, ts.emptyArray, ts.emptyArray);
         }
@@ -66589,14 +66604,19 @@ var ts;
             }
             if (node.parent.kind === 258 || node.parent.kind === 257 || node.parent.kind === 259) {
                 var modifiers = getVarianceModifiers(typeParameter);
-                if (modifiers === 32768 || modifiers === 65536) {
+                if (modifiers) {
                     var symbol = getSymbolOfNode(node.parent);
-                    var source = createMarkerType(symbol, typeParameter, modifiers === 65536 ? markerSubType : markerSuperType);
-                    var target = createMarkerType(symbol, typeParameter, modifiers === 65536 ? markerSuperType : markerSubType);
-                    var saveVarianceTypeParameter = typeParameter;
-                    varianceTypeParameter = typeParameter;
-                    checkTypeAssignableTo(source, target, node, ts.Diagnostics.Type_0_is_not_assignable_to_type_1_as_implied_by_variance_annotation);
-                    varianceTypeParameter = saveVarianceTypeParameter;
+                    if (node.parent.kind === 259 && !(ts.getObjectFlags(getDeclaredTypeOfSymbol(symbol)) & (16 | 32))) {
+                        error(node, ts.Diagnostics.Variance_annotations_are_only_supported_in_type_aliases_for_object_function_constructor_and_mapped_types);
+                    }
+                    else if (modifiers === 32768 || modifiers === 65536) {
+                        var source = createMarkerType(symbol, typeParameter, modifiers === 65536 ? markerSubType : markerSuperType);
+                        var target = createMarkerType(symbol, typeParameter, modifiers === 65536 ? markerSuperType : markerSubType);
+                        var saveVarianceTypeParameter = typeParameter;
+                        varianceTypeParameter = typeParameter;
+                        checkTypeAssignableTo(source, target, node, ts.Diagnostics.Type_0_is_not_assignable_to_type_1_as_implied_by_variance_annotation);
+                        varianceTypeParameter = saveVarianceTypeParameter;
+                    }
                 }
             }
             addLazyDiagnostic(function () { return checkTypeNameIsReserved(node.name, ts.Diagnostics.Type_parameter_name_cannot_be_0); });
@@ -72274,11 +72294,11 @@ var ts;
                 var _a = symbol, leftSpread = _a.leftSpread, rightSpread = _a.rightSpread, syntheticOrigin = _a.syntheticOrigin;
                 return leftSpread ? [leftSpread, rightSpread]
                     : syntheticOrigin ? [syntheticOrigin]
-                        : ts.singleElementArray(tryGetAliasTarget(symbol));
+                        : ts.singleElementArray(tryGetTarget(symbol));
             }
             return undefined;
         }
-        function tryGetAliasTarget(symbol) {
+        function tryGetTarget(symbol) {
             var target;
             var next = symbol;
             while (next = getSymbolLinks(next).target) {
@@ -72463,7 +72483,7 @@ var ts;
                 if (links === null || links === void 0 ? void 0 : links.referenced) {
                     return true;
                 }
-                var target = getSymbolLinks(symbol).target;
+                var target = getSymbolLinks(symbol).aliasTarget;
                 if (target && ts.getEffectiveModifierFlags(node) & 1 &&
                     target.flags & 111551 &&
                     (ts.shouldPreserveConstEnums(compilerOptions) || !isConstEnumOrConstEnumOnlyModule(target))) {
@@ -88863,6 +88883,10 @@ var ts;
             return factory.updateModifiers(statement, modifiers);
         }
         function transformTopLevelDeclaration(input) {
+            if (lateMarkedStatements) {
+                while (ts.orderedRemoveItem(lateMarkedStatements, input))
+                    ;
+            }
             if (shouldStripInternal(input))
                 return;
             switch (input.kind) {

package/lib/tsserver.js

@@ -100,7 +100,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.20220406";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220408";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -8717,6 +8717,7 @@ var ts;
         _0_index_signatures_are_incompatible: diag(2634, ts.DiagnosticCategory.Error, "_0_index_signatures_are_incompatible_2634", "'{0}' index signatures are incompatible."),
         Type_0_has_no_signatures_for_which_the_type_argument_list_is_applicable: diag(2635, ts.DiagnosticCategory.Error, "Type_0_has_no_signatures_for_which_the_type_argument_list_is_applicable_2635", "Type '{0}' has no signatures for which the type argument list is applicable."),
         Type_0_is_not_assignable_to_type_1_as_implied_by_variance_annotation: diag(2636, ts.DiagnosticCategory.Error, "Type_0_is_not_assignable_to_type_1_as_implied_by_variance_annotation_2636", "Type '{0}' is not assignable to type '{1}' as implied by variance annotation."),
+        Variance_annotations_are_only_supported_in_type_aliases_for_object_function_constructor_and_mapped_types: diag(2637, ts.DiagnosticCategory.Error, "Variance_annotations_are_only_supported_in_type_aliases_for_object_function_constructor_and_mapped_t_2637", "Variance annotations are only supported in type aliases for object, function, constructor, and mapped types."),
         Cannot_augment_module_0_with_value_exports_because_it_resolves_to_a_non_module_entity: diag(2649, ts.DiagnosticCategory.Error, "Cannot_augment_module_0_with_value_exports_because_it_resolves_to_a_non_module_entity_2649", "Cannot augment module '{0}' with value exports because it resolves to a non-module entity."),
         A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_members_defined_in_other_enums: diag(2651, ts.DiagnosticCategory.Error, "A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_memb_2651", "A member initializer in a enum declaration cannot reference members declared after it, including members defined in other enums."),
         Merged_declaration_0_cannot_include_a_default_export_declaration_Consider_adding_a_separate_export_default_0_declaration_instead: diag(2652, ts.DiagnosticCategory.Error, "Merged_declaration_0_cannot_include_a_default_export_declaration_Consider_adding_a_separate_export_d_2652", "Merged declaration '{0}' cannot include a default export declaration. Consider adding a separate 'export default {0}' declaration instead."),
@@ -45772,6 +45773,7 @@ var ts;
                 case 261 /* ModuleDeclaration */:
                 case 259 /* TypeAliasDeclaration */:
                 case 195 /* MappedType */:
+                case 176 /* IndexSignature */:
                     return 1 /* IsContainer */ | 32 /* HasLocals */;
                 case 305 /* SourceFile */:
                     return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */;
@@ -45790,7 +45792,6 @@ var ts;
                 case 317 /* JSDocFunctionType */:
                 case 179 /* FunctionType */:
                 case 175 /* ConstructSignature */:
-                case 176 /* IndexSignature */:
                 case 180 /* ConstructorType */:
                 case 170 /* ClassStaticBlockDeclaration */:
                     return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */;
@@ -50368,27 +50369,27 @@ var ts;
         function resolveAlias(symbol) {
             ts.Debug.assert((symbol.flags & 2097152 /* Alias */) !== 0, "Should only get Alias here.");
             var links = getSymbolLinks(symbol);
-            if (!links.target) {
-                links.target = resolvingSymbol;
+            if (!links.aliasTarget) {
+                links.aliasTarget = resolvingSymbol;
                 var node = getDeclarationOfAliasSymbol(symbol);
                 if (!node)
                     return ts.Debug.fail();
                 var target = getTargetOfAliasDeclaration(node);
-                if (links.target === resolvingSymbol) {
-                    links.target = target || unknownSymbol;
+                if (links.aliasTarget === resolvingSymbol) {
+                    links.aliasTarget = target || unknownSymbol;
                 }
                 else {
                     error(node, ts.Diagnostics.Circular_definition_of_import_alias_0, symbolToString(symbol));
                 }
             }
-            else if (links.target === resolvingSymbol) {
-                links.target = unknownSymbol;
+            else if (links.aliasTarget === resolvingSymbol) {
+                links.aliasTarget = unknownSymbol;
             }
-            return links.target;
+            return links.aliasTarget;
         }
         function tryResolveAlias(symbol) {
             var links = getSymbolLinks(symbol);
-            if (links.target !== resolvingSymbol) {
+            if (links.aliasTarget !== resolvingSymbol) {
                 return resolveAlias(symbol);
             }
             return undefined;
@@ -52185,13 +52186,37 @@ var ts;
                 return ts.Debug.fail("Should be unreachable.");
                 function conditionalTypeToTypeNode(type) {
                     var checkTypeNode = typeToTypeNodeHelper(type.checkType, context);
+                    context.approximateLength += 15;
+                    if (context.flags & 4 /* GenerateNamesForShadowedTypeParams */ && type.root.isDistributive && !(type.checkType.flags & 262144 /* TypeParameter */)) {
+                        var newParam = createTypeParameter(createSymbol(262144 /* TypeParameter */, "T"));
+                        var name = typeParameterToName(newParam, context);
+                        var newTypeVariable = ts.factory.createTypeReferenceNode(name);
+                        context.approximateLength += 37; // 15 each for two added conditionals, 7 for an added infer type
+                        var newMapper = prependTypeMapping(type.root.checkType, newParam, type.combinedMapper || type.mapper);
+                        var saveInferTypeParameters_1 = context.inferTypeParameters;
+                        context.inferTypeParameters = type.root.inferTypeParameters;
+                        var extendsTypeNode_1 = typeToTypeNodeHelper(instantiateType(type.root.extendsType, newMapper), context);
+                        context.inferTypeParameters = saveInferTypeParameters_1;
+                        var trueTypeNode_1 = typeToTypeNodeOrCircularityElision(instantiateType(getTypeFromTypeNode(type.root.node.trueType), newMapper));
+                        var falseTypeNode_1 = typeToTypeNodeOrCircularityElision(instantiateType(getTypeFromTypeNode(type.root.node.falseType), newMapper));
+                        // outermost conditional makes `T` a type parameter, allowing the inner conditionals to be distributive
+                        // second conditional makes `T` have `T & checkType` substitution, so it is correctly usable as the checkType
+                        // inner conditional runs the check the user provided on the check type (distributively) and returns the result
+                        // checkType extends infer T ? T extends checkType ? T extends extendsType<T> ? trueType<T> : falseType<T> : never : never;
+                        // this is potentially simplifiable to
+                        // checkType extends infer T ? T extends checkType & extendsType<T> ? trueType<T> : falseType<T> : never;
+                        // but that may confuse users who read the output more.
+                        // On the other hand,
+                        // checkType extends infer T extends checkType ? T extends extendsType<T> ? trueType<T> : falseType<T> : never;
+                        // may also work with `infer ... extends ...` in, but would produce declarations only compatible with the latest TS.
+                        return ts.factory.createConditionalTypeNode(checkTypeNode, ts.factory.createInferTypeNode(ts.factory.createTypeParameterDeclaration(/*modifiers*/ undefined, ts.factory.cloneNode(newTypeVariable.typeName))), ts.factory.createConditionalTypeNode(ts.factory.createTypeReferenceNode(ts.factory.cloneNode(name)), typeToTypeNodeHelper(type.checkType, context), ts.factory.createConditionalTypeNode(newTypeVariable, extendsTypeNode_1, trueTypeNode_1, falseTypeNode_1), ts.factory.createKeywordTypeNode(143 /* NeverKeyword */)), ts.factory.createKeywordTypeNode(143 /* NeverKeyword */));
+                    }
                     var saveInferTypeParameters = context.inferTypeParameters;
                     context.inferTypeParameters = type.root.inferTypeParameters;
                     var extendsTypeNode = typeToTypeNodeHelper(type.extendsType, context);
                     context.inferTypeParameters = saveInferTypeParameters;
                     var trueTypeNode = typeToTypeNodeOrCircularityElision(getTrueTypeFromConditionalType(type));
                     var falseTypeNode = typeToTypeNodeOrCircularityElision(getFalseTypeFromConditionalType(type));
-                    context.approximateLength += 15;
                     return ts.factory.createConditionalTypeNode(checkTypeNode, extendsTypeNode, trueTypeNode, falseTypeNode);
                 }
                 function typeToTypeNodeOrCircularityElision(type) {
@@ -76694,7 +76719,7 @@ var ts;
             var newSymbol = createSymbol(2097152 /* Alias */, "default" /* Default */);
             newSymbol.parent = originalSymbol;
             newSymbol.nameType = getStringLiteralType("default");
-            newSymbol.target = resolveSymbol(symbol);
+            newSymbol.aliasTarget = resolveSymbol(symbol);
             memberTable.set("default" /* Default */, newSymbol);
             return createAnonymousType(anonymousSymbol, memberTable, ts.emptyArray, ts.emptyArray, ts.emptyArray);
         }
@@ -79508,14 +79533,19 @@ var ts;
             }
             if (node.parent.kind === 258 /* InterfaceDeclaration */ || node.parent.kind === 257 /* ClassDeclaration */ || node.parent.kind === 259 /* TypeAliasDeclaration */) {
                 var modifiers = getVarianceModifiers(typeParameter);
-                if (modifiers === 32768 /* In */ || modifiers === 65536 /* Out */) {
+                if (modifiers) {
                     var symbol = getSymbolOfNode(node.parent);
-                    var source = createMarkerType(symbol, typeParameter, modifiers === 65536 /* Out */ ? markerSubType : markerSuperType);
-                    var target = createMarkerType(symbol, typeParameter, modifiers === 65536 /* Out */ ? markerSuperType : markerSubType);
-                    var saveVarianceTypeParameter = typeParameter;
-                    varianceTypeParameter = typeParameter;
-                    checkTypeAssignableTo(source, target, node, ts.Diagnostics.Type_0_is_not_assignable_to_type_1_as_implied_by_variance_annotation);
-                    varianceTypeParameter = saveVarianceTypeParameter;
+                    if (node.parent.kind === 259 /* TypeAliasDeclaration */ && !(ts.getObjectFlags(getDeclaredTypeOfSymbol(symbol)) & (16 /* Anonymous */ | 32 /* Mapped */))) {
+                        error(node, ts.Diagnostics.Variance_annotations_are_only_supported_in_type_aliases_for_object_function_constructor_and_mapped_types);
+                    }
+                    else if (modifiers === 32768 /* In */ || modifiers === 65536 /* Out */) {
+                        var source = createMarkerType(symbol, typeParameter, modifiers === 65536 /* Out */ ? markerSubType : markerSuperType);
+                        var target = createMarkerType(symbol, typeParameter, modifiers === 65536 /* Out */ ? markerSuperType : markerSubType);
+                        var saveVarianceTypeParameter = typeParameter;
+                        varianceTypeParameter = typeParameter;
+                        checkTypeAssignableTo(source, target, node, ts.Diagnostics.Type_0_is_not_assignable_to_type_1_as_implied_by_variance_annotation);
+                        varianceTypeParameter = saveVarianceTypeParameter;
+                    }
                 }
             }
             addLazyDiagnostic(function () { return checkTypeNameIsReserved(node.name, ts.Diagnostics.Type_parameter_name_cannot_be_0); });
@@ -86175,11 +86205,11 @@ var ts;
                 var _a = symbol, leftSpread = _a.leftSpread, rightSpread = _a.rightSpread, syntheticOrigin = _a.syntheticOrigin;
                 return leftSpread ? [leftSpread, rightSpread]
                     : syntheticOrigin ? [syntheticOrigin]
-                        : ts.singleElementArray(tryGetAliasTarget(symbol));
+                        : ts.singleElementArray(tryGetTarget(symbol));
             }
             return undefined;
         }
-        function tryGetAliasTarget(symbol) {
+        function tryGetTarget(symbol) {
             var target;
             var next = symbol;
             while (next = getSymbolLinks(next).target) {
@@ -86409,7 +86439,7 @@ var ts;
                 if (links === null || links === void 0 ? void 0 : links.referenced) {
                     return true;
                 }
-                var target = getSymbolLinks(symbol).target; // TODO: GH#18217
+                var target = getSymbolLinks(symbol).aliasTarget; // TODO: GH#18217
                 if (target && ts.getEffectiveModifierFlags(node) & 1 /* Export */ &&
                     target.flags & 111551 /* Value */ &&
                     (ts.shouldPreserveConstEnums(compilerOptions) || !isConstEnumOrConstEnumOnlyModule(target))) {
@@ -108405,6 +108435,10 @@ var ts;
             return factory.updateModifiers(statement, modifiers);
         }
         function transformTopLevelDeclaration(input) {
+            if (lateMarkedStatements) {
+                while (ts.orderedRemoveItem(lateMarkedStatements, input))
+                    ;
+            }
             if (shouldStripInternal(input))
                 return;
             switch (input.kind) {
@@ -158843,6 +158877,7 @@ var ts;
                 Messages.cannotAccessVariablesFromNestedScopes = createMessage("Cannot access variables from nested scopes");
                 Messages.cannotExtractToJSClass = createMessage("Cannot extract constant to a class scope in JS");
                 Messages.cannotExtractToExpressionArrowFunction = createMessage("Cannot extract constant to an arrow function without a block");
+                Messages.cannotExtractFunctionsContainingThisToMethod = createMessage("Cannot extract functions containing this to method");
             })(Messages = extractSymbol.Messages || (extractSymbol.Messages = {}));
             var RangeFacts;
             (function (RangeFacts) {
@@ -158851,10 +158886,11 @@ var ts;
                 RangeFacts[RangeFacts["IsGenerator"] = 2] = "IsGenerator";
                 RangeFacts[RangeFacts["IsAsyncFunction"] = 4] = "IsAsyncFunction";
                 RangeFacts[RangeFacts["UsesThis"] = 8] = "UsesThis";
+                RangeFacts[RangeFacts["UsesThisInFunction"] = 16] = "UsesThisInFunction";
                 /**
                  * The range is in a function which needs the 'static' modifier in a class
                  */
-                RangeFacts[RangeFacts["InStaticRegion"] = 16] = "InStaticRegion";
+                RangeFacts[RangeFacts["InStaticRegion"] = 32] = "InStaticRegion";
             })(RangeFacts || (RangeFacts = {}));
             /**
              * getRangeToExtract takes a span inside a text file and returns either an expression or an array
@@ -158885,6 +158921,7 @@ var ts;
                 // We'll modify these flags as we walk the tree to collect data
                 // about what things need to be done as part of the extraction.
                 var rangeFacts = RangeFacts.None;
+                var thisNode;
                 if (!start || !end) {
                     // cannot find either start or end node
                     return { errors: [ts.createFileDiagnostic(sourceFile, span.start, length, Messages.cannotExtractRange)] };
@@ -158923,7 +158960,7 @@ var ts;
                         // the expression.
                         return { errors: [ts.createFileDiagnostic(sourceFile, span.start, length, Messages.cannotExtractRange)] };
                     }
-                    return { targetRange: { range: statements, facts: rangeFacts, declarations: declarations } };
+                    return { targetRange: { range: statements, facts: rangeFacts, declarations: declarations, thisNode: thisNode } };
                 }
                 if (ts.isReturnStatement(start) && !start.expression) {
                     // Makes no sense to extract an expression-less return statement.
@@ -158935,7 +158972,7 @@ var ts;
                 if (errors) {
                     return { errors: errors };
                 }
-                return { targetRange: { range: getStatementOrExpressionRange(node), facts: rangeFacts, declarations: declarations } }; // TODO: GH#18217
+                return { targetRange: { range: getStatementOrExpressionRange(node), facts: rangeFacts, declarations: declarations, thisNode: thisNode } }; // TODO: GH#18217
                 /**
                  * Attempt to refine the extraction node (generally, by shrinking it) to produce better results.
                  * @param node The unrefined extraction node.
@@ -159027,6 +159064,14 @@ var ts;
                     var permittedJumps = 4 /* Return */;
                     var seenLabels;
                     visit(nodeToCheck);
+                    if (rangeFacts & RangeFacts.UsesThis) {
+                        var container = ts.getThisContainer(nodeToCheck, /** includeArrowFunctions */ false);
+                        if (container.kind === 256 /* FunctionDeclaration */ ||
+                            (container.kind === 169 /* MethodDeclaration */ && container.parent.kind === 205 /* ObjectLiteralExpression */) ||
+                            container.kind === 213 /* FunctionExpression */) {
+                            rangeFacts |= RangeFacts.UsesThisInFunction;
+                        }
+                    }
                     return errors;
                     function visit(node) {
                         if (errors) {
@@ -159065,6 +159110,7 @@ var ts;
                                 }
                                 else {
                                     rangeFacts |= RangeFacts.UsesThis;
+                                    thisNode = node;
                                 }
                                 break;
                             case 214 /* ArrowFunction */:
@@ -159072,6 +159118,7 @@ var ts;
                                 ts.forEachChild(node, function check(n) {
                                     if (ts.isThis(n)) {
                                         rangeFacts |= RangeFacts.UsesThis;
+                                        thisNode = node;
                                     }
                                     else if (ts.isClassLike(n) || (ts.isFunctionLike(n) && !ts.isArrowFunction(n))) {
                                         return false;
@@ -159128,6 +159175,7 @@ var ts;
                             case 192 /* ThisType */:
                             case 108 /* ThisKeyword */:
                                 rangeFacts |= RangeFacts.UsesThis;
+                                thisNode = node;
                                 break;
                             case 250 /* LabeledStatement */: {
                                 var label = node.label;
@@ -159215,7 +159263,7 @@ var ts;
              */
             function collectEnclosingScopes(range) {
                 var current = isReadonlyArray(range.range) ? ts.first(range.range) : range.range;
-                if (range.facts & RangeFacts.UsesThis) {
+                if (range.facts & RangeFacts.UsesThis && !(range.facts & RangeFacts.UsesThisInFunction)) {
                     // if range uses this as keyword or as type inside the class then it can only be extracted to a method of the containing class
                     var containingClass = ts.getContainingClass(current);
                     if (containingClass) {
@@ -159421,6 +159469,7 @@ var ts;
                 var _b = transformFunctionBody(node, exposedVariableDeclarations, writes, substitutions, !!(range.facts & RangeFacts.HasReturn)), body = _b.body, returnValueProperty = _b.returnValueProperty;
                 ts.suppressLeadingAndTrailingTrivia(body);
                 var newFunction;
+                var callThis = !!(range.facts & RangeFacts.UsesThisInFunction);
                 if (ts.isClassLike(scope)) {
                     // always create private method in TypeScript files
                     var modifiers = isJS ? [] : [ts.factory.createModifier(121 /* PrivateKeyword */)];
@@ -159435,6 +159484,15 @@ var ts;
                     /*questionToken*/ undefined, typeParameters, parameters, returnType, body);
                 }
                 else {
+                    if (callThis) {
+                        parameters.unshift(ts.factory.createParameterDeclaration(
+                        /*decorators*/ undefined, 
+                        /*modifiers*/ undefined, 
+                        /*dotDotDotToken*/ undefined, 
+                        /*name*/ "this", 
+                        /*questionToken*/ undefined, checker.typeToTypeNode(checker.getTypeAtLocation(range.thisNode), scope, 1 /* NoTruncation */), 
+                        /*initializer*/ undefined));
+                    }
                     newFunction = ts.factory.createFunctionDeclaration(
                     /*decorators*/ undefined, range.facts & RangeFacts.IsAsyncFunction ? [ts.factory.createToken(131 /* AsyncKeyword */)] : undefined, range.facts & RangeFacts.IsGenerator ? ts.factory.createToken(41 /* AsteriskToken */) : undefined, functionName, typeParameters, parameters, returnType, body);
                 }
@@ -159451,7 +159509,10 @@ var ts;
                 var newNodes = [];
                 // replace range with function call
                 var called = getCalledExpression(scope, range, functionNameText);
-                var call = ts.factory.createCallExpression(called, callTypeArguments, // Note that no attempt is made to take advantage of type argument inference
+                if (callThis) {
+                    callArguments.unshift(ts.factory.createIdentifier("this"));
+                }
+                var call = ts.factory.createCallExpression(callThis ? ts.factory.createPropertyAccessExpression(called, "call") : called, callTypeArguments, // Note that no attempt is made to take advantage of type argument inference
                 callArguments);
                 if (range.facts & RangeFacts.IsGenerator) {
                     call = ts.factory.createYieldExpression(ts.factory.createToken(41 /* AsteriskToken */), call);
@@ -160062,6 +160123,9 @@ var ts;
                         var errorNode = isReadonlyArray(targetRange.range) ? targetRange.range[0] : targetRange.range;
                         constantErrorsPerScope[i].push(ts.createDiagnosticForNode(errorNode, Messages.cannotAccessVariablesFromNestedScopes));
                     }
+                    if (targetRange.facts & RangeFacts.UsesThisInFunction && ts.isClassLike(scopes[i])) {
+                        functionErrorsPerScope[i].push(ts.createDiagnosticForNode(targetRange.thisNode, Messages.cannotExtractFunctionsContainingThisToMethod));
+                    }
                     var hasWrite = false;
                     var readonlyClassPropertyWrite;
                     usagesPerScope[i].usages.forEach(function (value) {