typescript 4.2.0-insiders.20210210 → 4.2.4

package/lib/tsserver.js

@@ -96,7 +96,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-insiders.20210210";
+    ts.version = "4.2.4";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -7005,13 +7005,13 @@ var ts;
             }
             var activeSession;
             var profilePath = "./profile.cpuprofile";
-            var realpathSync = (_a = _fs.realpathSync.native) !== null && _a !== void 0 ? _a : _fs.realpathSync;
             var Buffer = require("buffer").Buffer;
             var nodeVersion = getNodeMajorVersion();
             var isNode4OrLater = nodeVersion >= 4;
             var isLinuxOrMacOs = process.platform === "linux" || process.platform === "darwin";
             var platform = _os.platform();
             var useCaseSensitiveFileNames = isFileSystemCaseSensitive();
+            var realpathSync = useCaseSensitiveFileNames ? ((_a = _fs.realpathSync.native) !== null && _a !== void 0 ? _a : _fs.realpathSync) : _fs.realpathSync;
             var fsSupportsRecursiveFsWatch = isNode4OrLater && (process.platform === "win32" || process.platform === "darwin");
             var getCurrentDirectory = ts.memoize(function () { return process.cwd(); });
             var _c = createSystemWatchFunctions({
@@ -46983,7 +46983,9 @@ var ts;
             var result = new Type(checker, flags);
             typeCount++;
             result.id = typeCount;
-            typeCatalog.push(result);
+            if (ts.tracing) {
+                typeCatalog.push(result);
+            }
             return result;
         }
         function createOriginType(flags) {
@@ -47044,13 +47046,17 @@ var ts;
             return result || ts.emptyArray;
         }
         function setStructuredTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo) {
-            type.members = members;
-            type.properties = members === emptySymbols ? ts.emptyArray : getNamedMembers(members);
-            type.callSignatures = callSignatures;
-            type.constructSignatures = constructSignatures;
-            type.stringIndexInfo = stringIndexInfo;
-            type.numberIndexInfo = numberIndexInfo;
-            return type;
+            var resolved = type;
+            resolved.members = members;
+            resolved.properties = ts.emptyArray;
+            resolved.callSignatures = callSignatures;
+            resolved.constructSignatures = constructSignatures;
+            resolved.stringIndexInfo = stringIndexInfo;
+            resolved.numberIndexInfo = numberIndexInfo;
+            // This can loop back to getPropertyOfType() which would crash if `callSignatures` & `constructSignatures` are not initialized.
+            if (members !== emptySymbols)
+                resolved.properties = getNamedMembers(members);
+            return resolved;
         }
         function createAnonymousType(symbol, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo) {
             return setStructuredTypeMembers(createObjectType(16 /* Anonymous */, symbol), members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
@@ -55677,7 +55683,7 @@ var ts;
             }
             return true;
         }
