typescript 4.8.0-dev.20220616 → 4.8.0-dev.20220619

package/lib/tsserver.js

@@ -109,7 +109,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.20220616";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220619";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -9672,6 +9672,8 @@ var ts;
         Qualified_name_0_is_not_allowed_without_a_leading_param_object_1: diag(8032, ts.DiagnosticCategory.Error, "Qualified_name_0_is_not_allowed_without_a_leading_param_object_1_8032", "Qualified name '{0}' is not allowed without a leading '@param {object} {1}'."),
         A_JSDoc_typedef_comment_may_not_contain_multiple_type_tags: diag(8033, ts.DiagnosticCategory.Error, "A_JSDoc_typedef_comment_may_not_contain_multiple_type_tags_8033", "A JSDoc '@typedef' comment may not contain multiple '@type' tags."),
         The_tag_was_first_specified_here: diag(8034, ts.DiagnosticCategory.Error, "The_tag_was_first_specified_here_8034", "The tag was first specified here."),
+        You_cannot_rename_elements_that_are_defined_in_a_node_modules_folder: diag(8035, ts.DiagnosticCategory.Error, "You_cannot_rename_elements_that_are_defined_in_a_node_modules_folder_8035", "You cannot rename elements that are defined in a 'node_modules' folder."),
+        You_cannot_rename_elements_that_are_defined_in_another_node_modules_folder: diag(8036, ts.DiagnosticCategory.Error, "You_cannot_rename_elements_that_are_defined_in_another_node_modules_folder_8036", "You cannot rename elements that are defined in another 'node_modules' folder."),
         Declaration_emit_for_this_file_requires_using_private_name_0_An_explicit_type_annotation_may_unblock_declaration_emit: diag(9005, ts.DiagnosticCategory.Error, "Declaration_emit_for_this_file_requires_using_private_name_0_An_explicit_type_annotation_may_unblock_9005", "Declaration emit for this file requires using private name '{0}'. An explicit type annotation may unblock declaration emit."),
         Declaration_emit_for_this_file_requires_using_private_name_0_from_module_1_An_explicit_type_annotation_may_unblock_declaration_emit: diag(9006, ts.DiagnosticCategory.Error, "Declaration_emit_for_this_file_requires_using_private_name_0_from_module_1_An_explicit_type_annotati_9006", "Declaration emit for this file requires using private name '{0}' from module '{1}'. An explicit type annotation may unblock declaration emit."),
         JSX_attributes_must_only_be_assigned_a_non_empty_expression: diag(17000, ts.DiagnosticCategory.Error, "JSX_attributes_must_only_be_assigned_a_non_empty_expression_17000", "JSX attributes must only be assigned a non-empty 'expression'."),
@@ -9942,6 +9944,9 @@ var ts;
         For_await_loops_cannot_be_used_inside_a_class_static_block: diag(18038, ts.DiagnosticCategory.Error, "For_await_loops_cannot_be_used_inside_a_class_static_block_18038", "'For await' loops cannot be used inside a class static block."),
         Invalid_use_of_0_It_cannot_be_used_inside_a_class_static_block: diag(18039, ts.DiagnosticCategory.Error, "Invalid_use_of_0_It_cannot_be_used_inside_a_class_static_block_18039", "Invalid use of '{0}'. It cannot be used inside a class static block."),
         A_return_statement_cannot_be_used_inside_a_class_static_block: diag(18041, ts.DiagnosticCategory.Error, "A_return_statement_cannot_be_used_inside_a_class_static_block_18041", "A 'return' statement cannot be used inside a class static block."),
+        _0_is_a_type_and_cannot_be_imported_in_JavaScript_files_Use_1_in_a_JSDoc_type_annotation: diag(18042, ts.DiagnosticCategory.Error, "_0_is_a_type_and_cannot_be_imported_in_JavaScript_files_Use_1_in_a_JSDoc_type_annotation_18042", "'{0}' is a type and cannot be imported in JavaScript files. Use '{1}' in a JSDoc type annotation."),
+        Types_cannot_appear_in_export_declarations_in_JavaScript_files: diag(18043, ts.DiagnosticCategory.Error, "Types_cannot_appear_in_export_declarations_in_JavaScript_files_18043", "Types cannot appear in export declarations in JavaScript files."),
+        _0_is_automatically_exported_here: diag(18044, ts.DiagnosticCategory.Message, "_0_is_automatically_exported_here_18044", "'{0}' is automatically exported here."),
     };
 })(ts || (ts = {}));
 var ts;
@@ -34530,10 +34535,10 @@ var ts;
                 setDecoratorContext(/*val*/ false);
             }
             var pos = getNodePos();
-            var expr = parseAssignmentExpressionOrHigher();
+            var expr = parseAssignmentExpressionOrHigher(/*allowReturnTypeInArrowFunction*/ true);
             var operatorToken;
             while ((operatorToken = parseOptionalToken(27 /* CommaToken */))) {
-                expr = makeBinaryExpression(expr, operatorToken, parseAssignmentExpressionOrHigher(), pos);
+                expr = makeBinaryExpression(expr, operatorToken, parseAssignmentExpressionOrHigher(/*allowReturnTypeInArrowFunction*/ true), pos);
             }
             if (saveDecoratorContext) {
                 setDecoratorContext(/*val*/ true);
@@ -34541,9 +34546,9 @@ var ts;
             return expr;
         }
         function parseInitializer() {
-            return parseOptional(63 /* EqualsToken */) ? parseAssignmentExpressionOrHigher() : undefined;
+            return parseOptional(63 /* EqualsToken */) ? parseAssignmentExpressionOrHigher(/*allowReturnTypeInArrowFunction*/ true) : undefined;
         }
