typescript 4.6.0-dev.20220125 → 4.6.0-dev.20220129

package/lib/typescript.js

@@ -294,7 +294,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = ts.versionMajorMinor + ".0-dev.20220125";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220129";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -8049,7 +8049,7 @@ var ts;
     }
 })(ts || (ts = {}));
 // <auto-generated />
-// generated from './diagnosticInformationMap.generated.ts' by 'src/compiler'
+// generated from './diagnosticMessages.json' in 'src/compiler'
 /* @internal */
 var ts;
 (function (ts) {
@@ -9637,9 +9637,8 @@ var ts;
         Remove_variable_statement: diag(90010, ts.DiagnosticCategory.Message, "Remove_variable_statement_90010", "Remove variable statement"),
         Remove_template_tag: diag(90011, ts.DiagnosticCategory.Message, "Remove_template_tag_90011", "Remove template tag"),
         Remove_type_parameters: diag(90012, ts.DiagnosticCategory.Message, "Remove_type_parameters_90012", "Remove type parameters"),
-        Import_0_from_module_1: diag(90013, ts.DiagnosticCategory.Message, "Import_0_from_module_1_90013", "Import '{0}' from module \"{1}\""),
+        Import_0_from_1: diag(90013, ts.DiagnosticCategory.Message, "Import_0_from_1_90013", "Import '{0}' from \"{1}\""),
         Change_0_to_1: diag(90014, ts.DiagnosticCategory.Message, "Change_0_to_1_90014", "Change '{0}' to '{1}'"),
-        Add_0_to_existing_import_declaration_from_1: diag(90015, ts.DiagnosticCategory.Message, "Add_0_to_existing_import_declaration_from_1_90015", "Add '{0}' to existing import declaration from \"{1}\""),
         Declare_property_0: diag(90016, ts.DiagnosticCategory.Message, "Declare_property_0_90016", "Declare property '{0}'"),
         Add_index_signature_for_property_0: diag(90017, ts.DiagnosticCategory.Message, "Add_index_signature_for_property_0_90017", "Add index signature for property '{0}'"),
         Disable_checking_for_this_file: diag(90018, ts.DiagnosticCategory.Message, "Disable_checking_for_this_file_90018", "Disable checking for this file"),
@@ -9656,8 +9655,6 @@ var ts;
         Add_async_modifier_to_containing_function: diag(90029, ts.DiagnosticCategory.Message, "Add_async_modifier_to_containing_function_90029", "Add async modifier to containing function"),
         Replace_infer_0_with_unknown: diag(90030, ts.DiagnosticCategory.Message, "Replace_infer_0_with_unknown_90030", "Replace 'infer {0}' with 'unknown'"),
         Replace_all_unused_infer_with_unknown: diag(90031, ts.DiagnosticCategory.Message, "Replace_all_unused_infer_with_unknown_90031", "Replace all unused 'infer' with 'unknown'"),
-        Import_default_0_from_module_1: diag(90032, ts.DiagnosticCategory.Message, "Import_default_0_from_module_1_90032", "Import default '{0}' from module \"{1}\""),
-        Add_default_import_0_to_existing_import_declaration_from_1: diag(90033, ts.DiagnosticCategory.Message, "Add_default_import_0_to_existing_import_declaration_from_1_90033", "Add default import '{0}' to existing import declaration from \"{1}\""),
         Add_parameter_name: diag(90034, ts.DiagnosticCategory.Message, "Add_parameter_name_90034", "Add parameter name"),
         Declare_private_property_0: diag(90035, ts.DiagnosticCategory.Message, "Declare_private_property_0_90035", "Declare private property '{0}'"),
         Replace_0_with_Promise_1: diag(90036, ts.DiagnosticCategory.Message, "Replace_0_with_Promise_1_90036", "Replace '{0}' with 'Promise<{1}>'"),
@@ -9667,6 +9664,10 @@ var ts;
         Remove_unused_declarations_for_Colon_0: diag(90041, ts.DiagnosticCategory.Message, "Remove_unused_declarations_for_Colon_0_90041", "Remove unused declarations for: '{0}'"),
         Declare_a_private_field_named_0: diag(90053, ts.DiagnosticCategory.Message, "Declare_a_private_field_named_0_90053", "Declare a private field named '{0}'."),
         Includes_imports_of_types_referenced_by_0: diag(90054, ts.DiagnosticCategory.Message, "Includes_imports_of_types_referenced_by_0_90054", "Includes imports of types referenced by '{0}'"),
+        Remove_type_from_import_declaration_from_0: diag(90055, ts.DiagnosticCategory.Message, "Remove_type_from_import_declaration_from_0_90055", "Remove 'type' from import declaration from \"{0}\""),
+        Remove_type_from_import_of_0_from_1: diag(90056, ts.DiagnosticCategory.Message, "Remove_type_from_import_of_0_from_1_90056", "Remove 'type' from import of '{0}' from \"{1}\""),
+        Add_import_from_0: diag(90057, ts.DiagnosticCategory.Message, "Add_import_from_0_90057", "Add import from \"{0}\""),
+        Update_import_from_0: diag(90058, ts.DiagnosticCategory.Message, "Update_import_from_0_90058", "Update import from \"{0}\""),
         Convert_function_to_an_ES2015_class: diag(95001, ts.DiagnosticCategory.Message, "Convert_function_to_an_ES2015_class_95001", "Convert function to an ES2015 class"),
         Convert_0_to_1_in_0: diag(95003, ts.DiagnosticCategory.Message, "Convert_0_to_1_in_0_95003", "Convert '{0}' to '{1} in {0}'"),
         Extract_to_0_in_1: diag(95004, ts.DiagnosticCategory.Message, "Extract_to_0_in_1_95004", "Extract to {0} in {1}"),
@@ -14257,10 +14258,13 @@ var ts;
     function packageIdIsEqual(a, b) {
         return a === b || !!a && !!b && a.name === b.name && a.subModuleName === b.subModuleName && a.version === b.version;
     }
-    function packageIdToString(_a) {
-        var name = _a.name, subModuleName = _a.subModuleName, version = _a.version;
-        var fullName = subModuleName ? name + "/" + subModuleName : name;
-        return fullName + "@" + version;
+    function packageIdToPackageName(_a) {
+        var name = _a.name, subModuleName = _a.subModuleName;
+        return subModuleName ? name + "/" + subModuleName : name;
+    }
+    ts.packageIdToPackageName = packageIdToPackageName;
+    function packageIdToString(packageId) {
+        return packageIdToPackageName(packageId) + "@" + packageId.version;
     }
     ts.packageIdToString = packageIdToString;
     function typeDirectiveIsEqualTo(oldResolution, newResolution) {
@@ -15093,6 +15097,15 @@ var ts;
         };
     }
     ts.createDiagnosticForFileFromMessageChain = createDiagnosticForFileFromMessageChain;
+    function createDiagnosticMessageChainFromDiagnostic(diagnostic) {
+        return typeof diagnostic.messageText === "string" ? {
+            code: diagnostic.code,
+            category: diagnostic.category,
+            messageText: diagnostic.messageText,
+            next: diagnostic.next,
+        } : diagnostic.messageText;
+    }
+    ts.createDiagnosticMessageChainFromDiagnostic = createDiagnosticMessageChainFromDiagnostic;
     function createDiagnosticForRange(sourceFile, range, message) {
         return {
             file: sourceFile,
@@ -15261,7 +15274,8 @@ var ts;
             node.kind === 212 /* FunctionExpression */ ||
             node.kind === 213 /* ArrowFunction */ ||
             node.kind === 211 /* ParenthesizedExpression */ ||
-            node.kind === 253 /* VariableDeclaration */) ?
+            node.kind === 253 /* VariableDeclaration */ ||
+            node.kind === 274 /* ExportSpecifier */) ?
             ts.concatenate(ts.getTrailingCommentRanges(text, node.pos), ts.getLeadingCommentRanges(text, node.pos)) :
             ts.getLeadingCommentRanges(text, node.pos);
         // True if the comment starts with '/**' but not if it is '/**/'
@@ -21052,6 +21066,59 @@ var ts;
         return !!(type.flags & 262144 /* TypeParameter */ && type.isThisType);
     }
     ts.isThisTypeParameter = isThisTypeParameter;
+    function getNodeModulePathParts(fullPath) {
+        // If fullPath can't be valid module file within node_modules, returns undefined.
+        // Example of expected pattern: /base/path/node_modules/[@scope/otherpackage/@otherscope/node_modules/]package/[subdirectory/]file.js
+        // Returns indices:                       ^            ^                                                      ^             ^
+        var topLevelNodeModulesIndex = 0;
+        var topLevelPackageNameIndex = 0;
+        var packageRootIndex = 0;
+        var fileNameIndex = 0;
+        var States;
+        (function (States) {
+            States[States["BeforeNodeModules"] = 0] = "BeforeNodeModules";
+            States[States["NodeModules"] = 1] = "NodeModules";
+            States[States["Scope"] = 2] = "Scope";
+            States[States["PackageContent"] = 3] = "PackageContent";
+        })(States || (States = {}));
+        var partStart = 0;
+        var partEnd = 0;
+        var state = 0 /* BeforeNodeModules */;
+        while (partEnd >= 0) {
+            partStart = partEnd;
+            partEnd = fullPath.indexOf("/", partStart + 1);
+            switch (state) {
+                case 0 /* BeforeNodeModules */:
+                    if (fullPath.indexOf(ts.nodeModulesPathPart, partStart) === partStart) {
+                        topLevelNodeModulesIndex = partStart;
+                        topLevelPackageNameIndex = partEnd;
+                        state = 1 /* NodeModules */;
+                    }
+                    break;
+                case 1 /* NodeModules */:
+                case 2 /* Scope */:
+                    if (state === 1 /* NodeModules */ && fullPath.charAt(partStart + 1) === "@") {
+                        state = 2 /* Scope */;
+                    }
+                    else {
+                        packageRootIndex = partEnd;
+                        state = 3 /* PackageContent */;
+                    }
+                    break;
+                case 3 /* PackageContent */:
+                    if (fullPath.indexOf(ts.nodeModulesPathPart, partStart) === partStart) {
+                        state = 1 /* NodeModules */;
+                    }
+                    else {
+                        state = 3 /* PackageContent */;
+                    }
+                    break;
+            }
+        }
+        fileNameIndex = partStart;
+        return state > 1 /* NodeModules */ ? { topLevelNodeModulesIndex: topLevelNodeModulesIndex, topLevelPackageNameIndex: topLevelPackageNameIndex, packageRootIndex: packageRootIndex, fileNameIndex: fileNameIndex } : undefined;
+    }
+    ts.getNodeModulePathParts = getNodeModulePathParts;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
@@ -36412,7 +36479,8 @@ var ts;
             return finishNode(node, pos);
         }
         function parseExportSpecifier() {
-            return parseImportOrExportSpecifier(274 /* ExportSpecifier */);
+            var hasJSDoc = hasPrecedingJSDocComment();
+            return withJSDoc(parseImportOrExportSpecifier(274 /* ExportSpecifier */), hasJSDoc);
         }
         function parseImportSpecifier() {
             return parseImportOrExportSpecifier(269 /* ImportSpecifier */);
@@ -43617,14 +43685,12 @@ var ts;
     }
     var binder = createBinder();
     function bindSourceFile(file, options) {
-        ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.push("bind" /* Bind */, "bindSourceFile", { path: file.path }, /*separateBeginAndEnd*/ true);
         ts.performance.mark("beforeBind");
         ts.perfLogger.logStartBindFile("" + file.fileName);
         binder(file, options);
         ts.perfLogger.logStopBindFile();
         ts.performance.mark("afterBind");
         ts.performance.measure("Bind", "beforeBind", "afterBind");
-        ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.pop();
     }
     ts.bindSourceFile = bindSourceFile;
     function createBinder() {
@@ -43684,7 +43750,9 @@ var ts;
             ts.Debug.attachFlowNodeDebugInfo(unreachableFlow);
             ts.Debug.attachFlowNodeDebugInfo(reportedUnreachableFlow);
             if (!file.locals) {
+                ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.push("bind" /* Bind */, "bindSourceFile", { path: file.path }, /*separateBeginAndEnd*/ true);
                 bind(file);
+                ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.pop();
                 file.symbolCount = symbolCount;
                 file.classifiableNames = classifiableNames;
                 delayedBindJSDocTypedefTag();
@@ -47951,6 +48019,9 @@ var ts;
             suggestionDiagnostics.add(diagnostic);
             return diagnostic;
         }
+        function isDeprecatedSymbol(symbol) {
+            return !!(getDeclarationNodeFlagsFromSymbol(symbol) & 134217728 /* Deprecated */);
+        }
         function addDeprecatedSuggestion(location, declarations, deprecatedEntity) {
             var diagnostic = ts.createDiagnosticForNode(location, ts.Diagnostics._0_is_deprecated, deprecatedEntity);
             return addDeprecatedSuggestionWorker(declarations, diagnostic);
@@ -48942,24 +49013,19 @@ var ts;
                         error(errorLocation, ts.Diagnostics.Parameter_0_cannot_reference_identifier_1_declared_after_it, ts.declarationNameToString(associatedDeclarationForContainingInitializerOrBindingName.name), ts.declarationNameToString(errorLocation));
                     }
                 }
