typescript 4.6.0-dev.20211115 → 4.6.0-dev.20211119

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.20211115";
+    ts.version = ts.versionMajorMinor + ".0-dev.20211119";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -162,26 +162,6 @@ var ts;
     ts.emptyArray = [];
     ts.emptyMap = new ts.Map();
     ts.emptySet = new ts.Set();
-    function createMap() {
-        return new ts.Map();
-    }
-    ts.createMap = createMap;
-    /**
-     * Create a new map from a template object is provided, the map will copy entries from it.
-     * @deprecated Use `new Map(getEntries(template))` instead.
-     */
-    function createMapFromTemplate(template) {
-        var map = new ts.Map();
-        // Copies keys/values from template. Note that for..in will not throw if
-        // template is undefined, and instead will just exit the loop.
-        for (var key in template) {
-            if (hasOwnProperty.call(template, key)) {
-                map.set(key, template[key]);
-            }
-        }
-        return map;
-    }
-    ts.createMapFromTemplate = createMapFromTemplate;
     function length(array) {
         return array ? array.length : 0;
     }
@@ -2416,11 +2396,6 @@ var ts;
             return value;
         }
         Debug.checkDefined = checkDefined;
-        /**
-         * @deprecated Use `checkDefined` to check whether a value is defined inline. Use `assertIsDefined` to check whether
-         * a value is defined at the statement level.
-         */
-        Debug.assertDefined = checkDefined;
         function assertEachIsDefined(value, message, stackCrawlMark) {
             for (var _i = 0, value_1 = value; _i < value_1.length; _i++) {
                 var v = value_1[_i];
@@ -2433,11 +2408,6 @@ var ts;
             return value;
         }
         Debug.checkEachDefined = checkEachDefined;
-        /**
-         * @deprecated Use `checkEachDefined` to check whether the elements of an array are defined inline. Use `assertEachIsDefined` to check whether
-         * the elements of an array are defined at the statement level.
-         */
-        Debug.assertEachDefined = checkEachDefined;
         function assertNever(member, message, stackCrawlMark) {
             if (message === void 0) { message = "Illegal value:"; }
             var detail = typeof member === "object" && ts.hasProperty(member, "kind") && ts.hasProperty(member, "pos") && formatSyntaxKind ? "SyntaxKind: " + formatSyntaxKind(member.kind) : JSON.stringify(member);
@@ -13897,21 +13867,6 @@ var ts;
         return undefined;
     }
     ts.getDeclarationOfKind = getDeclarationOfKind;
-    /**
-     * Create a new escaped identifier map.
-     * @deprecated Use `new Map<__String, T>()` instead.
-     */
-    function createUnderscoreEscapedMap() {
-        return new ts.Map();
-    }
-    ts.createUnderscoreEscapedMap = createUnderscoreEscapedMap;
-    /**
-     * @deprecated Use `!!map?.size` instead
-     */
-    function hasEntries(map) {
-        return !!map && !!map.size;
-    }
-    ts.hasEntries = hasEntries;
     function createSymbolTable(symbols) {
         var result = new ts.Map();
         if (symbols) {
@@ -26504,7 +26459,7 @@ var ts;
             sourceMapText = mapTextOrStripInternal;
         }
         var node = oldFileOfCurrentEmit ?
-            parseOldFileOfCurrentEmit(ts.Debug.assertDefined(bundleFileInfo)) :
+            parseOldFileOfCurrentEmit(ts.Debug.checkDefined(bundleFileInfo)) :
             parseUnparsedSourceFile(bundleFileInfo, stripInternal, length);
         node.fileName = fileName;
         node.sourceMapPath = sourceMapPath;
@@ -26651,13 +26606,13 @@ var ts;
             };
             node.javascriptPath = declarationTextOrJavascriptPath;
             node.javascriptMapPath = javascriptMapPath;
-            node.declarationPath = ts.Debug.assertDefined(javascriptMapTextOrDeclarationPath);
+            node.declarationPath = ts.Debug.checkDefined(javascriptMapTextOrDeclarationPath);
             node.declarationMapPath = declarationMapPath;
             node.buildInfoPath = declarationMapTextOrBuildInfoPath;
             Object.defineProperties(node, {
                 javascriptText: { get: function () { return definedTextGetter_1(declarationTextOrJavascriptPath); } },
                 javascriptMapText: { get: function () { return textGetter_1(javascriptMapPath); } },
-                declarationText: { get: function () { return definedTextGetter_1(ts.Debug.assertDefined(javascriptMapTextOrDeclarationPath)); } },
+                declarationText: { get: function () { return definedTextGetter_1(ts.Debug.checkDefined(javascriptMapTextOrDeclarationPath)); } },
                 declarationMapText: { get: function () { return textGetter_1(declarationMapPath); } },
                 buildInfo: { get: function () { return getAndCacheBuildInfo_1(function () { return textGetter_1(declarationMapTextOrBuildInfoPath); }); } }
             });
@@ -51666,8 +51621,8 @@ var ts;
                 var expandedParams = getExpandedParameters(signature, /*skipUnionExpanding*/ true)[0];
                 // If the expanded parameter list had a variadic in a non-trailing position, don't expand it
                 var parameters = (ts.some(expandedParams, function (p) { return p !== expandedParams[expandedParams.length - 1] && !!(ts.getCheckFlags(p) & 32768 /* RestParameter */); }) ? signature.parameters : expandedParams).map(function (parameter) { return symbolToParameterDeclaration(parameter, context, kind === 170 /* Constructor */, options === null || options === void 0 ? void 0 : options.privateSymbolVisitor, options === null || options === void 0 ? void 0 : options.bundledImports); });
-                if (signature.thisParameter) {
-                    var thisParameter = symbolToParameterDeclaration(signature.thisParameter, context);
+                var thisParameter = tryGetThisParameterDeclaration(signature, context);
+                if (thisParameter) {
                     parameters.unshift(thisParameter);
                 }
                 var returnTypeNode;
@@ -51716,6 +51671,21 @@ var ts;
                 }
                 return node;
             }