-        function removeRedundantLiteralTypes(types, includes) {
+        function removeRedundantLiteralTypes(types, includes, reduceVoidUndefined) {
             var i = types.length;
             while (i > 0) {
                 i--;
@@ -55687,7 +55693,7 @@ var ts;
                     flags & 256 /* NumberLiteral */ && includes & 8 /* Number */ ||
                     flags & 2048 /* BigIntLiteral */ && includes & 64 /* BigInt */ ||
                     flags & 8192 /* UniqueESSymbol */ && includes & 4096 /* ESSymbol */ ||
-                    flags & 32768 /* Undefined */ && includes & 16384 /* Void */ ||
+                    reduceVoidUndefined && flags & 32768 /* Undefined */ && includes & 16384 /* Void */ ||
                     isFreshLiteralType(t) && containsType(types, t.regularType);
                 if (remove) {
                     ts.orderedRemoveItemAt(types, i);
@@ -55719,7 +55725,7 @@ var ts;
                 if (t.flags & 1048576 /* Union */) {
                     var origin = t.origin;
                     if (t.aliasSymbol || origin && !(origin.flags & 1048576 /* Union */)) {
-                        namedUnions.push(t);
+                        ts.pushIfUnique(namedUnions, t);
                     }
                     else if (origin && origin.flags & 1048576 /* Union */) {
                         addNamedUnions(namedUnions, origin.types);
@@ -55755,7 +55761,7 @@ var ts;
                 }
                 if (unionReduction & (1 /* Literal */ | 2 /* Subtype */)) {
                     if (includes & (2944 /* Literal */ | 8192 /* UniqueESSymbol */) || includes & 16384 /* Void */ && includes & 32768 /* Undefined */) {
-                        removeRedundantLiteralTypes(typeSet, includes);
+                        removeRedundantLiteralTypes(typeSet, includes, !!(unionReduction & 2 /* Subtype */));
                     }
                     if (includes & 128 /* StringLiteral */ && includes & 134217728 /* TemplateLiteral */) {
                         removeStringLiteralsMatchedByTemplateLiterals(typeSet);
@@ -63776,7 +63782,16 @@ var ts;
                         var type = getTypeOfDottedName(node.expression, diagnostic);
                         if (type) {
                             var name = node.name;
-                            var prop = getPropertyOfType(type, ts.isPrivateIdentifier(name) ? ts.getSymbolNameForPrivateIdentifier(type.symbol, name.escapedText) : name.escapedText);
+                            var prop = void 0;
+                            if (ts.isPrivateIdentifier(name)) {
+                                if (!type.symbol) {
+                                    return undefined;
+                                }
+                                prop = getPropertyOfType(type, ts.getSymbolNameForPrivateIdentifier(type.symbol, name.escapedText));
+                            }
+                            else {
+                                prop = getPropertyOfType(type, name.escapedText);
+                            }
                             return prop && getExplicitTypeOfSymbol(prop, diagnostic);
                         }
                         return undefined;
@@ -75193,7 +75208,9 @@ var ts;
                 : ts.isPropertyAccessExpression(location) ? location.name
                     : ts.isBinaryExpression(location) && ts.isIdentifier(location.right) ? location.right
                         : undefined;
-            if (!testedNode) {
+            var isPropertyExpressionCast = ts.isPropertyAccessExpression(location)
+                && ts.isAssertionExpression(ts.skipParentheses(location.expression));
+            if (!testedNode || isPropertyExpressionCast) {
                 return;
             }
             var possiblyFalsy = getFalsyFlags(type);
@@ -77343,6 +77360,7 @@ var ts;
             return true;
         }
         function checkAliasSymbol(node) {
+            var _a;
             var symbol = getSymbolOfNode(node);
             var target = resolveAlias(symbol);
             if (target !== unknownSymbol) {
@@ -77370,7 +77388,7 @@ var ts;
                     && !(node.flags & 8388608 /* Ambient */)) {
                     error(node, ts.Diagnostics.Re_exporting_a_type_when_the_isolatedModules_flag_is_provided_requires_using_export_type);
                 }
-                if (ts.isImportSpecifier(node) && ts.every(target.declarations, function (d) { return !!(ts.getCombinedNodeFlags(d) & 134217728 /* Deprecated */); })) {
+                if (ts.isImportSpecifier(node) && ((_a = target.declarations) === null || _a === void 0 ? void 0 : _a.every(function (d) { return !!(ts.getCombinedNodeFlags(d) & 134217728 /* Deprecated */); }))) {
                     addDeprecatedSuggestion(node.name, target.declarations, symbol.escapedName);
                 }
             }
@@ -111475,10 +111493,11 @@ var ts;
             var redirects = host.redirectTargetsMap.get(importedPath) || ts.emptyArray;
             var importedFileNames = __spreadArray(__spreadArray(__spreadArray([], (referenceRedirect ? [referenceRedirect] : ts.emptyArray)), [importedFileName]), redirects);
             var targets = importedFileNames.map(function (f) { return ts.getNormalizedAbsolutePath(f, cwd); });
+            var shouldFilterIgnoredPaths = !ts.every(targets, ts.containsIgnoredPath);
             if (!preferSymlinks) {
                 // Symlinks inside ignored paths are already filtered out of the symlink cache,
                 // so we only need to remove them from the realpath filenames.
-                var result_15 = ts.forEach(targets, function (p) { return !ts.containsIgnoredPath(p) && cb(p, referenceRedirect === p); });
+                var result_15 = ts.forEach(targets, function (p) { return !(shouldFilterIgnoredPaths && ts.containsIgnoredPath(p)) && cb(p, referenceRedirect === p); });
                 if (result_15)
                     return result_15;
             }
@@ -111504,13 +111523,14 @@ var ts;
                         var symlinkDirectory = symlinkDirectories_1[_i];
                         var option = ts.resolvePath(symlinkDirectory, relative);
                         var result_16 = cb(option, target === referenceRedirect);
+                        shouldFilterIgnoredPaths = true; // We found a non-ignored path in symlinks, so we can reject ignored-path realpaths
                         if (result_16)
                             return result_16;
                     }
                 });
             });
             return result || (preferSymlinks
-                ? ts.forEach(targets, function (p) { return ts.containsIgnoredPath(p) ? undefined : cb(p, p === referenceRedirect); })
+                ? ts.forEach(targets, function (p) { return shouldFilterIgnoredPaths && ts.containsIgnoredPath(p) ? undefined : cb(p, p === referenceRedirect); })
                 : undefined);
         }
         moduleSpecifiers.forEachFileNameOfModule = forEachFileNameOfModule;
@@ -139585,7 +139605,7 @@ var ts;
         }
         function addFunctionDeclaration(changes, context, info) {
             var importAdder = codefix.createImportAdder(context.sourceFile, context.program, context.preferences, context.host);
-            var functionDeclaration = codefix.createSignatureDeclarationFromCallExpression(251 /* FunctionDeclaration */, context, importAdder, info.call, info.token, info.modifierFlags, info.parentDeclaration);
+            var functionDeclaration = codefix.createSignatureDeclarationFromCallExpression(251 /* FunctionDeclaration */, context, importAdder, info.call, ts.idText(info.token), info.modifierFlags, info.parentDeclaration);
             changes.insertNodeAtEndOfScope(info.sourceFile, info.parentDeclaration, functionDeclaration);
         }
     })(codefix = ts.codefix || (ts.codefix = {}));