-                if (result && errorLocation && meaning & 111551 /* Value */ && result.flags & 2097152 /* Alias */) {
-                    checkSymbolUsageInExpressionContext(result, name, errorLocation);
+                if (result && errorLocation && meaning & 111551 /* Value */ && result.flags & 2097152 /* Alias */ && !(result.flags & 111551 /* Value */) && !ts.isValidTypeOnlyAliasUseSite(errorLocation)) {
+                    var typeOnlyDeclaration = getTypeOnlyAliasDeclaration(result);
+                    if (typeOnlyDeclaration) {
+                        var message = typeOnlyDeclaration.kind === 274 /* ExportSpecifier */
+                            ? ts.Diagnostics._0_cannot_be_used_as_a_value_because_it_was_exported_using_export_type
+                            : ts.Diagnostics._0_cannot_be_used_as_a_value_because_it_was_imported_using_import_type;
+                        var unescapedName = ts.unescapeLeadingUnderscores(name);
+                        addTypeOnlyDeclarationRelatedInfo(error(errorLocation, message, unescapedName), typeOnlyDeclaration, unescapedName);
+                    }
                 }
             }
             return result;
         }
-        function checkSymbolUsageInExpressionContext(symbol, name, useSite) {
-            if (!ts.isValidTypeOnlyAliasUseSite(useSite)) {
-                var typeOnlyDeclaration = getTypeOnlyAliasDeclaration(symbol);
-                if (typeOnlyDeclaration) {
-                    var message = typeOnlyDeclaration.kind === 274 /* ExportSpecifier */
-                        ? ts.Diagnostics._0_cannot_be_used_as_a_value_because_it_was_exported_using_export_type
-                        : ts.Diagnostics._0_cannot_be_used_as_a_value_because_it_was_imported_using_import_type;
-                    var unescapedName = ts.unescapeLeadingUnderscores(name);
-                    addTypeOnlyDeclarationRelatedInfo(error(useSite, message, unescapedName), typeOnlyDeclaration, unescapedName);
-                }
-            }
-        }
         function addTypeOnlyDeclarationRelatedInfo(diagnostic, typeOnlyDeclaration, unescapedName) {
             if (!typeOnlyDeclaration)
                 return diagnostic;
@@ -52721,7 +52787,8 @@ var ts;
                         includePrivateSymbol === null || includePrivateSymbol === void 0 ? void 0 : includePrivateSymbol(sym);
                     }
                     if (ts.isIdentifier(node)) {
-                        var name = sym.flags & 262144 /* TypeParameter */ ? typeParameterToName(getDeclaredTypeOfSymbol(sym), context) : ts.factory.cloneNode(node);
+                        var type = getDeclaredTypeOfSymbol(sym);
+                        var name = sym.flags & 262144 /* TypeParameter */ && !isTypeSymbolAccessible(type.symbol, context.enclosingDeclaration) ? typeParameterToName(type, context) : ts.factory.cloneNode(node);
                         name.symbol = sym; // for quickinfo, which uses identifier symbol information
                         return { introducesError: introducesError, node: ts.setEmitFlags(ts.setOriginalNode(name, node), 16777216 /* NoAsciiEscaping */) };
                     }
@@ -60737,7 +60804,7 @@ var ts;
                 }
                 var prop = getPropertyOfType(objectType, propName);
                 if (prop) {
-                    if (accessFlags & 64 /* ReportDeprecated */ && accessNode && prop.declarations && getDeclarationNodeFlagsFromSymbol(prop) & 134217728 /* Deprecated */ && isUncalledFunctionReference(accessNode, prop)) {
+                    if (accessFlags & 64 /* ReportDeprecated */ && accessNode && prop.declarations && isDeprecatedSymbol(prop) && isUncalledFunctionReference(accessNode, prop)) {
                         var deprecatedNode = (_a = accessExpression === null || accessExpression === void 0 ? void 0 : accessExpression.argumentExpression) !== null && _a !== void 0 ? _a : (ts.isIndexedAccessTypeNode(accessNode) ? accessNode.indexType : accessNode);
                         addDeprecatedSuggestion(deprecatedNode, prop.declarations, propName);
                     }
@@ -70140,9 +70207,9 @@ var ts;
                 markAliasReferenced(symbol, node);
             }
             var localOrExportSymbol = getExportSymbolOfValueSymbolIfExported(symbol);
-            var sourceSymbol = localOrExportSymbol.flags & 2097152 /* Alias */ ? resolveAlias(localOrExportSymbol) : localOrExportSymbol;
-            if (sourceSymbol.declarations && getDeclarationNodeFlagsFromSymbol(sourceSymbol) & 134217728 /* Deprecated */ && isUncalledFunctionReference(node, sourceSymbol)) {
-                addDeprecatedSuggestion(node, sourceSymbol.declarations, node.escapedText);
+            var targetSymbol = checkDeprecatedAliasedSymbol(localOrExportSymbol, node);
+            if (isDeprecatedSymbol(targetSymbol) && isUncalledFunctionReference(node, targetSymbol) && targetSymbol.declarations) {
+                addDeprecatedSuggestion(node, targetSymbol.declarations, node.escapedText);
             }
             var declaration = localOrExportSymbol.valueDeclaration;
             if (declaration && localOrExportSymbol.flags & 32 /* Class */) {
@@ -73154,7 +73221,7 @@ var ts;
                 }
             }
             else {
-                if (prop.declarations && getDeclarationNodeFlagsFromSymbol(prop) & 134217728 /* Deprecated */ && isUncalledFunctionReference(node, prop)) {
+                if (isDeprecatedSymbol(prop) && isUncalledFunctionReference(node, prop) && prop.declarations) {
                     addDeprecatedSuggestion(right, prop.declarations, right.escapedText);
                 }
                 checkPropertyNotUsedBeforeDeclaration(prop, node, right);
@@ -74613,7 +74680,7 @@ var ts;
                         }
                         var diags_3 = max > 1 ? allDiagnostics[minIndex] : ts.flatten(allDiagnostics);
                         ts.Debug.assert(diags_3.length > 0, "No errors reported for 3 or fewer overload signatures");
-                        var chain = ts.chainDiagnosticMessages(ts.map(diags_3, function (d) { return typeof d.messageText === "string" ? d : d.messageText; }), ts.Diagnostics.No_overload_matches_this_call);
+                        var chain = ts.chainDiagnosticMessages(ts.map(diags_3, ts.createDiagnosticMessageChainFromDiagnostic), ts.Diagnostics.No_overload_matches_this_call);
                         // The below is a spread to guarantee we get a new (mutable) array - our `flatMap` helper tries to do "smart" optimizations where it reuses input
                         // arrays and the emptyArray singleton where possible, which is decidedly not what we want while we're still constructing this diagnostic
                         var related = __spreadArray([], ts.flatMap(diags_3, function (d) { return d.relatedInformation; }), true);
@@ -82992,16 +83059,15 @@ var ts;
                         return ts.nodeIsMissing(expr) ? 0 : evaluateEnumMember(expr, getSymbolOfNode(member.parent), identifier.escapedText);
                     case 206 /* ElementAccessExpression */:
                     case 205 /* PropertyAccessExpression */:
-                        var ex = expr;
-                        if (isConstantMemberAccess(ex)) {
-                            var type = getTypeOfExpression(ex.expression);
+                        if (isConstantMemberAccess(expr)) {
+                            var type = getTypeOfExpression(expr.expression);
                             if (type.symbol && type.symbol.flags & 384 /* Enum */) {
                                 var name = void 0;
-                                if (ex.kind === 205 /* PropertyAccessExpression */) {
-                                    name = ex.name.escapedText;
+                                if (expr.kind === 205 /* PropertyAccessExpression */) {
+                                    name = expr.name.escapedText;
                                 }
                                 else {
-                                    name = ts.escapeLeadingUnderscores(ts.cast(ex.argumentExpression, ts.isLiteralExpression).text);
+                                    name = ts.escapeLeadingUnderscores(ts.cast(expr.argumentExpression, ts.isLiteralExpression).text);
                                 }
                                 return evaluateEnumMember(expr, type.symbol, name);
                             }
@@ -83029,6 +83095,10 @@ var ts;
             }
         }
         function isConstantMemberAccess(node) {
+            var type = getTypeOfExpression(node);
+            if (type === errorType) {
+                return false;
+            }
             return node.kind === 79 /* Identifier */ ||
                 node.kind === 205 /* PropertyAccessExpression */ && isConstantMemberAccess(node.expression) ||
                 node.kind === 206 /* ElementAccessExpression */ && isConstantMemberAccess(node.expression) &&
@@ -83323,7 +83393,6 @@ var ts;
             return true;
         }
         function checkAliasSymbol(node) {
-            var _a;
             var symbol = getSymbolOfNode(node);
             var target = resolveAlias(symbol);
             if (target !== unknownSymbol) {
@@ -83379,10 +83448,45 @@ var ts;
                         }
                     }
                 }
-                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);
+                if (ts.isImportSpecifier(node)) {
+                    var targetSymbol = checkDeprecatedAliasedSymbol(symbol, node);
+                    if (isDeprecatedAliasedSymbol(targetSymbol) && targetSymbol.declarations) {
+                        addDeprecatedSuggestion(node, targetSymbol.declarations, targetSymbol.escapedName);
+                    }
+                }
+            }
+        }
+        function isDeprecatedAliasedSymbol(symbol) {
+            return !!symbol.declarations && ts.every(symbol.declarations, function (d) { return !!(ts.getCombinedNodeFlags(d) & 134217728 /* Deprecated */); });
+        }
+        function checkDeprecatedAliasedSymbol(symbol, location) {
+            if (!(symbol.flags & 2097152 /* Alias */))
+                return symbol;
+            var targetSymbol = resolveAlias(symbol);
+            if (targetSymbol === unknownSymbol)
+                return targetSymbol;
+            while (symbol.flags & 2097152 /* Alias */) {
+                var target = getImmediateAliasedSymbol(symbol);
+                if (target) {
+                    if (target === targetSymbol)
+                        break;
+                    if (target.declarations && ts.length(target.declarations)) {
+                        if (isDeprecatedAliasedSymbol(target)) {
+                            addDeprecatedSuggestion(location, target.declarations, target.escapedName);
+                            break;
+                        }
+                        else {
+                            if (symbol === targetSymbol)
+                                break;
+                            symbol = target;
+                        }
+                    }
+                }
+                else {
+                    break;
                 }
             }
+            return targetSymbol;
         }
         function checkImportBinding(node) {
             checkCollisionsForDeclarationName(node, node.name);
@@ -85818,7 +85922,7 @@ var ts;
             if (quickResult !== undefined) {
                 return quickResult;
             }
-            var lastStatic, lastDeclare, lastAsync, lastReadonly, lastOverride;
+            var lastStatic, lastDeclare, lastAsync, lastOverride;
             var flags = 0 /* None */;
             for (var _i = 0, _a = node.modifiers; _i < _a.length; _i++) {
                 var modifier = _a[_i];
@@ -85922,7 +86026,6 @@ var ts;
                             return grammarErrorOnNode(modifier, ts.Diagnostics.readonly_modifier_can_only_appear_on_a_property_declaration_or_index_signature);
                         }
                         flags |= 64 /* Readonly */;
-                        lastReadonly = modifier;
                         break;
                     case 93 /* ExportKeyword */:
                         if (flags & 1 /* Export */) {
@@ -86035,18 +86138,12 @@ var ts;
                 if (flags & 32 /* Static */) {
                     return grammarErrorOnNode(lastStatic, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "static");
                 }
-                if (flags & 128 /* Abstract */) {
-                    return grammarErrorOnNode(lastStatic, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "abstract"); // TODO: GH#18217
-                }
                 if (flags & 16384 /* Override */) {
                     return grammarErrorOnNode(lastOverride, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "override"); // TODO: GH#18217
                 }
-                else if (flags & 256 /* Async */) {
+                if (flags & 256 /* Async */) {
                     return grammarErrorOnNode(lastAsync, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "async");
                 }
-                else if (flags & 64 /* Readonly */) {
-                    return grammarErrorOnNode(lastReadonly, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "readonly");
-                }
                 return false;
             }
             else if ((node.kind === 265 /* ImportDeclaration */ || node.kind === 264 /* ImportEqualsDeclaration */) && flags & 2 /* Ambient */) {
@@ -116041,14 +116138,14 @@ var ts;
                     redirectTargetsMap.add(fileFromPackageId.path, fileName);
                     addFileToFilesByName(dupFile, path, redirectedPath);
                     addFileIncludeReason(dupFile, reason);
-                    sourceFileToPackageName.set(path, packageId.name);
+                    sourceFileToPackageName.set(path, ts.packageIdToPackageName(packageId));
                     processingOtherFiles.push(dupFile);
                     return dupFile;
                 }
                 else if (file) {
                     // This is the first source file to have this packageId.
                     packageIdToSourceFile.set(packageIdKey, file);
-                    sourceFileToPackageName.set(path, packageId.name);
+                    sourceFileToPackageName.set(path, ts.packageIdToPackageName(packageId));
                 }
             }
             addFileToFilesByName(file, path, redirectedPath);
@@ -120187,7 +120284,7 @@ var ts;
             if (!host.fileExists || !host.readFile) {
                 return undefined;
             }
-            var parts = getNodeModulePathParts(path);
+            var parts = ts.getNodeModulePathParts(path);
             if (!parts) {
                 return undefined;
             }
@@ -120310,58 +120407,6 @@ var ts;
                 }
             }
         }