+            function tryGetThisParameterDeclaration(signature, context) {
+                if (signature.thisParameter) {
+                    return symbolToParameterDeclaration(signature.thisParameter, context);
+                }
+                if (signature.declaration) {
+                    var thisTag = ts.getJSDocThisTag(signature.declaration);
+                    if (thisTag && thisTag.typeExpression) {
+                        return ts.factory.createParameterDeclaration(
+                        /* decorators */ undefined, 
+                        /* modifiers */ undefined, 
+                        /* dotDotDotToken */ undefined, "this", 
+                        /* questionToken */ undefined, typeToTypeNodeHelper(getTypeFromTypeNode(thisTag.typeExpression), context));
+                    }
+                }
+            }
             function typeParameterToDeclarationWithConstraint(type, context, constraintNode) {
                 var savedContextFlags = context.flags;
                 context.flags &= ~512 /* WriteTypeParametersInQualifiedName */; // Avoids potential infinite loop when building for a claimspace with a generic
@@ -52157,10 +52127,8 @@ var ts;
                             firstChar = symbolName.charCodeAt(0);
                         }
                         var expression = void 0;
-                        if (ts.isSingleOrDoubleQuote(firstChar)) {
-                            expression = ts.factory.createStringLiteral(symbolName
-                                .substring(1, symbolName.length - 1)
-                                .replace(/\\./g, function (s) { return s.substring(1); }), firstChar === 39 /* singleQuote */);
+                        if (ts.isSingleOrDoubleQuote(firstChar) && !(symbol.flags & 8 /* EnumMember */)) {
+                            expression = ts.factory.createStringLiteral(ts.stripQuotes(symbolName).replace(/\\./g, function (s) { return s.substring(1); }), firstChar === 39 /* singleQuote */);
                         }
                         else if (("" + +symbolName) === symbolName) {
                             expression = ts.factory.createNumericLiteral(+symbolName);
@@ -94153,7 +94121,7 @@ var ts;
         function visitYieldExpression(node) {
             if (enclosingFunctionFlags & 2 /* Async */ && enclosingFunctionFlags & 1 /* Generator */) {
                 if (node.asteriskToken) {
-                    var expression = ts.visitNode(ts.Debug.assertDefined(node.expression), visitor, ts.isExpression);
+                    var expression = ts.visitNode(ts.Debug.checkDefined(node.expression), visitor, ts.isExpression);
                     return ts.setOriginalNode(ts.setTextRange(factory.createYieldExpression(
                     /*asteriskToken*/ undefined, emitHelpers().createAwaitHelper(factory.updateYieldExpression(node, node.asteriskToken, ts.setTextRange(emitHelpers().createAsyncDelegatorHelper(ts.setTextRange(emitHelpers().createAsyncValuesHelper(expression), expression)), expression)))), node), node);
                 }
@@ -95078,11 +95046,11 @@ var ts;
                 return existing.name;
             }
             if (!currentFileState.utilizedImplicitRuntimeImports) {
-                currentFileState.utilizedImplicitRuntimeImports = ts.createMap();
+                currentFileState.utilizedImplicitRuntimeImports = new ts.Map();
             }
             var specifierSourceImports = currentFileState.utilizedImplicitRuntimeImports.get(importSource);
             if (!specifierSourceImports) {
-                specifierSourceImports = ts.createMap();
+                specifierSourceImports = new ts.Map();
                 currentFileState.utilizedImplicitRuntimeImports.set(importSource, specifierSourceImports);
             }
             var generatedName = factory.createUniqueName("_" + name, 16 /* Optimistic */ | 32 /* FileLevel */ | 64 /* AllowNameSubstitution */);
@@ -108677,6 +108645,7 @@ var ts;
                         return emitJSDocSignature(node);
                     case 325 /* JSDocTag */:
                     case 330 /* JSDocClassTag */:
+                    case 335 /* JSDocOverrideTag */:
                         return emitJSDocSimpleTag(node);
                     case 326 /* JSDocAugmentsTag */:
                     case 327 /* JSDocImplementsTag */:
@@ -108689,7 +108658,6 @@ var ts;
                     case 332 /* JSDocPrivateTag */:
                     case 333 /* JSDocProtectedTag */:
                     case 334 /* JSDocReadonlyTag */:
-                    case 335 /* JSDocOverrideTag */:
                         return;
                     case 336 /* JSDocCallbackTag */:
                         return emitJSDocCallbackTag(node);
@@ -113609,6 +113577,24 @@ var ts;
         }
     }
     ts.getImpliedNodeFormatForFile = getImpliedNodeFormatForFile;
+    /** @internal */
+    ts.plainJSErrors = new ts.Set([
+        ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0.code,
+        ts.Diagnostics.A_module_cannot_have_multiple_default_exports.code,
+        ts.Diagnostics.Another_export_default_is_here.code,
+        ts.Diagnostics.The_first_export_default_is_here.code,
+        ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_at_the_top_level_of_a_module.code,
+        ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode.code,
+        ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_that_cannot_be_used_here.code,
+        ts.Diagnostics.constructor_is_a_reserved_word.code,
+        ts.Diagnostics.delete_cannot_be_called_on_an_identifier_in_strict_mode.code,
+        ts.Diagnostics.Code_contained_in_a_class_is_evaluated_in_JavaScript_s_strict_mode_which_does_not_allow_this_use_of_0_For_more_information_see_https_Colon_Slash_Slashdeveloper_mozilla_org_Slashen_US_Slashdocs_SlashWeb_SlashJavaScript_SlashReference_SlashStrict_mode.code,
+        ts.Diagnostics.Invalid_use_of_0_Modules_are_automatically_in_strict_mode.code,
+        ts.Diagnostics.Invalid_use_of_0_in_strict_mode.code,
+        ts.Diagnostics.A_label_is_not_allowed_here.code,
+        ts.Diagnostics.Octal_literals_are_not_allowed_in_strict_mode.code,
+        ts.Diagnostics.with_statements_are_not_allowed_in_strict_mode.code,
+    ]);
     /**
      * Determine if source file needs to be re-created even if its text hasn't changed
      */
@@ -114269,6 +114255,7 @@ var ts;
                 newSourceFile.originalFileName = oldSourceFile.originalFileName;
                 newSourceFile.resolvedPath = oldSourceFile.resolvedPath;
                 newSourceFile.fileName = oldSourceFile.fileName;
+                newSourceFile.impliedNodeFormat = oldSourceFile.impliedNodeFormat;
                 var packageName = oldProgram.sourceFileToPackageName.get(oldSourceFile.path);
                 if (packageName !== undefined) {
                     // If there are 2 different source files for the same package name and at least one of them changes,
@@ -114625,14 +114612,23 @@ var ts;
                 }
                 var typeChecker = getDiagnosticsProducingTypeChecker();
                 ts.Debug.assert(!!sourceFile.bindDiagnostics);
-                var isCheckJs = ts.isCheckJsEnabledForFile(sourceFile, options);
+                var isJs = sourceFile.scriptKind === 1 /* JS */ || sourceFile.scriptKind === 2 /* JSX */;
+                var isCheckJs = isJs && ts.isCheckJsEnabledForFile(sourceFile, options);
+                var isPlainJs = isJs && !sourceFile.checkJsDirective && options.checkJs === undefined;
                 var isTsNoCheck = !!sourceFile.checkJsDirective && sourceFile.checkJsDirective.enabled === false;
-                // By default, only type-check .ts, .tsx, 'Deferred' and 'External' files (external files are added by plugins)
+                // By default, only type-check .ts, .tsx, Deferred, plain JS, checked JS and External
+                // - plain JS: .js files with no // ts-check and checkJs: undefined
+                // - check JS: .js files with either // ts-check or checkJs: true
+                // - external: files that are added by plugins
                 var includeBindAndCheckDiagnostics = !isTsNoCheck && (sourceFile.scriptKind === 3 /* TS */ || sourceFile.scriptKind === 4 /* TSX */
-                    || sourceFile.scriptKind === 5 /* External */ || isCheckJs || sourceFile.scriptKind === 7 /* Deferred */);
+                    || sourceFile.scriptKind === 5 /* External */ || isPlainJs || isCheckJs || sourceFile.scriptKind === 7 /* Deferred */);
                 var bindDiagnostics = includeBindAndCheckDiagnostics ? sourceFile.bindDiagnostics : ts.emptyArray;
