typescript 4.5.0-dev.20211028 → 4.5.0-dev.20211029

package/lib/tsserverlibrary.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.20211028";
+    ts.version = ts.versionMajorMinor + ".0-dev.20211029";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -2745,6 +2745,10 @@ var ts;
             return formatEnum(kind, ts.SyntaxKind, /*isFlags*/ false);
         }
         Debug.formatSyntaxKind = formatSyntaxKind;
+        function formatSnippetKind(kind) {
+            return formatEnum(kind, ts.SnippetKind, /*isFlags*/ false);
+        }
+        Debug.formatSnippetKind = formatSnippetKind;
         function formatNodeFlags(flags) {
             return formatEnum(flags, ts.NodeFlags, /*isFlags*/ true);
         }
@@ -4661,6 +4665,13 @@ var ts;
         ExitStatus[ExitStatus["ProjectReferenceCycle_OutputsSkupped"] = 4] = "ProjectReferenceCycle_OutputsSkupped";
     })(ExitStatus = ts.ExitStatus || (ts.ExitStatus = {}));
     /* @internal */
+    var MemberOverrideStatus;
+    (function (MemberOverrideStatus) {
+        MemberOverrideStatus[MemberOverrideStatus["Ok"] = 0] = "Ok";
+        MemberOverrideStatus[MemberOverrideStatus["NeedsOverride"] = 1] = "NeedsOverride";
+        MemberOverrideStatus[MemberOverrideStatus["HasInvalidOverride"] = 2] = "HasInvalidOverride";
+    })(MemberOverrideStatus = ts.MemberOverrideStatus || (ts.MemberOverrideStatus = {}));
+    /* @internal */
     var UnionReduction;
     (function (UnionReduction) {
         UnionReduction[UnionReduction["None"] = 0] = "None";
@@ -5642,6 +5653,15 @@ var ts;
         // Masks
         // - Additional bitmasks
     })(TransformFlags = ts.TransformFlags || (ts.TransformFlags = {}));
+    // Reference: https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax
+    /* @internal */
+    var SnippetKind;
+    (function (SnippetKind) {
+        SnippetKind[SnippetKind["TabStop"] = 0] = "TabStop";
+        SnippetKind[SnippetKind["Placeholder"] = 1] = "Placeholder";
+        SnippetKind[SnippetKind["Choice"] = 2] = "Choice";
+        SnippetKind[SnippetKind["Variable"] = 3] = "Variable";
+    })(SnippetKind = ts.SnippetKind || (ts.SnippetKind = {}));
     var EmitFlags;
     (function (EmitFlags) {
         EmitFlags[EmitFlags["None"] = 0] = "None";
@@ -20947,6 +20967,10 @@ var ts;
         return node.kind === 212 /* FunctionExpression */ || node.kind === 213 /* ArrowFunction */;
     }
     ts.isFunctionExpressionOrArrowFunction = isFunctionExpressionOrArrowFunction;
+    function escapeSnippetText(text) {
+        return text.replace(/\$/gm, "\\$");
+    }
+    ts.escapeSnippetText = escapeSnippetText;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
@@ -27150,6 +27174,25 @@ var ts;
         }
     }
     ts.moveEmitHelpers = moveEmitHelpers;
+    /**
+     * Gets the SnippetElement of a node.
+     */
+    /* @internal */
+    function getSnippetElement(node) {
+        var _a;
+        return (_a = node.emitNode) === null || _a === void 0 ? void 0 : _a.snippetElement;
+    }
+    ts.getSnippetElement = getSnippetElement;
+    /**
+     * Sets the SnippetElement of a node.
+     */
+    /* @internal */
+    function setSnippetElement(node, snippet) {
+        var emitNode = getOrCreateEmitNode(node);
+        emitNode.snippetElement = snippet;
+        return node;
+    }
+    ts.setSnippetElement = setSnippetElement;
     /* @internal */
     function ignoreSourceNewlines(node) {
         getOrCreateEmitNode(node).flags |= 134217728 /* IgnoreSourceNewlines */;
@@ -47275,6 +47318,7 @@ var ts;
             isDeclarationVisible: isDeclarationVisible,
             isPropertyAccessible: isPropertyAccessible,
             getTypeOnlyAliasDeclaration: getTypeOnlyAliasDeclaration,
+            getMemberOverrideModifierStatus: getMemberOverrideModifierStatus,
         };
         function getResolvedSignatureWorker(nodeIn, candidatesOutArray, argumentCount, checkMode) {
             var node = ts.getParseTreeNode(nodeIn, ts.isCallLikeExpression);
@@ -81850,7 +81894,7 @@ var ts;
                     checkKindsOfPropertyMemberOverrides(type, baseType_1);
                 }
             }
-            checkMembersForMissingOverrideModifier(node, type, typeWithThis, staticType);
+            checkMembersForOverrideModifier(node, type, typeWithThis, staticType);
             var implementedTypeNodes = ts.getEffectiveImplementsTypeNodes(node);
             if (implementedTypeNodes) {
                 for (var _b = 0, implementedTypeNodes_1 = implementedTypeNodes; _b < implementedTypeNodes_1.length; _b++) {
@@ -81885,8 +81929,7 @@ var ts;
                 checkPropertyInitialization(node);
             }
         }
-        function checkMembersForMissingOverrideModifier(node, type, typeWithThis, staticType) {
-            var nodeInAmbientContext = !!(node.flags & 8388608 /* Ambient */);
+        function checkMembersForOverrideModifier(node, type, typeWithThis, staticType) {
             var baseTypeNode = ts.getEffectiveBaseTypeNode(node);
             var baseTypes = baseTypeNode && getBaseTypes(type);
             var baseWithThis = (baseTypes === null || baseTypes === void 0 ? void 0 : baseTypes.length) ? getTypeWithThisArgument(ts.first(baseTypes), type.thisType) : undefined;
@@ -81898,46 +81941,71 @@ var ts;
                 if (ts.isConstructorDeclaration(member)) {
                     ts.forEach(member.parameters, function (param) {
                         if (ts.isParameterPropertyDeclaration(param, member)) {
-                            checkClassMember(param, /*memberIsParameterProperty*/ true);
+                            checkExistingMemberForOverrideModifier(node, staticType, baseStaticType, baseWithThis, type, typeWithThis, param, 
+                            /* memberIsParameterProperty */ true);
                         }
                     });
                 }
-                checkClassMember(member);
+                checkExistingMemberForOverrideModifier(node, staticType, baseStaticType, baseWithThis, type, typeWithThis, member, 
+                /* memberIsParameterProperty */ false);
             };
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
                 _loop_29(member);
             }