-        function getNodeModulePathParts(fullPath) {
-            // If fullPath can't be valid module file within node_modules, returns undefined.
-            // Example of expected pattern: /base/path/node_modules/[@scope/otherpackage/@otherscope/node_modules/]package/[subdirectory/]file.js
-            // Returns indices:                       ^            ^                                                      ^             ^
-            var topLevelNodeModulesIndex = 0;
-            var topLevelPackageNameIndex = 0;
-            var packageRootIndex = 0;
-            var fileNameIndex = 0;
-            var States;
-            (function (States) {
-                States[States["BeforeNodeModules"] = 0] = "BeforeNodeModules";
-                States[States["NodeModules"] = 1] = "NodeModules";
-                States[States["Scope"] = 2] = "Scope";
-                States[States["PackageContent"] = 3] = "PackageContent";
-            })(States || (States = {}));
-            var partStart = 0;
-            var partEnd = 0;
-            var state = 0 /* BeforeNodeModules */;
-            while (partEnd >= 0) {
-                partStart = partEnd;
-                partEnd = fullPath.indexOf("/", partStart + 1);
-                switch (state) {
-                    case 0 /* BeforeNodeModules */:
-                        if (fullPath.indexOf(ts.nodeModulesPathPart, partStart) === partStart) {
-                            topLevelNodeModulesIndex = partStart;
-                            topLevelPackageNameIndex = partEnd;
-                            state = 1 /* NodeModules */;
-                        }
-                        break;
-                    case 1 /* NodeModules */:
-                    case 2 /* Scope */:
-                        if (state === 1 /* NodeModules */ && fullPath.charAt(partStart + 1) === "@") {
-                            state = 2 /* Scope */;
-                        }
-                        else {
-                            packageRootIndex = partEnd;
-                            state = 3 /* PackageContent */;
-                        }
-                        break;
-                    case 3 /* PackageContent */:
-                        if (fullPath.indexOf(ts.nodeModulesPathPart, partStart) === partStart) {
-                            state = 1 /* NodeModules */;
-                        }
-                        else {
-                            state = 3 /* PackageContent */;
-                        }
-                        break;
-                }
-            }
-            fileNameIndex = partStart;
-            return state > 1 /* NodeModules */ ? { topLevelNodeModulesIndex: topLevelNodeModulesIndex, topLevelPackageNameIndex: topLevelPackageNameIndex, packageRootIndex: packageRootIndex, fileNameIndex: fileNameIndex } : undefined;
-        }
         function getPathRelativeToRootDirs(path, rootDirs, getCanonicalFileName) {
             return ts.firstDefined(rootDirs, function (rootDir) {
                 var relativePath = getRelativePathIfInDirectory(path, rootDir, getCanonicalFileName);
@@ -127125,11 +127170,11 @@ var ts;
         return ts.isArray(valueOrArray) ? ts.first(valueOrArray) : valueOrArray;
     }
     ts.firstOrOnly = firstOrOnly;
-    function getNameForExportedSymbol(symbol, scriptTarget) {
+    function getNameForExportedSymbol(symbol, scriptTarget, preferCapitalized) {
         if (!(symbol.flags & 33554432 /* Transient */) && (symbol.escapedName === "export=" /* ExportEquals */ || symbol.escapedName === "default" /* Default */)) {
             // Name of "export default foo;" is "foo". Name of "export default 0" is the filename converted to camelCase.
             return ts.firstDefined(symbol.declarations, function (d) { var _a; return ts.isExportAssignment(d) ? (_a = ts.tryCast(ts.skipOuterExpressions(d.expression), ts.isIdentifier)) === null || _a === void 0 ? void 0 : _a.text : undefined; })
-                || ts.codefix.moduleSymbolToValidIdentifier(getSymbolParentOrFail(symbol), scriptTarget);
+                || ts.codefix.moduleSymbolToValidIdentifier(getSymbolParentOrFail(symbol), scriptTarget, !!preferCapitalized);
         }
         return symbol.name;
     }
@@ -127248,6 +127293,17 @@ var ts;
         var exportInfoId = 1;
         var exportInfo = ts.createMultiMap();
         var symbols = new ts.Map();
+        /**
+         * Key: node_modules package name (no @types).
+         * Value: path to deepest node_modules folder seen that is
+         * both visible to `usableByFileName` and contains the package.
+         *
+         * Later, we can see if a given SymbolExportInfo is shadowed by
+         * a another installation of the same package in a deeper
+         * node_modules folder by seeing if its path starts with the
+         * value stored here.
+         */
+        var packages = new ts.Map();
         var usableByFileName;
         var cache = {
             isUsableByFile: function (importingFile) { return importingFile === usableByFileName; },
@@ -127257,11 +127313,32 @@ var ts;
                 symbols.clear();
                 usableByFileName = undefined;
             },
-            add: function (importingFile, symbol, symbolTableKey, moduleSymbol, moduleFile, exportKind, isFromPackageJson, scriptTarget, checker) {
+            add: function (importingFile, symbol, symbolTableKey, moduleSymbol, moduleFile, exportKind, isFromPackageJson, checker) {
                 if (importingFile !== usableByFileName) {
                     cache.clear();
                     usableByFileName = importingFile;
                 }
+                var packageName;
+                if (moduleFile) {
+                    var nodeModulesPathParts = ts.getNodeModulePathParts(moduleFile.fileName);
+                    if (nodeModulesPathParts) {
+                        var topLevelNodeModulesIndex = nodeModulesPathParts.topLevelNodeModulesIndex, topLevelPackageNameIndex = nodeModulesPathParts.topLevelPackageNameIndex, packageRootIndex = nodeModulesPathParts.packageRootIndex;
+                        packageName = ts.unmangleScopedPackageName(ts.getPackageNameFromTypesPackageName(moduleFile.fileName.substring(topLevelPackageNameIndex + 1, packageRootIndex)));
+                        if (ts.startsWith(importingFile, moduleFile.path.substring(0, topLevelNodeModulesIndex))) {
+                            var prevDeepestNodeModulesPath = packages.get(packageName);
+                            var nodeModulesPath = moduleFile.fileName.substring(0, topLevelPackageNameIndex);
+                            if (prevDeepestNodeModulesPath) {
+                                var prevDeepestNodeModulesIndex = prevDeepestNodeModulesPath.indexOf(ts.nodeModulesPathPart);
+                                if (topLevelNodeModulesIndex > prevDeepestNodeModulesIndex) {
+                                    packages.set(packageName, nodeModulesPath);
+                                }
+                            }
+                            else {
+                                packages.set(packageName, nodeModulesPath);
+                            }
+                        }
+                    }
+                }
                 var isDefault = exportKind === 1 /* Default */;
                 var namedSymbol = isDefault && ts.getLocalSymbolForExportDefault(symbol) || symbol;
                 // 1. A named export must be imported by its key in `moduleSymbol.exports` or `moduleSymbol.members`.
@@ -127273,7 +127350,7 @@ var ts;
                 //    get a better name.
                 var importedName = exportKind === 0 /* Named */ || ts.isExternalModuleSymbol(namedSymbol)
                     ? ts.unescapeLeadingUnderscores(symbolTableKey)
-                    : ts.getNameForExportedSymbol(namedSymbol, scriptTarget);
+                    : ts.getNameForExportedSymbol(namedSymbol, /*scriptTarget*/ undefined);
                 var moduleName = ts.stripQuotes(moduleSymbol.name);
                 var id = exportInfoId++;
                 var target = ts.skipAlias(symbol, checker);
@@ -127288,6 +127365,7 @@ var ts;
                     moduleName: moduleName,
                     moduleFile: moduleFile,
                     moduleFileName: moduleFile === null || moduleFile === void 0 ? void 0 : moduleFile.fileName,
+                    packageName: packageName,
                     exportKind: exportKind,
                     targetFlags: target.flags,
                     isFromPackageJson: isFromPackageJson,
@@ -127306,7 +127384,17 @@ var ts;
                     return;
                 exportInfo.forEach(function (info, key) {
                     var _a = parseKey(key), symbolName = _a.symbolName, ambientModuleName = _a.ambientModuleName;
-                    action(info.map(rehydrateCachedInfo), symbolName, !!ambientModuleName, key);
+                    var rehydrated = info.map(rehydrateCachedInfo);
+                    var filtered = rehydrated.filter(function (r, i) { return isNotShadowedByDeeperNodeModulesPackage(r, info[i].packageName); });
+                    if (filtered.length) {
+                        action(filtered, function (preferCapitalized) {
+                            var _a = rehydrated[0], symbol = _a.symbol, exportKind = _a.exportKind;
+                            var namedSymbol = exportKind === 1 /* Default */ && ts.getLocalSymbolForExportDefault(symbol) || symbol;
+                            return preferCapitalized
+                                ? ts.getNameForExportedSymbol(namedSymbol, /*scriptTarget*/ undefined, /*preferCapitalized*/ true)
+                                : symbolName;
+                        }, !!ambientModuleName, key);
+                    }
                 });
             },
             releaseSymbols: function () {
@@ -127406,6 +127494,12 @@ var ts;
             }
             return true;
         }
+        function isNotShadowedByDeeperNodeModulesPackage(info, packageName) {
+            if (!packageName || !info.moduleFileName)
+                return true;
+            var packageDeepestNodeModulesPath = packages.get(packageName);
+            return !packageDeepestNodeModulesPath || ts.startsWith(info.moduleFileName, packageDeepestNodeModulesPath);
+        }
     }
     ts.createCacheableExportInfoMap = createCacheableExportInfoMap;
     function isImportableFile(program, from, to, preferences, packageJsonFilter, moduleSpecifierResolutionHost, moduleSpecifierCache) {
@@ -127488,7 +127582,6 @@ var ts;
         }
         (_d = host.log) === null || _d === void 0 ? void 0 : _d.call(host, "getExportInfoMap: cache miss or empty; calculating new results");
         var compilerOptions = program.getCompilerOptions();
-        var scriptTarget = ts.getEmitScriptTarget(compilerOptions);
         var moduleCount = 0;
         forEachExternalModuleToImportFrom(program, host, /*useAutoImportProvider*/ true, function (moduleSymbol, moduleFile, program, isFromPackageJson) {
             if (++moduleCount % 100 === 0)
@@ -127499,11 +127592,11 @@ var ts;
             // Note: I think we shouldn't actually see resolved module symbols here, but weird merges
             // can cause it to happen: see 'completionsImport_mergedReExport.ts'
             if (defaultInfo && isImportableSymbol(defaultInfo.symbol, checker)) {
-                cache.add(importingFile.path, defaultInfo.symbol, defaultInfo.exportKind === 1 /* Default */ ? "default" /* Default */ : "export=" /* ExportEquals */, moduleSymbol, moduleFile, defaultInfo.exportKind, isFromPackageJson, scriptTarget, checker);
+                cache.add(importingFile.path, defaultInfo.symbol, defaultInfo.exportKind === 1 /* Default */ ? "default" /* Default */ : "export=" /* ExportEquals */, moduleSymbol, moduleFile, defaultInfo.exportKind, isFromPackageJson, checker);
             }
             checker.forEachExportAndPropertyOfModule(moduleSymbol, function (exported, key) {
                 if (exported !== (defaultInfo === null || defaultInfo === void 0 ? void 0 : defaultInfo.symbol) && isImportableSymbol(exported, checker) && ts.addToSeen(seenExports, key)) {
-                    cache.add(importingFile.path, exported, key, moduleSymbol, moduleFile, 0 /* Named */, isFromPackageJson, scriptTarget, checker);
+                    cache.add(importingFile.path, exported, key, moduleSymbol, moduleFile, 0 /* Named */, isFromPackageJson, checker);
                 }
             });
         });
@@ -129577,6 +129670,8 @@ var ts;
             CompletionSource["ThisProperty"] = "ThisProperty/";
             /** Auto-import that comes attached to a class member snippet */
             CompletionSource["ClassMemberSnippet"] = "ClassMemberSnippet/";
+            /** A type-only import that needs to be promoted in order to be used at the completion location */
+            CompletionSource["TypeOnlyAlias"] = "TypeOnlyAlias/";
         })(CompletionSource = Completions.CompletionSource || (Completions.CompletionSource = {}));
         var SymbolOriginInfoKind;
         (function (SymbolOriginInfoKind) {
@@ -129586,6 +129681,7 @@ var ts;
             SymbolOriginInfoKind[SymbolOriginInfoKind["Promise"] = 8] = "Promise";
             SymbolOriginInfoKind[SymbolOriginInfoKind["Nullable"] = 16] = "Nullable";
             SymbolOriginInfoKind[SymbolOriginInfoKind["ResolvedExport"] = 32] = "ResolvedExport";
+            SymbolOriginInfoKind[SymbolOriginInfoKind["TypeOnlyAlias"] = 64] = "TypeOnlyAlias";
             SymbolOriginInfoKind[SymbolOriginInfoKind["SymbolMemberNoExport"] = 2] = "SymbolMemberNoExport";
             SymbolOriginInfoKind[SymbolOriginInfoKind["SymbolMemberExport"] = 6] = "SymbolMemberExport";
         })(SymbolOriginInfoKind || (SymbolOriginInfoKind = {}));