@@ -148401,7 +148421,7 @@ var ts;
         };
         SignatureObject.prototype.getJsDocTags = function () {
             if (this.jsDocTags === undefined) {
-                this.jsDocTags = this.declaration ? getJsDocTags([this.declaration], this.checker) : [];
+                this.jsDocTags = this.declaration ? getJsDocTagsOfSignature(this.declaration, this.checker) : [];
             }
             return this.jsDocTags;
         };
@@ -148415,15 +148435,13 @@ var ts;
     function hasJSDocInheritDocTag(node) {
         return ts.getJSDocTags(node).some(function (tag) { return tag.tagName.text === "inheritDoc"; });
     }
-    function getJsDocTags(declarations, checker) {
-        var tags = ts.JsDoc.getJsDocTagsFromDeclarations(declarations);
-        if (tags.length === 0 || declarations.some(hasJSDocInheritDocTag)) {
-            ts.forEachUnique(declarations, function (declaration) {
-                var inheritedTags = findBaseOfDeclaration(checker, declaration, function (symbol) { return symbol.getJsDocTags(); });
-                if (inheritedTags) {
-                    tags = __spreadArray(__spreadArray([], inheritedTags), tags);
-                }
-            });
+    function getJsDocTagsOfSignature(declaration, checker) {
+        var tags = ts.JsDoc.getJsDocTagsFromDeclarations([declaration]);
+        if (tags.length === 0 || hasJSDocInheritDocTag(declaration)) {
+            var inheritedTags = findBaseOfDeclaration(checker, declaration, function (symbol) { var _a; return ((_a = symbol.declarations) === null || _a === void 0 ? void 0 : _a.length) === 1 ? symbol.getJsDocTags() : undefined; });
+            if (inheritedTags) {
+                tags = __spreadArray(__spreadArray([], inheritedTags), tags);
+            }
         }
         return tags;
     }
@@ -152527,6 +152545,34 @@ var ts;
                 ScriptTarget["ES2020"] = "ES2020";
                 ScriptTarget["ESNext"] = "ESNext";
             })(ScriptTarget = protocol.ScriptTarget || (protocol.ScriptTarget = {}));