-            function checkClassMember(member, memberIsParameterProperty) {
-                var hasOverride = ts.hasOverrideModifier(member);
-                var hasStatic = ts.isStatic(member);
-                var isJs = ts.isInJSFile(member);
-                if (baseWithThis && (hasOverride || compilerOptions.noImplicitOverride)) {
-                    var declaredProp = member.name && getSymbolAtLocation(member.name) || getSymbolAtLocation(member);
-                    if (!declaredProp) {
-                        return;
-                    }
-                    var thisType = hasStatic ? staticType : typeWithThis;
-                    var baseType = hasStatic ? baseStaticType : baseWithThis;
-                    var prop = getPropertyOfType(thisType, declaredProp.escapedName);
-                    var baseProp = getPropertyOfType(baseType, declaredProp.escapedName);
-                    var baseClassName = typeToString(baseWithThis);
-                    if (prop && !baseProp && hasOverride) {
-                        var suggestion = getSuggestedSymbolForNonexistentClassMember(ts.symbolName(declaredProp), baseType);
+        }
+        /**
+         * @param member Existing member node to be checked.
+         * Note: `member` cannot be a synthetic node.
+         */
+        function checkExistingMemberForOverrideModifier(node, staticType, baseStaticType, baseWithThis, type, typeWithThis, member, memberIsParameterProperty, reportErrors) {
+            if (reportErrors === void 0) { reportErrors = true; }
+            var declaredProp = member.name
+                && getSymbolAtLocation(member.name)
+                || getSymbolAtLocation(member);
+            if (!declaredProp) {
+                return 0 /* Ok */;
+            }
+            return checkMemberForOverrideModifier(node, staticType, baseStaticType, baseWithThis, type, typeWithThis, ts.hasOverrideModifier(member), ts.hasAbstractModifier(member), ts.isStatic(member), memberIsParameterProperty, ts.symbolName(declaredProp), reportErrors ? member : undefined);
+        }
+        /**
+         * Checks a class member declaration for either a missing or an invalid `override` modifier.
+         * Note: this function can be used for speculative checking,
+         * i.e. checking a member that does not yet exist in the program.
+         * An example of that would be to call this function in a completions scenario,
+         * when offering a method declaration as completion.
+         * @param errorNode The node where we should report an error, or undefined if we should not report errors.
+         */
+        function checkMemberForOverrideModifier(node, staticType, baseStaticType, baseWithThis, type, typeWithThis, memberHasOverrideModifier, memberHasAbstractModifier, memberIsStatic, memberIsParameterProperty, memberName, errorNode) {
+            var isJs = ts.isInJSFile(node);
+            var nodeInAmbientContext = !!(node.flags & 8388608 /* Ambient */);
+            if (baseWithThis && (memberHasOverrideModifier || compilerOptions.noImplicitOverride)) {
+                var memberEscapedName = ts.escapeLeadingUnderscores(memberName);
+                var thisType = memberIsStatic ? staticType : typeWithThis;
+                var baseType = memberIsStatic ? baseStaticType : baseWithThis;
+                var prop = getPropertyOfType(thisType, memberEscapedName);
+                var baseProp = getPropertyOfType(baseType, memberEscapedName);
+                var baseClassName = typeToString(baseWithThis);
+                if (prop && !baseProp && memberHasOverrideModifier) {
+                    if (errorNode) {
+                        var suggestion = getSuggestedSymbolForNonexistentClassMember(memberName, baseType); // Again, using symbol name: note that's different from `symbol.escapedName`
                         suggestion ?
-                            error(member, isJs ?
+                            error(errorNode, isJs ?
                                 ts.Diagnostics.This_member_cannot_have_a_JSDoc_comment_with_an_override_tag_because_it_is_not_declared_in_the_base_class_0_Did_you_mean_1 :
                                 ts.Diagnostics.This_member_cannot_have_an_override_modifier_because_it_is_not_declared_in_the_base_class_0_Did_you_mean_1, baseClassName, symbolToString(suggestion)) :
-                            error(member, isJs ?
+                            error(errorNode, isJs ?
                                 ts.Diagnostics.This_member_cannot_have_a_JSDoc_comment_with_an_override_tag_because_it_is_not_declared_in_the_base_class_0 :
                                 ts.Diagnostics.This_member_cannot_have_an_override_modifier_because_it_is_not_declared_in_the_base_class_0, baseClassName);
                     }
-                    else if (prop && (baseProp === null || baseProp === void 0 ? void 0 : baseProp.declarations) && compilerOptions.noImplicitOverride && !nodeInAmbientContext) {
-                        var baseHasAbstract = ts.some(baseProp.declarations, ts.hasAbstractModifier);
-                        if (hasOverride) {
-                            return;
-                        }
-                        if (!baseHasAbstract) {
+                    return 2 /* HasInvalidOverride */;
+                }
+                else if (prop && (baseProp === null || baseProp === void 0 ? void 0 : baseProp.declarations) && compilerOptions.noImplicitOverride && !nodeInAmbientContext) {
+                    var baseHasAbstract = ts.some(baseProp.declarations, ts.hasAbstractModifier);
+                    if (memberHasOverrideModifier) {
+                        return 0 /* Ok */;
+                    }
+                    if (!baseHasAbstract) {
+                        if (errorNode) {
                             var diag = memberIsParameterProperty ?
                                 isJs ?
                                     ts.Diagnostics.This_parameter_property_must_have_a_JSDoc_comment_with_an_override_tag_because_it_overrides_a_member_in_the_base_class_0 :
@@ -81945,20 +82013,28 @@ var ts;
                                 isJs ?
                                     ts.Diagnostics.This_member_must_have_a_JSDoc_comment_with_an_override_tag_because_it_overrides_a_member_in_the_base_class_0 :
                                     ts.Diagnostics.This_member_must_have_an_override_modifier_because_it_overrides_a_member_in_the_base_class_0;
-                            error(member, diag, baseClassName);
+                            error(errorNode, diag, baseClassName);
                         }
-                        else if (ts.hasAbstractModifier(member) && baseHasAbstract) {
-                            error(member, ts.Diagnostics.This_member_must_have_an_override_modifier_because_it_overrides_an_abstract_method_that_is_declared_in_the_base_class_0, baseClassName);
+                        return 1 /* NeedsOverride */;
+                    }
+                    else if (memberHasAbstractModifier && baseHasAbstract) {
+                        if (errorNode) {
+                            error(errorNode, ts.Diagnostics.This_member_must_have_an_override_modifier_because_it_overrides_an_abstract_method_that_is_declared_in_the_base_class_0, baseClassName);
                         }
+                        return 1 /* NeedsOverride */;
                     }
                 }
-                else if (hasOverride) {
+            }
+            else if (memberHasOverrideModifier) {
+                if (errorNode) {
                     var className = typeToString(type);
-                    error(member, isJs ?
+                    error(errorNode, isJs ?
                         ts.Diagnostics.This_member_cannot_have_a_JSDoc_comment_with_an_override_tag_because_its_containing_class_0_does_not_extend_another_class :
                         ts.Diagnostics.This_member_cannot_have_an_override_modifier_because_its_containing_class_0_does_not_extend_another_class, className);
                 }
+                return 2 /* HasInvalidOverride */;
             }
+            return 0 /* Ok */;
         }
         function issueMemberSpecificError(node, typeWithThis, baseWithThis, broadDiag) {
             // iterate over all implemented properties and issue errors on each one which isn't compatible, rather than the class as a whole, if possible
@@ -82001,6 +82077,31 @@ var ts;
                 }
             }
         }
+        /**
+         * Checks a member declaration node to see if has a missing or invalid `override` modifier.
+         * @param node Class-like node where the member is declared.
+         * @param member Member declaration node.
+         * Note: `member` can be a synthetic node without a parent.
+         */
+        function getMemberOverrideModifierStatus(node, member) {
+            if (!member.name) {
+                return 0 /* Ok */;
+            }
+            var symbol = getSymbolOfNode(node);
+            var type = getDeclaredTypeOfSymbol(symbol);
+            var typeWithThis = getTypeWithThisArgument(type);
+            var staticType = getTypeOfSymbol(symbol);
+            var baseTypeNode = ts.getEffectiveBaseTypeNode(node);
+            var baseTypes = baseTypeNode && getBaseTypes(type);
+            var baseWithThis = (baseTypes === null || baseTypes === void 0 ? void 0 : baseTypes.length) ? getTypeWithThisArgument(ts.first(baseTypes), type.thisType) : undefined;
+            var baseStaticType = getBaseConstructorTypeOfClass(type);
+            var memberHasOverrideModifier = member.parent
+                ? ts.hasOverrideModifier(member)
+                : ts.hasSyntacticModifier(member, 16384 /* Override */);
+            var memberName = ts.unescapeLeadingUnderscores(ts.getTextOfPropertyName(member.name));
+            return checkMemberForOverrideModifier(node, staticType, baseStaticType, baseWithThis, type, typeWithThis, memberHasOverrideModifier, ts.hasAbstractModifier(member), ts.isStatic(member), 
+            /* memberIsParameterProperty */ false, memberName);
+        }
         function getTargetSymbol(s) {
             // if symbol is instantiated its flags are not copied from the 'target'
             // so we'll need to get back original 'target' symbol to work with correct set of flags
@@ -108305,7 +108406,14 @@ var ts;
             // clear the parenthesizer rule as we ascend
             currentParenthesizerRule = undefined;
         }
-        function pipelineEmitWithHintWorker(hint, node) {
+        function pipelineEmitWithHintWorker(hint, node, allowSnippets) {
+            if (allowSnippets === void 0) { allowSnippets = true; }
+            if (allowSnippets) {
+                var snippet = ts.getSnippetElement(node);
+                if (snippet) {
+                    return emitSnippetNode(hint, node, snippet);
+                }
+            }
             if (hint === 0 /* SourceFile */)
                 return emitSourceFile(ts.cast(node, ts.isSourceFile));
             if (hint === 2 /* IdentifierName */)
@@ -108914,6 +109022,28 @@ var ts;
             }
         }
         //
+        // Snippet Elements
+        //
+        function emitSnippetNode(hint, node, snippet) {
+            switch (snippet.kind) {
+                case 1 /* Placeholder */:
+                    emitPlaceholder(hint, node, snippet);
+                    break;
+                case 0 /* TabStop */:
+                    emitTabStop(snippet);
+                    break;
+            }
+        }
+        function emitPlaceholder(hint, node, snippet) {
+            nonEscapingWrite("${" + snippet.order + ":"); // `${2:`
+            pipelineEmitWithHintWorker(hint, node, /*allowSnippets*/ false); // `...`
+            nonEscapingWrite("}"); // `}`
+            // `${2:...}`
+        }
+        function emitTabStop(snippet) {
+            nonEscapingWrite("$" + snippet.order);
+        }
+        //
         // Identifiers
         //
         function emitIdentifier(node) {
@@ -111152,6 +111282,15 @@ var ts;
         function writeProperty(s) {
             writer.writeProperty(s);
         }
+        function nonEscapingWrite(s) {
+            // This should be defined in a snippet-escaping text writer.
+            if (writer.nonEscapingWrite) {
+                writer.nonEscapingWrite(s);
+            }
+            else {
+                writer.write(s);
+            }
+        }
         function writeLine(count) {
             if (count === void 0) { count = 1; }
             for (var i = 0; i < count; i++) {
@@ -126177,6 +126316,10 @@ var ts;
         return decisionFromFile !== null && decisionFromFile !== void 0 ? decisionFromFile : program.usesUriStyleNodeCoreModules;
     }
     ts.shouldUseUriStyleNodeCoreModules = shouldUseUriStyleNodeCoreModules;
+    function getNewLineKind(newLineCharacter) {
+        return newLineCharacter === "\n" ? 1 /* LineFeed */ : 0 /* CarriageReturnLineFeed */;
+    }
+    ts.getNewLineKind = getNewLineKind;
     // #endregion
 })(ts || (ts = {}));
 /*@internal*/
@@ -127774,7 +127917,7 @@ var ts;
     (function (Completions) {
         var StringCompletions;
         (function (StringCompletions) {
-            function getStringLiteralCompletions(sourceFile, position, contextToken, checker, options, host, log, preferences) {
+            function getStringLiteralCompletions(sourceFile, position, contextToken, options, host, program, log, preferences) {
                 if (ts.isInReferenceComment(sourceFile, position)) {
                     var entries = getTripleSlashReferenceCompletion(sourceFile, position, options, host);
                     return entries && convertPathCompletions(entries);
@@ -127782,12 +127925,12 @@ var ts;
                 if (ts.isInString(sourceFile, position, contextToken)) {
                     if (!contextToken || !ts.isStringLiteralLike(contextToken))
                         return undefined;
-                    var entries = getStringLiteralCompletionEntries(sourceFile, contextToken, position, checker, options, host, preferences);
-                    return convertStringLiteralCompletions(entries, contextToken, sourceFile, checker, log, options, preferences);
+                    var entries = getStringLiteralCompletionEntries(sourceFile, contextToken, position, program.getTypeChecker(), options, host, preferences);
+                    return convertStringLiteralCompletions(entries, contextToken, sourceFile, host, program, log, options, preferences);
                 }
             }
             StringCompletions.getStringLiteralCompletions = getStringLiteralCompletions;
-            function convertStringLiteralCompletions(completion, contextToken, sourceFile, checker, log, options, preferences) {
+            function convertStringLiteralCompletions(completion, contextToken, sourceFile, host, program, log, options, preferences) {
                 if (completion === undefined) {
                     return undefined;
                 }
@@ -127797,7 +127940,7 @@ var ts;
                         return convertPathCompletions(completion.paths);
                     case 1 /* Properties */: {
                         var entries = [];
-                        Completions.getCompletionEntriesFromSymbols(completion.symbols, entries, contextToken, contextToken, sourceFile, sourceFile, checker, 99 /* ESNext */, log, 4 /* String */, preferences, options); // Target will not be used, so arbitrary
+                        Completions.getCompletionEntriesFromSymbols(completion.symbols, entries, contextToken, contextToken, sourceFile, sourceFile, host, program, 99 /* ESNext */, log, 4 /* String */, preferences, options); // Target will not be used, so arbitrary
                         return { isGlobalCompletion: false, isMemberCompletion: true, isNewIdentifierLocation: completion.hasIndexSignature, optionalReplacementSpan: optionalReplacementSpan, entries: entries };
                     }
                     case 2 /* Types */: {
@@ -128631,7 +128774,6 @@ var ts;
             }
             // If the request is a continuation of an earlier `isIncomplete` response,
             // we can continue it from the cached previous response.
-            var typeChecker = program.getTypeChecker();
             var compilerOptions = program.getCompilerOptions();
             var incompleteCompletionsCache = preferences.allowIncompleteCompletions ? (_a = host.getIncompleteCompletionsCache) === null || _a === void 0 ? void 0 : _a.call(host) : undefined;
             if (incompleteCompletionsCache && completionKind === 3 /* TriggerForIncompleteCompletions */ && previousToken && ts.isIdentifier(previousToken)) {
@@ -128643,7 +128785,7 @@ var ts;
             else {
                 incompleteCompletionsCache === null || incompleteCompletionsCache === void 0 ? void 0 : incompleteCompletionsCache.clear();
             }
-            var stringCompletions = Completions.StringCompletions.getStringLiteralCompletions(sourceFile, position, previousToken, typeChecker, compilerOptions, host, log, preferences);
+            var stringCompletions = Completions.StringCompletions.getStringLiteralCompletions(sourceFile, position, previousToken, compilerOptions, host, program, log, preferences);
             if (stringCompletions) {
                 return stringCompletions;
             }
@@ -128657,7 +128799,7 @@ var ts;
             }
             switch (completionData.kind) {
                 case 0 /* Data */:
-                    var response = completionInfoFromData(sourceFile, typeChecker, compilerOptions, log, completionData, preferences);
+                    var response = completionInfoFromData(sourceFile, host, program, compilerOptions, log, completionData, preferences);
                     if (response === null || response === void 0 ? void 0 : response.isIncomplete) {
                         incompleteCompletionsCache === null || incompleteCompletionsCache === void 0 ? void 0 : incompleteCompletionsCache.set(response);
                     }
@@ -128754,7 +128896,7 @@ var ts;
             // StringLiteralLike locations are handled separately in stringCompletions.ts
             return (location === null || location === void 0 ? void 0 : location.kind) === 79 /* Identifier */ ? ts.createTextSpanFromNode(location) : undefined;
         }
-        function completionInfoFromData(sourceFile, typeChecker, compilerOptions, log, completionData, preferences) {
+        function completionInfoFromData(sourceFile, host, program, compilerOptions, log, completionData, preferences) {
             var symbols = completionData.symbols, contextToken = completionData.contextToken, completionKind = completionData.completionKind, isInSnippetScope = completionData.isInSnippetScope, isNewIdentifierLocation = completionData.isNewIdentifierLocation, location = completionData.location, propertyAccessToConvert = completionData.propertyAccessToConvert, keywordFilters = completionData.keywordFilters, literals = completionData.literals, symbolToOriginInfoMap = completionData.symbolToOriginInfoMap, recommendedCompletion = completionData.recommendedCompletion, isJsxInitializer = completionData.isJsxInitializer, isTypeOnlyLocation = completionData.isTypeOnlyLocation, isJsxIdentifierExpected = completionData.isJsxIdentifierExpected, importCompletionNode = completionData.importCompletionNode, insideJsDocTagTypeExpression = completionData.insideJsDocTagTypeExpression, symbolToSortTextIdMap = completionData.symbolToSortTextIdMap, hasUnresolvedAutoImports = completionData.hasUnresolvedAutoImports;
             // Verify if the file is JSX language variant
             if (ts.getLanguageVariant(sourceFile.scriptKind) === 1 /* JSX */) {
@@ -128766,7 +128908,7 @@ var ts;
             var entries = [];
             if (isUncheckedFile(sourceFile, compilerOptions)) {
                 var uniqueNames = getCompletionEntriesFromSymbols(symbols, entries, 
-                /*replacementToken*/ undefined, contextToken, location, sourceFile, typeChecker, ts.getEmitScriptTarget(compilerOptions), log, completionKind, preferences, compilerOptions, isTypeOnlyLocation, propertyAccessToConvert, isJsxIdentifierExpected, isJsxInitializer, importCompletionNode, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextIdMap);
+                /*replacementToken*/ undefined, contextToken, location, sourceFile, host, program, ts.getEmitScriptTarget(compilerOptions), log, completionKind, preferences, compilerOptions, isTypeOnlyLocation, propertyAccessToConvert, isJsxIdentifierExpected, isJsxInitializer, importCompletionNode, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextIdMap);
                 getJSCompletionEntries(sourceFile, location.pos, uniqueNames, ts.getEmitScriptTarget(compilerOptions), entries); // TODO: GH#18217
             }
             else {
@@ -128774,7 +128916,7 @@ var ts;
                     return undefined;
                 }
                 getCompletionEntriesFromSymbols(symbols, entries, 
-                /*replacementToken*/ undefined, contextToken, location, sourceFile, typeChecker, ts.getEmitScriptTarget(compilerOptions), log, completionKind, preferences, compilerOptions, isTypeOnlyLocation, propertyAccessToConvert, isJsxIdentifierExpected, isJsxInitializer, importCompletionNode, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextIdMap);
+                /*replacementToken*/ undefined, contextToken, location, sourceFile, host, program, ts.getEmitScriptTarget(compilerOptions), log, completionKind, preferences, compilerOptions, isTypeOnlyLocation, propertyAccessToConvert, isJsxIdentifierExpected, isJsxInitializer, importCompletionNode, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextIdMap);
             }
             if (keywordFilters !== 0 /* None */) {
                 var entryNames = new ts.Set(entries.map(function (e) { return e.name; }));
@@ -128880,14 +129022,15 @@ var ts;
         function createCompletionEntryForLiteral(sourceFile, preferences, literal) {
             return { name: completionNameForLiteral(sourceFile, preferences, literal), kind: "string" /* string */, kindModifiers: "" /* none */, sortText: SortText.LocationPriority };
         }
-        function createCompletionEntry(symbol, sortText, replacementToken, contextToken, location, sourceFile, typeChecker, name, needsConvertPropertyAccess, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, importCompletionNode, useSemicolons, options, preferences) {
-            var _a;
+        function createCompletionEntry(symbol, sortText, replacementToken, contextToken, location, sourceFile, host, program, name, needsConvertPropertyAccess, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, importCompletionNode, useSemicolons, options, preferences, completionKind) {
+            var _a, _b;
             var insertText;
             var replacementSpan = ts.getReplacementSpanForContextToken(replacementToken);
             var data;
             var isSnippet;
             var sourceDisplay;
             var hasAction;
+            var typeChecker = program.getTypeChecker();
             var insertQuestionDot = origin && originIsNullableMember(origin);
             var useBraces = origin && originIsSymbolMember(origin) || needsConvertPropertyAccess;
             if (origin && originIsThisType(origin)) {
@@ -128938,12 +129081,11 @@ var ts;
                     isSnippet = preferences.includeCompletionsWithSnippetText ? true : undefined;
                 }
             }
-            if (insertText !== undefined && !preferences.includeCompletionsWithInsertText) {
-                return undefined;
-            }
-            if (originIsExport(origin) || originIsResolvedExport(origin)) {
-                data = originToCompletionEntryData(origin);
-                hasAction = !importCompletionNode;
+            if (preferences.includeCompletionsWithClassMemberSnippets &&
+                preferences.includeCompletionsWithInsertText &&
+                completionKind === 3 /* MemberLike */ &&
+                isClassLikeMemberCompletion(symbol, location)) {
+                (_b = getEntryForMemberCompletion(host, program, options, preferences, name, symbol, location, contextToken), insertText = _b.insertText, isSnippet = _b.isSnippet);
             }
             var kind = ts.SymbolDisplay.getSymbolKind(typeChecker, symbol, location);
             if (kind === "JSX attribute" /* jsxAttribute */ && preferences.includeCompletionsWithSnippetText && preferences.jsxAttributeCompletionStyle && preferences.jsxAttributeCompletionStyle !== "none") {
@@ -128955,7 +129097,7 @@ var ts;
                     && !(type.flags & 1048576 /* Union */ && ts.find(type.types, function (type) { return !!(type.flags & 528 /* BooleanLike */); }))) {
                     if (type.flags & 402653316 /* StringLike */ || (type.flags & 1048576 /* Union */ && ts.every(type.types, function (type) { return !!(type.flags & (402653316 /* StringLike */ | 32768 /* Undefined */)); }))) {
                         // If is string like or undefined use quotes
-                        insertText = escapeSnippetText(name) + "=" + ts.quote(sourceFile, preferences, "$1");
+                        insertText = ts.escapeSnippetText(name) + "=" + ts.quote(sourceFile, preferences, "$1");
                         isSnippet = true;
                     }
                     else {
@@ -128964,13 +129106,20 @@ var ts;
                     }
                 }
                 if (useBraces_1) {
-                    insertText = escapeSnippetText(name) + "={$1}";
+                    insertText = ts.escapeSnippetText(name) + "={$1}";
                     isSnippet = true;
                 }
                 if (isSnippet) {
                     replacementSpan = ts.createTextSpanFromNode(location, sourceFile);
                 }
             }
+            if (insertText !== undefined && !preferences.includeCompletionsWithInsertText) {
+                return undefined;
+            }
+            if (originIsExport(origin) || originIsResolvedExport(origin)) {
+                data = originToCompletionEntryData(origin);
+                hasAction = !importCompletionNode;
+            }
             // TODO(drosen): Right now we just permit *all* semantic meanings when calling
             // 'getSymbolKind' which is permissible given that it is backwards compatible; but
             // really we should consider passing the meaning for the node so that we don't report
@@ -128995,8 +129144,203 @@ var ts;
                 data: data,
             };
         }
-        function escapeSnippetText(text) {
-            return text.replace(/\$/gm, "\\$");
+        function isClassLikeMemberCompletion(symbol, location) {
+            // TODO: support JS files.
+            if (ts.isInJSFile(location)) {
+                return false;
+            }
+            // Completion symbol must be for a class member.
+            var memberFlags = 106500 /* ClassMember */
+                & 900095 /* EnumMemberExcludes */;
+            /* In
+            `class C {
+                |
+            }`
+            `location` is a class-like declaration.
+            In
+            `class C {
+                m|
+            }`
+            `location` is an identifier,
+            `location.parent` is a class element declaration,
+            and `location.parent.parent` is a class-like declaration.
+            In
+            `abstract class C {
+                abstract
+                abstract m|
+            }`
+            `location` is a syntax list (with modifiers as children),
+            and `location.parent` is a class-like declaration.
+            */
+            return !!(symbol.flags & memberFlags) &&
+                (ts.isClassLike(location) ||
+                    (location.parent &&
+                        location.parent.parent &&
+                        ts.isClassElement(location.parent) &&
+                        location === location.parent.name &&
+                        ts.isClassLike(location.parent.parent)) ||
+                    (location.parent &&
+                        ts.isSyntaxList(location) &&
+                        ts.isClassLike(location.parent)));
+        }
+        function getEntryForMemberCompletion(host, program, options, preferences, name, symbol, location, contextToken) {
+            var classLikeDeclaration = ts.findAncestor(location, ts.isClassLike);
+            if (!classLikeDeclaration) {
+                return { insertText: name };
+            }
+            var isSnippet;
+            var insertText = name;
+            var checker = program.getTypeChecker();
+            var sourceFile = location.getSourceFile();
+            var printer = createSnippetPrinter({
+                removeComments: true,
+                module: options.module,
+                target: options.target,
+                omitTrailingSemicolon: true,
+                newLine: ts.getNewLineKind(ts.getNewLineCharacter(options, ts.maybeBind(host, host.getNewLine))),
+            });
+            var importAdder = ts.codefix.createImportAdder(sourceFile, program, preferences, host);
+            var body;
+            var tabstopStart = 1;
+            if (preferences.includeCompletionsWithSnippetText) {
+                isSnippet = true;
+                // We are adding a final tabstop (i.e. $0) in the body of the suggested member, if it has one.
+                // Note: this assumes we won't have more than one body in the completion nodes, which should be the case.
+                var emptyStatement1 = ts.factory.createExpressionStatement(ts.factory.createIdentifier(""));
+                ts.setSnippetElement(emptyStatement1, { kind: 0 /* TabStop */, order: 1 });
+                tabstopStart = 2;
+                body = ts.factory.createBlock([emptyStatement1], /* multiline */ true);
+            }
+            else {
+                body = ts.factory.createBlock([], /* multiline */ true);
+            }
+            var modifiers = 0 /* None */;
+            // Whether the suggested member should be abstract.
+            // e.g. in `abstract class C { abstract | }`, we should offer abstract method signatures at position `|`.
+            // Note: We are relying on checking if the context token is `abstract`,
+            // since other visibility modifiers (e.g. `protected`) should come *before* `abstract`.
+            // However, that is not true for the e.g. `override` modifier, so this check has its limitations.
+            var isAbstract = contextToken && isModifierLike(contextToken) === 126 /* AbstractKeyword */;
+            var completionNodes = [];
+            ts.codefix.addNewNodeForMemberSymbol(symbol, classLikeDeclaration, sourceFile, { program: program, host: host }, preferences, importAdder, 
+            // `addNewNodeForMemberSymbol` calls this callback function for each new member node
+            // it adds for the given member symbol.
+            // We store these member nodes in the `completionNodes` array.
+            // Note: there might be:
+            //  - No nodes if `addNewNodeForMemberSymbol` cannot figure out a node for the member;
+            //  - One node;
+            //  - More than one node if the member is overloaded (e.g. a method with overload signatures).
+            function (node) {
+                var requiredModifiers = 0 /* None */;
+                if (isAbstract) {
+                    requiredModifiers |= 128 /* Abstract */;
+                }
+                if (ts.isClassElement(node)
+                    && checker.getMemberOverrideModifierStatus(classLikeDeclaration, node) === 1 /* NeedsOverride */) {
+                    requiredModifiers |= 16384 /* Override */;
+                }
+                var presentModifiers = 0 /* None */;
+                if (!completionNodes.length) {
+                    // Omit already present modifiers from the first completion node/signature.
+                    if (contextToken) {
+                        presentModifiers = getPresentModifiers(contextToken);
+                    }
+                    // Keep track of added missing required modifiers and modifiers already present.
+                    // This is needed when we have overloaded signatures,
+                    // so this callback will be called for multiple nodes/signatures,
+                    // and we need to make sure the modifiers are uniform for all nodes/signatures.
+                    modifiers = node.modifierFlagsCache | requiredModifiers | presentModifiers;
+                }
+                node = ts.factory.updateModifiers(node, modifiers & (~presentModifiers));
+                completionNodes.push(node);
+            }, body, isAbstract);
+            if (completionNodes.length) {
+                if (preferences.includeCompletionsWithSnippetText) {
+                    addSnippets(completionNodes, tabstopStart);
+                }
+                insertText = printer.printSnippetList(1 /* MultiLine */, ts.factory.createNodeArray(completionNodes), sourceFile);
+            }
+            return { insertText: insertText, isSnippet: isSnippet };
+        }
+        function getPresentModifiers(contextToken) {
+            var modifiers = 0 /* None */;
+            var contextMod;
+            /*
+            Cases supported:
+            In
+            `class C {
+                public abstract |
+            }`
+            `contextToken` is ``abstract`` (as an identifier),
+            `contextToken.parent` is property declaration,
+            `location` is class declaration ``class C { ... }``.
+            In
+            `class C {
+                protected override m|
+            }`
+                `contextToken` is ``override`` (as a keyword),
+            `contextToken.parent` is property declaration,
+            `location` is identifier ``m``,
+            `location.parent` is property declaration ``protected override m``,
+            `location.parent.parent` is class declaration ``class C { ... }``.
+            */
+            if (contextMod = isModifierLike(contextToken)) {
+                modifiers |= ts.modifierToFlag(contextMod);
+            }
+            if (ts.isPropertyDeclaration(contextToken.parent)) {
+                modifiers |= ts.modifiersToFlags(contextToken.parent.modifiers);
+            }
+            return modifiers;
+        }
+        function isModifierLike(node) {
+            if (ts.isModifier(node)) {
+                return node.kind;
+            }
+            if (ts.isIdentifier(node) && node.originalKeywordKind && ts.isModifierKind(node.originalKeywordKind)) {
+                return node.originalKeywordKind;
+            }
+            return undefined;
+        }
+        function addSnippets(nodes, orderStart) {
+            var order = orderStart;
+            for (var _i = 0, nodes_1 = nodes; _i < nodes_1.length; _i++) {
+                var node = nodes_1[_i];
+                addSnippetsWorker(node, /*parent*/ undefined);
+            }
+            function addSnippetsWorker(node, parent) {
+                if (ts.isVariableLike(node) && node.kind === 163 /* Parameter */) {
+                    // Placeholder
+                    ts.setSnippetElement(node.name, { kind: 1 /* Placeholder */, order: order });
+                    order += 1;
+                    if (node.type) {
+                        ts.setSnippetElement(node.type, { kind: 1 /* Placeholder */, order: order });
+                        order += 1;
+                    }
+                }
+                else if (ts.isTypeNode(node) && parent && ts.isFunctionLikeDeclaration(parent)) {
+                    ts.setSnippetElement(node, { kind: 1 /* Placeholder */, order: order });
+                    order += 1;
+                }
+                else if (ts.isTypeParameterDeclaration(node) && parent && ts.isFunctionLikeDeclaration(parent)) {
+                    ts.setSnippetElement(node, { kind: 1 /* Placeholder */, order: order });
+                    order += 1;
+                }
+                ts.forEachChild(node, function (child) { return addSnippetsWorker(child, node); });
+            }
+        }
+        function createSnippetPrinter(printerOptions) {
+            var printer = ts.createPrinter(printerOptions);
+            var baseWriter = ts.createTextWriter(ts.getNewLineCharacter(printerOptions));
+            var writer = __assign(__assign({}, baseWriter), { write: function (s) { return baseWriter.write(ts.escapeSnippetText(s)); }, nonEscapingWrite: baseWriter.write, writeLiteral: function (s) { return baseWriter.writeLiteral(ts.escapeSnippetText(s)); }, writeStringLiteral: function (s) { return baseWriter.writeStringLiteral(ts.escapeSnippetText(s)); }, writeSymbol: function (s, symbol) { return baseWriter.writeSymbol(ts.escapeSnippetText(s), symbol); }, writeParameter: function (s) { return baseWriter.writeParameter(ts.escapeSnippetText(s)); }, writeComment: function (s) { return baseWriter.writeComment(ts.escapeSnippetText(s)); }, writeProperty: function (s) { return baseWriter.writeProperty(ts.escapeSnippetText(s)); } });
+            return {
+                printSnippetList: printSnippetList,
+            };
+            /* Snippet-escaping version of `printer.printList`. */
+            function printSnippetList(format, list, sourceFile) {
+                writer.clear();
+                printer.writeList(format, list, sourceFile, writer);
+                return writer.getText();
+            }
         }
         function originToCompletionEntryData(origin) {
             var ambientModuleName = origin.fileName ? undefined : ts.stripQuotes(origin.moduleSymbol.name);
@@ -129064,10 +129408,10 @@ var ts;
             var importSpecifierTypeOnlyText = isImportSpecifierTypeOnly ? ts.tokenToString(151 /* TypeKeyword */) + " " : "";
             var suffix = useSemicolons ? ";" : "";
             switch (importKind) {
-                case 3 /* CommonJS */: return { replacementSpan: replacementSpan, insertText: "import" + topLevelTypeOnlyText + escapeSnippetText(name) + tabStop + " = require(" + quotedModuleSpecifier + ")" + suffix };
-                case 1 /* Default */: return { replacementSpan: replacementSpan, insertText: "import" + topLevelTypeOnlyText + escapeSnippetText(name) + tabStop + " from " + quotedModuleSpecifier + suffix };
-                case 2 /* Namespace */: return { replacementSpan: replacementSpan, insertText: "import" + topLevelTypeOnlyText + "* as " + escapeSnippetText(name) + " from " + quotedModuleSpecifier + suffix };
-                case 0 /* Named */: return { replacementSpan: replacementSpan, insertText: "import" + topLevelTypeOnlyText + "{ " + importSpecifierTypeOnlyText + escapeSnippetText(name) + tabStop + " } from " + quotedModuleSpecifier + suffix };
+                case 3 /* CommonJS */: return { replacementSpan: replacementSpan, insertText: "import" + topLevelTypeOnlyText + ts.escapeSnippetText(name) + tabStop + " = require(" + quotedModuleSpecifier + ")" + suffix };
+                case 1 /* Default */: return { replacementSpan: replacementSpan, insertText: "import" + topLevelTypeOnlyText + ts.escapeSnippetText(name) + tabStop + " from " + quotedModuleSpecifier + suffix };
+                case 2 /* Namespace */: return { replacementSpan: replacementSpan, insertText: "import" + topLevelTypeOnlyText + "* as " + ts.escapeSnippetText(name) + " from " + quotedModuleSpecifier + suffix };
+                case 0 /* Named */: return { replacementSpan: replacementSpan, insertText: "import" + topLevelTypeOnlyText + "{ " + importSpecifierTypeOnlyText + ts.escapeSnippetText(name) + tabStop + " } from " + quotedModuleSpecifier + suffix };
             }
         }
         function quotePropertyName(sourceFile, preferences, name) {
@@ -129091,11 +129435,12 @@ var ts;
                 return CompletionSource.ThisProperty;
             }
         }
-        function getCompletionEntriesFromSymbols(symbols, entries, replacementToken, contextToken, location, sourceFile, typeChecker, target, log, kind, preferences, compilerOptions, isTypeOnlyLocation, propertyAccessToConvert, jsxIdentifierExpected, isJsxInitializer, importCompletionNode, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextIdMap) {
+        function getCompletionEntriesFromSymbols(symbols, entries, replacementToken, contextToken, location, sourceFile, host, program, target, log, kind, preferences, compilerOptions, isTypeOnlyLocation, propertyAccessToConvert, jsxIdentifierExpected, isJsxInitializer, importCompletionNode, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextIdMap) {
             var _a;
             var start = ts.timestamp();
             var variableDeclaration = getVariableDeclaration(location);
             var useSemicolons = ts.probablyUsesSemicolons(sourceFile);
+            var typeChecker = program.getTypeChecker();
             // Tracks unique names.
             // Value is set to false for global variables or completions from external module exports, because we can have multiple of those;
             // true otherwise. Based on the order we add things we will always see locals first, then globals, then module exports.
@@ -129111,7 +129456,7 @@ var ts;
                 var name = info.name, needsConvertPropertyAccess = info.needsConvertPropertyAccess;
                 var sortTextId = (_a = symbolToSortTextIdMap === null || symbolToSortTextIdMap === void 0 ? void 0 : symbolToSortTextIdMap[ts.getSymbolId(symbol)]) !== null && _a !== void 0 ? _a : 11 /* LocationPriority */;
                 var sortText = (isDeprecated(symbol, typeChecker) ? 8 /* DeprecatedOffset */ + sortTextId : sortTextId).toString();
-                var entry = createCompletionEntry(symbol, sortText, replacementToken, contextToken, location, sourceFile, typeChecker, name, needsConvertPropertyAccess, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, importCompletionNode, useSemicolons, compilerOptions, preferences);
+                var entry = createCompletionEntry(symbol, sortText, replacementToken, contextToken, location, sourceFile, host, program, name, needsConvertPropertyAccess, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, importCompletionNode, useSemicolons, compilerOptions, preferences, kind);
                 if (!entry) {
                     continue;
                 }
@@ -144503,8 +144848,8 @@ var ts;
             ChangeTracker.prototype.deleteNodes = function (sourceFile, nodes, options, hasTrailingComment) {
                 if (options === void 0) { options = { leadingTriviaOption: LeadingTriviaOption.IncludeAll }; }
                 // When deleting multiple nodes we need to track if the end position is including multiline trailing comments.
-                for (var _i = 0, nodes_1 = nodes; _i < nodes_1.length; _i++) {
-                    var node = nodes_1[_i];
+                for (var _i = 0, nodes_2 = nodes; _i < nodes_2.length; _i++) {
+                    var node = nodes_2[_i];
                     var pos = getAdjustedStartPosition(sourceFile, node, options, hasTrailingComment);
                     var end = getAdjustedEndPosition(sourceFile, node, options);
                     this.deleteRange(sourceFile, { pos: pos, end: end });
@@ -145144,7 +145489,7 @@ var ts;
             /** Note: output node may be mutated input node. */
             function getNonformattedText(node, sourceFile, newLineCharacter) {
                 var writer = createWriter(newLineCharacter);
-                var newLine = newLineCharacter === "\n" ? 1 /* LineFeed */ : 0 /* CarriageReturnLineFeed */;
+                var newLine = ts.getNewLineKind(newLineCharacter);
                 ts.createPrinter({
                     newLine: newLine,
                     neverAsciiEscape: true,
@@ -152745,7 +153090,7 @@ var ts;
             for (var _i = 0, possiblyMissingSymbols_1 = possiblyMissingSymbols; _i < possiblyMissingSymbols_1.length; _i++) {
                 var symbol = possiblyMissingSymbols_1[_i];
                 if (!classMembers.has(symbol.escapedName)) {
-                    addNewNodeForMemberSymbol(symbol, classDeclaration, sourceFile, context, preferences, importAdder, addClassElement);
+                    addNewNodeForMemberSymbol(symbol, classDeclaration, sourceFile, context, preferences, importAdder, addClassElement, /* body */ undefined);
                 }
             }
         }
@@ -152758,9 +153103,11 @@ var ts;
         }
         codefix.getNoopSymbolTrackerWithResolver = getNoopSymbolTrackerWithResolver;
         /**
-         * @returns Empty string iff there we can't figure out a representation for `symbol` in `enclosingDeclaration`.
+         * `addClassElement` will not be called if we can't figure out a representation for `symbol` in `enclosingDeclaration`.
+         * @param body If defined, this will be the body of the member node passed to `addClassElement`. Otherwise, the body will default to a stub.
          */
-        function addNewNodeForMemberSymbol(symbol, enclosingDeclaration, sourceFile, context, preferences, importAdder, addClassElement) {
+        function addNewNodeForMemberSymbol(symbol, enclosingDeclaration, sourceFile, context, preferences, importAdder, addClassElement, body, isAmbient) {
+            if (isAmbient === void 0) { isAmbient = false; }
             var declarations = symbol.getDeclarations();
             if (!(declarations && declarations.length)) {
                 return undefined;
@@ -152773,7 +153120,7 @@ var ts;
             var modifiers = visibilityModifier ? ts.factory.createNodeArray([visibilityModifier]) : undefined;
             var type = checker.getWidenedType(checker.getTypeOfSymbolAtLocation(symbol, enclosingDeclaration));
             var optional = !!(symbol.flags & 16777216 /* Optional */);
-            var ambient = !!(enclosingDeclaration.flags & 8388608 /* Ambient */);
+            var ambient = !!(enclosingDeclaration.flags & 8388608 /* Ambient */) || isAmbient;
             var quotePreference = ts.getQuotePreference(sourceFile, preferences);
             switch (declaration.kind) {
                 case 165 /* PropertySignature */:
@@ -152809,14 +153156,14 @@ var ts;
                         var accessor = orderedAccessors_1[_i];
                         if (ts.isGetAccessorDeclaration(accessor)) {
                             addClassElement(ts.factory.createGetAccessorDeclaration(
-                            /*decorators*/ undefined, modifiers, name, ts.emptyArray, typeNode_1, ambient ? undefined : createStubbedMethodBody(quotePreference)));
+                            /*decorators*/ undefined, modifiers, name, ts.emptyArray, typeNode_1, ambient ? undefined : body || createStubbedMethodBody(quotePreference)));
                         }
                         else {
                             ts.Debug.assertNode(accessor, ts.isSetAccessorDeclaration, "The counterpart to a getter should be a setter");
                             var parameter = ts.getSetAccessorValueParameter(accessor);
                             var parameterName = parameter && ts.isIdentifier(parameter.name) ? ts.idText(parameter.name) : undefined;
                             addClassElement(ts.factory.createSetAccessorDeclaration(
-                            /*decorators*/ undefined, modifiers, name, createDummyParameters(1, [parameterName], [typeNode_1], 1, /*inJs*/ false), ambient ? undefined : createStubbedMethodBody(quotePreference)));
+                            /*decorators*/ undefined, modifiers, name, createDummyParameters(1, [parameterName], [typeNode_1], 1, /*inJs*/ false), ambient ? undefined : body || createStubbedMethodBody(quotePreference)));
                         }
                     }
                     break;
@@ -152837,7 +153184,7 @@ var ts;
                     if (declarations.length === 1) {
                         ts.Debug.assert(signatures.length === 1, "One declaration implies one signature");
                         var signature = signatures[0];
-                        outputMethod(quotePreference, signature, modifiers, name, ambient ? undefined : createStubbedMethodBody(quotePreference));
+                        outputMethod(quotePreference, signature, modifiers, name, ambient ? undefined : body || createStubbedMethodBody(quotePreference));
                         break;
                     }
                     for (var _a = 0, signatures_1 = signatures; _a < signatures_1.length; _a++) {
@@ -152848,11 +153195,11 @@ var ts;
                     if (!ambient) {
                         if (declarations.length > signatures.length) {
                             var signature = checker.getSignatureFromDeclaration(declarations[declarations.length - 1]);
-                            outputMethod(quotePreference, signature, modifiers, name, createStubbedMethodBody(quotePreference));
+                            outputMethod(quotePreference, signature, modifiers, name, body || createStubbedMethodBody(quotePreference));
                         }
                         else {
                             ts.Debug.assert(declarations.length === signatures.length, "Declarations and signatures should match count");
-                            addClassElement(createMethodImplementingSignatures(checker, context, enclosingDeclaration, signatures, name, optional, modifiers, quotePreference));
+                            addClassElement(createMethodImplementingSignatures(checker, context, enclosingDeclaration, signatures, name, optional, modifiers, quotePreference, body));
                         }
                     }
                     break;
@@ -152863,6 +153210,7 @@ var ts;
                     addClassElement(method);
             }
         }
+        codefix.addNewNodeForMemberSymbol = addNewNodeForMemberSymbol;
         function createSignatureDeclarationFromSignature(kind, context, quotePreference, signature, body, name, modifiers, optional, enclosingDeclaration, importAdder) {
             var program = context.program;
             var checker = program.getTypeChecker();
@@ -153000,7 +153348,7 @@ var ts;
             }
             return parameters;
         }
-        function createMethodImplementingSignatures(checker, context, enclosingDeclaration, signatures, name, optional, modifiers, quotePreference) {
+        function createMethodImplementingSignatures(checker, context, enclosingDeclaration, signatures, name, optional, modifiers, quotePreference, body) {
             /** This is *a* signature with the maximal number of arguments,
              * such that if there is a "maximal" signature without rest arguments,
              * this is one of them.
@@ -153031,7 +153379,7 @@ var ts;
                 parameters.push(restParameter);
             }
             return createStubbedMethod(modifiers, name, optional, 
-            /*typeParameters*/ undefined, parameters, getReturnTypeFromSignatures(signatures, checker, context, enclosingDeclaration), quotePreference);
+            /*typeParameters*/ undefined, parameters, getReturnTypeFromSignatures(signatures, checker, context, enclosingDeclaration), quotePreference, body);
         }
         function getReturnTypeFromSignatures(signatures, checker, context, enclosingDeclaration) {
             if (ts.length(signatures)) {
@@ -153039,10 +153387,10 @@ var ts;
                 return checker.typeToTypeNode(type, enclosingDeclaration, /*flags*/ undefined, getNoopSymbolTrackerWithResolver(context));
             }
         }
-        function createStubbedMethod(modifiers, name, optional, typeParameters, parameters, returnType, quotePreference) {
+        function createStubbedMethod(modifiers, name, optional, typeParameters, parameters, returnType, quotePreference, body) {
             return ts.factory.createMethodDeclaration(
             /*decorators*/ undefined, modifiers, 
-            /*asteriskToken*/ undefined, name, optional ? ts.factory.createToken(57 /* QuestionToken */) : undefined, typeParameters, parameters, returnType, createStubbedMethodBody(quotePreference));
+            /*asteriskToken*/ undefined, name, optional ? ts.factory.createToken(57 /* QuestionToken */) : undefined, typeParameters, parameters, returnType, body || createStubbedMethodBody(quotePreference));
         }
         function createStubbedMethodBody(quotePreference) {
             return createStubbedBody(ts.Diagnostics.Method_not_implemented.message, quotePreference);
@@ -159053,8 +159401,8 @@ var ts;
         var list = createNode(346 /* SyntaxList */, nodes.pos, nodes.end, parent);
         list._children = [];
         var pos = nodes.pos;
-        for (var _i = 0, nodes_2 = nodes; _i < nodes_2.length; _i++) {
-            var node = nodes_2[_i];
+        for (var _i = 0, nodes_3 = nodes; _i < nodes_3.length; _i++) {
+            var node = nodes_3[_i];
             addSyntheticNodes(list._children, pos, node.pos, parent);
             list._children.push(node);
             pos = node.end;