@@ -129613,6 +129709,9 @@ var ts;
         function originIsNullableMember(origin) {
             return !!(origin.kind & 16 /* Nullable */);
         }
+        function originIsTypeOnlyAlias(origin) {
+            return !!(origin && origin.kind & 64 /* TypeOnlyAlias */);
+        }
         var KeywordCompletionFilters;
         (function (KeywordCompletionFilters) {
             KeywordCompletionFilters[KeywordCompletionFilters["None"] = 0] = "None";
@@ -129711,7 +129810,7 @@ var ts;
             }
             switch (completionData.kind) {
                 case 0 /* Data */:
-                    var response = completionInfoFromData(sourceFile, host, program, compilerOptions, log, completionData, preferences, formatContext);
+                    var response = completionInfoFromData(sourceFile, host, program, compilerOptions, log, completionData, preferences, formatContext, position);
                     if (response === null || response === void 0 ? void 0 : response.isIncomplete) {
                         incompleteCompletionsCache === null || incompleteCompletionsCache === void 0 ? void 0 : incompleteCompletionsCache.set(response);
                     }
@@ -129831,7 +129930,7 @@ var ts;
             // StringLiteralLike locations are handled separately in stringCompletions.ts
             return (location === null || location === void 0 ? void 0 : location.kind) === 79 /* Identifier */ ? ts.createTextSpanFromNode(location) : undefined;
         }
-        function completionInfoFromData(sourceFile, host, program, compilerOptions, log, completionData, preferences, formatContext) {
+        function completionInfoFromData(sourceFile, host, program, compilerOptions, log, completionData, preferences, formatContext, position) {
             var symbols = completionData.symbols, contextToken = completionData.contextToken, completionKind = completionData.completionKind, isInSnippetScope = completionData.isInSnippetScope, isNewIdentifierLocation = completionData.isNewIdentifierLocation, location = completionData.location, propertyAccessToConvert = completionData.propertyAccessToConvert, keywordFilters = completionData.keywordFilters, literals = completionData.literals, symbolToOriginInfoMap = completionData.symbolToOriginInfoMap, recommendedCompletion = completionData.recommendedCompletion, isJsxInitializer = completionData.isJsxInitializer, isTypeOnlyLocation = completionData.isTypeOnlyLocation, isJsxIdentifierExpected = completionData.isJsxIdentifierExpected, isRightOfOpenTag = completionData.isRightOfOpenTag, importCompletionNode = completionData.importCompletionNode, insideJsDocTagTypeExpression = completionData.insideJsDocTagTypeExpression, symbolToSortTextIdMap = completionData.symbolToSortTextIdMap, hasUnresolvedAutoImports = completionData.hasUnresolvedAutoImports;
             // Verify if the file is JSX language variant
             if (ts.getLanguageVariant(sourceFile.scriptKind) === 1 /* JSX */) {
@@ -129844,7 +129943,7 @@ var ts;
             if (isUncheckedFile(sourceFile, compilerOptions)) {
                 var uniqueNames = getCompletionEntriesFromSymbols(symbols, entries, 
                 /*replacementToken*/ undefined, contextToken, location, sourceFile, host, program, ts.getEmitScriptTarget(compilerOptions), log, completionKind, preferences, compilerOptions, formatContext, isTypeOnlyLocation, propertyAccessToConvert, isJsxIdentifierExpected, isJsxInitializer, importCompletionNode, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextIdMap, isJsxIdentifierExpected, isRightOfOpenTag);
-                getJSCompletionEntries(sourceFile, location.pos, uniqueNames, ts.getEmitScriptTarget(compilerOptions), entries); // TODO: GH#18217
+                getJSCompletionEntries(sourceFile, location.pos, uniqueNames, ts.getEmitScriptTarget(compilerOptions), entries);
             }
             else {
                 if (!isNewIdentifierLocation && (!symbols || symbols.length === 0) && keywordFilters === 0 /* None */) {
@@ -129854,16 +129953,23 @@ var ts;
                 /*replacementToken*/ undefined, contextToken, location, sourceFile, host, program, ts.getEmitScriptTarget(compilerOptions), log, completionKind, preferences, compilerOptions, formatContext, isTypeOnlyLocation, propertyAccessToConvert, isJsxIdentifierExpected, isJsxInitializer, importCompletionNode, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextIdMap, isJsxIdentifierExpected, isRightOfOpenTag);
             }
             if (keywordFilters !== 0 /* None */) {
-                var entryNames = new ts.Set(entries.map(function (e) { return e.name; }));
+                var entryNames_1 = new ts.Set(entries.map(function (e) { return e.name; }));
                 for (var _i = 0, _a = getKeywordCompletions(keywordFilters, !insideJsDocTagTypeExpression && ts.isSourceFileJS(sourceFile)); _i < _a.length; _i++) {
                     var keywordEntry = _a[_i];
-                    if (!entryNames.has(keywordEntry.name)) {
+                    if (!entryNames_1.has(keywordEntry.name)) {
                         ts.insertSorted(entries, keywordEntry, compareCompletionEntries, /*allowDuplicates*/ true);
                     }
                 }
             }
-            for (var _b = 0, literals_1 = literals; _b < literals_1.length; _b++) {
-                var literal = literals_1[_b];
+            var entryNames = new ts.Set(entries.map(function (e) { return e.name; }));
+            for (var _b = 0, _c = getContextualKeywords(contextToken, position); _b < _c.length; _b++) {
+                var keywordEntry = _c[_b];
+                if (!entryNames.has(keywordEntry.name)) {
+                    ts.insertSorted(entries, keywordEntry, compareCompletionEntries, /*allowDuplicates*/ true);
+                }
+            }
+            for (var _d = 0, literals_1 = literals; _d < literals_1.length; _d++) {
+                var literal = literals_1[_d];
                 ts.insertSorted(entries, createCompletionEntryForLiteral(sourceFile, preferences, literal), compareCompletionEntries, /*allowDuplicates*/ true);
             }
             return {
@@ -130017,6 +130123,9 @@ var ts;
                     isSnippet = preferences.includeCompletionsWithSnippetText ? true : undefined;
                 }
             }
+            if ((origin === null || origin === void 0 ? void 0 : origin.kind) === 64 /* TypeOnlyAlias */) {
+                hasAction = true;
+            }
             if (preferences.includeCompletionsWithClassMemberSnippets &&
                 preferences.includeCompletionsWithInsertText &&
                 completionKind === 3 /* MemberLike */ &&
@@ -130361,6 +130470,9 @@ var ts;
             if ((origin === null || origin === void 0 ? void 0 : origin.kind) === 1 /* ThisType */) {
                 return CompletionSource.ThisProperty;
             }
+            if ((origin === null || origin === void 0 ? void 0 : origin.kind) === 64 /* TypeOnlyAlias */) {
+                return CompletionSource.TypeOnlyAlias;
+            }
         }
         function getCompletionEntriesFromSymbols(symbols, entries, replacementToken, contextToken, location, sourceFile, host, program, target, log, kind, preferences, compilerOptions, formatContext, isTypeOnlyLocation, propertyAccessToConvert, jsxIdentifierExpected, isJsxInitializer, importCompletionNode, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextIdMap, isJsxIdentifierExpected, isRightOfOpenTag) {
             var _a;
@@ -130388,7 +130500,7 @@ var ts;
                     continue;
                 }
                 /** True for locals; false for globals, module exports from other files, `this.` completions. */
-                var shouldShadowLaterSymbols = !origin && !(symbol.parent === undefined && !ts.some(symbol.declarations, function (d) { return d.getSourceFile() === location.getSourceFile(); }));
+                var shouldShadowLaterSymbols = (!origin || originIsTypeOnlyAlias(origin)) && !(symbol.parent === undefined && !ts.some(symbol.declarations, function (d) { return d.getSourceFile() === location.getSourceFile(); }));
                 uniques.set(name, shouldShadowLaterSymbols);
                 ts.insertSorted(entries, entry, compareCompletionEntries, /*allowDuplicates*/ true);
             }
@@ -130401,6 +130513,7 @@ var ts;
                 add: function (name) { return uniques.set(name, true); },
             };
             function shouldIncludeSymbol(symbol, symbolToSortTextIdMap) {
+                var allFlags = symbol.flags;
                 if (!ts.isSourceFile(location)) {
                     // export = /**/ here we want to get all meanings, so any symbol is ok
                     if (ts.isExportAssignment(location.parent)) {
@@ -130426,11 +130539,10 @@ var ts;
                             || symbolToSortTextIdMap[ts.getSymbolId(symbolOrigin)] === 11 /* LocationPriority */)) {
                         return false;
                     }
-                    // Continue with origin symbol
-                    symbol = symbolOrigin;
+                    allFlags |= ts.getCombinedLocalAndExportSymbolFlags(symbolOrigin);
                     // import m = /**/ <-- It can only access namespace (if typing import = x. this would get member symbols and not namespace)
                     if (ts.isInRightSideOfInternalImportEqualsDeclaration(location)) {
-                        return !!(symbol.flags & 1920 /* Namespace */);
+                        return !!(allFlags & 1920 /* Namespace */);
                     }
                     if (isTypeOnlyLocation) {
                         // It's a type, but you can reach it by namespace.type as well
@@ -130438,7 +130550,7 @@ var ts;
                     }
                 }
                 // expressions are value space (which includes the value namespaces)
-                return !!(ts.getCombinedLocalAndExportSymbolFlags(symbol) & 111551 /* Value */);
+                return !!(allFlags & 111551 /* Value */);
             }
         }
         Completions.getCompletionEntriesFromSymbols = getCompletionEntriesFromSymbols;
@@ -130572,8 +130684,7 @@ var ts;
         Completions.createCompletionDetails = createCompletionDetails;
         function getCompletionEntryCodeActionsAndSourceDisplay(name, location, contextToken, origin, symbol, program, host, compilerOptions, sourceFile, position, previousToken, formatContext, preferences, data, source) {
             if (data === null || data === void 0 ? void 0 : data.moduleSpecifier) {
-                var _a = getRelevantTokens(position, sourceFile), contextToken_3 = _a.contextToken, previousToken_2 = _a.previousToken;
-                if (previousToken_2 && getImportStatementCompletionInfo(contextToken_3 || previousToken_2).replacementNode) {
+                if (previousToken && getImportStatementCompletionInfo(contextToken || previousToken).replacementNode) {
                     // Import statement completion: 'import c|'
                     return { codeActions: undefined, sourceDisplay: [ts.textPart(data.moduleSpecifier)] };
                 }
@@ -130591,13 +130702,19 @@ var ts;
                     };
                 }
             }
+            if (originIsTypeOnlyAlias(origin)) {
+                var codeAction_1 = ts.codefix.getPromoteTypeOnlyCompletionAction(sourceFile, origin.declaration.name, program, host, formatContext, preferences);
+                ts.Debug.assertIsDefined(codeAction_1, "Expected to have a code action for promoting type-only alias");
+                return { codeActions: [codeAction_1], sourceDisplay: undefined };
+            }
             if (!origin || !(originIsExport(origin) || originIsResolvedExport(origin))) {
                 return { codeActions: undefined, sourceDisplay: undefined };
             }
             var checker = origin.isFromPackageJson ? host.getPackageJsonAutoImportProvider().getTypeChecker() : program.getTypeChecker();
             var moduleSymbol = origin.moduleSymbol;
             var targetSymbol = checker.getMergedSymbol(ts.skipAlias(symbol.exportSymbol || symbol, checker));
-            var _b = ts.codefix.getImportCompletionAction(targetSymbol, moduleSymbol, sourceFile, ts.getNameForExportedSymbol(symbol, ts.getEmitScriptTarget(compilerOptions)), host, program, formatContext, previousToken && ts.isIdentifier(previousToken) ? previousToken.getStart(sourceFile) : position, preferences), moduleSpecifier = _b.moduleSpecifier, codeAction = _b.codeAction;
+            var isJsxOpeningTagName = (contextToken === null || contextToken === void 0 ? void 0 : contextToken.kind) === 29 /* LessThanToken */ && ts.isJsxOpeningLikeElement(contextToken.parent);
+            var _a = ts.codefix.getImportCompletionAction(targetSymbol, moduleSymbol, sourceFile, ts.getNameForExportedSymbol(symbol, ts.getEmitScriptTarget(compilerOptions), isJsxOpeningTagName), isJsxOpeningTagName, host, program, formatContext, previousToken && ts.isIdentifier(previousToken) ? previousToken.getStart(sourceFile) : position, preferences), moduleSpecifier = _a.moduleSpecifier, codeAction = _a.codeAction;
             ts.Debug.assert(!(data === null || data === void 0 ? void 0 : data.moduleSpecifier) || moduleSpecifier === data.moduleSpecifier);
             return { sourceDisplay: [ts.textPart(moduleSpecifier)], codeActions: [codeAction] };
         }