+            var ClassificationType;
+            (function (ClassificationType) {
+                ClassificationType[ClassificationType["comment"] = 1] = "comment";
+                ClassificationType[ClassificationType["identifier"] = 2] = "identifier";
+                ClassificationType[ClassificationType["keyword"] = 3] = "keyword";
+                ClassificationType[ClassificationType["numericLiteral"] = 4] = "numericLiteral";
+                ClassificationType[ClassificationType["operator"] = 5] = "operator";
+                ClassificationType[ClassificationType["stringLiteral"] = 6] = "stringLiteral";
+                ClassificationType[ClassificationType["regularExpressionLiteral"] = 7] = "regularExpressionLiteral";
+                ClassificationType[ClassificationType["whiteSpace"] = 8] = "whiteSpace";
+                ClassificationType[ClassificationType["text"] = 9] = "text";
+                ClassificationType[ClassificationType["punctuation"] = 10] = "punctuation";
+                ClassificationType[ClassificationType["className"] = 11] = "className";
+                ClassificationType[ClassificationType["enumName"] = 12] = "enumName";
+                ClassificationType[ClassificationType["interfaceName"] = 13] = "interfaceName";
+                ClassificationType[ClassificationType["moduleName"] = 14] = "moduleName";
+                ClassificationType[ClassificationType["typeParameterName"] = 15] = "typeParameterName";
+                ClassificationType[ClassificationType["typeAliasName"] = 16] = "typeAliasName";
+                ClassificationType[ClassificationType["parameterName"] = 17] = "parameterName";
+                ClassificationType[ClassificationType["docCommentTagName"] = 18] = "docCommentTagName";
+                ClassificationType[ClassificationType["jsxOpenTagName"] = 19] = "jsxOpenTagName";
+                ClassificationType[ClassificationType["jsxCloseTagName"] = 20] = "jsxCloseTagName";
+                ClassificationType[ClassificationType["jsxSelfClosingTagName"] = 21] = "jsxSelfClosingTagName";
+                ClassificationType[ClassificationType["jsxAttribute"] = 22] = "jsxAttribute";
+                ClassificationType[ClassificationType["jsxText"] = 23] = "jsxText";
+                ClassificationType[ClassificationType["jsxAttributeStringLiteralValue"] = 24] = "jsxAttributeStringLiteralValue";
+                ClassificationType[ClassificationType["bigintLiteral"] = 25] = "bigintLiteral";
+            })(ClassificationType = protocol.ClassificationType || (protocol.ClassificationType = {}));
         })(protocol = server.protocol || (server.protocol = {}));
     })(server = ts.server || (ts.server = {}));
 })(ts || (ts = {}));

package/lib/tsserverlibrary.d.ts

@@ -7136,6 +7136,41 @@ declare namespace ts.server.protocol {
          */
         body?: string[];
     }