-                var checkDiagnostics = includeBindAndCheckDiagnostics ? typeChecker.getDiagnostics(sourceFile, cancellationToken) : ts.emptyArray;
-                return getMergedBindAndCheckDiagnostics(sourceFile, includeBindAndCheckDiagnostics, bindDiagnostics, checkDiagnostics, isCheckJs ? sourceFile.jsDocDiagnostics : undefined);
+                var checkDiagnostics = includeBindAndCheckDiagnostics && !isPlainJs ? typeChecker.getDiagnostics(sourceFile, cancellationToken) : ts.emptyArray;
+                if (isPlainJs) {
+                    bindDiagnostics = ts.filter(bindDiagnostics, function (d) { return ts.plainJSErrors.has(d.code); });
+                }
+                // skip ts-expect-error errors in plain JS files, and skip JSDoc errors except in checked JS
+                return getMergedBindAndCheckDiagnostics(sourceFile, includeBindAndCheckDiagnostics && !isPlainJs, bindDiagnostics, checkDiagnostics, isCheckJs ? sourceFile.jsDocDiagnostics : undefined);
             });
         }
         function getMergedBindAndCheckDiagnostics(sourceFile, includeBindAndCheckDiagnostics) {
@@ -115646,7 +115642,7 @@ var ts;
             return resolvedRef;
         }
         function verifyCompilerOptions() {
-            var isNightly = ts.stringContains(ts.version, "-dev");
+            var isNightly = ts.stringContains(ts.version, "-dev") || ts.stringContains(ts.version, "-insiders");
             if (!isNightly) {
                 if (ts.getEmitModuleKind(options) === ts.ModuleKind.Node12) {
                     createOptionValueDiagnostic("module", ts.Diagnostics.Compiler_option_0_of_value_1_is_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_with_npm_install_D_typescript_next, "module", "node12");
@@ -118541,7 +118537,7 @@ var ts;
         function watchFailedLookupLocationsOfExternalModuleResolutions(name, resolution, filePath, getResolutionWithResolvedFileName) {
             if (resolution.refCount) {
                 resolution.refCount++;
-                ts.Debug.assertDefined(resolution.files);
+                ts.Debug.assertIsDefined(resolution.files);
             }
             else {
                 resolution.refCount = 1;
@@ -118609,7 +118605,7 @@ var ts;
             }
         }
         function stopWatchFailedLookupLocationOfResolution(resolution, filePath, getResolutionWithResolvedFileName) {
-            ts.unorderedRemoveItem(ts.Debug.assertDefined(resolution.files), filePath);
+            ts.unorderedRemoveItem(ts.Debug.checkDefined(resolution.files), filePath);
             resolution.refCount--;
             if (resolution.refCount) {
                 return;
@@ -118701,7 +118697,7 @@ var ts;
                 if (resolution.isInvalidated || !canInvalidate(resolution))
                     continue;
                 resolution.isInvalidated = invalidated = true;
-                for (var _a = 0, _b = ts.Debug.assertDefined(resolution.files); _a < _b.length; _a++) {
+                for (var _a = 0, _b = ts.Debug.checkDefined(resolution.files); _a < _b.length; _a++) {
                     var containingFilePath = _b[_a];
                     (filesWithInvalidatedResolutions || (filesWithInvalidatedResolutions = new ts.Set())).add(containingFilePath);
                     // When its a file with inferred types resolution, invalidate type reference directive resolution
@@ -135589,14 +135585,17 @@ var ts;
             if (node === sourceFile) {
                 return undefined;
             }
-            var symbol = typeChecker.getSymbolAtLocation(node);
+            var symbol = getSymbol(node, typeChecker);
             if (!symbol)
                 return undefined;
             var typeAtLocation = typeChecker.getTypeOfSymbolAtLocation(symbol, node);
             var returnType = tryGetReturnTypeOfFunction(symbol, typeAtLocation, typeChecker);
             var fromReturnType = returnType && definitionFromType(returnType, typeChecker, node);
             // If a function returns 'void' or some other type with no definition, just return the function definition.
-            return fromReturnType && fromReturnType.length !== 0 ? fromReturnType : definitionFromType(typeAtLocation, typeChecker, node);
+            var typeDefinitions = fromReturnType && fromReturnType.length !== 0 ? fromReturnType : definitionFromType(typeAtLocation, typeChecker, node);
+            return typeDefinitions.length ? typeDefinitions
+                : !(symbol.flags & 111551 /* Value */) && symbol.flags & 788968 /* Type */ ? getDefinitionFromSymbol(typeChecker, ts.skipAlias(symbol, typeChecker), node)
+                    : undefined;
         }
         GoToDefinition.getTypeDefinitionAtPosition = getTypeDefinitionAtPosition;
         function definitionFromType(type, checker, node) {
@@ -144584,6 +144583,26 @@ var ts;
                 var indent = sourceFile.text.slice(startPosition, fnStart);
                 this.insertNodeAt(sourceFile, fnStart, tag, { preserveLeadingWhitespace: false, suffix: this.newLineCharacter + indent });
             };
+            ChangeTracker.prototype.addJSDocTags = function (sourceFile, parent, newTags) {
+                var comments = ts.flatMap(parent.jsDoc, function (j) { return typeof j.comment === "string" ? ts.factory.createJSDocText(j.comment) : j.comment; });
+                var oldTags = ts.flatMapToMutable(parent.jsDoc, function (j) { return j.tags; });
+                var unmergedNewTags = newTags.filter(function (newTag) { return !oldTags.some(function (tag, i) {
+                    var merged = tryMergeJsdocTags(tag, newTag);
+                    if (merged)
+                        oldTags[i] = merged;
+                    return !!merged;
+                }); });
+                var tag = ts.factory.createJSDocComment(ts.factory.createNodeArray(ts.intersperse(comments, ts.factory.createJSDocText("\n"))), ts.factory.createNodeArray(__spreadArray(__spreadArray([], oldTags, true), unmergedNewTags, true)));
+                var host = updateJSDocHost(parent);
+                this.insertJsdocCommentBefore(sourceFile, host, tag);
+            };
+            ChangeTracker.prototype.filterJSDocTags = function (sourceFile, parent, predicate) {
+                var comments = ts.flatMap(parent.jsDoc, function (j) { return typeof j.comment === "string" ? ts.factory.createJSDocText(j.comment) : j.comment; });
+                var oldTags = ts.flatMapToMutable(parent.jsDoc, function (j) { return j.tags; });
+                var tag = ts.factory.createJSDocComment(ts.factory.createNodeArray(ts.intersperse(comments, ts.factory.createJSDocText("\n"))), ts.factory.createNodeArray(__spreadArray([], (ts.filter(oldTags, predicate) || ts.emptyArray), true)));
+                var host = updateJSDocHost(parent);
+                this.insertJsdocCommentBefore(sourceFile, host, tag);
+            };
             ChangeTracker.prototype.replaceRangeWithText = function (sourceFile, range, text) {
                 this.changes.push({ kind: ChangeKind.Text, sourceFile: sourceFile, range: range, text: text });
             };
@@ -144978,6 +144997,33 @@ var ts;
             return ChangeTracker;
         }());
         textChanges_3.ChangeTracker = ChangeTracker;
+        function updateJSDocHost(parent) {
+            if (parent.kind !== 213 /* ArrowFunction */) {
+                return parent;
+            }
+            var jsDocNode = parent.parent.kind === 166 /* PropertyDeclaration */ ?
+                parent.parent :
+                parent.parent.parent;
+            jsDocNode.jsDoc = parent.jsDoc;
+            jsDocNode.jsDocCache = parent.jsDocCache;
+            return jsDocNode;
+        }
+        function tryMergeJsdocTags(oldTag, newTag) {
+            if (oldTag.kind !== newTag.kind) {
+                return undefined;
+            }
+            switch (oldTag.kind) {
+                case 338 /* JSDocParameterTag */: {
+                    var oldParam = oldTag;
+                    var newParam = newTag;
+                    return ts.isIdentifier(oldParam.name) && ts.isIdentifier(newParam.name) && oldParam.name.escapedText === newParam.name.escapedText
+                        ? ts.factory.createJSDocParameterTag(/*tagName*/ undefined, newParam.name, /*isBracketed*/ false, newParam.typeExpression, newParam.isNameFirst, oldParam.comment)
+                        : undefined;
+                }
+                case 339 /* JSDocReturnTag */:
+                    return ts.factory.createJSDocReturnTag(/*tagName*/ undefined, newTag.typeExpression, oldTag.comment);
+            }
+        }
         // find first non-whitespace position in the leading trivia of the node
         function startPositionToDeleteNodeInList(sourceFile, node) {
             return ts.skipTrivia(sourceFile.text, getAdjustedStartPosition(sourceFile, node, { leadingTriviaOption: LeadingTriviaOption.IncludeAll }), /*stopAfterLineBreak*/ false, /*stopAtComments*/ true);
@@ -149226,35 +149272,72 @@ var ts;
             ts.Diagnostics.This_member_cannot_have_an_override_modifier_because_its_containing_class_0_does_not_extend_another_class.code,
             ts.Diagnostics.This_member_must_have_an_override_modifier_because_it_overrides_an_abstract_method_that_is_declared_in_the_base_class_0.code,
             ts.Diagnostics.This_member_must_have_an_override_modifier_because_it_overrides_a_member_in_the_base_class_0.code,
-            ts.Diagnostics.This_parameter_property_must_have_an_override_modifier_because_it_overrides_a_member_in_base_class_0.code
+            ts.Diagnostics.This_parameter_property_must_have_an_override_modifier_because_it_overrides_a_member_in_base_class_0.code,
+            ts.Diagnostics.This_member_must_have_a_JSDoc_comment_with_an_override_tag_because_it_overrides_a_member_in_the_base_class_0.code,
+            ts.Diagnostics.This_member_cannot_have_a_JSDoc_comment_with_an_override_tag_because_its_containing_class_0_does_not_extend_another_class.code,
+            ts.Diagnostics.This_parameter_property_must_have_a_JSDoc_comment_with_an_override_tag_because_it_overrides_a_member_in_the_base_class_0.code,
+            ts.Diagnostics.This_member_cannot_have_a_JSDoc_comment_with_an_override_tag_because_it_is_not_declared_in_the_base_class_0.code,
         ];
         var errorCodeFixIdMap = (_a = {},
-            _a[ts.Diagnostics.This_member_must_have_an_override_modifier_because_it_overrides_a_member_in_the_base_class_0.code] = [
-                ts.Diagnostics.Add_override_modifier, fixAddOverrideId, ts.Diagnostics.Add_all_missing_override_modifiers,
-            ],
-            _a[ts.Diagnostics.This_member_cannot_have_an_override_modifier_because_its_containing_class_0_does_not_extend_another_class.code] = [
-                ts.Diagnostics.Remove_override_modifier, fixRemoveOverrideId, ts.Diagnostics.Remove_all_unnecessary_override_modifiers
-            ],
-            _a[ts.Diagnostics.This_parameter_property_must_have_an_override_modifier_because_it_overrides_a_member_in_base_class_0.code] = [
-                ts.Diagnostics.Add_override_modifier, fixAddOverrideId, ts.Diagnostics.Add_all_missing_override_modifiers,
-            ],
-            _a[ts.Diagnostics.This_member_must_have_an_override_modifier_because_it_overrides_an_abstract_method_that_is_declared_in_the_base_class_0.code] = [
-                ts.Diagnostics.Add_override_modifier, fixAddOverrideId, ts.Diagnostics.Remove_all_unnecessary_override_modifiers
-            ],
-            _a[ts.Diagnostics.This_member_cannot_have_an_override_modifier_because_it_is_not_declared_in_the_base_class_0.code] = [
-                ts.Diagnostics.Remove_override_modifier, fixRemoveOverrideId, ts.Diagnostics.Remove_all_unnecessary_override_modifiers
-            ],
+            // case #1:
+            _a[ts.Diagnostics.This_member_must_have_an_override_modifier_because_it_overrides_a_member_in_the_base_class_0.code] = {
+                descriptions: ts.Diagnostics.Add_override_modifier,
+                fixId: fixAddOverrideId,
+                fixAllDescriptions: ts.Diagnostics.Add_all_missing_override_modifiers,
+            },
+            _a[ts.Diagnostics.This_member_must_have_a_JSDoc_comment_with_an_override_tag_because_it_overrides_a_member_in_the_base_class_0.code] = {
+                descriptions: ts.Diagnostics.Add_override_modifier,
+                fixId: fixAddOverrideId,
+                fixAllDescriptions: ts.Diagnostics.Add_all_missing_override_modifiers
+            },
+            // case #2:
+            _a[ts.Diagnostics.This_member_cannot_have_an_override_modifier_because_its_containing_class_0_does_not_extend_another_class.code] = {
+                descriptions: ts.Diagnostics.Remove_override_modifier,
+                fixId: fixRemoveOverrideId,
+                fixAllDescriptions: ts.Diagnostics.Remove_all_unnecessary_override_modifiers,
+            },
+            _a[ts.Diagnostics.This_member_cannot_have_a_JSDoc_comment_with_an_override_tag_because_its_containing_class_0_does_not_extend_another_class.code] = {
+                descriptions: ts.Diagnostics.Remove_override_modifier,
+                fixId: fixRemoveOverrideId,
+                fixAllDescriptions: ts.Diagnostics.Remove_override_modifier
+            },
+            // case #3:
+            _a[ts.Diagnostics.This_parameter_property_must_have_an_override_modifier_because_it_overrides_a_member_in_base_class_0.code] = {
+                descriptions: ts.Diagnostics.Add_override_modifier,
+                fixId: fixAddOverrideId,
+                fixAllDescriptions: ts.Diagnostics.Add_all_missing_override_modifiers,
+            },
+            _a[ts.Diagnostics.This_parameter_property_must_have_a_JSDoc_comment_with_an_override_tag_because_it_overrides_a_member_in_the_base_class_0.code] = {
+                descriptions: ts.Diagnostics.Add_override_modifier,
+                fixId: fixAddOverrideId,
+                fixAllDescriptions: ts.Diagnostics.Add_all_missing_override_modifiers,
+            },
+            // case #4:
+            _a[ts.Diagnostics.This_member_must_have_an_override_modifier_because_it_overrides_an_abstract_method_that_is_declared_in_the_base_class_0.code] = {
+                descriptions: ts.Diagnostics.Add_override_modifier,
+                fixId: fixAddOverrideId,
+                fixAllDescriptions: ts.Diagnostics.Remove_all_unnecessary_override_modifiers,
+            },
+            // case #5:
+            _a[ts.Diagnostics.This_member_cannot_have_an_override_modifier_because_it_is_not_declared_in_the_base_class_0.code] = {
+                descriptions: ts.Diagnostics.Remove_override_modifier,
+                fixId: fixRemoveOverrideId,
+                fixAllDescriptions: ts.Diagnostics.Remove_all_unnecessary_override_modifiers,
+            },
+            _a[ts.Diagnostics.This_member_cannot_have_a_JSDoc_comment_with_an_override_tag_because_it_is_not_declared_in_the_base_class_0.code] = {
+                descriptions: ts.Diagnostics.Remove_override_modifier,
+                fixId: fixRemoveOverrideId,
+                fixAllDescriptions: ts.Diagnostics.Remove_all_unnecessary_override_modifiers,
+            },
             _a);
         codefix.registerCodeFix({
             errorCodes: errorCodes,
             getCodeActions: function (context) {
-                var errorCode = context.errorCode, span = context.span, sourceFile = context.sourceFile;
+                var errorCode = context.errorCode, span = context.span;
                 var info = errorCodeFixIdMap[errorCode];
                 if (!info)
                     return ts.emptyArray;
-                var descriptions = info[0], fixId = info[1], fixAllDescriptions = info[2];
-                if (ts.isSourceFileJS(sourceFile))
-                    return ts.emptyArray;
+                var descriptions = info.descriptions, fixId = info.fixId, fixAllDescriptions = info.fixAllDescriptions;
                 var changes = ts.textChanges.ChangeTracker.with(context, function (changes) { return dispatchChanges(changes, context, errorCode, span.start); });
                 return [
                     codefix.createCodeFixActionMaybeFixAll(fixName, changes, descriptions, fixId, fixAllDescriptions)
@@ -149263,9 +149346,9 @@ var ts;
             fixIds: [fixName, fixAddOverrideId, fixRemoveOverrideId],
             getAllCodeActions: function (context) {
                 return codefix.codeFixAll(context, errorCodes, function (changes, diag) {
-                    var code = diag.code, start = diag.start, file = diag.file;
+                    var code = diag.code, start = diag.start;
                     var info = errorCodeFixIdMap[code];
-                    if (!info || info[1] !== context.fixId || ts.isSourceFileJS(file)) {
+                    if (!info || info.fixId !== context.fixId) {
                         return;
                     }
                     dispatchChanges(changes, context, code, start);
@@ -149275,11 +149358,15 @@ var ts;
         function dispatchChanges(changeTracker, context, errorCode, pos) {
             switch (errorCode) {
                 case ts.Diagnostics.This_member_must_have_an_override_modifier_because_it_overrides_a_member_in_the_base_class_0.code:
+                case ts.Diagnostics.This_member_must_have_a_JSDoc_comment_with_an_override_tag_because_it_overrides_a_member_in_the_base_class_0.code:
                 case ts.Diagnostics.This_member_must_have_an_override_modifier_because_it_overrides_an_abstract_method_that_is_declared_in_the_base_class_0.code:
                 case ts.Diagnostics.This_parameter_property_must_have_an_override_modifier_because_it_overrides_a_member_in_base_class_0.code:
+                case ts.Diagnostics.This_parameter_property_must_have_a_JSDoc_comment_with_an_override_tag_because_it_overrides_a_member_in_the_base_class_0.code:
                     return doAddOverrideModifierChange(changeTracker, context.sourceFile, pos);
                 case ts.Diagnostics.This_member_cannot_have_an_override_modifier_because_it_is_not_declared_in_the_base_class_0.code:
+                case ts.Diagnostics.This_member_cannot_have_a_JSDoc_comment_with_an_override_tag_because_it_is_not_declared_in_the_base_class_0.code:
                 case ts.Diagnostics.This_member_cannot_have_an_override_modifier_because_its_containing_class_0_does_not_extend_another_class.code:
+                case ts.Diagnostics.This_member_cannot_have_a_JSDoc_comment_with_an_override_tag_because_its_containing_class_0_does_not_extend_another_class.code:
                     return doRemoveOverrideModifierChange(changeTracker, context.sourceFile, pos);
                 default:
                     ts.Debug.fail("Unexpected error code: " + errorCode);
@@ -149287,6 +149374,10 @@ var ts;
         }
         function doAddOverrideModifierChange(changeTracker, sourceFile, pos) {
             var classElement = findContainerClassElementLike(sourceFile, pos);
+            if (ts.isSourceFileJS(sourceFile)) {
+                changeTracker.addJSDocTags(sourceFile, classElement, [ts.factory.createJSDocOverrideTag(ts.factory.createIdentifier("override"))]);
+                return;
+            }
             var modifiers = classElement.modifiers || ts.emptyArray;
             var staticModifier = ts.find(modifiers, ts.isStaticModifier);
             var abstractModifier = ts.find(modifiers, ts.isAbstractModifier);
@@ -149300,6 +149391,10 @@ var ts;
         }
         function doRemoveOverrideModifierChange(changeTracker, sourceFile, pos) {
             var classElement = findContainerClassElementLike(sourceFile, pos);
+            if (ts.isSourceFileJS(sourceFile)) {
+                changeTracker.filterJSDocTags(sourceFile, classElement, ts.not(ts.isJSDocOverrideTag));
+                return;
+            }
             var overrideModifier = classElement.modifiers && ts.find(classElement.modifiers, function (modifier) { return modifier.kind === 158 /* OverrideKeyword */; });
             ts.Debug.assertIsDefined(overrideModifier);
             changeTracker.deleteModifier(sourceFile, overrideModifier);
@@ -149393,9 +149488,9 @@ var ts;
             if (!ts.isFunctionDeclaration(fn) && !ts.isFunctionExpression(fn))
                 return undefined;
             if (!ts.isSourceFile(ts.getThisContainer(fn, /*includeArrowFunctions*/ false))) { // 'this' is defined outside, convert to arrow function
-                var fnKeyword = ts.Debug.assertDefined(ts.findChildOfKind(fn, 98 /* FunctionKeyword */, sourceFile));
+                var fnKeyword = ts.Debug.checkDefined(ts.findChildOfKind(fn, 98 /* FunctionKeyword */, sourceFile));
                 var name = fn.name;
-                var body = ts.Debug.assertDefined(fn.body); // Should be defined because the function contained a 'this' expression
+                var body = ts.Debug.checkDefined(fn.body); // Should be defined because the function contained a 'this' expression
                 if (ts.isFunctionExpression(fn)) {
                     if (name && ts.FindAllReferences.Core.isSymbolReferencedInFile(name, checker, sourceFile, body)) {
                         // Function expression references itself. To fix we would have to extract it to a const.
@@ -151663,7 +151758,7 @@ var ts;
                         if (typeNode) {
                             // Note that the codefix will never fire with an existing `@type` tag, so there is no need to merge tags
                             var typeTag = ts.factory.createJSDocTypeTag(/*tagName*/ undefined, ts.factory.createJSDocTypeExpression(typeNode), /*comment*/ undefined);
-                            addJSDocTags(changes, sourceFile, ts.cast(parent.parent.parent, ts.isExpressionStatement), [typeTag]);
+                            changes.addJSDocTags(sourceFile, ts.cast(parent.parent.parent, ts.isExpressionStatement), [typeTag]);
                         }
                         importAdder.writeFixes(changes);
                         return parent;
@@ -151774,7 +151869,7 @@ var ts;
             }
         }
         function annotateJSDocThis(changes, sourceFile, containingFunction, typeNode) {
-            addJSDocTags(changes, sourceFile, containingFunction, [
+            changes.addJSDocTags(sourceFile, containingFunction, [
                 ts.factory.createJSDocThisTag(/*tagName*/ undefined, ts.factory.createJSDocTypeExpression(typeNode)),
             ]);
         }
@@ -151803,7 +151898,7 @@ var ts;
                     }
                     var typeExpression = ts.factory.createJSDocTypeExpression(typeNode);
                     var typeTag = ts.isGetAccessorDeclaration(declaration) ? ts.factory.createJSDocReturnTag(/*tagName*/ undefined, typeExpression, /*comment*/ undefined) : ts.factory.createJSDocTypeTag(/*tagName*/ undefined, typeExpression, /*comment*/ undefined);
-                    addJSDocTags(changes, sourceFile, parent, [typeTag]);
+                    changes.addJSDocTags(sourceFile, parent, [typeTag]);
                 }
                 else if (!tryReplaceImportTypeNodeWithAutoImport(typeNode, declaration, sourceFile, changes, importAdder, ts.getEmitScriptTarget(program.getCompilerOptions()))) {
                     changes.tryInsertTypeAnnotation(sourceFile, declaration, typeNode);
@@ -151859,45 +151954,7 @@ var ts;
                     var name = _a.name, typeNode = _a.typeNode, isOptional = _a.isOptional;
                     return ts.factory.createJSDocParameterTag(/*tagName*/ undefined, name, /*isBracketed*/ !!isOptional, ts.factory.createJSDocTypeExpression(typeNode), /* isNameFirst */ false, /*comment*/ undefined);
                 });
-                addJSDocTags(changes, sourceFile, signature, paramTags);
-            }
-        }
-        function addJSDocTags(changes, sourceFile, parent, newTags) {
-            var comments = ts.flatMap(parent.jsDoc, function (j) { return typeof j.comment === "string" ? ts.factory.createJSDocText(j.comment) : j.comment; });
-            var oldTags = ts.flatMapToMutable(parent.jsDoc, function (j) { return j.tags; });
-            var unmergedNewTags = newTags.filter(function (newTag) { return !oldTags || !oldTags.some(function (tag, i) {
-                var merged = tryMergeJsdocTags(tag, newTag);
-                if (merged)
-                    oldTags[i] = merged;
-                return !!merged;
-            }); });
-            var tag = ts.factory.createJSDocComment(ts.factory.createNodeArray(ts.intersperse(comments, ts.factory.createJSDocText("\n"))), ts.factory.createNodeArray(__spreadArray(__spreadArray([], (oldTags || ts.emptyArray), true), unmergedNewTags, true)));
-            var jsDocNode = parent.kind === 213 /* ArrowFunction */ ? getJsDocNodeForArrowFunction(parent) : parent;
-            jsDocNode.jsDoc = parent.jsDoc;
-            jsDocNode.jsDocCache = parent.jsDocCache;
-            changes.insertJsdocCommentBefore(sourceFile, jsDocNode, tag);
-        }
-        codefix.addJSDocTags = addJSDocTags;
-        function getJsDocNodeForArrowFunction(signature) {
-            if (signature.parent.kind === 166 /* PropertyDeclaration */) {
-                return signature.parent;
-            }
-            return signature.parent.parent;
-        }
-        function tryMergeJsdocTags(oldTag, newTag) {
-            if (oldTag.kind !== newTag.kind) {
-                return undefined;
-            }
-            switch (oldTag.kind) {
-                case 338 /* JSDocParameterTag */: {
-                    var oldParam = oldTag;
-                    var newParam = newTag;
-                    return ts.isIdentifier(oldParam.name) && ts.isIdentifier(newParam.name) && oldParam.name.escapedText === newParam.name.escapedText
-                        ? ts.factory.createJSDocParameterTag(/*tagName*/ undefined, newParam.name, /*isBracketed*/ false, newParam.typeExpression, newParam.isNameFirst, oldParam.comment)
-                        : undefined;
-                }
-                case 339 /* JSDocReturnTag */:
-                    return ts.factory.createJSDocReturnTag(/*tagName*/ undefined, newTag.typeExpression, oldTag.comment);
+                changes.addJSDocTags(sourceFile, signature, paramTags);
             }
         }
         function getReferences(token, program, cancellationToken) {
@@ -165850,15 +165907,15 @@ var ts;
                         if (!resolution.resolvedFileName)
                             continue;
                         var resolvedFileName = resolution.resolvedFileName, originalPath = resolution.originalPath;
+                        if (originalPath) {
+                            symlinkCache.setSymlinkedDirectoryFromSymlinkedFile(originalPath, resolvedFileName);
+                        }
                         if (!program.getSourceFile(resolvedFileName) && (!originalPath || !program.getSourceFile(originalPath))) {
                             rootNames = ts.append(rootNames, resolvedFileName);
                             // Avoid creating a large project that would significantly slow down time to editor interactivity
                             if (dependencySelection === 2 /* Auto */ && rootNames.length > this.maxDependencies) {
                                 return ts.emptyArray;
                             }
-                            if (originalPath) {
-                                symlinkCache.setSymlinkedDirectoryFromSymlinkedFile(originalPath, resolvedFileName);
-                            }
                         }
                     }
                 }
@@ -171859,7 +171916,7 @@ var ts;
             Session.prototype.getFullNavigateToItems = function (args) {
                 var currentFileOnly = args.currentFileOnly, searchValue = args.searchValue, maxResultCount = args.maxResultCount, projectFileName = args.projectFileName;
                 if (currentFileOnly) {
-                    ts.Debug.assertDefined(args.file);
+                    ts.Debug.assertIsDefined(args.file);
                     var _a = this.getFileAndProject(args), file = _a.file, project = _a.project;
                     return [{ project: project, result: project.getLanguageService().getNavigateToItems(searchValue, maxResultCount, file) }];
                 }