@@ -131267,21 +131384,29 @@ var ts;
                 var scopeNode = getScopeNode(contextToken, adjustedPosition, sourceFile) || sourceFile;
                 isInSnippetScope = isSnippetScope(scopeNode);
                 var symbolMeanings = (isTypeOnlyLocation ? 0 /* None */ : 111551 /* Value */) | 788968 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */;
+                var typeOnlyAliasNeedsPromotion = previousToken && !ts.isValidTypeOnlyAliasUseSite(previousToken);
                 symbols = ts.concatenate(symbols, typeChecker.getSymbolsInScope(scopeNode, symbolMeanings));
                 ts.Debug.assertEachIsDefined(symbols, "getSymbolsInScope() should all be defined");
-                for (var _i = 0, symbols_1 = symbols; _i < symbols_1.length; _i++) {
-                    var symbol = symbols_1[_i];
+                for (var i = 0; i < symbols.length; i++) {
+                    var symbol = symbols[i];
                     if (!typeChecker.isArgumentsSymbol(symbol) &&
                         !ts.some(symbol.declarations, function (d) { return d.getSourceFile() === sourceFile; })) {
                         symbolToSortTextIdMap[ts.getSymbolId(symbol)] = 15 /* GlobalsOrKeywords */;
                     }
+                    if (typeOnlyAliasNeedsPromotion && !(symbol.flags & 111551 /* Value */)) {
+                        var typeOnlyAliasDeclaration = symbol.declarations && ts.find(symbol.declarations, ts.isTypeOnlyImportOrExportDeclaration);
+                        if (typeOnlyAliasDeclaration) {
+                            var origin = { kind: 64 /* TypeOnlyAlias */, declaration: typeOnlyAliasDeclaration };
+                            symbolToOriginInfoMap[i] = origin;
+                        }
+                    }
                 }
                 // Need to insert 'this.' before properties of `this` type, so only do that if `includeInsertTextCompletions`
                 if (preferences.includeCompletionsWithInsertText && scopeNode.kind !== 303 /* SourceFile */) {
                     var thisType = typeChecker.tryGetThisTypeAt(scopeNode, /*includeGlobalThis*/ false);
                     if (thisType && !isProbablyGlobalType(thisType, sourceFile, typeChecker)) {
-                        for (var _a = 0, _b = getPropertiesForCompletion(thisType, typeChecker); _a < _b.length; _a++) {
-                            var symbol = _b[_a];
+                        for (var _i = 0, _a = getPropertiesForCompletion(thisType, typeChecker); _i < _a.length; _i++) {
+                            var symbol = _a[_i];
                             symbolToOriginInfoMap[symbols.length] = { kind: 1 /* ThisType */ };
                             symbols.push(symbol);
                             symbolToSortTextIdMap[ts.getSymbolId(symbol)] = 14 /* SuggestedClassMembers */;
@@ -131384,7 +131509,8 @@ var ts;
                 var packageJsonAutoImportProvider = (_b = host.getPackageJsonAutoImportProvider) === null || _b === void 0 ? void 0 : _b.call(host);
                 var packageJsonFilter = detailsEntryId ? undefined : ts.createPackageJsonImportFilter(sourceFile, preferences, host);
                 resolvingModuleSpecifiers("collectAutoImports", host, program, sourceFile, preferences, !!importCompletionNode, function (context) {
-                    exportInfo.forEach(sourceFile.path, function (info, symbolName, isFromAmbientModule, exportMapKey) {
+                    exportInfo.forEach(sourceFile.path, function (info, getSymbolName, isFromAmbientModule, exportMapKey) {
+                        var symbolName = getSymbolName(/*preferCapitalized*/ isRightOfOpenTag);
                         if (!ts.isIdentifierText(symbolName, ts.getEmitScriptTarget(host.getCompilationSettings())))
                             return;
                         if (!detailsEntryId && ts.isStringANonContextualKeyword(symbolName))
@@ -131394,6 +131520,10 @@ var ts;
                             return;
                         if (isTypeOnlyLocation && !(info[0].targetFlags & (1536 /* Module */ | 788968 /* Type */)))
                             return;
+                        // Do not try to auto-import something with a lowercase first letter for a JSX tag
+                        var firstChar = symbolName.charCodeAt(0);
+                        if (isRightOfOpenTag && (firstChar < 65 /* A */ || firstChar > 90 /* Z */))
+                            return;
                         var isCompletionDetailsMatch = detailsEntryId && ts.some(info, function (i) { return detailsEntryId.source === ts.stripQuotes(i.moduleSymbol.name); });
                         if (isCompletionDetailsMatch || !detailsEntryId && charactersFuzzyMatchInString(symbolName, lowerCaseTokenText)) {
                             var defaultExportInfo = ts.find(info, isImportableExportInfo);
@@ -131470,16 +131600,19 @@ var ts;
                     return true;
                 }
                 if (contextToken.kind === 31 /* GreaterThanToken */ && contextToken.parent) {
+                    // <Component<string> /**/ />
+                    // <Component<string> /**/ ><Component>
+                    // - contextToken: GreaterThanToken (before cursor)
+                    // - location: JsxSelfClosingElement or JsxOpeningElement
+                    // - contextToken.parent === location
+                    if (location === contextToken.parent && (location.kind === 279 /* JsxOpeningElement */ || location.kind === 278 /* JsxSelfClosingElement */)) {
+                        return false;
+                    }
                     if (contextToken.parent.kind === 279 /* JsxOpeningElement */) {
-                        // Two possibilities:
-                        //   1. <div>/**/
-                        //      - contextToken: GreaterThanToken (before cursor)
-                        //      - location: JSXElement
-                        //      - different parents (JSXOpeningElement, JSXElement)
-                        //   2. <Component<string> /**/>
-                        //      - contextToken: GreaterThanToken (before cursor)
-                        //      - location: GreaterThanToken (after cursor)
-                        //      - same parent (JSXOpeningElement)
+                        // <div>/**/
+                        // - contextToken: GreaterThanToken (before cursor)
+                        // - location: JSXElement
+                        // - different parents (JSXOpeningElement, JSXElement)
                         return location.parent.kind !== 279 /* JsxOpeningElement */;
                     }
                     if (contextToken.parent.kind === 280 /* JsxClosingElement */ || contextToken.parent.kind === 278 /* JsxSelfClosingElement */) {
@@ -132386,6 +132519,34 @@ var ts;
         function keywordForNode(node) {
             return ts.isIdentifier(node) ? node.originalKeywordKind || 0 /* Unknown */ : node.kind;
         }
+        function getContextualKeywords(contextToken, position) {
+            var entries = [];
+            /**
+             * An `AssertClause` can come after an import declaration:
+             *  import * from "foo" |
+             *  import "foo" |
+             * or after a re-export declaration that has a module specifier:
+             *  export { foo } from "foo" |
+             * Source: https://tc39.es/proposal-import-assertions/
+             */
+            if (contextToken) {
+                var file = contextToken.getSourceFile();
+                var parent = contextToken.parent;
+                var tokenLine = file.getLineAndCharacterOfPosition(contextToken.end).line;
+                var currentLine = file.getLineAndCharacterOfPosition(position).line;
+                if ((ts.isImportDeclaration(parent) || ts.isExportDeclaration(parent) && parent.moduleSpecifier)
+                    && contextToken === parent.moduleSpecifier
+                    && tokenLine === currentLine) {
+                    entries.push({
+                        name: ts.tokenToString(129 /* AssertKeyword */),
+                        kind: "keyword" /* keyword */,
+                        kindModifiers: "" /* none */,
+                        sortText: SortText.GlobalsOrKeywords,
+                    });
+                }
+            }
+            return entries;
+        }
         /** Get the corresponding JSDocTag node if the position is in a jsDoc comment */
         function getJsDocTagAtPosition(node, position) {
             return ts.findAncestor(node, function (n) {
@@ -132680,10 +132841,14 @@ var ts;
         /** True if symbol is a type or a module containing at least one type. */
         function symbolCanBeReferencedAtTypeLocation(symbol, checker, seenModules) {
             if (seenModules === void 0) { seenModules = new ts.Map(); }
-            var sym = ts.skipAlias(symbol.exportSymbol || symbol, checker);
-            return !!(sym.flags & 788968 /* Type */) || checker.isUnknownSymbol(sym) ||
-                !!(sym.flags & 1536 /* Module */) && ts.addToSeen(seenModules, ts.getSymbolId(sym)) &&
-                    checker.getExportsOfModule(sym).some(function (e) { return symbolCanBeReferencedAtTypeLocation(e, checker, seenModules); });
+            // Since an alias can be merged with a local declaration, we need to test both the alias and its target.
+            // This code used to just test the result of `skipAlias`, but that would ignore any locally introduced meanings.
+            return nonAliasCanBeReferencedAtTypeLocation(symbol) || nonAliasCanBeReferencedAtTypeLocation(ts.skipAlias(symbol.exportSymbol || symbol, checker));
+            function nonAliasCanBeReferencedAtTypeLocation(symbol) {
+                return !!(symbol.flags & 788968 /* Type */) || checker.isUnknownSymbol(symbol) ||
+                    !!(symbol.flags & 1536 /* Module */) && ts.addToSeen(seenModules, ts.getSymbolId(symbol)) &&
+                        checker.getExportsOfModule(symbol).some(function (e) { return symbolCanBeReferencedAtTypeLocation(e, checker, seenModules); });
+            }
         }
         function isDeprecated(symbol, checker) {
             var declarations = ts.skipAlias(symbol, checker).declarations;
@@ -134937,8 +135102,8 @@ var ts;
                     var sourceId = ts.getNodeId(sourceFile);
                     var seenSymbols = this.sourceFileToSeenSymbols[sourceId] || (this.sourceFileToSeenSymbols[sourceId] = new ts.Set());
                     var anyNewSymbols = false;
-                    for (var _i = 0, symbols_2 = symbols; _i < symbols_2.length; _i++) {
-                        var sym = symbols_2[_i];
+                    for (var _i = 0, symbols_1 = symbols; _i < symbols_1.length; _i++) {
+                        var sym = symbols_1[_i];
                         anyNewSymbols = ts.tryAddToSet(seenSymbols, ts.getSymbolId(sym)) || anyNewSymbols;
                     }
                     return anyNewSymbols;
@@ -141898,6 +142063,8 @@ var ts;
             }
             if (flags & 16 /* Function */)
                 return isLocalVariableOrFunction(symbol) ? "local function" /* localFunctionElement */ : "function" /* functionElement */;
+            // FIXME: getter and setter use the same symbol. And it is rare to use only setter without getter, so in most cases the symbol always has getter flag.
+            // So, even when the location is just on the declaration of setter, this function returns getter.
             if (flags & 32768 /* GetAccessor */)
                 return "getter" /* memberGetAccessorElement */;
             if (flags & 65536 /* SetAccessor */)
@@ -141984,9 +142151,24 @@ var ts;
             }
             // Class at constructor site need to be shown as constructor apart from property,method, vars
             if (symbolKind !== "" /* unknown */ || symbolFlags & 32 /* Class */ || symbolFlags & 2097152 /* Alias */) {
-                // If it is accessor they are allowed only if location is at name of the accessor
+                // If symbol is accessor, they are allowed only if location is at declaration identifier of the accessor
                 if (symbolKind === "getter" /* memberGetAccessorElement */ || symbolKind === "setter" /* memberSetAccessorElement */) {
-                    symbolKind = "property" /* memberVariableElement */;
+                    var declaration = ts.find(symbol.declarations, function (declaration) { return declaration.name === location; });
+                    if (declaration) {
+                        switch (declaration.kind) {
+                            case 171 /* GetAccessor */:
+                                symbolKind = "getter" /* memberGetAccessorElement */;
+                                break;
+                            case 172 /* SetAccessor */:
+                                symbolKind = "setter" /* memberSetAccessorElement */;
+                                break;
+                            default:
+                                ts.Debug.assertNever(declaration);
+                        }
+                    }
+                    else {
+                        symbolKind = "property" /* memberVariableElement */;
+                    }
                 }
                 var signature = void 0;
                 type = isThisExpression ? typeChecker.getTypeAtLocation(location) : typeChecker.getTypeOfSymbolAtLocation(symbol, location);
@@ -142300,6 +142482,8 @@ var ts;
                         }
                         // For properties, variables and local vars: show the type
                         if (symbolKind === "property" /* memberVariableElement */ ||
+                            symbolKind === "getter" /* memberGetAccessorElement */ ||
+                            symbolKind === "setter" /* memberSetAccessorElement */ ||
                             symbolKind === "JSX attribute" /* jsxAttribute */ ||
                             symbolFlags & 3 /* Variable */ ||
                             symbolKind === "local var" /* localVariableElement */ ||
@@ -142370,7 +142554,7 @@ var ts;
                 }
             }
             if (tags.length === 0 && !hasMultipleSignatures) {
-                tags = symbol.getJsDocTags(typeChecker);
+                tags = symbol.getContextualJsDocTags(enclosingDeclaration, typeChecker);
             }
             if (documentation.length === 0 && documentationFromAlias) {
                 documentation = documentationFromAlias;
@@ -145790,6 +145974,7 @@ var ts;
             ChangeTracker.prototype.delete = function (sourceFile, node) {
                 this.deletedNodes.push({ sourceFile: sourceFile, node: node });
             };
+            /** Stop! Consider using `delete` instead, which has logic for deleting nodes from delimited lists. */
             ChangeTracker.prototype.deleteNode = function (sourceFile, node, options) {
                 if (options === void 0) { options = { leadingTriviaOption: LeadingTriviaOption.IncludeAll }; }
                 this.deleteRange(sourceFile, getAdjustedRange(sourceFile, node, node, options));
@@ -146193,6 +146378,15 @@ var ts;
             ChangeTracker.prototype.insertExportModifier = function (sourceFile, node) {
                 this.insertText(sourceFile, node.getStart(sourceFile), "export ");
             };
+            ChangeTracker.prototype.insertImportSpecifierAtIndex = function (sourceFile, importSpecifier, namedImports, index) {
+                var prevSpecifier = namedImports.elements[index - 1];
+                if (prevSpecifier) {
+                    this.insertNodeInListAfter(sourceFile, prevSpecifier, importSpecifier);
+                }
+                else {
+                    this.insertNodeBefore(sourceFile, namedImports.elements[0], importSpecifier, !ts.positionsAreOnSameLine(namedImports.elements[0].getStart(), namedImports.parent.parent.getStart(), sourceFile));
+                }
+            };
             /**
              * This function should be used to insert nodes in lists when nodes don't carry separators as the part of the node range,
              * i.e. arguments in arguments lists, parameters in parameter lists etc.
@@ -149695,7 +149889,8 @@ var ts;
             ts.Diagnostics.Cannot_find_namespace_0.code,
             ts.Diagnostics._0_refers_to_a_UMD_global_but_the_current_file_is_a_module_Consider_adding_an_import_instead.code,
             ts.Diagnostics._0_only_refers_to_a_type_but_is_being_used_as_a_value_here.code,
-            ts.Diagnostics.No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer.code
+            ts.Diagnostics.No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer.code,
+            ts.Diagnostics._0_cannot_be_used_as_a_value_because_it_was_imported_using_import_type.code,
         ];
         codefix.registerCodeFix({
             errorCodes: errorCodes,
@@ -149704,9 +149899,10 @@ var ts;
                 var info = getFixesInfo(context, errorCode, span.start, /*useAutoImportProvider*/ true);
                 if (!info)
                     return undefined;
-                var fixes = info.fixes, symbolName = info.symbolName;
+                var fixes = info.fixes, symbolName = info.symbolName, errorIdentifierText = info.errorIdentifierText;
                 var quotePreference = ts.getQuotePreference(sourceFile, preferences);
-                return fixes.map(function (fix) { return codeActionForFix(context, sourceFile, symbolName, fix, quotePreference, program.getCompilerOptions()); });
+                return fixes.map(function (fix) { return codeActionForFix(context, sourceFile, symbolName, fix, 
+                /*includeSymbolNameInDescription*/ symbolName !== errorIdentifierText, quotePreference, program.getCompilerOptions()); });
             },
             fixIds: [importFixId],
             getAllCodeActions: function (context) {
@@ -149741,11 +149937,11 @@ var ts;
                 var symbolName = ts.getNameForExportedSymbol(exportedSymbol, ts.getEmitScriptTarget(compilerOptions));
                 var checker = program.getTypeChecker();
                 var symbol = checker.getMergedSymbol(ts.skipAlias(exportedSymbol, checker));
-                var exportInfos = getAllReExportingModules(sourceFile, symbol, moduleSymbol, symbolName, host, program, preferences, useAutoImportProvider);
+                var exportInfos = getAllReExportingModules(sourceFile, symbol, moduleSymbol, symbolName, /*isJsxTagName*/ false, host, program, preferences, useAutoImportProvider);
                 var useRequire = shouldUseRequire(sourceFile, program);
                 var fix = getImportFixForSymbol(sourceFile, exportInfos, moduleSymbol, symbolName, program, /*position*/ undefined, !!isValidTypeOnlyUseSite, useRequire, host, preferences);
                 if (fix) {
-                    addImport({ fixes: [fix], symbolName: symbolName });
+                    addImport({ fixes: [fix], symbolName: symbolName, errorIdentifierText: undefined });
                 }
             }
             function addImport(info) {
@@ -149800,6 +149996,9 @@ var ts;
                         }
                         break;
                     }
+                    case 4 /* PromoteTypeOnly */:
+                        // Excluding from fix-all
+                        break;
                     default:
                         ts.Debug.assertNever(fix, "fix wasn't never - got kind " + fix.kind);
                 }
@@ -149891,6 +150090,7 @@ var ts;
             ImportFixKind[ImportFixKind["JsdocTypeImport"] = 1] = "JsdocTypeImport";
             ImportFixKind[ImportFixKind["AddToExisting"] = 2] = "AddToExisting";
             ImportFixKind[ImportFixKind["AddNew"] = 3] = "AddNew";
+            ImportFixKind[ImportFixKind["PromoteTypeOnly"] = 4] = "PromoteTypeOnly";
         })(ImportFixKind || (ImportFixKind = {}));
         // These should not be combined as bitflags, but are given powers of 2 values to
         // easily detect conflicts between `NotAllowed` and `Required` by giving them a unique sum.
@@ -149902,20 +150102,29 @@ var ts;
             AddAsTypeOnly[AddAsTypeOnly["Required"] = 2] = "Required";
             AddAsTypeOnly[AddAsTypeOnly["NotAllowed"] = 4] = "NotAllowed";
         })(AddAsTypeOnly || (AddAsTypeOnly = {}));
-        function getImportCompletionAction(targetSymbol, moduleSymbol, sourceFile, symbolName, host, program, formatContext, position, preferences) {
+        function getImportCompletionAction(targetSymbol, moduleSymbol, sourceFile, symbolName, isJsxTagName, host, program, formatContext, position, preferences) {
             var compilerOptions = program.getCompilerOptions();
             var exportInfos = ts.pathIsBareSpecifier(ts.stripQuotes(moduleSymbol.name))
                 ? [getSymbolExportInfoForSymbol(targetSymbol, moduleSymbol, program, host)]
-                : getAllReExportingModules(sourceFile, targetSymbol, moduleSymbol, symbolName, host, program, preferences, /*useAutoImportProvider*/ true);
+                : getAllReExportingModules(sourceFile, targetSymbol, moduleSymbol, symbolName, isJsxTagName, host, program, preferences, /*useAutoImportProvider*/ true);
             var useRequire = shouldUseRequire(sourceFile, program);
             var isValidTypeOnlyUseSite = ts.isValidTypeOnlyAliasUseSite(ts.getTokenAtPosition(sourceFile, position));
             var fix = ts.Debug.checkDefined(getImportFixForSymbol(sourceFile, exportInfos, moduleSymbol, symbolName, program, position, isValidTypeOnlyUseSite, useRequire, host, preferences));
             return {
                 moduleSpecifier: fix.moduleSpecifier,
-                codeAction: codeFixActionToCodeAction(codeActionForFix({ host: host, formatContext: formatContext, preferences: preferences }, sourceFile, symbolName, fix, ts.getQuotePreference(sourceFile, preferences), compilerOptions))
+                codeAction: codeFixActionToCodeAction(codeActionForFix({ host: host, formatContext: formatContext, preferences: preferences }, sourceFile, symbolName, fix, 
+                /*includeSymbolNameInDescription*/ false, ts.getQuotePreference(sourceFile, preferences), compilerOptions))
             };
         }
         codefix.getImportCompletionAction = getImportCompletionAction;
+        function getPromoteTypeOnlyCompletionAction(sourceFile, symbolToken, program, host, formatContext, preferences) {
+            var compilerOptions = program.getCompilerOptions();
+            var symbolName = getSymbolName(sourceFile, program.getTypeChecker(), symbolToken, compilerOptions);
+            var fix = getTypeOnlyPromotionFix(sourceFile, symbolToken, symbolName, program);
+            var includeSymbolNameInDescription = symbolName !== symbolToken.text;
+            return fix && codeFixActionToCodeAction(codeActionForFix({ host: host, formatContext: formatContext, preferences: preferences }, sourceFile, symbolName, fix, includeSymbolNameInDescription, 1 /* Double */, compilerOptions));
+        }
+        codefix.getPromoteTypeOnlyCompletionAction = getPromoteTypeOnlyCompletionAction;
         function getImportFixForSymbol(sourceFile, exportInfos, moduleSymbol, symbolName, program, position, isValidTypeOnlyUseSite, useRequire, host, preferences) {
             ts.Debug.assert(exportInfos.some(function (info) { return info.moduleSymbol === moduleSymbol || info.symbol.parent === moduleSymbol; }), "Some exportInfo should match the specified moduleSymbol");
             var packageJsonImportFilter = ts.createPackageJsonImportFilter(sourceFile, preferences, host);
@@ -149945,7 +150154,7 @@ var ts;
                 }
             }
         }
-        function getAllReExportingModules(importingFile, targetSymbol, exportingModuleSymbol, symbolName, host, program, preferences, useAutoImportProvider) {
+        function getAllReExportingModules(importingFile, targetSymbol, exportingModuleSymbol, symbolName, isJsxTagName, host, program, preferences, useAutoImportProvider) {
             var result = [];
             var compilerOptions = program.getCompilerOptions();
             var getModuleSpecifierResolutionHost = ts.memoizeOne(function (isFromPackageJson) {
@@ -149958,7 +150167,7 @@ var ts;
                     return;
                 }
                 var defaultInfo = ts.getDefaultLikeExportInfo(moduleSymbol, checker, compilerOptions);
-                if (defaultInfo && (defaultInfo.name === symbolName || moduleSymbolToValidIdentifier(moduleSymbol, ts.getEmitScriptTarget(compilerOptions)) === symbolName) && ts.skipAlias(defaultInfo.symbol, checker) === targetSymbol && isImportable(program, moduleFile, isFromPackageJson)) {
+                if (defaultInfo && (defaultInfo.name === symbolName || moduleSymbolToValidIdentifier(moduleSymbol, ts.getEmitScriptTarget(compilerOptions), isJsxTagName) === symbolName) && ts.skipAlias(defaultInfo.symbol, checker) === targetSymbol && isImportable(program, moduleFile, isFromPackageJson)) {
                     result.push({ symbol: defaultInfo.symbol, moduleSymbol: moduleSymbol, moduleFileName: moduleFile === null || moduleFile === void 0 ? void 0 : moduleFile.fileName, exportKind: defaultInfo.exportKind, targetFlags: ts.skipAlias(defaultInfo.symbol, checker).flags, isFromPackageJson: isFromPackageJson });
                 }
                 for (var _i = 0, _a = checker.getExportsAndPropertiesOfModule(moduleSymbol); _i < _a.length; _i++) {
@@ -150196,9 +150405,21 @@ var ts;
         }
         function getFixesInfo(context, errorCode, pos, useAutoImportProvider) {
             var symbolToken = ts.getTokenAtPosition(context.sourceFile, pos);
-            var info = errorCode === ts.Diagnostics._0_refers_to_a_UMD_global_but_the_current_file_is_a_module_Consider_adding_an_import_instead.code
-                ? getFixesInfoForUMDImport(context, symbolToken)
-                : ts.isIdentifier(symbolToken) ? getFixesInfoForNonUMDImport(context, symbolToken, useAutoImportProvider) : undefined;
+            var info;
+            if (errorCode === ts.Diagnostics._0_refers_to_a_UMD_global_but_the_current_file_is_a_module_Consider_adding_an_import_instead.code) {
+                info = getFixesInfoForUMDImport(context, symbolToken);
+            }
+            else if (!ts.isIdentifier(symbolToken)) {
+                return undefined;
+            }
+            else if (errorCode === ts.Diagnostics._0_cannot_be_used_as_a_value_because_it_was_imported_using_import_type.code) {
+                var symbolName_1 = getSymbolName(context.sourceFile, context.program.getTypeChecker(), symbolToken, context.program.getCompilerOptions());
+                var fix = getTypeOnlyPromotionFix(context.sourceFile, symbolToken, symbolName_1, context.program);
+                return fix && { fixes: [fix], symbolName: symbolName_1, errorIdentifierText: symbolToken.text };
+            }
+            else {
+                info = getFixesInfoForNonUMDImport(context, symbolToken, useAutoImportProvider);
+            }
             var packageJsonImportFilter = ts.createPackageJsonImportFilter(context.sourceFile, context.preferences, context.host);
             return info && __assign(__assign({}, info), { fixes: sortFixes(info.fixes, context.sourceFile, context.program, packageJsonImportFilter) });
         }
@@ -150239,6 +150460,7 @@ var ts;
             return 0 /* EqualTo */;
         }
         function getFixesInfoForUMDImport(_a, token) {
+            var _b;
             var sourceFile = _a.sourceFile, program = _a.program, host = _a.host, preferences = _a.preferences;
             var checker = program.getTypeChecker();
             var umdSymbol = getUmdSymbol(token, checker);
@@ -150249,7 +150471,7 @@ var ts;
             var exportInfos = [{ symbol: umdSymbol, moduleSymbol: symbol, moduleFileName: undefined, exportKind: 3 /* UMD */, targetFlags: symbol.flags, isFromPackageJson: false }];
             var useRequire = shouldUseRequire(sourceFile, program);
             var fixes = getImportFixes(exportInfos, symbolName, ts.isIdentifier(token) ? token.getStart(sourceFile) : undefined, /*isValidTypeOnlyUseSite*/ false, useRequire, program, sourceFile, host, preferences);
-            return { fixes: fixes, symbolName: symbolName };
+            return { fixes: fixes, symbolName: symbolName, errorIdentifierText: (_b = ts.tryCast(token, ts.isIdentifier)) === null || _b === void 0 ? void 0 : _b.text };
         }
         function getUmdSymbol(token, checker) {
             // try the identifier to see if it is the umd symbol
@@ -150315,12 +150537,22 @@ var ts;
             ts.Debug.assert(symbolName !== "default" /* Default */, "'default' isn't a legal identifier and couldn't occur here");
             var isValidTypeOnlyUseSite = ts.isValidTypeOnlyAliasUseSite(symbolToken);
             var useRequire = shouldUseRequire(sourceFile, program);
-            var exportInfos = getExportInfos(symbolName, ts.getMeaningFromLocation(symbolToken), cancellationToken, sourceFile, program, useAutoImportProvider, host, preferences);
+            var exportInfos = getExportInfos(symbolName, ts.isJSXTagName(symbolToken), ts.getMeaningFromLocation(symbolToken), cancellationToken, sourceFile, program, useAutoImportProvider, host, preferences);
             var fixes = ts.arrayFrom(ts.flatMapIterator(exportInfos.entries(), function (_a) {
                 var _ = _a[0], exportInfos = _a[1];
                 return getImportFixes(exportInfos, symbolName, symbolToken.getStart(sourceFile), isValidTypeOnlyUseSite, useRequire, program, sourceFile, host, preferences);
             }));
-            return { fixes: fixes, symbolName: symbolName };
+            return { fixes: fixes, symbolName: symbolName, errorIdentifierText: symbolToken.text };
+        }
+        function getTypeOnlyPromotionFix(sourceFile, symbolToken, symbolName, program) {
+            var checker = program.getTypeChecker();
+            var symbol = checker.resolveName(symbolName, symbolToken, 111551 /* Value */, /*excludeGlobals*/ true);
+            if (!symbol)
+                return undefined;
+            var typeOnlyAliasDeclaration = checker.getTypeOnlyAliasDeclaration(symbol);
+            if (!typeOnlyAliasDeclaration || ts.getSourceFileOfNode(typeOnlyAliasDeclaration) !== sourceFile)
+                return undefined;
+            return { kind: 4 /* PromoteTypeOnly */, typeOnlyAliasDeclaration: typeOnlyAliasDeclaration };
         }
         function jsxModeNeedsExplicitImport(jsx) {
             return jsx === 2 /* React */ || jsx === 3 /* ReactNative */;
@@ -150329,14 +150561,20 @@ var ts;
             var parent = symbolToken.parent;
             if ((ts.isJsxOpeningLikeElement(parent) || ts.isJsxClosingElement(parent)) && parent.tagName === symbolToken && jsxModeNeedsExplicitImport(compilerOptions.jsx)) {
                 var jsxNamespace = checker.getJsxNamespace(sourceFile);
-                if (ts.isIntrinsicJsxName(symbolToken.text) || !checker.resolveName(jsxNamespace, parent, 111551 /* Value */, /*excludeGlobals*/ true)) {
+                if (needsJsxNamespaceFix(jsxNamespace, symbolToken, checker)) {
                     return jsxNamespace;
                 }
             }
             return symbolToken.text;
         }
+        function needsJsxNamespaceFix(jsxNamespace, symbolToken, checker) {
+            if (ts.isIntrinsicJsxName(symbolToken.text))
+                return true; // If we were triggered by a matching error code on an intrinsic, the error must have been about missing the JSX factory
+            var namespaceSymbol = checker.resolveName(jsxNamespace, symbolToken, 111551 /* Value */, /*excludeGlobals*/ true);
+            return !namespaceSymbol || ts.some(namespaceSymbol.declarations, ts.isTypeOnlyImportOrExportDeclaration) && !(namespaceSymbol.flags & 111551 /* Value */);
+        }
         // Returns a map from an exported symbol's ID to a list of every way it's (re-)exported.
-        function getExportInfos(symbolName, currentTokenMeaning, cancellationToken, fromFile, program, useAutoImportProvider, host, preferences) {
+        function getExportInfos(symbolName, isJsxTagName, currentTokenMeaning, cancellationToken, fromFile, program, useAutoImportProvider, host, preferences) {
             var _a;
             // For each original symbol, keep all re-exports of that symbol together so we can call `getCodeActionsForImport` on the whole group at once.
             // Maps symbol id to info for modules providing that symbol (original export + re-exports).
@@ -150359,7 +150597,7 @@ var ts;
                 cancellationToken.throwIfCancellationRequested();
                 var compilerOptions = program.getCompilerOptions();
                 var defaultInfo = ts.getDefaultLikeExportInfo(moduleSymbol, checker, compilerOptions);
-                if (defaultInfo && (defaultInfo.name === symbolName || moduleSymbolToValidIdentifier(moduleSymbol, ts.getEmitScriptTarget(compilerOptions)) === symbolName) && symbolHasMeaning(defaultInfo.symbolForMeaning, currentTokenMeaning)) {
+                if (defaultInfo && (defaultInfo.name === symbolName || moduleSymbolToValidIdentifier(moduleSymbol, ts.getEmitScriptTarget(compilerOptions), isJsxTagName) === symbolName) && symbolHasMeaning(defaultInfo.symbolForMeaning, currentTokenMeaning)) {
                     addSymbol(moduleSymbol, sourceFile, defaultInfo.symbol, defaultInfo.exportKind, program, isFromPackageJson);
                 }
                 // check exports with the same name
@@ -150399,14 +150637,14 @@ var ts;
             //    allowSyntheticDefaultImports/esModuleInterop is enabled.
             return allowSyntheticDefaults ? 1 /* Default */ : 3 /* CommonJS */;
         }
-        function codeActionForFix(context, sourceFile, symbolName, fix, quotePreference, compilerOptions) {
+        function codeActionForFix(context, sourceFile, symbolName, fix, includeSymbolNameInDescription, quotePreference, compilerOptions) {
             var diag;
             var changes = ts.textChanges.ChangeTracker.with(context, function (tracker) {
-                diag = codeActionForFixWorker(tracker, sourceFile, symbolName, fix, quotePreference, compilerOptions);
+                diag = codeActionForFixWorker(tracker, sourceFile, symbolName, fix, includeSymbolNameInDescription, quotePreference, compilerOptions);
             });
             return codefix.createCodeFixAction(codefix.importFixName, changes, diag, importFixId, ts.Diagnostics.Add_all_missing_imports);
         }
-        function codeActionForFixWorker(changes, sourceFile, symbolName, fix, quotePreference, compilerOptions) {
+        function codeActionForFixWorker(changes, sourceFile, symbolName, fix, includeSymbolNameInDescription, quotePreference, compilerOptions) {
             switch (fix.kind) {
                 case 0 /* UseNamespace */:
                     addNamespaceQualifier(changes, sourceFile, fix);
@@ -150418,11 +150656,9 @@ var ts;
                     var importClauseOrBindingPattern = fix.importClauseOrBindingPattern, importKind = fix.importKind, addAsTypeOnly = fix.addAsTypeOnly, moduleSpecifier = fix.moduleSpecifier;
                     doAddExistingFix(changes, sourceFile, importClauseOrBindingPattern, importKind === 1 /* Default */ ? { name: symbolName, addAsTypeOnly: addAsTypeOnly } : undefined, importKind === 0 /* Named */ ? [{ name: symbolName, addAsTypeOnly: addAsTypeOnly }] : ts.emptyArray, compilerOptions);
                     var moduleSpecifierWithoutQuotes = ts.stripQuotes(moduleSpecifier);
-                    return [
-                        importKind === 1 /* Default */ ? ts.Diagnostics.Add_default_import_0_to_existing_import_declaration_from_1 : ts.Diagnostics.Add_0_to_existing_import_declaration_from_1,
-                        symbolName,
-                        moduleSpecifierWithoutQuotes
-                    ]; // you too!
+                    return includeSymbolNameInDescription
+                        ? [ts.Diagnostics.Import_0_from_1, symbolName, moduleSpecifierWithoutQuotes]
+                        : [ts.Diagnostics.Update_import_from_0, moduleSpecifierWithoutQuotes];
                 }
                 case 3 /* AddNew */: {
                     var importKind = fix.importKind, moduleSpecifier = fix.moduleSpecifier, addAsTypeOnly = fix.addAsTypeOnly, useRequire = fix.useRequire;
@@ -150431,12 +150667,84 @@ var ts;
                     var namedImports = importKind === 0 /* Named */ ? [{ name: symbolName, addAsTypeOnly: addAsTypeOnly }] : undefined;
                     var namespaceLikeImport = importKind === 2 /* Namespace */ || importKind === 3 /* CommonJS */ ? { importKind: importKind, name: symbolName, addAsTypeOnly: addAsTypeOnly } : undefined;
                     ts.insertImports(changes, sourceFile, getDeclarations(moduleSpecifier, quotePreference, defaultImport, namedImports, namespaceLikeImport), /*blankLineBetween*/ true);
-                    return [importKind === 1 /* Default */ ? ts.Diagnostics.Import_default_0_from_module_1 : ts.Diagnostics.Import_0_from_module_1, symbolName, moduleSpecifier];
+                    return includeSymbolNameInDescription
+                        ? [ts.Diagnostics.Import_0_from_1, symbolName, moduleSpecifier]
+                        : [ts.Diagnostics.Add_import_from_0, moduleSpecifier];
+                }
+                case 4 /* PromoteTypeOnly */: {
+                    var typeOnlyAliasDeclaration = fix.typeOnlyAliasDeclaration;
+                    var promotedDeclaration = promoteFromTypeOnly(changes, typeOnlyAliasDeclaration, compilerOptions, sourceFile);
+                    return promotedDeclaration.kind === 269 /* ImportSpecifier */
+                        ? [ts.Diagnostics.Remove_type_from_import_of_0_from_1, symbolName, getModuleSpecifierText(promotedDeclaration.parent.parent)]
+                        : [ts.Diagnostics.Remove_type_from_import_declaration_from_0, getModuleSpecifierText(promotedDeclaration)];
                 }
                 default:
                     return ts.Debug.assertNever(fix, "Unexpected fix kind " + fix.kind);
             }
         }
+        function getModuleSpecifierText(promotedDeclaration) {
+            var _a, _b;
+            return promotedDeclaration.kind === 264 /* ImportEqualsDeclaration */
+                ? ((_b = ts.tryCast((_a = ts.tryCast(promotedDeclaration.moduleReference, ts.isExternalModuleReference)) === null || _a === void 0 ? void 0 : _a.expression, ts.isStringLiteralLike)) === null || _b === void 0 ? void 0 : _b.text) || promotedDeclaration.moduleReference.getText()
+                : ts.cast(promotedDeclaration.parent.moduleSpecifier, ts.isStringLiteral).text;
+        }
+        function promoteFromTypeOnly(changes, aliasDeclaration, compilerOptions, sourceFile) {
+            // See comment in `doAddExistingFix` on constant with the same name.
+            var convertExistingToTypeOnly = compilerOptions.preserveValueImports && compilerOptions.isolatedModules;
+            switch (aliasDeclaration.kind) {
+                case 269 /* ImportSpecifier */:
+                    if (aliasDeclaration.isTypeOnly) {
+                        if (aliasDeclaration.parent.elements.length > 1 && ts.OrganizeImports.importSpecifiersAreSorted(aliasDeclaration.parent.elements)) {
+                            changes.delete(sourceFile, aliasDeclaration);
+                            var newSpecifier = ts.factory.updateImportSpecifier(aliasDeclaration, /*isTypeOnly*/ false, aliasDeclaration.propertyName, aliasDeclaration.name);
+                            var insertionIndex = ts.OrganizeImports.getImportSpecifierInsertionIndex(aliasDeclaration.parent.elements, newSpecifier);
+                            changes.insertImportSpecifierAtIndex(sourceFile, newSpecifier, aliasDeclaration.parent, insertionIndex);
+                        }
+                        else {
+                            changes.deleteRange(sourceFile, aliasDeclaration.getFirstToken());
+                        }
+                        return aliasDeclaration;
+                    }
+                    else {
+                        ts.Debug.assert(aliasDeclaration.parent.parent.isTypeOnly);
+                        promoteImportClause(aliasDeclaration.parent.parent);
+                        return aliasDeclaration.parent.parent;
+                    }
+                case 266 /* ImportClause */:
+                    promoteImportClause(aliasDeclaration);
+                    return aliasDeclaration;
+                case 267 /* NamespaceImport */:
+                    promoteImportClause(aliasDeclaration.parent);
+                    return aliasDeclaration.parent;
+                case 264 /* ImportEqualsDeclaration */:
+                    changes.deleteRange(sourceFile, aliasDeclaration.getChildAt(1));
+                    return aliasDeclaration;
+                default:
+                    ts.Debug.failBadSyntaxKind(aliasDeclaration);
+            }
+            function promoteImportClause(importClause) {
+                changes.delete(sourceFile, ts.getTypeKeywordOfTypeOnlyImport(importClause, sourceFile));
+                if (convertExistingToTypeOnly) {
+                    var namedImports = ts.tryCast(importClause.namedBindings, ts.isNamedImports);
+                    if (namedImports && namedImports.elements.length > 1) {
+                        if (ts.OrganizeImports.importSpecifiersAreSorted(namedImports.elements) &&
+                            aliasDeclaration.kind === 269 /* ImportSpecifier */ &&
+                            namedImports.elements.indexOf(aliasDeclaration) !== 0) {
+                            // The import specifier being promoted will be the only non-type-only,
+                            //  import in the NamedImports, so it should be moved to the front.
+                            changes.delete(sourceFile, aliasDeclaration);
+                            changes.insertImportSpecifierAtIndex(sourceFile, aliasDeclaration, namedImports, 0);
+                        }
+                        for (var _i = 0, _a = namedImports.elements; _i < _a.length; _i++) {
+                            var element = _a[_i];
+                            if (element !== aliasDeclaration && !element.isTypeOnly) {
+                                changes.insertModifierBefore(sourceFile, 151 /* TypeKeyword */, element);
+                            }
+                        }
+                    }
+                }
+            }
+        }
         function doAddExistingFix(changes, sourceFile, clause, defaultImport, namedImports, compilerOptions) {
             var _a;
             if (clause.kind === 200 /* ObjectBindingPattern */) {
@@ -150474,13 +150782,7 @@ var ts;
                         var insertionIndex = convertExistingToTypeOnly && !spec.isTypeOnly
                             ? 0
                             : ts.OrganizeImports.getImportSpecifierInsertionIndex(existingSpecifiers, spec);
-                        var prevSpecifier = clause.namedBindings.elements[insertionIndex - 1];
-                        if (prevSpecifier) {
-                            changes.insertNodeInListAfter(sourceFile, prevSpecifier, spec);
-                        }
-                        else {
-                            changes.insertNodeBefore(sourceFile, existingSpecifiers[0], spec, !ts.positionsAreOnSameLine(existingSpecifiers[0].getStart(), clause.parent.getStart(), sourceFile));
-                        }
+                        changes.insertImportSpecifierAtIndex(sourceFile, spec, clause.namedBindings, insertionIndex);
                     }
                 }
                 else if (existingSpecifiers === null || existingSpecifiers === void 0 ? void 0 : existingSpecifiers.length) {
@@ -150595,17 +150897,20 @@ var ts;
             var declarations = _a.declarations;
             return ts.some(declarations, function (decl) { return !!(ts.getMeaningFromDeclaration(decl) & meaning); });
         }
-        function moduleSymbolToValidIdentifier(moduleSymbol, target) {
-            return moduleSpecifierToValidIdentifier(ts.removeFileExtension(ts.stripQuotes(moduleSymbol.name)), target);
+        function moduleSymbolToValidIdentifier(moduleSymbol, target, forceCapitalize) {
+            return moduleSpecifierToValidIdentifier(ts.removeFileExtension(ts.stripQuotes(moduleSymbol.name)), target, forceCapitalize);
         }
         codefix.moduleSymbolToValidIdentifier = moduleSymbolToValidIdentifier;
-        function moduleSpecifierToValidIdentifier(moduleSpecifier, target) {
+        function moduleSpecifierToValidIdentifier(moduleSpecifier, target, forceCapitalize) {
             var baseName = ts.getBaseFileName(ts.removeSuffix(moduleSpecifier, "/index"));
             var res = "";
             var lastCharWasValid = true;
             var firstCharCode = baseName.charCodeAt(0);
             if (ts.isIdentifierStart(firstCharCode, target)) {
                 res += String.fromCharCode(firstCharCode);
+                if (forceCapitalize) {
+                    res = res.toUpperCase();
+                }
             }
             else {
                 lastCharWasValid = false;
@@ -158224,14 +158529,22 @@ var ts;
             var result = [];
             return visitor(selection) ? undefined : result;
             function visitor(node) {
-                var _a;
                 if (ts.isTypeReferenceNode(node)) {
                     if (ts.isIdentifier(node.typeName)) {
-                        var symbol = checker.resolveName(node.typeName.text, node.typeName, 262144 /* TypeParameter */, /* excludeGlobals */ true);
-                        var declaration = ts.tryCast((_a = symbol === null || symbol === void 0 ? void 0 : symbol.declarations) === null || _a === void 0 ? void 0 : _a[0], ts.isTypeParameterDeclaration);
-                        if (declaration) {
-                            if (rangeContainsSkipTrivia(statement, declaration, file) && !rangeContainsSkipTrivia(selection, declaration, file)) {
-                                ts.pushIfUnique(result, declaration);
+                        var typeName = node.typeName;
+                        var symbol = checker.resolveName(typeName.text, typeName, 262144 /* TypeParameter */, /* excludeGlobals */ true);
+                        for (var _i = 0, _a = (symbol === null || symbol === void 0 ? void 0 : symbol.declarations) || ts.emptyArray; _i < _a.length; _i++) {
+                            var decl = _a[_i];
+                            if (ts.isTypeParameterDeclaration(decl) && decl.getSourceFile() === file) {
+                                // skip extraction if the type node is in the range of the type parameter declaration.
+                                // function foo<T extends { a?: /**/T }>(): void;
+                                if (decl.name.escapedText === typeName.escapedText && rangeContainsSkipTrivia(decl, selection, file)) {
+                                    return true;
+                                }
+                                if (rangeContainsSkipTrivia(statement, decl, file) && !rangeContainsSkipTrivia(selection, decl, file)) {
+                                    ts.pushIfUnique(result, decl);
+                                    break;
+                                }
                             }
                         }
                     }
@@ -160574,13 +160887,11 @@ var ts;
             switch (context === null || context === void 0 ? void 0 : context.kind) {
                 case 171 /* GetAccessor */:
                     if (!this.contextualGetAccessorDocumentationComment) {
-                        this.contextualGetAccessorDocumentationComment = ts.emptyArray;
                         this.contextualGetAccessorDocumentationComment = getDocumentationComment(ts.filter(this.declarations, ts.isGetAccessor), checker);
                     }
                     return this.contextualGetAccessorDocumentationComment;
                 case 172 /* SetAccessor */:
                     if (!this.contextualSetAccessorDocumentationComment) {
-                        this.contextualSetAccessorDocumentationComment = ts.emptyArray;
                         this.contextualSetAccessorDocumentationComment = getDocumentationComment(ts.filter(this.declarations, ts.isSetAccessor), checker);
                     }
                     return this.contextualSetAccessorDocumentationComment;
@@ -160590,10 +160901,26 @@ var ts;
         };
         SymbolObject.prototype.getJsDocTags = function (checker) {
             if (this.tags === undefined) {
-                this.tags = ts.JsDoc.getJsDocTagsFromDeclarations(this.declarations, checker);
+                this.tags = getJsDocTagsOfDeclarations(this.declarations, checker);
             }
             return this.tags;
         };
+        SymbolObject.prototype.getContextualJsDocTags = function (context, checker) {
+            switch (context === null || context === void 0 ? void 0 : context.kind) {
+                case 171 /* GetAccessor */:
+                    if (!this.contextualGetAccessorTags) {
+                        this.contextualGetAccessorTags = getJsDocTagsOfDeclarations(ts.filter(this.declarations, ts.isGetAccessor), checker);
+                    }
+                    return this.contextualGetAccessorTags;
+                case 172 /* SetAccessor */:
+                    if (!this.contextualSetAccessorTags) {
+                        this.contextualSetAccessorTags = getJsDocTagsOfDeclarations(ts.filter(this.declarations, ts.isSetAccessor), checker);
+                    }
+                    return this.contextualSetAccessorTags;
+                default:
+                    return this.getJsDocTags(checker);
+            }
+        };
         return SymbolObject;
     }());
     var TokenObject = /** @class */ (function (_super) {
@@ -160763,10 +161090,7 @@ var ts;
             return this.documentationComment || (this.documentationComment = getDocumentationComment(ts.singleElementArray(this.declaration), this.checker));
         };
         SignatureObject.prototype.getJsDocTags = function () {
-            if (this.jsDocTags === undefined) {
-                this.jsDocTags = this.declaration ? getJsDocTagsOfSignature(this.declaration, this.checker) : [];
-            }
-            return this.jsDocTags;
+            return this.jsDocTags || (this.jsDocTags = getJsDocTagsOfDeclarations(ts.singleElementArray(this.declaration), this.checker));
         };
         return SignatureObject;
     }());
@@ -160778,12 +161102,30 @@ var ts;
     function hasJSDocInheritDocTag(node) {
         return ts.getJSDocTags(node).some(function (tag) { return tag.tagName.text === "inheritDoc"; });
     }
-    function getJsDocTagsOfSignature(declaration, checker) {
-        var tags = ts.JsDoc.getJsDocTagsFromDeclarations([declaration], checker);
-        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, true), tags, true);
+    function getJsDocTagsOfDeclarations(declarations, checker) {
+        if (!declarations)
+            return ts.emptyArray;
+        var tags = ts.JsDoc.getJsDocTagsFromDeclarations(declarations, checker);
+        if (checker && (tags.length === 0 || declarations.some(hasJSDocInheritDocTag))) {
+            var seenSymbols_1 = new ts.Set();
+            var _loop_22 = function (declaration) {
+                var inheritedTags = findBaseOfDeclaration(checker, declaration, function (symbol) {
+                    var _a;
+                    if (!seenSymbols_1.has(symbol)) {
+                        seenSymbols_1.add(symbol);
+                        if (declaration.kind === 171 /* GetAccessor */ || declaration.kind === 172 /* SetAccessor */) {
+                            return symbol.getContextualJsDocTags(declaration, checker);
+                        }
+                        return ((_a = symbol.declarations) === null || _a === void 0 ? void 0 : _a.length) === 1 ? symbol.getJsDocTags() : undefined;
+                    }
+                });
+                if (inheritedTags) {
+                    tags = __spreadArray(__spreadArray([], inheritedTags, true), tags, true);
+                }
+            };
+            for (var _i = 0, declarations_6 = declarations; _i < declarations_6.length; _i++) {
+                var declaration = declarations_6[_i];
+                _loop_22(declaration);
             }
         }
         return tags;
@@ -160793,18 +161135,24 @@ var ts;
             return ts.emptyArray;
         var doc = ts.JsDoc.getJsDocCommentsFromDeclarations(declarations, checker);
         if (checker && (doc.length === 0 || declarations.some(hasJSDocInheritDocTag))) {
-            var seenSymbols_1 = new ts.Set();
-            for (var _i = 0, declarations_6 = declarations; _i < declarations_6.length; _i++) {
-                var declaration = declarations_6[_i];
+            var seenSymbols_2 = new ts.Set();
+            var _loop_23 = function (declaration) {
                 var inheritedDocs = findBaseOfDeclaration(checker, declaration, function (symbol) {
-                    if (!seenSymbols_1.has(symbol)) {
-                        seenSymbols_1.add(symbol);
+                    if (!seenSymbols_2.has(symbol)) {
+                        seenSymbols_2.add(symbol);
+                        if (declaration.kind === 171 /* GetAccessor */ || declaration.kind === 172 /* SetAccessor */) {
+                            return symbol.getContextualDocumentationComment(declaration, checker);
+                        }
                         return symbol.getDocumentationComment(checker);
                     }
                 });
                 // TODO: GH#16312 Return a ReadonlyArray, avoid copying inheritedDocs
                 if (inheritedDocs)
                     doc = doc.length === 0 ? inheritedDocs.slice() : inheritedDocs.concat(ts.lineBreakPart(), doc);
+            };
+            for (var _i = 0, declarations_7 = declarations; _i < declarations_7.length; _i++) {
+                var declaration = declarations_7[_i];
+                _loop_23(declaration);
             }
         }
         return doc;