+    /**
+     * A request to get encoded semantic classifications for a span in the file
+     */
+    interface EncodedSemanticClassificationsRequest extends FileRequest {
+        arguments: EncodedSemanticClassificationsRequestArgs;
+    }
+    /**
+     * Arguments for EncodedSemanticClassificationsRequest request.
+     */
+    interface EncodedSemanticClassificationsRequestArgs extends FileRequestArgs {
+        /**
+         * Start position of the span.
+         */
+        start: number;
+        /**
+         * Length of the span.
+         */
+        length: number;
+        /**
+         * Optional parameter for the semantic highlighting response, if absent it
+         * defaults to "original".
+         */
+        format?: "original" | "2020";
+    }
+    /** The response for a EncodedSemanticClassificationsRequest */
+    interface EncodedSemanticClassificationsResponse extends Response {
+        body?: EncodedSemanticClassificationsResponseBody;
+    }
+    /**
+     * Implementation response message. Gives series of text spans depending on the format ar.
+     */
+    interface EncodedSemanticClassificationsResponseBody {
+        endOfLineState: EndOfLineState;
+        spans: number[];
+    }
     /**
      * Arguments in document highlight request; include: filesToSearch, file,
      * line, offset.
@@ -9159,6 +9194,33 @@ declare namespace ts.server.protocol {
         ES2020 = "ES2020",
         ESNext = "ESNext"
     }
+    enum ClassificationType {
+        comment = 1,
+        identifier = 2,
+        keyword = 3,
+        numericLiteral = 4,
+        operator = 5,
+        stringLiteral = 6,
+        regularExpressionLiteral = 7,
+        whiteSpace = 8,
+        text = 9,
+        punctuation = 10,
+        className = 11,
+        enumName = 12,
+        interfaceName = 13,
+        moduleName = 14,
+        typeParameterName = 15,
+        typeAliasName = 16,
+        parameterName = 17,
+        docCommentTagName = 18,
+        jsxOpenTagName = 19,
+        jsxCloseTagName = 20,
+        jsxSelfClosingTagName = 21,
+        jsxAttribute = 22,
+        jsxText = 23,
+        jsxAttributeStringLiteralValue = 24,
+        bigintLiteral = 25
+    }
 }
 declare namespace ts.server {
     interface ScriptInfoVersion {

package/lib/tsserverlibrary.js

@@ -290,7 +290,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = ts.versionMajorMinor + ".0-insiders.20210210";
+    ts.version = "4.2.4";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -7199,13 +7199,13 @@ var ts;
             }
             var activeSession;
             var profilePath = "./profile.cpuprofile";
-            var realpathSync = (_a = _fs.realpathSync.native) !== null && _a !== void 0 ? _a : _fs.realpathSync;
             var Buffer = require("buffer").Buffer;
             var nodeVersion = getNodeMajorVersion();
             var isNode4OrLater = nodeVersion >= 4;
             var isLinuxOrMacOs = process.platform === "linux" || process.platform === "darwin";
             var platform = _os.platform();
             var useCaseSensitiveFileNames = isFileSystemCaseSensitive();
+            var realpathSync = useCaseSensitiveFileNames ? ((_a = _fs.realpathSync.native) !== null && _a !== void 0 ? _a : _fs.realpathSync) : _fs.realpathSync;
             var fsSupportsRecursiveFsWatch = isNode4OrLater && (process.platform === "win32" || process.platform === "darwin");
             var getCurrentDirectory = ts.memoize(function () { return process.cwd(); });
             var _c = createSystemWatchFunctions({
@@ -47177,7 +47177,9 @@ var ts;
             var result = new Type(checker, flags);
             typeCount++;
             result.id = typeCount;
-            typeCatalog.push(result);
+            if (ts.tracing) {
+                typeCatalog.push(result);
+            }
             return result;
         }
         function createOriginType(flags) {
@@ -47238,13 +47240,17 @@ var ts;
             return result || ts.emptyArray;
         }
         function setStructuredTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo) {
-            type.members = members;
-            type.properties = members === emptySymbols ? ts.emptyArray : getNamedMembers(members);
-            type.callSignatures = callSignatures;
-            type.constructSignatures = constructSignatures;
-            type.stringIndexInfo = stringIndexInfo;
-            type.numberIndexInfo = numberIndexInfo;
-            return type;
+            var resolved = type;
+            resolved.members = members;
+            resolved.properties = ts.emptyArray;
+            resolved.callSignatures = callSignatures;
+            resolved.constructSignatures = constructSignatures;
+            resolved.stringIndexInfo = stringIndexInfo;
+            resolved.numberIndexInfo = numberIndexInfo;
+            // This can loop back to getPropertyOfType() which would crash if `callSignatures` & `constructSignatures` are not initialized.
+            if (members !== emptySymbols)
+                resolved.properties = getNamedMembers(members);
+            return resolved;
         }
         function createAnonymousType(symbol, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo) {
             return setStructuredTypeMembers(createObjectType(16 /* Anonymous */, symbol), members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
@@ -55871,7 +55877,7 @@ var ts;
             }
             return true;
         }
