typescript 4.6.0-dev.20211116 → 4.6.0-dev.20211117

package/lib/tsc.js

@@ -69,7 +69,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var ts;
 (function (ts) {
     ts.versionMajorMinor = "4.6";
-    ts.version = ts.versionMajorMinor + ".0-dev.20211116";
+    ts.version = ts.versionMajorMinor + ".0-dev.20211117";
     var NativeCollections;
     (function (NativeCollections) {
         function tryGetNativeMap() {
@@ -89224,6 +89224,7 @@ var ts;
                         return emitJSDocSignature(node);
                     case 325:
                     case 330:
+                    case 335:
                         return emitJSDocSimpleTag(node);
                     case 326:
                     case 327:
@@ -89235,7 +89236,6 @@ var ts;
                     case 332:
                     case 333:
                     case 334:
-                    case 335:
                         return;
                     case 336:
                         return emitJSDocCallbackTag(node);
@@ -95424,7 +95424,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");

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.20211116";
+    ts.version = ts.versionMajorMinor + ".0-dev.20211117";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -108677,6 +108677,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 +108690,6 @@ var ts;
                     case 332 /* JSDocPrivateTag */:
                     case 333 /* JSDocProtectedTag */:
                     case 334 /* JSDocReadonlyTag */:
-                    case 335 /* JSDocOverrideTag */:
                         return;
                     case 336 /* JSDocCallbackTag */:
                         return emitJSDocCallbackTag(node);
@@ -115646,7 +115646,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");
@@ -144584,6 +144584,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 +144998,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 +149273,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 +149347,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 +149359,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 +149375,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 +149392,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);
@@ -151663,7 +151759,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 +151870,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 +151899,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 +151955,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 +165908,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);
-                            }
                         }
                     }
                 }