-        function parseAssignmentExpressionOrHigher() {
+        function parseAssignmentExpressionOrHigher(allowReturnTypeInArrowFunction) {
             //  AssignmentExpression[in,yield]:
             //      1) ConditionalExpression[?in,?yield]
             //      2) LeftHandSideExpression = AssignmentExpression[?in,?yield]
@@ -34569,7 +34574,7 @@ var ts;
             // If we do successfully parse arrow-function, we must *not* recurse for productions 1, 2 or 3. An ArrowFunction is
             // not a LeftHandSideExpression, nor does it start a ConditionalExpression.  So we are done
             // with AssignmentExpression if we see one.
-            var arrowExpression = tryParseParenthesizedArrowFunctionExpression() || tryParseAsyncSimpleArrowFunctionExpression();
+            var arrowExpression = tryParseParenthesizedArrowFunctionExpression(allowReturnTypeInArrowFunction) || tryParseAsyncSimpleArrowFunctionExpression(allowReturnTypeInArrowFunction);
             if (arrowExpression) {
                 return arrowExpression;
             }
@@ -34588,7 +34593,7 @@ var ts;
             // parameter ('x => ...') above. We handle it here by checking if the parsed expression was a single
             // identifier and the current token is an arrow.
             if (expr.kind === 79 /* Identifier */ && token() === 38 /* EqualsGreaterThanToken */) {
-                return parseSimpleArrowFunctionExpression(pos, expr, /*asyncModifier*/ undefined);
+                return parseSimpleArrowFunctionExpression(pos, expr, allowReturnTypeInArrowFunction, /*asyncModifier*/ undefined);
             }
             // Now see if we might be in cases '2' or '3'.
             // If the expression was a LHS expression, and we have an assignment operator, then
@@ -34597,10 +34602,10 @@ var ts;
             // Note: we call reScanGreaterToken so that we get an appropriately merged token
             // for cases like `> > =` becoming `>>=`
             if (ts.isLeftHandSideExpression(expr) && ts.isAssignmentOperator(reScanGreaterToken())) {
-                return makeBinaryExpression(expr, parseTokenNode(), parseAssignmentExpressionOrHigher(), pos);
+                return makeBinaryExpression(expr, parseTokenNode(), parseAssignmentExpressionOrHigher(allowReturnTypeInArrowFunction), pos);
             }
             // It wasn't an assignment or a lambda.  This is a conditional expression:
-            return parseConditionalExpressionRest(expr, pos);
+            return parseConditionalExpressionRest(expr, pos, allowReturnTypeInArrowFunction);
         }
         function isYieldExpression() {
             if (token() === 125 /* YieldKeyword */) {
@@ -34640,7 +34645,7 @@ var ts;
             nextToken();
             if (!scanner.hasPrecedingLineBreak() &&
                 (token() === 41 /* AsteriskToken */ || isStartOfExpression())) {
-                return finishNode(factory.createYieldExpression(parseOptionalToken(41 /* AsteriskToken */), parseAssignmentExpressionOrHigher()), pos);
+                return finishNode(factory.createYieldExpression(parseOptionalToken(41 /* AsteriskToken */), parseAssignmentExpressionOrHigher(/*allowReturnTypeInArrowFunction*/ true)), pos);
             }
             else {
                 // if the next token is not on the same line as yield.  or we don't have an '*' or
@@ -34648,7 +34653,7 @@ var ts;
                 return finishNode(factory.createYieldExpression(/*asteriskToken*/ undefined, /*expression*/ undefined), pos);
             }
         }
-        function parseSimpleArrowFunctionExpression(pos, identifier, asyncModifier) {
+        function parseSimpleArrowFunctionExpression(pos, identifier, allowReturnTypeInArrowFunction, asyncModifier) {
             ts.Debug.assert(token() === 38 /* EqualsGreaterThanToken */, "parseSimpleArrowFunctionExpression should only have been called if we had a =>");
             var parameter = factory.createParameterDeclaration(
             /*modifiers*/ undefined, 
@@ -34659,11 +34664,11 @@ var ts;
             finishNode(parameter, identifier.pos);
             var parameters = createNodeArray([parameter], parameter.pos, parameter.end);
             var equalsGreaterThanToken = parseExpectedToken(38 /* EqualsGreaterThanToken */);
-            var body = parseArrowFunctionExpressionBody(/*isAsync*/ !!asyncModifier);
+            var body = parseArrowFunctionExpressionBody(/*isAsync*/ !!asyncModifier, allowReturnTypeInArrowFunction);
             var node = factory.createArrowFunction(asyncModifier, /*typeParameters*/ undefined, parameters, /*type*/ undefined, equalsGreaterThanToken, body);
             return addJSDocComment(finishNode(node, pos));
         }
-        function tryParseParenthesizedArrowFunctionExpression() {
+        function tryParseParenthesizedArrowFunctionExpression(allowReturnTypeInArrowFunction) {
             var triState = isParenthesizedArrowFunctionExpression();
             if (triState === 0 /* False */) {
                 // It's definitely not a parenthesized arrow function expression.
@@ -34674,8 +34679,8 @@ var ts;
             // it out, but don't allow any ambiguity, and return 'undefined' if this could be an
             // expression instead.
             return triState === 1 /* True */ ?
-                parseParenthesizedArrowFunctionExpression(/*allowAmbiguity*/ true) :
-                tryParse(parsePossibleParenthesizedArrowFunctionExpression);
+                parseParenthesizedArrowFunctionExpression(/*allowAmbiguity*/ true, /*allowReturnTypeInArrowFunction*/ true) :
+                tryParse(function () { return parsePossibleParenthesizedArrowFunctionExpression(allowReturnTypeInArrowFunction); });
         }
         //  True        -> We definitely expect a parenthesized arrow function here.
         //  False       -> There *cannot* be a parenthesized arrow function here.
@@ -34809,25 +34814,25 @@ var ts;
                 return 2 /* Unknown */;
             }
         }
-        function parsePossibleParenthesizedArrowFunctionExpression() {
+        function parsePossibleParenthesizedArrowFunctionExpression(allowReturnTypeInArrowFunction) {
             var tokenPos = scanner.getTokenPos();
             if (notParenthesizedArrow === null || notParenthesizedArrow === void 0 ? void 0 : notParenthesizedArrow.has(tokenPos)) {
                 return undefined;
             }
-            var result = parseParenthesizedArrowFunctionExpression(/*allowAmbiguity*/ false);
+            var result = parseParenthesizedArrowFunctionExpression(/*allowAmbiguity*/ false, allowReturnTypeInArrowFunction);
             if (!result) {
                 (notParenthesizedArrow || (notParenthesizedArrow = new ts.Set())).add(tokenPos);
             }
             return result;
         }
-        function tryParseAsyncSimpleArrowFunctionExpression() {
+        function tryParseAsyncSimpleArrowFunctionExpression(allowReturnTypeInArrowFunction) {
             // We do a check here so that we won't be doing unnecessarily call to "lookAhead"
             if (token() === 131 /* AsyncKeyword */) {
                 if (lookAhead(isUnParenthesizedAsyncArrowFunctionWorker) === 1 /* True */) {
                     var pos = getNodePos();
                     var asyncModifier = parseModifiersForArrowFunction();
                     var expr = parseBinaryExpressionOrHigher(0 /* Lowest */);
-                    return parseSimpleArrowFunctionExpression(pos, expr, asyncModifier);
+                    return parseSimpleArrowFunctionExpression(pos, expr, allowReturnTypeInArrowFunction, asyncModifier);
                 }
             }
             return undefined;
@@ -34851,7 +34856,7 @@ var ts;
             }
             return 0 /* False */;
         }
-        function parseParenthesizedArrowFunctionExpression(allowAmbiguity) {
+        function parseParenthesizedArrowFunctionExpression(allowAmbiguity, allowReturnTypeInArrowFunction) {
             var pos = getNodePos();
             var hasJSDoc = hasPrecedingJSDocComment();
             var modifiers = parseModifiersForArrowFunction();
@@ -34886,6 +34891,7 @@ var ts;
                     return undefined;
                 }
             }
+            var hasReturnColon = token() === 58 /* ColonToken */;
             var type = parseReturnType(58 /* ColonToken */, /*isType*/ false);
             if (type && !allowAmbiguity && typeHasArrowFunctionBlockingParseError(type)) {
                 return undefined;
@@ -34914,12 +34920,37 @@ var ts;
             var lastToken = token();
             var equalsGreaterThanToken = parseExpectedToken(38 /* EqualsGreaterThanToken */);
             var body = (lastToken === 38 /* EqualsGreaterThanToken */ || lastToken === 18 /* OpenBraceToken */)
-                ? parseArrowFunctionExpressionBody(ts.some(modifiers, ts.isAsyncModifier))
+                ? parseArrowFunctionExpressionBody(ts.some(modifiers, ts.isAsyncModifier), allowReturnTypeInArrowFunction)
                 : parseIdentifier();
+            // Given:
+            //     x ? y => ({ y }) : z => ({ z })
+            // We try to parse the body of the first arrow function by looking at:
+            //     ({ y }) : z => ({ z })
+            // This is a valid arrow function with "z" as the return type.
+            //
+            // But, if we're in the true side of a conditional expression, this colon
+            // terminates the expression, so we cannot allow a return type if we aren't
+            // certain whether or not the preceding text was parsed as a parameter list.
+            //
+            // For example,
+            //     a() ? (b: number, c?: string): void => d() : e
+            // is determined by isParenthesizedArrowFunctionExpression to unambiguously
+            // be an arrow expression, so we allow a return type.
+            if (!allowReturnTypeInArrowFunction && hasReturnColon) {
+                // However, if the arrow function we were able to parse is followed by another colon
+                // as in:
+                //     a ? (x): string => x : null
+                // Then allow the arrow function, and treat the second colon as terminating
+                // the conditional expression. It's okay to do this because this code would
+                // be a syntax error in JavaScript (as the second colon shouldn't be there).
+                if (token() !== 58 /* ColonToken */) {
+                    return undefined;
+                }
+            }
             var node = factory.createArrowFunction(modifiers, typeParameters, parameters, type, equalsGreaterThanToken, body);
             return withJSDoc(finishNode(node, pos), hasJSDoc);
         }
-        function parseArrowFunctionExpressionBody(isAsync) {
+        function parseArrowFunctionExpressionBody(isAsync, allowReturnTypeInArrowFunction) {
             if (token() === 18 /* OpenBraceToken */) {
                 return parseFunctionBlock(isAsync ? 2 /* Await */ : 0 /* None */);
             }
@@ -34947,12 +34978,12 @@ var ts;
             var savedTopLevel = topLevel;
             topLevel = false;
             var node = isAsync
-                ? doInAwaitContext(parseAssignmentExpressionOrHigher)
-                : doOutsideOfAwaitContext(parseAssignmentExpressionOrHigher);
+                ? doInAwaitContext(function () { return parseAssignmentExpressionOrHigher(allowReturnTypeInArrowFunction); })
+                : doOutsideOfAwaitContext(function () { return parseAssignmentExpressionOrHigher(allowReturnTypeInArrowFunction); });
             topLevel = savedTopLevel;
             return node;
         }
-        function parseConditionalExpressionRest(leftOperand, pos) {
+        function parseConditionalExpressionRest(leftOperand, pos, allowReturnTypeInArrowFunction) {
             // Note: we are passed in an expression which was produced from parseBinaryExpressionOrHigher.
             var questionToken = parseOptionalToken(57 /* QuestionToken */);
             if (!questionToken) {
@@ -34961,8 +34992,8 @@ var ts;
             // Note: we explicitly 'allowIn' in the whenTrue part of the condition expression, and
             // we do not that for the 'whenFalse' part.
             var colonToken;
-            return finishNode(factory.createConditionalExpression(leftOperand, questionToken, doOutsideOfContext(disallowInAndDecoratorContext, parseAssignmentExpressionOrHigher), colonToken = parseExpectedToken(58 /* ColonToken */), ts.nodeIsPresent(colonToken)
-                ? parseAssignmentExpressionOrHigher()
+            return finishNode(factory.createConditionalExpression(leftOperand, questionToken, doOutsideOfContext(disallowInAndDecoratorContext, function () { return parseAssignmentExpressionOrHigher(/*allowReturnTypeInArrowFunction*/ false); }), colonToken = parseExpectedToken(58 /* ColonToken */), ts.nodeIsPresent(colonToken)
+                ? parseAssignmentExpressionOrHigher(allowReturnTypeInArrowFunction)
                 : createMissingNode(79 /* Identifier */, /*reportAtCurrentPosition*/ false, ts.Diagnostics._0_expected, ts.tokenToString(58 /* ColonToken */))), pos);
         }
         function parseBinaryExpressionOrHigher(precedence) {
@@ -35877,13 +35908,13 @@ var ts;
         function parseSpreadElement() {
             var pos = getNodePos();
             parseExpected(25 /* DotDotDotToken */);
-            var expression = parseAssignmentExpressionOrHigher();
+            var expression = parseAssignmentExpressionOrHigher(/*allowReturnTypeInArrowFunction*/ true);
             return finishNode(factory.createSpreadElement(expression), pos);
         }
         function parseArgumentOrArrayLiteralElement() {
             return token() === 25 /* DotDotDotToken */ ? parseSpreadElement() :
                 token() === 27 /* CommaToken */ ? finishNode(factory.createOmittedExpression(), getNodePos()) :
-                    parseAssignmentExpressionOrHigher();
+                    parseAssignmentExpressionOrHigher(/*allowReturnTypeInArrowFunction*/ true);
         }
         function parseArgumentExpression() {
             return doOutsideOfContext(disallowInAndDecoratorContext, parseArgumentOrArrayLiteralElement);
@@ -35901,7 +35932,7 @@ var ts;
             var pos = getNodePos();
             var hasJSDoc = hasPrecedingJSDocComment();
             if (parseOptionalToken(25 /* DotDotDotToken */)) {
-                var expression = parseAssignmentExpressionOrHigher();
+                var expression = parseAssignmentExpressionOrHigher(/*allowReturnTypeInArrowFunction*/ true);
                 return withJSDoc(finishNode(factory.createSpreadAssignment(expression), pos), hasJSDoc);
             }
             var decorators = parseDecorators();
@@ -35930,7 +35961,7 @@ var ts;
             var isShorthandPropertyAssignment = tokenIsIdentifier && (token() !== 58 /* ColonToken */);
             if (isShorthandPropertyAssignment) {
                 var equalsToken = parseOptionalToken(63 /* EqualsToken */);
-                var objectAssignmentInitializer = equalsToken ? allowInAnd(parseAssignmentExpressionOrHigher) : undefined;
+                var objectAssignmentInitializer = equalsToken ? allowInAnd(function () { return parseAssignmentExpressionOrHigher(/*allowReturnTypeInArrowFunction*/ true); }) : undefined;
                 node = factory.createShorthandPropertyAssignment(name, objectAssignmentInitializer);
                 // Save equals token for error reporting.
                 // TODO(rbuckton): Consider manufacturing this when we need to report an error as it is otherwise not useful.
@@ -35938,7 +35969,7 @@ var ts;
             }
             else {
                 parseExpected(58 /* ColonToken */);
-                var initializer = allowInAnd(parseAssignmentExpressionOrHigher);
+                var initializer = allowInAnd(function () { return parseAssignmentExpressionOrHigher(/*allowReturnTypeInArrowFunction*/ true); });
                 node = factory.createPropertyAssignment(name, initializer);
             }
             // Decorators, Modifiers, questionToken, and exclamationToken are not supported by property assignments and are reported in the grammar checker
@@ -36115,7 +36146,7 @@ var ts;
             }
             var node;
             if (awaitToken ? parseExpected(160 /* OfKeyword */) : parseOptional(160 /* OfKeyword */)) {
-                var expression = allowInAnd(parseAssignmentExpressionOrHigher);
+                var expression = allowInAnd(function () { return parseAssignmentExpressionOrHigher(/*allowReturnTypeInArrowFunction*/ true); });
                 parseExpected(21 /* CloseParenToken */);
                 node = factory.createForOfStatement(awaitToken, initializer, expression, parseStatement());
             }
@@ -37303,7 +37334,7 @@ var ts;
             var pos = getNodePos();
             var name = ts.tokenIsIdentifierOrKeyword(token()) ? parseIdentifierName() : parseLiteralLikeNode(10 /* StringLiteral */);
             parseExpected(58 /* ColonToken */);
-            var value = parseAssignmentExpressionOrHigher();
+            var value = parseAssignmentExpressionOrHigher(/*allowReturnTypeInArrowFunction*/ true);
             return finishNode(factory.createAssertEntry(name, value), pos);
         }
         function parseAssertClause(skipAssertKeyword) {
@@ -37544,7 +37575,7 @@ var ts;
             else {
                 parseExpected(88 /* DefaultKeyword */);
             }
-            var expression = parseAssignmentExpressionOrHigher();
+            var expression = parseAssignmentExpressionOrHigher(/*allowReturnTypeInArrowFunction*/ true);
             parseSemicolon();
             setAwaitContext(savedAwaitContext);
             var node = factory.createExportAssignment(modifiers, isExportEquals, expression);
@@ -48910,9 +48941,9 @@ var ts;
                 return moduleSpecifier && resolveExternalModuleName(moduleSpecifier, moduleSpecifier, /*ignoreErrors*/ true);
             },
             resolveExternalModuleSymbol: resolveExternalModuleSymbol,
-            tryGetThisTypeAt: function (nodeIn, includeGlobalThis) {
+            tryGetThisTypeAt: function (nodeIn, includeGlobalThis, container) {
                 var node = ts.getParseTreeNode(nodeIn);
-                return node && tryGetThisTypeAt(node, includeGlobalThis);
+                return node && tryGetThisTypeAt(node, includeGlobalThis, container);
             },
             getTypeArgumentConstraint: function (nodeIn) {
                 var node = ts.getParseTreeNode(nodeIn, ts.isTypeNode);
@@ -59360,7 +59391,7 @@ var ts;
                 }
                 if (t.flags & 268435456 /* StringMapping */) {
                     var constraint = getBaseConstraint(t.type);
-                    return constraint ? getStringMappingType(t.symbol, constraint) : stringType;
+                    return constraint && constraint !== t.type ? getStringMappingType(t.symbol, constraint) : stringType;
                 }
                 if (t.flags & 8388608 /* IndexedAccess */) {
                     if (isMappedTypeGenericIndexedAccess(t)) {
@@ -62330,9 +62361,12 @@ var ts;
         }
         function getStringMappingType(symbol, type) {
             return type.flags & (1048576 /* Union */ | 131072 /* Never */) ? mapType(type, function (t) { return getStringMappingType(symbol, t); }) :
-                isGenericIndexType(type) ? getStringMappingTypeForGenericType(symbol, type) :
-                    type.flags & 128 /* StringLiteral */ ? getStringLiteralType(applyStringMapping(symbol, type.value)) :
-                        type;
+                // Mapping<Mapping<T>> === Mapping<T>
+                type.flags & 268435456 /* StringMapping */ && symbol === type.symbol ? type :
+                    isGenericIndexType(type) || isPatternLiteralPlaceholderType(type) ? getStringMappingTypeForGenericType(symbol, isPatternLiteralPlaceholderType(type) && !(type.flags & 268435456 /* StringMapping */) ? getTemplateLiteralType(["", ""], [type]) : type) :
+                        type.flags & 128 /* StringLiteral */ ? getStringLiteralType(applyStringMapping(symbol, type.value)) :
+                            type.flags & 134217728 /* TemplateLiteral */ ? getTemplateLiteralType.apply(void 0, applyTemplateStringMapping(symbol, type.texts, type.types)) :
+                                type;
         }
         function applyStringMapping(symbol, str) {
             switch (intrinsicTypeKinds.get(symbol.escapedName)) {
@@ -62343,6 +62377,15 @@ var ts;
             }
             return str;
         }
+        function applyTemplateStringMapping(symbol, texts, types) {
+            switch (intrinsicTypeKinds.get(symbol.escapedName)) {
+                case 0 /* Uppercase */: return [texts.map(function (t) { return t.toUpperCase(); }), types.map(function (t) { return getStringMappingType(symbol, t); })];
+                case 1 /* Lowercase */: return [texts.map(function (t) { return t.toLowerCase(); }), types.map(function (t) { return getStringMappingType(symbol, t); })];
+                case 2 /* Capitalize */: return [texts[0] === "" ? texts : __spreadArray([texts[0].charAt(0).toUpperCase() + texts[0].slice(1)], texts.slice(1), true), texts[0] === "" ? __spreadArray([getStringMappingType(symbol, types[0])], types.slice(1), true) : types];
+                case 3 /* Uncapitalize */: return [texts[0] === "" ? texts : __spreadArray([texts[0].charAt(0).toLowerCase() + texts[0].slice(1)], texts.slice(1), true), texts[0] === "" ? __spreadArray([getStringMappingType(symbol, types[0])], types.slice(1), true) : types];
+            }
+            return [texts, types];
+        }
         function getStringMappingTypeForGenericType(symbol, type) {
             var id = getSymbolId(symbol) + "," + getTypeId(type);
             var result = stringMappingTypes.get(id);
@@ -62584,7 +62627,7 @@ var ts;
                         accessNode;
         }
         function isPatternLiteralPlaceholderType(type) {
-            return !!(type.flags & (1 /* Any */ | 4 /* String */ | 8 /* Number */ | 64 /* BigInt */));
+            return !!(type.flags & (1 /* Any */ | 4 /* String */ | 8 /* Number */ | 64 /* BigInt */)) || !!(type.flags & 268435456 /* StringMapping */ && isPatternLiteralPlaceholderType(type.type));
         }
         function isPatternLiteralType(type) {
             return !!(type.flags & 134217728 /* TemplateLiteral */) && ts.every(type.types, isPatternLiteralPlaceholderType);
@@ -66296,6 +66339,13 @@ var ts;
                         return -1 /* True */;
                     }
                 }
+                else if (target.flags & 268435456 /* StringMapping */) {
+                    if (!(source.flags & 268435456 /* StringMapping */)) {
+                        if (isMemberOfStringMapping(source, target)) {
+                            return -1 /* True */;
+                        }
+                    }
+                }
                 if (sourceFlags & 8650752 /* TypeVariable */) {
                     // IndexedAccess comparisons are handled above in the `targetFlags & TypeFlage.IndexedAccess` branch
                     if (!(sourceFlags & 8388608 /* IndexedAccess */ && targetFlags & 8388608 /* IndexedAccess */)) {
@@ -66339,7 +66389,10 @@ var ts;
                     }
                 }
                 else if (sourceFlags & 268435456 /* StringMapping */) {
-                    if (targetFlags & 268435456 /* StringMapping */ && source.symbol === target.symbol) {
+                    if (targetFlags & 268435456 /* StringMapping */) {
+                        if (source.symbol !== target.symbol) {
+                            return 0 /* False */;
+                        }
                         if (result = isRelatedTo(source.type, target.type, 3 /* Both */, reportErrors)) {
                             resetErrorInfo(saveErrorInfo);
                             return result;
@@ -67264,7 +67317,7 @@ var ts;
                     return typeCouldHaveTopLevelSingletonTypes(constraint);
                 }
             }
-            return isUnitType(type) || !!(type.flags & 134217728 /* TemplateLiteral */);
+            return isUnitType(type) || !!(type.flags & 134217728 /* TemplateLiteral */) || !!(type.flags & 268435456 /* StringMapping */);
         }
         function getExactOptionalUnassignableProperties(source, target) {
             if (isTupleType(source) && isTupleType(target))
@@ -68735,6 +68788,31 @@ var ts;
             return success && result === 9 /* BigIntLiteral */ && scanner.getTextPos() === (s.length + 1) && !(flags & 512 /* ContainsSeparator */)
                 && (!roundTripOnly || s === ts.pseudoBigIntToString({ negative: negative, base10Value: ts.parsePseudoBigInt(scanner.getTokenValue()) }));
         }
+        function isMemberOfStringMapping(source, target) {
+            if (target.flags & (4 /* String */ | 3 /* AnyOrUnknown */)) {
+                return true;
+            }
+            if (target.flags & 134217728 /* TemplateLiteral */) {
+                return isTypeAssignableTo(source, target);
+            }
+            if (target.flags & 268435456 /* StringMapping */) {
+                // We need to see whether applying the same mappings of the target
+                // onto the source would produce an identical type *and* that
+                // it's compatible with the inner-most non-string-mapped type.
+                //
+                // The intuition here is that if same mappings don't affect the source at all,
+                // and the source is compatible with the unmapped target, then they must
+                // still reside in the same domain.
+                var mappingStack = [];
+                while (target.flags & 268435456 /* StringMapping */) {
+                    mappingStack.unshift(target.symbol);
+                    target = target.type;
+                }
+                var mappedSource = ts.reduceLeft(mappingStack, function (memo, value) { return getStringMappingType(value, memo); }, source);
+                return mappedSource === source && isMemberOfStringMapping(source, target);
+            }
+            return false;
+        }
         function isValidTypeForTemplateLiteralPlaceholder(source, target) {
             if (source === target || target.flags & (1 /* Any */ | 4 /* String */)) {
                 return true;
@@ -68743,7 +68821,8 @@ var ts;
                 var value = source.value;
                 return !!(target.flags & 8 /* Number */ && isValidNumberString(value, /*roundTripOnly*/ false) ||
                     target.flags & 64 /* BigInt */ && isValidBigIntString(value, /*roundTripOnly*/ false) ||
-                    target.flags & (512 /* BooleanLiteral */ | 98304 /* Nullable */) && value === target.intrinsicName);
+                    target.flags & (512 /* BooleanLiteral */ | 98304 /* Nullable */) && value === target.intrinsicName ||
+                    target.flags & 268435456 /* StringMapping */ && isMemberOfStringMapping(getStringLiteralType(value), target));
             }
             if (source.flags & 134217728 /* TemplateLiteral */) {
                 var texts = source.texts;
@@ -85622,6 +85701,7 @@ var ts;
             return true;
         }
         function checkAliasSymbol(node) {
+            var _a, _b, _c, _d, _e;
             var symbol = getSymbolOfNode(node);
             var target = resolveAlias(symbol);
             if (target !== unknownSymbol) {
@@ -85632,6 +85712,31 @@ var ts;
                 // otherwise it will conflict with some local declaration). Note that in addition to normal flags we include matching SymbolFlags.Export*
                 // in order to prevent collisions with declarations that were exported from the current module (they still contribute to local names).
                 symbol = getMergedSymbol(symbol.exportSymbol || symbol);
+                // A type-only import/export will already have a grammar error in a JS file, so no need to issue more errors within
+                if (ts.isInJSFile(node) && !(target.flags & 111551 /* Value */) && !ts.isTypeOnlyImportOrExportDeclaration(node)) {
+                    var errorNode = ts.isImportOrExportSpecifier(node) ? node.propertyName || node.name :
+                        ts.isNamedDeclaration(node) ? node.name :
+                            node;
+                    ts.Debug.assert(node.kind !== 274 /* NamespaceExport */);
+                    if (node.kind === 275 /* ExportSpecifier */) {
+                        var diag = error(errorNode, ts.Diagnostics.Types_cannot_appear_in_export_declarations_in_JavaScript_files);
+                        var alreadyExportedSymbol = (_b = (_a = ts.getSourceFileOfNode(node).symbol) === null || _a === void 0 ? void 0 : _a.exports) === null || _b === void 0 ? void 0 : _b.get((node.propertyName || node.name).escapedText);
+                        if (alreadyExportedSymbol === target) {
+                            var exportingDeclaration = (_c = alreadyExportedSymbol.declarations) === null || _c === void 0 ? void 0 : _c.find(ts.isJSDocNode);
+                            if (exportingDeclaration) {
+                                ts.addRelatedInfo(diag, ts.createDiagnosticForNode(exportingDeclaration, ts.Diagnostics._0_is_automatically_exported_here, ts.unescapeLeadingUnderscores(alreadyExportedSymbol.escapedName)));
+                            }
+                        }
+                    }
+                    else {
+                        ts.Debug.assert(node.kind !== 254 /* VariableDeclaration */);
+                        var importDeclaration = ts.findAncestor(node, ts.or(ts.isImportDeclaration, ts.isImportEqualsDeclaration));
+                        var moduleSpecifier = (_e = (importDeclaration && ((_d = ts.tryGetModuleSpecifierFromDeclaration(importDeclaration)) === null || _d === void 0 ? void 0 : _d.text))) !== null && _e !== void 0 ? _e : "...";
+                        var importedIdentifier = ts.unescapeLeadingUnderscores(ts.isIdentifier(errorNode) ? errorNode.escapedText : symbol.escapedName);
+                        error(errorNode, ts.Diagnostics._0_is_a_type_and_cannot_be_imported_in_JavaScript_files_Use_1_in_a_JSDoc_type_annotation, importedIdentifier, "import(\"" + moduleSpecifier + "\")." + importedIdentifier);
+                    }
+                    return;
+                }
                 var excludedMeanings = (symbol.flags & (111551 /* Value */ | 1048576 /* ExportValue */) ? 111551 /* Value */ : 0) |
                     (symbol.flags & 788968 /* Type */ ? 788968 /* Type */ : 0) |
                     (symbol.flags & 1920 /* Namespace */ ? 1920 /* Namespace */ : 0);
@@ -130632,32 +130737,41 @@ var ts;
             || ts.startsWith(getCanonicalFileName(fromPath), toNodeModulesParent)
             || (!!globalCachePath && ts.startsWith(getCanonicalFileName(globalCachePath), toNodeModulesParent));
     }
-    function forEachExternalModuleToImportFrom(program, host, useAutoImportProvider, cb) {
+    function forEachExternalModuleToImportFrom(program, host, preferences, useAutoImportProvider, cb) {
         var _a, _b;
-        forEachExternalModule(program.getTypeChecker(), program.getSourceFiles(), function (module, file) { return cb(module, file, program, /*isFromPackageJson*/ false); });
+        var useCaseSensitiveFileNames = ts.hostUsesCaseSensitiveFileNames(host);
+        var excludePatterns = preferences.autoImportFileExcludePatterns && ts.mapDefined(preferences.autoImportFileExcludePatterns, function (spec) {
+            // The client is expected to send rooted path specs since we don't know
+            // what directory a relative path is relative to.
+            var pattern = ts.getPatternFromSpec(spec, "", "exclude");
+            return pattern ? ts.getRegexFromPattern(pattern, useCaseSensitiveFileNames) : undefined;
+        });
+        forEachExternalModule(program.getTypeChecker(), program.getSourceFiles(), excludePatterns, function (module, file) { return cb(module, file, program, /*isFromPackageJson*/ false); });
         var autoImportProvider = useAutoImportProvider && ((_a = host.getPackageJsonAutoImportProvider) === null || _a === void 0 ? void 0 : _a.call(host));
         if (autoImportProvider) {
             var start = ts.timestamp();
-            forEachExternalModule(autoImportProvider.getTypeChecker(), autoImportProvider.getSourceFiles(), function (module, file) { return cb(module, file, autoImportProvider, /*isFromPackageJson*/ true); });
+            forEachExternalModule(autoImportProvider.getTypeChecker(), autoImportProvider.getSourceFiles(), excludePatterns, function (module, file) { return cb(module, file, autoImportProvider, /*isFromPackageJson*/ true); });
             (_b = host.log) === null || _b === void 0 ? void 0 : _b.call(host, "forEachExternalModuleToImportFrom autoImportProvider: " + (ts.timestamp() - start));
         }
     }
     ts.forEachExternalModuleToImportFrom = forEachExternalModuleToImportFrom;
-    function forEachExternalModule(checker, allSourceFiles, cb) {
-        for (var _i = 0, _a = checker.getAmbientModules(); _i < _a.length; _i++) {
-            var ambient = _a[_i];
-            if (!ts.stringContains(ambient.name, "*")) {
+    function forEachExternalModule(checker, allSourceFiles, excludePatterns, cb) {
+        var _a;
+        var isExcluded = function (fileName) { return excludePatterns === null || excludePatterns === void 0 ? void 0 : excludePatterns.some(function (p) { return p.test(fileName); }); };
+        for (var _i = 0, _b = checker.getAmbientModules(); _i < _b.length; _i++) {
+            var ambient = _b[_i];
+            if (!ts.stringContains(ambient.name, "*") && !(excludePatterns && ((_a = ambient.declarations) === null || _a === void 0 ? void 0 : _a.every(function (d) { return isExcluded(d.getSourceFile().fileName); })))) {
                 cb(ambient, /*sourceFile*/ undefined);
             }
         }
-        for (var _b = 0, allSourceFiles_1 = allSourceFiles; _b < allSourceFiles_1.length; _b++) {
-            var sourceFile = allSourceFiles_1[_b];
-            if (ts.isExternalOrCommonJsModule(sourceFile)) {
+        for (var _c = 0, allSourceFiles_1 = allSourceFiles; _c < allSourceFiles_1.length; _c++) {
+            var sourceFile = allSourceFiles_1[_c];
+            if (ts.isExternalOrCommonJsModule(sourceFile) && !isExcluded(sourceFile.fileName)) {
                 cb(checker.getMergedSymbol(sourceFile.symbol), sourceFile);
             }
         }
     }
-    function getExportInfoMap(importingFile, host, program, cancellationToken) {
+    function getExportInfoMap(importingFile, host, program, preferences, cancellationToken) {
         var _a, _b, _c, _d, _e;
         var start = ts.timestamp();
         // Pulling the AutoImportProvider project will trigger its updateGraph if pending,
@@ -130677,7 +130791,7 @@ var ts;
         var compilerOptions = program.getCompilerOptions();
         var moduleCount = 0;
         try {
-            forEachExternalModuleToImportFrom(program, host, /*useAutoImportProvider*/ true, function (moduleSymbol, moduleFile, program, isFromPackageJson) {
+            forEachExternalModuleToImportFrom(program, host, preferences, /*useAutoImportProvider*/ true, function (moduleSymbol, moduleFile, program, isFromPackageJson) {
                 if (++moduleCount % 100 === 0)
                     cancellationToken === null || cancellationToken === void 0 ? void 0 : cancellationToken.throwIfCancellationRequested();
                 var seenExports = new ts.Map();
@@ -133073,7 +133187,7 @@ var ts;
             if (!previousResponse)
                 return undefined;
             var lowerCaseTokenText = location.text.toLowerCase();
-            var exportMap = ts.getExportInfoMap(file, host, program, cancellationToken);
+            var exportMap = ts.getExportInfoMap(file, host, program, preferences, cancellationToken);
             var newEntries = resolvingModuleSpecifiers("continuePreviousIncompleteResponse", host, ts.codefix.createImportSpecifierResolver(file, program, host, preferences), program, location.getStart(), preferences, 
             /*isForImportStatementCompletion*/ false, ts.isValidTypeOnlyAliasUseSite(location), function (context) {
                 var entries = ts.mapDefined(previousResponse.entries, function (entry) {
@@ -134782,7 +134896,7 @@ var ts;
                 }
                 // Need to insert 'this.' before properties of `this` type, so only do that if `includeInsertTextCompletions`
                 if (preferences.includeCompletionsWithInsertText && scopeNode.kind !== 305 /* SourceFile */) {
-                    var thisType = typeChecker.tryGetThisTypeAt(scopeNode, /*includeGlobalThis*/ false);
+                    var thisType = typeChecker.tryGetThisTypeAt(scopeNode, /*includeGlobalThis*/ false, ts.isClassLike(scopeNode.parent) ? scopeNode : undefined);
                     if (thisType && !isProbablyGlobalType(thisType, sourceFile, typeChecker)) {
                         for (var _i = 0, _a = getPropertiesForCompletion(thisType, typeChecker); _i < _a.length; _i++) {
                             var symbol = _a[_i];
@@ -134885,7 +134999,7 @@ var ts;
                     previousToken && ts.isIdentifier(previousToken) ? previousToken.text.toLowerCase() :
                         "";
                 var moduleSpecifierCache = (_a = host.getModuleSpecifierCache) === null || _a === void 0 ? void 0 : _a.call(host);
-                var exportInfo = ts.getExportInfoMap(sourceFile, host, program, cancellationToken);
+                var exportInfo = ts.getExportInfoMap(sourceFile, host, program, preferences, cancellationToken);
                 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, importSpecifierResolver || (importSpecifierResolver = ts.codefix.createImportSpecifierResolver(sourceFile, program, host, preferences)), program, position, preferences, !!importCompletionNode, ts.isValidTypeOnlyAliasUseSite(location), function (context) {
@@ -144120,10 +144234,10 @@ var ts;
 (function (ts) {
     var Rename;
     (function (Rename) {
-        function getRenameInfo(program, sourceFile, position, options) {
+        function getRenameInfo(program, sourceFile, position, preferences) {
             var node = ts.getAdjustedRenameLocation(ts.getTouchingPropertyName(sourceFile, position));
             if (nodeIsEligibleForRename(node)) {
-                var renameInfo = getRenameInfoForNode(node, program.getTypeChecker(), sourceFile, program, options);
+                var renameInfo = getRenameInfoForNode(node, program.getTypeChecker(), sourceFile, program, preferences);
                 if (renameInfo) {
                     return renameInfo;
                 }
@@ -144131,7 +144245,7 @@ var ts;
             return getRenameInfoError(ts.Diagnostics.You_cannot_rename_this_element);
         }
         Rename.getRenameInfo = getRenameInfo;
-        function getRenameInfoForNode(node, typeChecker, sourceFile, program, options) {
+        function getRenameInfoForNode(node, typeChecker, sourceFile, program, preferences) {
             var symbol = typeChecker.getSymbolAtLocation(node);
             if (!symbol) {
                 if (ts.isStringLiteralLike(node)) {
@@ -144159,7 +144273,12 @@ var ts;
                 return undefined;
             }
             if (ts.isStringLiteralLike(node) && ts.tryGetImportFromModuleSpecifier(node)) {
-                return options && options.allowRenameOfImportPath ? getRenameInfoForModule(node, sourceFile, symbol) : undefined;
+                return preferences.allowRenameOfImportPath ? getRenameInfoForModule(node, sourceFile, symbol) : undefined;
+            }
+            // Disallow rename for elements that would rename across `*/node_modules/*` packages.
+            var wouldRenameNodeModules = wouldRenameInOtherNodeModules(sourceFile, symbol, typeChecker, preferences);
+            if (wouldRenameNodeModules) {
+                return getRenameInfoError(wouldRenameNodeModules);
             }
             var kind = ts.SymbolDisplay.getSymbolKind(typeChecker, symbol, node);
             var specifierName = (ts.isImportOrExportSpecifierName(node) || ts.isStringOrNumericLiteralLike(node) && node.parent.kind === 162 /* ComputedPropertyName */)
@@ -144173,6 +144292,49 @@ var ts;
             var sourceFile = declaration.getSourceFile();
             return program.isSourceFileDefaultLibrary(sourceFile) && ts.fileExtensionIs(sourceFile.fileName, ".d.ts" /* Dts */);
         }
+        function wouldRenameInOtherNodeModules(originalFile, symbol, checker, preferences) {
+            if (!preferences.providePrefixAndSuffixTextForRename && symbol.flags & 2097152 /* Alias */) {
+                var importSpecifier = symbol.declarations && ts.find(symbol.declarations, function (decl) { return ts.isImportSpecifier(decl); });
+                if (importSpecifier && !importSpecifier.propertyName) {
+                    symbol = checker.getAliasedSymbol(symbol);
+                }
+            }
+            var declarations = symbol.declarations;
+            if (!declarations) {
+                return undefined;
+            }
+            var originalPackage = getPackagePathComponents(originalFile.path);
+            if (originalPackage === undefined) { // original source file is not in node_modules
+                if (ts.some(declarations, function (declaration) { return ts.isInsideNodeModules(declaration.getSourceFile().path); })) {
+                    return ts.Diagnostics.You_cannot_rename_elements_that_are_defined_in_a_node_modules_folder;
+                }
+                else {
+                    return undefined;
+                }
+            }
+            // original source file is in node_modules
+            for (var _i = 0, declarations_4 = declarations; _i < declarations_4.length; _i++) {
+                var declaration = declarations_4[_i];
+                var declPackage = getPackagePathComponents(declaration.getSourceFile().path);
+                if (declPackage) {
+                    var length_2 = Math.min(originalPackage.length, declPackage.length);
+                    for (var i = 0; i <= length_2; i++) {
+                        if (ts.compareStringsCaseSensitive(originalPackage[i], declPackage[i]) !== 0 /* EqualTo */) {
+                            return ts.Diagnostics.You_cannot_rename_elements_that_are_defined_in_another_node_modules_folder;
+                        }
+                    }
+                }
+            }
+            return undefined;
+        }
+        function getPackagePathComponents(filePath) {
+            var components = ts.getPathComponents(filePath);
+            var nodeModulesIdx = components.lastIndexOf("node_modules");
+            if (nodeModulesIdx === -1) {
+                return undefined;
+            }
+            return components.slice(0, nodeModulesIdx + 2);
+        }
         function getRenameInfoForModule(node, sourceFile, moduleSymbol) {
             if (!ts.isExternalModuleNameRelative(node.text)) {
                 return getRenameInfoError(ts.Diagnostics.You_cannot_rename_a_module_via_a_global_import);
@@ -154034,7 +154196,7 @@ var ts;
             var getModuleSpecifierResolutionHost = ts.memoizeOne(function (isFromPackageJson) {
                 return ts.createModuleSpecifierResolutionHost(isFromPackageJson ? host.getPackageJsonAutoImportProvider() : program, host);
             });
-            ts.forEachExternalModuleToImportFrom(program, host, useAutoImportProvider, function (moduleSymbol, moduleFile, program, isFromPackageJson) {
+            ts.forEachExternalModuleToImportFrom(program, host, preferences, useAutoImportProvider, function (moduleSymbol, moduleFile, program, isFromPackageJson) {
                 var checker = program.getTypeChecker();
                 // Don't import from a re-export when looking "up" like to `./index` or `../index`.
                 if (moduleFile && moduleSymbol !== exportingModuleSymbol && ts.startsWith(importingFile.fileName, ts.getDirectoryPath(moduleFile.fileName))) {
@@ -154503,7 +154665,7 @@ var ts;
                     originalSymbolToExportInfos.add(ts.getUniqueSymbolId(exportedSymbol, checker).toString(), { symbol: exportedSymbol, moduleSymbol: moduleSymbol, moduleFileName: toFile === null || toFile === void 0 ? void 0 : toFile.fileName, exportKind: exportKind, targetFlags: ts.skipAlias(exportedSymbol, checker).flags, isFromPackageJson: isFromPackageJson });
                 }
             }
-            ts.forEachExternalModuleToImportFrom(program, host, useAutoImportProvider, function (moduleSymbol, sourceFile, program, isFromPackageJson) {
+            ts.forEachExternalModuleToImportFrom(program, host, preferences, useAutoImportProvider, function (moduleSymbol, sourceFile, program, isFromPackageJson) {
                 var checker = program.getTypeChecker();
                 cancellationToken.throwIfCancellationRequested();
                 var compilerOptions = program.getCompilerOptions();
@@ -161212,11 +161374,11 @@ var ts;
                         }
                     }
                     else if (ts.isVariableStatement(node) || ts.isVariableDeclarationList(node)) {
-                        var declarations_5 = ts.isVariableStatement(node) ? node.declarationList.declarations : node.declarations;
+                        var declarations_6 = ts.isVariableStatement(node) ? node.declarationList.declarations : node.declarations;
                         var numInitializers = 0;
                         var lastInitializer = void 0;
-                        for (var _i = 0, declarations_4 = declarations_5; _i < declarations_4.length; _i++) {
-                            var declaration = declarations_4[_i];
+                        for (var _i = 0, declarations_5 = declarations_6; _i < declarations_5.length; _i++) {
+                            var declaration = declarations_5[_i];
                             if (declaration.initializer) {
                                 numInitializers++;
                                 lastInitializer = declaration.initializer;
@@ -165353,8 +165515,8 @@ var ts;
                     tags = __spreadArray(__spreadArray([], inheritedTags, true), tags, true);
                 }
             };
-            for (var _i = 0, declarations_6 = declarations; _i < declarations_6.length; _i++) {
-                var declaration = declarations_6[_i];
+            for (var _i = 0, declarations_7 = declarations; _i < declarations_7.length; _i++) {
+                var declaration = declarations_7[_i];
                 _loop_21(declaration);
             }
         }
@@ -165380,8 +165542,8 @@ var ts;
                 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];
+            for (var _i = 0, declarations_8 = declarations; _i < declarations_8.length; _i++) {
+                var declaration = declarations_8[_i];
                 _loop_22(declaration);
             }
         }
@@ -166958,9 +167120,9 @@ var ts;
                 return ts.stringContains(path, "/node_modules/");
             }
         }
-        function getRenameInfo(fileName, position, options) {
+        function getRenameInfo(fileName, position, preferences) {
             synchronizeHostData();
-            return ts.Rename.getRenameInfo(program, getValidSourceFile(fileName), position, options);
+            return ts.Rename.getRenameInfo(program, getValidSourceFile(fileName), position, preferences || {});
         }
         function getRefactorContext(file, positionOrRange, preferences, formatOptions, triggerReason, kind) {
             var _a = typeof positionOrRange === "number" ? [positionOrRange, undefined] : [positionOrRange.pos, positionOrRange.end], startPosition = _a[0], endPosition = _a[1];
@@ -168326,9 +168488,9 @@ var ts;
             var _this = this;
             return this.forwardJSONCall("getImplementationAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getImplementationAtPosition(fileName, position); });
         };
-        LanguageServiceShimObject.prototype.getRenameInfo = function (fileName, position, options) {
+        LanguageServiceShimObject.prototype.getRenameInfo = function (fileName, position, preferences) {
             var _this = this;
-            return this.forwardJSONCall("getRenameInfo('" + fileName + "', " + position + ")", function () { return _this.languageService.getRenameInfo(fileName, position, options); });
+            return this.forwardJSONCall("getRenameInfo('" + fileName + "', " + position + ")", function () { return _this.languageService.getRenameInfo(fileName, position, preferences); });
         };
         LanguageServiceShimObject.prototype.getSmartSelectionRange = function (fileName, position) {
             var _this = this;
@@ -176498,7 +176660,7 @@ var ts;
             return info && !info.isLocal ? { fileName: info.fileName, pos: info.textSpan.start } : undefined;
         }
         function getReferencesWorker(projects, defaultProject, initialLocation, logger) {
-            var _a;
+            var _a, _b;
             var perProjectResults = getPerProjectReferences(projects, defaultProject, initialLocation, 
             /*isForRename*/ false, function (project, position) {
                 logger.info("Finding references to " + position.fileName + " position " + position.pos + " in project " + project.getProjectName());
@@ -176518,7 +176680,7 @@ var ts;
             // have started the other project searches from related symbols.  Propagate the
             // correct results to all other projects.
             var defaultProjectResults = perProjectResults.get(defaultProject);
-            if (((_a = defaultProjectResults === null || defaultProjectResults === void 0 ? void 0 : defaultProjectResults[0].references[0]) === null || _a === void 0 ? void 0 : _a.isDefinition) === undefined) {
+            if (((_b = (_a = defaultProjectResults === null || defaultProjectResults === void 0 ? void 0 : defaultProjectResults[0]) === null || _a === void 0 ? void 0 : _a.references[0]) === null || _b === void 0 ? void 0 : _b.isDefinition) === undefined) {
                 // Clear all isDefinition properties
                 perProjectResults.forEach(function (projectResults) {
                     for (var _i = 0, projectResults_2 = projectResults; _i < projectResults_2.length; _i++) {
@@ -176535,8 +176697,8 @@ var ts;
                 var knownSymbolSpans_1 = createDocumentSpanSet();
                 for (var _i = 0, defaultProjectResults_1 = defaultProjectResults; _i < defaultProjectResults_1.length; _i++) {
                     var referencedSymbol = defaultProjectResults_1[_i];
-                    for (var _b = 0, _c = referencedSymbol.references; _b < _c.length; _b++) {
-                        var ref = _c[_b];
+                    for (var _c = 0, _d = referencedSymbol.references; _c < _d.length; _c++) {
+                        var ref = _d[_c];
                         if (ref.isDefinition) {
                             knownSymbolSpans_1.add(ref);
                             // One is enough - updateIsDefinitionOfReferencedSymbols will fill out the set based on symbols
@@ -176655,23 +176817,30 @@ var ts;
             var getSourceDefinition = ts.memoize(function () { return defaultProject.isSourceOfProjectReferenceRedirect(defaultDefinition.fileName) ?
                 defaultDefinition :
                 defaultProject.getLanguageService().getSourceMapper().tryGetSourcePosition(defaultDefinition); });
-            // Track which projects we have already searched so that we don't repeat searches.
-            // We store the project key, rather than the project, because that's what `loadAncestorProjectTree` wants.
-            // (For that same reason, we don't use `resultsMap` for this check.)
-            var searchedProjects = new ts.Set();
+            // The keys of resultsMap allow us to check which projects have already been searched, but we also
+            // maintain a set of strings because that's what `loadAncestorProjectTree` wants.
+            var searchedProjectKeys = new ts.Set();
             onCancellation: while (queue.length) {
                 while (queue.length) {
                     if (cancellationToken.isCancellationRequested())
                         break onCancellation;
+                    var skipCount = 0;
+                    for (; skipCount < queue.length && resultsMap.has(queue[skipCount].project); skipCount++)
+                        ;
+                    if (skipCount === queue.length) {
+                        queue.length = 0;
+                        break;
+                    }
+                    if (skipCount > 0) {
+                        queue.splice(0, skipCount);
+                    }
+                    // NB: we may still skip if it's a project reference redirect
                     var _a = queue.shift(), project = _a.project, location = _a.location;
                     if (isLocationProjectReferenceRedirect(project, location))
                         continue;
-                    if (!ts.tryAddToSet(searchedProjects, getProjectKey(project)))
-                        continue;
                     var projectResults = searchPosition(project, location);
-                    if (projectResults) {
-                        resultsMap.set(project, projectResults);
-                    }
+                    resultsMap.set(project, projectResults !== null && projectResults !== void 0 ? projectResults : server.emptyArray);
+                    searchedProjectKeys.add(getProjectKey(project));
                 }
                 // At this point, we know about all projects passed in as arguments and any projects in which
                 // `getResultsForPosition` has returned results.  We expand that set to include any projects
@@ -176679,11 +176848,11 @@ var ts;
                 // containing `initialLocation`.
                 if (defaultDefinition) {
                     // This seems to mean "load all projects downstream from any member of `seenProjects`".
-                    projectService.loadAncestorProjectTree(searchedProjects);
+                    projectService.loadAncestorProjectTree(searchedProjectKeys);
                     projectService.forEachEnabledProject(function (project) {
                         if (cancellationToken.isCancellationRequested())
                             return; // There's no mechanism for skipping the remaining projects
-                        if (searchedProjects.has(getProjectKey(project)))
+                        if (resultsMap.has(project))
                             return; // Can loop forever without this (enqueue here, dequeue above, repeat)
                         var location = mapDefinitionInProject(defaultDefinition, project, getGeneratedDefinition, getSourceDefinition);
                         if (location) {
@@ -176694,9 +176863,10 @@ var ts;
             }
             // In the common case where there's only one project, return a simpler result to make
             // it easier for the caller to skip post-processing.
-            if (searchedProjects.size === 1) {
+            if (resultsMap.size === 1) {
                 var it = resultsMap.values().next();
-                return it.done ? server.emptyArray : it.value; // There may not be any results at all
+                ts.Debug.assert(!it.done);
+                return it.value;
             }
             return resultsMap;
             function searchPosition(project, location) {
@@ -176713,7 +176883,7 @@ var ts;
                         var originalScriptInfo = projectService.getScriptInfo(originalLocation.fileName);
                         for (var _i = 0, _a = originalScriptInfo.containingProjects; _i < _a.length; _i++) {
                             var project_1 = _a[_i];
-                            if (!project_1.isOrphan()) {
+                            if (!project_1.isOrphan() && !resultsMap.has(project_1)) { // Optimization: don't enqueue if will be discarded
                                 queue.push({ project: project_1, location: originalLocation });
                             }
                         }
@@ -176722,7 +176892,7 @@ var ts;
                             symlinkedProjectsMap.forEach(function (symlinkedProjects, symlinkedPath) {
                                 for (var _i = 0, symlinkedProjects_2 = symlinkedProjects; _i < symlinkedProjects_2.length; _i++) {
                                     var symlinkedProject = symlinkedProjects_2[_i];
-                                    if (!symlinkedProject.isOrphan()) {
+                                    if (!symlinkedProject.isOrphan() && !resultsMap.has(symlinkedProject)) { // Optimization: don't enqueue if will be discarded
                                         queue.push({ project: symlinkedProject, location: { fileName: symlinkedPath, pos: originalLocation.pos } });
                                     }
                                 }
@@ -178015,7 +178185,8 @@ var ts;
             Session.prototype.getRenameInfo = function (args) {
                 var _a = this.getFileAndProject(args), file = _a.file, project = _a.project;
                 var position = this.getPositionInFile(args, file);
-                return project.getLanguageService().getRenameInfo(file, position, { allowRenameOfImportPath: this.getPreferences(file).allowRenameOfImportPath });
+                var preferences = this.getPreferences(file);
+                return project.getLanguageService().getRenameInfo(file, position, preferences);
             };
             Session.prototype.getProjects = function (args, getScriptInfoEnsuringProjectsUptoDate, ignoreNoProjectError) {
                 var _a;
@@ -178066,10 +178237,11 @@ var ts;
                 var position = this.getPositionInFile(args, file);
                 var projects = this.getProjects(args);
                 var defaultProject = this.getDefaultProject(args);
-                var renameInfo = this.mapRenameInfo(defaultProject.getLanguageService().getRenameInfo(file, position, { allowRenameOfImportPath: this.getPreferences(file).allowRenameOfImportPath }), ts.Debug.checkDefined(this.projectService.getScriptInfo(file)));
+                var preferences = this.getPreferences(file);
+                var renameInfo = this.mapRenameInfo(defaultProject.getLanguageService().getRenameInfo(file, position, preferences), ts.Debug.checkDefined(this.projectService.getScriptInfo(file)));
                 if (!renameInfo.canRename)
                     return simplifiedResult ? { info: renameInfo, locs: [] } : [];
-                var locations = getRenameLocationsWorker(projects, defaultProject, { fileName: args.file, pos: position }, !!args.findInStrings, !!args.findInComments, this.getPreferences(file));
+                var locations = getRenameLocationsWorker(projects, defaultProject, { fileName: args.file, pos: position }, !!args.findInStrings, !!args.findInComments, preferences);
                 if (!simplifiedResult)
                     return locations;
                 return { info: renameInfo, locs: this.toSpanGroups(locations) };