-        function removeRedundantLiteralTypes(types, includes) {
+        function removeRedundantLiteralTypes(types, includes, reduceVoidUndefined) {
             var i = types.length;
             while (i > 0) {
                 i--;
@@ -55881,7 +55887,7 @@ var ts;
                     flags & 256 /* NumberLiteral */ && includes & 8 /* Number */ ||
                     flags & 2048 /* BigIntLiteral */ && includes & 64 /* BigInt */ ||
                     flags & 8192 /* UniqueESSymbol */ && includes & 4096 /* ESSymbol */ ||
-                    flags & 32768 /* Undefined */ && includes & 16384 /* Void */ ||
+                    reduceVoidUndefined && flags & 32768 /* Undefined */ && includes & 16384 /* Void */ ||
                     isFreshLiteralType(t) && containsType(types, t.regularType);
                 if (remove) {
                     ts.orderedRemoveItemAt(types, i);
@@ -55913,7 +55919,7 @@ var ts;
                 if (t.flags & 1048576 /* Union */) {
                     var origin = t.origin;
                     if (t.aliasSymbol || origin && !(origin.flags & 1048576 /* Union */)) {
-                        namedUnions.push(t);
+                        ts.pushIfUnique(namedUnions, t);
                     }
                     else if (origin && origin.flags & 1048576 /* Union */) {
                         addNamedUnions(namedUnions, origin.types);
@@ -55949,7 +55955,7 @@ var ts;
                 }
                 if (unionReduction & (1 /* Literal */ | 2 /* Subtype */)) {
                     if (includes & (2944 /* Literal */ | 8192 /* UniqueESSymbol */) || includes & 16384 /* Void */ && includes & 32768 /* Undefined */) {
-                        removeRedundantLiteralTypes(typeSet, includes);
+                        removeRedundantLiteralTypes(typeSet, includes, !!(unionReduction & 2 /* Subtype */));
                     }
                     if (includes & 128 /* StringLiteral */ && includes & 134217728 /* TemplateLiteral */) {
                         removeStringLiteralsMatchedByTemplateLiterals(typeSet);
@@ -63970,7 +63976,16 @@ var ts;
                         var type = getTypeOfDottedName(node.expression, diagnostic);
                         if (type) {
                             var name = node.name;
-                            var prop = getPropertyOfType(type, ts.isPrivateIdentifier(name) ? ts.getSymbolNameForPrivateIdentifier(type.symbol, name.escapedText) : name.escapedText);
+                            var prop = void 0;
+                            if (ts.isPrivateIdentifier(name)) {
+                                if (!type.symbol) {
+                                    return undefined;
+                                }
+                                prop = getPropertyOfType(type, ts.getSymbolNameForPrivateIdentifier(type.symbol, name.escapedText));
+                            }
+                            else {
+                                prop = getPropertyOfType(type, name.escapedText);
+                            }
                             return prop && getExplicitTypeOfSymbol(prop, diagnostic);
                         }
                         return undefined;
@@ -75387,7 +75402,9 @@ var ts;
                 : ts.isPropertyAccessExpression(location) ? location.name
                     : ts.isBinaryExpression(location) && ts.isIdentifier(location.right) ? location.right
                         : undefined;
-            if (!testedNode) {
+            var isPropertyExpressionCast = ts.isPropertyAccessExpression(location)
+                && ts.isAssertionExpression(ts.skipParentheses(location.expression));
+            if (!testedNode || isPropertyExpressionCast) {
                 return;
             }
             var possiblyFalsy = getFalsyFlags(type);
@@ -77537,6 +77554,7 @@ var ts;
             return true;
         }
         function checkAliasSymbol(node) {
+            var _a;
             var symbol = getSymbolOfNode(node);
             var target = resolveAlias(symbol);
             if (target !== unknownSymbol) {
@@ -77564,7 +77582,7 @@ var ts;
                     && !(node.flags & 8388608 /* Ambient */)) {
                     error(node, ts.Diagnostics.Re_exporting_a_type_when_the_isolatedModules_flag_is_provided_requires_using_export_type);
                 }
-                if (ts.isImportSpecifier(node) && ts.every(target.declarations, function (d) { return !!(ts.getCombinedNodeFlags(d) & 134217728 /* Deprecated */); })) {
+                if (ts.isImportSpecifier(node) && ((_a = target.declarations) === null || _a === void 0 ? void 0 : _a.every(function (d) { return !!(ts.getCombinedNodeFlags(d) & 134217728 /* Deprecated */); }))) {
                     addDeprecatedSuggestion(node.name, target.declarations, symbol.escapedName);
                 }
             }
@@ -111669,10 +111687,11 @@ var ts;
             var redirects = host.redirectTargetsMap.get(importedPath) || ts.emptyArray;
             var importedFileNames = __spreadArray(__spreadArray(__spreadArray([], (referenceRedirect ? [referenceRedirect] : ts.emptyArray)), [importedFileName]), redirects);
             var targets = importedFileNames.map(function (f) { return ts.getNormalizedAbsolutePath(f, cwd); });
+            var shouldFilterIgnoredPaths = !ts.every(targets, ts.containsIgnoredPath);
             if (!preferSymlinks) {
                 // Symlinks inside ignored paths are already filtered out of the symlink cache,
                 // so we only need to remove them from the realpath filenames.
-                var result_15 = ts.forEach(targets, function (p) { return !ts.containsIgnoredPath(p) && cb(p, referenceRedirect === p); });
+                var result_15 = ts.forEach(targets, function (p) { return !(shouldFilterIgnoredPaths && ts.containsIgnoredPath(p)) && cb(p, referenceRedirect === p); });
                 if (result_15)
                     return result_15;
             }
@@ -111698,13 +111717,14 @@ var ts;
                         var symlinkDirectory = symlinkDirectories_1[_i];
                         var option = ts.resolvePath(symlinkDirectory, relative);
                         var result_16 = cb(option, target === referenceRedirect);
+                        shouldFilterIgnoredPaths = true; // We found a non-ignored path in symlinks, so we can reject ignored-path realpaths
                         if (result_16)
                             return result_16;
                     }
                 });
             });
             return result || (preferSymlinks
-                ? ts.forEach(targets, function (p) { return ts.containsIgnoredPath(p) ? undefined : cb(p, p === referenceRedirect); })
+                ? ts.forEach(targets, function (p) { return shouldFilterIgnoredPaths && ts.containsIgnoredPath(p) ? undefined : cb(p, p === referenceRedirect); })
                 : undefined);
         }
         moduleSpecifiers.forEachFileNameOfModule = forEachFileNameOfModule;
@@ -140154,7 +140174,7 @@ var ts;
         }
         function addFunctionDeclaration(changes, context, info) {
             var importAdder = codefix.createImportAdder(context.sourceFile, context.program, context.preferences, context.host);
-            var functionDeclaration = codefix.createSignatureDeclarationFromCallExpression(251 /* FunctionDeclaration */, context, importAdder, info.call, info.token, info.modifierFlags, info.parentDeclaration);
+            var functionDeclaration = codefix.createSignatureDeclarationFromCallExpression(251 /* FunctionDeclaration */, context, importAdder, info.call, ts.idText(info.token), info.modifierFlags, info.parentDeclaration);
             changes.insertNodeAtEndOfScope(info.sourceFile, info.parentDeclaration, functionDeclaration);
         }
     })(codefix = ts.codefix || (ts.codefix = {}));
@@ -148970,7 +148990,7 @@ var ts;
         };
         SignatureObject.prototype.getJsDocTags = function () {
             if (this.jsDocTags === undefined) {
-                this.jsDocTags = this.declaration ? getJsDocTags([this.declaration], this.checker) : [];
+                this.jsDocTags = this.declaration ? getJsDocTagsOfSignature(this.declaration, this.checker) : [];
             }
             return this.jsDocTags;
         };
@@ -148984,15 +149004,13 @@ var ts;
     function hasJSDocInheritDocTag(node) {
         return ts.getJSDocTags(node).some(function (tag) { return tag.tagName.text === "inheritDoc"; });
     }
-    function getJsDocTags(declarations, checker) {
-        var tags = ts.JsDoc.getJsDocTagsFromDeclarations(declarations);
-        if (tags.length === 0 || declarations.some(hasJSDocInheritDocTag)) {
-            ts.forEachUnique(declarations, function (declaration) {
-                var inheritedTags = findBaseOfDeclaration(checker, declaration, function (symbol) { return symbol.getJsDocTags(); });
-                if (inheritedTags) {
-                    tags = __spreadArray(__spreadArray([], inheritedTags), tags);
-                }
-            });
+    function getJsDocTagsOfSignature(declaration, checker) {
+        var tags = ts.JsDoc.getJsDocTagsFromDeclarations([declaration]);
+        if (tags.length === 0 || hasJSDocInheritDocTag(declaration)) {
+            var inheritedTags = findBaseOfDeclaration(checker, declaration, function (symbol) { var _a; return ((_a = symbol.declarations) === null || _a === void 0 ? void 0 : _a.length) === 1 ? symbol.getJsDocTags() : undefined; });
+            if (inheritedTags) {
+                tags = __spreadArray(__spreadArray([], inheritedTags), tags);
+            }
         }
         return tags;
     }
@@ -152721,6 +152739,34 @@ var ts;
                 ScriptTarget["ES2020"] = "ES2020";
                 ScriptTarget["ESNext"] = "ESNext";
             })(ScriptTarget = protocol.ScriptTarget || (protocol.ScriptTarget = {}));
+            var ClassificationType;
+            (function (ClassificationType) {
+                ClassificationType[ClassificationType["comment"] = 1] = "comment";
+                ClassificationType[ClassificationType["identifier"] = 2] = "identifier";
+                ClassificationType[ClassificationType["keyword"] = 3] = "keyword";
+                ClassificationType[ClassificationType["numericLiteral"] = 4] = "numericLiteral";
+                ClassificationType[ClassificationType["operator"] = 5] = "operator";
+                ClassificationType[ClassificationType["stringLiteral"] = 6] = "stringLiteral";
+                ClassificationType[ClassificationType["regularExpressionLiteral"] = 7] = "regularExpressionLiteral";
+                ClassificationType[ClassificationType["whiteSpace"] = 8] = "whiteSpace";
+                ClassificationType[ClassificationType["text"] = 9] = "text";
+                ClassificationType[ClassificationType["punctuation"] = 10] = "punctuation";
+                ClassificationType[ClassificationType["className"] = 11] = "className";
+                ClassificationType[ClassificationType["enumName"] = 12] = "enumName";
+                ClassificationType[ClassificationType["interfaceName"] = 13] = "interfaceName";
+                ClassificationType[ClassificationType["moduleName"] = 14] = "moduleName";
+                ClassificationType[ClassificationType["typeParameterName"] = 15] = "typeParameterName";
+                ClassificationType[ClassificationType["typeAliasName"] = 16] = "typeAliasName";
+                ClassificationType[ClassificationType["parameterName"] = 17] = "parameterName";
+                ClassificationType[ClassificationType["docCommentTagName"] = 18] = "docCommentTagName";
+                ClassificationType[ClassificationType["jsxOpenTagName"] = 19] = "jsxOpenTagName";
+                ClassificationType[ClassificationType["jsxCloseTagName"] = 20] = "jsxCloseTagName";
+                ClassificationType[ClassificationType["jsxSelfClosingTagName"] = 21] = "jsxSelfClosingTagName";
+                ClassificationType[ClassificationType["jsxAttribute"] = 22] = "jsxAttribute";
+                ClassificationType[ClassificationType["jsxText"] = 23] = "jsxText";
+                ClassificationType[ClassificationType["jsxAttributeStringLiteralValue"] = 24] = "jsxAttributeStringLiteralValue";
+                ClassificationType[ClassificationType["bigintLiteral"] = 25] = "bigintLiteral";
+            })(ClassificationType = protocol.ClassificationType || (protocol.ClassificationType = {}));
         })(protocol = server.protocol || (server.protocol = {}));
     })(server = ts.server || (ts.server = {}));
 })(ts || (ts = {}));