typescript 4.8.0-dev.20220728 → 4.8.0-dev.20220729

package/lib/tsc.js

@@ -69,7 +69,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var ts;
 (function (ts) {
     ts.versionMajorMinor = "4.8";
-    ts.version = ts.versionMajorMinor + ".0-dev.20220728";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220729";
     var NativeCollections;
     (function (NativeCollections) {
         var globals = typeof globalThis !== "undefined" ? globalThis :
@@ -1484,6 +1484,10 @@ var ts;
     ts.cast = cast;
     function noop(_) { }
     ts.noop = noop;
+    ts.noopPush = {
+        push: noop,
+        length: 0
+    };
     function returnFalse() {
         return false;
     }
@@ -5945,6 +5949,7 @@ var ts;
         Cannot_create_an_instance_of_an_abstract_class: diag(2511, ts.DiagnosticCategory.Error, "Cannot_create_an_instance_of_an_abstract_class_2511", "Cannot create an instance of an abstract class."),
         Overload_signatures_must_all_be_abstract_or_non_abstract: diag(2512, ts.DiagnosticCategory.Error, "Overload_signatures_must_all_be_abstract_or_non_abstract_2512", "Overload signatures must all be abstract or non-abstract."),
         Abstract_method_0_in_class_1_cannot_be_accessed_via_super_expression: diag(2513, ts.DiagnosticCategory.Error, "Abstract_method_0_in_class_1_cannot_be_accessed_via_super_expression_2513", "Abstract method '{0}' in class '{1}' cannot be accessed via super expression."),
+        A_tuple_type_cannot_be_indexed_with_a_negative_value: diag(2514, ts.DiagnosticCategory.Error, "A_tuple_type_cannot_be_indexed_with_a_negative_value_2514", "A tuple type cannot be indexed with a negative value."),
         Non_abstract_class_0_does_not_implement_inherited_abstract_member_1_from_class_2: diag(2515, ts.DiagnosticCategory.Error, "Non_abstract_class_0_does_not_implement_inherited_abstract_member_1_from_class_2_2515", "Non-abstract class '{0}' does not implement inherited abstract member '{1}' from class '{2}'."),
         All_declarations_of_an_abstract_method_must_be_consecutive: diag(2516, ts.DiagnosticCategory.Error, "All_declarations_of_an_abstract_method_must_be_consecutive_2516", "All declarations of an abstract method must be consecutive."),
         Cannot_assign_an_abstract_constructor_type_to_a_non_abstract_constructor_type: diag(2517, ts.DiagnosticCategory.Error, "Cannot_assign_an_abstract_constructor_type_to_a_non_abstract_constructor_type_2517", "Cannot assign an abstract constructor type to a non-abstract constructor type."),
@@ -35246,18 +35251,7 @@ var ts;
                 NodeResolutionFeatures.None;
     }
     function resolvePackageNameToPackageJson(packageName, containingDirectory, options, host, cache) {
-        var moduleResolutionState = {
-            compilerOptions: options,
-            host: host,
-            traceEnabled: isTraceEnabled(options, host),
-            failedLookupLocations: [],
-            affectingLocations: [],
-            packageJsonInfoCache: cache === null || cache === void 0 ? void 0 : cache.getPackageJsonInfoCache(),
-            conditions: ts.emptyArray,
-            features: NodeResolutionFeatures.None,
-            requestContainingDirectory: containingDirectory,
-            reportDiagnostic: ts.noop
-        };
+        var moduleResolutionState = getTemporaryModuleResolutionState(cache === null || cache === void 0 ? void 0 : cache.getPackageJsonInfoCache(), host, options);
         return ts.forEachAncestorDirectory(containingDirectory, function (ancestorDirectory) {
             if (ts.getBaseFileName(ancestorDirectory) !== "node_modules") {
                 var nodeModulesFolder = ts.combinePaths(ancestorDirectory, "node_modules");
@@ -36057,18 +36051,9 @@ var ts;
         var entrypoints;
         var extensions = resolveJs ? Extensions.JavaScript : Extensions.TypeScript;
         var features = getDefaultNodeResolutionFeatures(options);
-        var requireState = {
-            compilerOptions: options,
-            host: host,
-            traceEnabled: isTraceEnabled(options, host),
-            failedLookupLocations: [],
-            affectingLocations: [],
-            packageJsonInfoCache: cache === null || cache === void 0 ? void 0 : cache.getPackageJsonInfoCache(),
-            conditions: ["node", "require", "types"],
-            features: features,
-            requestContainingDirectory: packageJsonInfo.packageDirectory,
-            reportDiagnostic: ts.noop
-        };
+        var requireState = getTemporaryModuleResolutionState(cache === null || cache === void 0 ? void 0 : cache.getPackageJsonInfoCache(), host, options);
+        requireState.conditions = ["node", "require", "types"];
+        requireState.requestContainingDirectory = packageJsonInfo.packageDirectory;
         var requireResolution = loadNodeModuleFromDirectoryWorker(extensions, packageJsonInfo.packageDirectory, false, requireState, packageJsonInfo.packageJsonContent, packageJsonInfo.versionPaths);
         entrypoints = ts.append(entrypoints, requireResolution === null || requireResolution === void 0 ? void 0 : requireResolution.path);
         if (features & NodeResolutionFeatures.Exports && packageJsonInfo.packageJsonContent.exports) {
@@ -36138,19 +36123,22 @@ var ts;
             }
         }
     }
-    function getPackageScopeForPath(fileName, packageJsonInfoCache, host, options) {
-        var state = {
+    function getTemporaryModuleResolutionState(packageJsonInfoCache, host, options) {
+        return {
             host: host,
             compilerOptions: options,
             traceEnabled: isTraceEnabled(options, host),
-            failedLookupLocations: [],
-            affectingLocations: [],
+            failedLookupLocations: ts.noopPush,
+            affectingLocations: ts.noopPush,
             packageJsonInfoCache: packageJsonInfoCache,
-            features: 0,
-            conditions: [],
+            features: NodeResolutionFeatures.None,
+            conditions: ts.emptyArray,
             requestContainingDirectory: undefined,
             reportDiagnostic: ts.noop
         };
+    }
+    ts.getTemporaryModuleResolutionState = getTemporaryModuleResolutionState;
+    function getPackageScopeForPath(fileName, state) {
         var parts = ts.getPathComponents(fileName);
         parts.pop();
         while (parts.length > 0) {
@@ -36307,7 +36295,7 @@ var ts;
         var _a, _b;
         var useCaseSensitiveFileNames = typeof state.host.useCaseSensitiveFileNames === "function" ? state.host.useCaseSensitiveFileNames() : state.host.useCaseSensitiveFileNames;
         var directoryPath = ts.toPath(ts.combinePaths(directory, "dummy"), (_b = (_a = state.host).getCurrentDirectory) === null || _b === void 0 ? void 0 : _b.call(_a), ts.createGetCanonicalFileName(useCaseSensitiveFileNames === undefined ? true : useCaseSensitiveFileNames));
-        var scope = getPackageScopeForPath(directoryPath, state.packageJsonInfoCache, state.host, state.compilerOptions);
+        var scope = getPackageScopeForPath(directoryPath, state);
         if (!scope || !scope.packageJsonContent.exports) {
             return undefined;
         }
@@ -36366,7 +36354,7 @@ var ts;
         }
         var useCaseSensitiveFileNames = typeof state.host.useCaseSensitiveFileNames === "function" ? state.host.useCaseSensitiveFileNames() : state.host.useCaseSensitiveFileNames;
         var directoryPath = ts.toPath(ts.combinePaths(directory, "dummy"), (_b = (_a = state.host).getCurrentDirectory) === null || _b === void 0 ? void 0 : _b.call(_a), ts.createGetCanonicalFileName(useCaseSensitiveFileNames === undefined ? true : useCaseSensitiveFileNames));
-        var scope = getPackageScopeForPath(directoryPath, state.packageJsonInfoCache, state.host, state.compilerOptions);
+        var scope = getPackageScopeForPath(directoryPath, state);
         if (!scope) {
             if (state.traceEnabled) {
                 trace(state.host, ts.Diagnostics.Directory_0_has_no_containing_package_json_scope_Imports_will_not_resolve, directoryPath);
@@ -43559,6 +43547,12 @@ var ts;
                 return context.truncating = context.approximateLength > ((context.flags & 1) ? ts.noTruncationMaximumTruncationLength : ts.defaultMaximumTruncationLength);
             }
             function typeToTypeNodeHelper(type, context) {
+                var savedFlags = context.flags;
+                var typeNode = typeToTypeNodeWorker(type, context);
+                context.flags = savedFlags;
+                return typeNode;
+            }
+            function typeToTypeNodeWorker(type, context) {
                 if (cancellationToken && cancellationToken.throwIfCancellationRequested) {
                     cancellationToken.throwIfCancellationRequested();
                 }
@@ -52082,21 +52076,28 @@ var ts;
                         getFlowTypeOfReference(accessExpression, propType) :
                         propType;
                 }
-                if (everyType(objectType, isTupleType) && ts.isNumericLiteralName(propName) && +propName >= 0) {
+                if (everyType(objectType, isTupleType) && ts.isNumericLiteralName(propName)) {
+                    var index = +propName;
                     if (accessNode && everyType(objectType, function (t) { return !t.target.hasRestElement; }) && !(accessFlags & 16)) {
                         var indexNode = getIndexNodeForAccessExpression(accessNode);
                         if (isTupleType(objectType)) {
+                            if (index < 0) {
+                                error(indexNode, ts.Diagnostics.A_tuple_type_cannot_be_indexed_with_a_negative_value);
+                                return undefinedType;
+                            }
                             error(indexNode, ts.Diagnostics.Tuple_type_0_of_length_1_has_no_element_at_index_2, typeToString(objectType), getTypeReferenceArity(objectType), ts.unescapeLeadingUnderscores(propName));
                         }
                         else {
                             error(indexNode, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.unescapeLeadingUnderscores(propName), typeToString(objectType));
                         }
                     }
-                    errorIfWritingToReadonlyIndex(getIndexInfoOfType(objectType, numberType));
-                    return mapType(objectType, function (t) {
-                        var restType = getRestTypeOfTupleType(t) || undefinedType;
-                        return accessFlags & 1 ? getUnionType([restType, undefinedType]) : restType;
-                    });
+                    if (index >= 0) {
+                        errorIfWritingToReadonlyIndex(getIndexInfoOfType(objectType, numberType));
+                        return mapType(objectType, function (t) {
+                            var restType = getRestTypeOfTupleType(t) || undefinedType;
+                            return accessFlags & 1 ? getUnionType([restType, undefinedType]) : restType;
+                        });
+                    }
                 }
             }
             if (!(indexType.flags & 98304) && isTypeAssignableToKind(indexType, 402653316 | 296 | 12288)) {
@@ -97290,7 +97291,7 @@ var ts;
                 return undefined;
         }
         function lookupFromPackageJson() {
-            var scope = ts.getPackageScopeForPath(fileName, packageJsonInfoCache, host, options);
+            var scope = ts.getPackageScopeForPath(fileName, ts.getTemporaryModuleResolutionState(packageJsonInfoCache, host, options));
             return (scope === null || scope === void 0 ? void 0 : scope.packageJsonContent.type) === "module" ? ts.ModuleKind.ESNext : ts.ModuleKind.CommonJS;
         }
     }

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.20220728";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220729";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -1710,6 +1710,10 @@ var ts;
     /** Does nothing. */
     function noop(_) { }
     ts.noop = noop;
+    ts.noopPush = {
+        push: noop,
+        length: 0
+    };
     /** Do nothing and return false */
     function returnFalse() {
         return false;
@@ -8791,6 +8795,7 @@ var ts;
         Cannot_create_an_instance_of_an_abstract_class: diag(2511, ts.DiagnosticCategory.Error, "Cannot_create_an_instance_of_an_abstract_class_2511", "Cannot create an instance of an abstract class."),
         Overload_signatures_must_all_be_abstract_or_non_abstract: diag(2512, ts.DiagnosticCategory.Error, "Overload_signatures_must_all_be_abstract_or_non_abstract_2512", "Overload signatures must all be abstract or non-abstract."),
         Abstract_method_0_in_class_1_cannot_be_accessed_via_super_expression: diag(2513, ts.DiagnosticCategory.Error, "Abstract_method_0_in_class_1_cannot_be_accessed_via_super_expression_2513", "Abstract method '{0}' in class '{1}' cannot be accessed via super expression."),
+        A_tuple_type_cannot_be_indexed_with_a_negative_value: diag(2514, ts.DiagnosticCategory.Error, "A_tuple_type_cannot_be_indexed_with_a_negative_value_2514", "A tuple type cannot be indexed with a negative value."),
         Non_abstract_class_0_does_not_implement_inherited_abstract_member_1_from_class_2: diag(2515, ts.DiagnosticCategory.Error, "Non_abstract_class_0_does_not_implement_inherited_abstract_member_1_from_class_2_2515", "Non-abstract class '{0}' does not implement inherited abstract member '{1}' from class '{2}'."),
         All_declarations_of_an_abstract_method_must_be_consecutive: diag(2516, ts.DiagnosticCategory.Error, "All_declarations_of_an_abstract_method_must_be_consecutive_2516", "All declarations of an abstract method must be consecutive."),
         Cannot_assign_an_abstract_constructor_type_to_a_non_abstract_constructor_type: diag(2517, ts.DiagnosticCategory.Error, "Cannot_assign_an_abstract_constructor_type_to_a_non_abstract_constructor_type_2517", "Cannot assign an abstract constructor type to a non-abstract constructor type."),
@@ -43145,18 +43150,7 @@ var ts;
      * Does not try `@types/${packageName}` - use a second pass if needed.
      */
     function resolvePackageNameToPackageJson(packageName, containingDirectory, options, host, cache) {
-        var moduleResolutionState = {
-            compilerOptions: options,
-            host: host,
-            traceEnabled: isTraceEnabled(options, host),
-            failedLookupLocations: [],
-            affectingLocations: [],
-            packageJsonInfoCache: cache === null || cache === void 0 ? void 0 : cache.getPackageJsonInfoCache(),
-            conditions: ts.emptyArray,
-            features: NodeResolutionFeatures.None,
-            requestContainingDirectory: containingDirectory,
-            reportDiagnostic: ts.noop
-        };
+        var moduleResolutionState = getTemporaryModuleResolutionState(cache === null || cache === void 0 ? void 0 : cache.getPackageJsonInfoCache(), host, options);
         return ts.forEachAncestorDirectory(containingDirectory, function (ancestorDirectory) {
             if (ts.getBaseFileName(ancestorDirectory) !== "node_modules") {
                 var nodeModulesFolder = ts.combinePaths(ancestorDirectory, "node_modules");
@@ -44116,18 +44110,9 @@ var ts;
         var entrypoints;
         var extensions = resolveJs ? Extensions.JavaScript : Extensions.TypeScript;
         var features = getDefaultNodeResolutionFeatures(options);
-        var requireState = {
-            compilerOptions: options,
-            host: host,
-            traceEnabled: isTraceEnabled(options, host),
-            failedLookupLocations: [],
-            affectingLocations: [],
-            packageJsonInfoCache: cache === null || cache === void 0 ? void 0 : cache.getPackageJsonInfoCache(),
-            conditions: ["node", "require", "types"],
-            features: features,
-            requestContainingDirectory: packageJsonInfo.packageDirectory,
-            reportDiagnostic: ts.noop
-        };
+        var requireState = getTemporaryModuleResolutionState(cache === null || cache === void 0 ? void 0 : cache.getPackageJsonInfoCache(), host, options);
+        requireState.conditions = ["node", "require", "types"];
+        requireState.requestContainingDirectory = packageJsonInfo.packageDirectory;
         var requireResolution = loadNodeModuleFromDirectoryWorker(extensions, packageJsonInfo.packageDirectory, 
         /*onlyRecordFailures*/ false, requireState, packageJsonInfo.packageJsonContent, packageJsonInfo.versionPaths);
         entrypoints = ts.append(entrypoints, requireResolution === null || requireResolution === void 0 ? void 0 : requireResolution.path);
@@ -44200,23 +44185,27 @@ var ts;
             }
         }
     }
-    /**
-     * A function for locating the package.json scope for a given path
-     */
     /*@internal*/
-    function getPackageScopeForPath(fileName, packageJsonInfoCache, host, options) {
-        var state = {
+    function getTemporaryModuleResolutionState(packageJsonInfoCache, host, options) {
+        return {
             host: host,
             compilerOptions: options,
             traceEnabled: isTraceEnabled(options, host),
-            failedLookupLocations: [],
-            affectingLocations: [],
+            failedLookupLocations: ts.noopPush,
+            affectingLocations: ts.noopPush,
             packageJsonInfoCache: packageJsonInfoCache,
-            features: 0,
-            conditions: [],
+            features: NodeResolutionFeatures.None,
+            conditions: ts.emptyArray,
             requestContainingDirectory: undefined,
             reportDiagnostic: ts.noop
         };
+    }
+    ts.getTemporaryModuleResolutionState = getTemporaryModuleResolutionState;
+    /**
+     * A function for locating the package.json scope for a given path
+     */
+    /*@internal*/
+    function getPackageScopeForPath(fileName, state) {
         var parts = ts.getPathComponents(fileName);
         parts.pop();
         while (parts.length > 0) {
@@ -44387,7 +44376,7 @@ var ts;
         var _a, _b;
         var useCaseSensitiveFileNames = typeof state.host.useCaseSensitiveFileNames === "function" ? state.host.useCaseSensitiveFileNames() : state.host.useCaseSensitiveFileNames;
         var directoryPath = ts.toPath(ts.combinePaths(directory, "dummy"), (_b = (_a = state.host).getCurrentDirectory) === null || _b === void 0 ? void 0 : _b.call(_a), ts.createGetCanonicalFileName(useCaseSensitiveFileNames === undefined ? true : useCaseSensitiveFileNames));
-        var scope = getPackageScopeForPath(directoryPath, state.packageJsonInfoCache, state.host, state.compilerOptions);
+        var scope = getPackageScopeForPath(directoryPath, state);
         if (!scope || !scope.packageJsonContent.exports) {
             return undefined;
         }
@@ -44446,7 +44435,7 @@ var ts;
         }
         var useCaseSensitiveFileNames = typeof state.host.useCaseSensitiveFileNames === "function" ? state.host.useCaseSensitiveFileNames() : state.host.useCaseSensitiveFileNames;
         var directoryPath = ts.toPath(ts.combinePaths(directory, "dummy"), (_b = (_a = state.host).getCurrentDirectory) === null || _b === void 0 ? void 0 : _b.call(_a), ts.createGetCanonicalFileName(useCaseSensitiveFileNames === undefined ? true : useCaseSensitiveFileNames));
-        var scope = getPackageScopeForPath(directoryPath, state.packageJsonInfoCache, state.host, state.compilerOptions);
+        var scope = getPackageScopeForPath(directoryPath, state);
         if (!scope) {
             if (state.traceEnabled) {
                 trace(state.host, ts.Diagnostics.Directory_0_has_no_containing_package_json_scope_Imports_will_not_resolve, directoryPath);
@@ -52906,6 +52895,12 @@ var ts;
                 return context.truncating = context.approximateLength > ((context.flags & 1 /* NoTruncation */) ? ts.noTruncationMaximumTruncationLength : ts.defaultMaximumTruncationLength);
             }
             function typeToTypeNodeHelper(type, context) {
+                var savedFlags = context.flags;
+                var typeNode = typeToTypeNodeWorker(type, context);
+                context.flags = savedFlags;
+                return typeNode;
+            }
+            function typeToTypeNodeWorker(type, context) {
                 if (cancellationToken && cancellationToken.throwIfCancellationRequested) {
                     cancellationToken.throwIfCancellationRequested();
                 }
@@ -62644,21 +62639,28 @@ var ts;
                         getFlowTypeOfReference(accessExpression, propType) :
                         propType;
                 }
-                if (everyType(objectType, isTupleType) && ts.isNumericLiteralName(propName) && +propName >= 0) {
+                if (everyType(objectType, isTupleType) && ts.isNumericLiteralName(propName)) {
+                    var index = +propName;
                     if (accessNode && everyType(objectType, function (t) { return !t.target.hasRestElement; }) && !(accessFlags & 16 /* NoTupleBoundsCheck */)) {
                         var indexNode = getIndexNodeForAccessExpression(accessNode);
                         if (isTupleType(objectType)) {
+                            if (index < 0) {
+                                error(indexNode, ts.Diagnostics.A_tuple_type_cannot_be_indexed_with_a_negative_value);
+                                return undefinedType;
+                            }
                             error(indexNode, ts.Diagnostics.Tuple_type_0_of_length_1_has_no_element_at_index_2, typeToString(objectType), getTypeReferenceArity(objectType), ts.unescapeLeadingUnderscores(propName));
                         }
                         else {
                             error(indexNode, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.unescapeLeadingUnderscores(propName), typeToString(objectType));
                         }
                     }
-                    errorIfWritingToReadonlyIndex(getIndexInfoOfType(objectType, numberType));
-                    return mapType(objectType, function (t) {
-                        var restType = getRestTypeOfTupleType(t) || undefinedType;
-                        return accessFlags & 1 /* IncludeUndefined */ ? getUnionType([restType, undefinedType]) : restType;
-                    });
+                    if (index >= 0) {
+                        errorIfWritingToReadonlyIndex(getIndexInfoOfType(objectType, numberType));
+                        return mapType(objectType, function (t) {
+                            var restType = getRestTypeOfTupleType(t) || undefinedType;
+                            return accessFlags & 1 /* IncludeUndefined */ ? getUnionType([restType, undefinedType]) : restType;
+                        });
+                    }
                 }
             }
             if (!(indexType.flags & 98304 /* Nullable */) && isTypeAssignableToKind(indexType, 402653316 /* StringLike */ | 296 /* NumberLike */ | 12288 /* ESSymbolLike */)) {
@@ -117669,7 +117671,7 @@ var ts;
                 return undefined;
         }
         function lookupFromPackageJson() {
-            var scope = ts.getPackageScopeForPath(fileName, packageJsonInfoCache, host, options);
+            var scope = ts.getPackageScopeForPath(fileName, ts.getTemporaryModuleResolutionState(packageJsonInfoCache, host, options));
             return (scope === null || scope === void 0 ? void 0 : scope.packageJsonContent.type) === "module" ? ts.ModuleKind.ESNext : ts.ModuleKind.CommonJS;
         }
     }
@@ -148632,6 +148634,7 @@ var ts;
             var options = _a.options, getRules = _a.getRules, host = _a.host;
             // formatting context is used by rules provider
             var formattingContext = new formatting.FormattingContext(sourceFile, requestKind, options);
+            var previousRangeTriviaEnd;
             var previousRange;
             var previousParent;
             var previousRangeStartLine;
@@ -148660,10 +148663,30 @@ var ts;
                 }
             }
             if (previousRange && formattingScanner.getStartPos() >= originalRange.end) {
+                // Formatting edits happen by looking at pairs of contiguous tokens (see `processPair`),
+                // typically inserting or deleting whitespace between them. The recursive `processNode`
+                // logic above bails out as soon as it encounters a token that is beyond the end of the
+                // range we're supposed to format (or if we reach the end of the file). But this potentially
+                // leaves out an edit that would occur *inside* the requested range but cannot be discovered
+                // without looking at one token *beyond* the end of the range: consider the line `x = { }`
+                // with a selection from the beginning of the line to the space inside the curly braces,
+                // inclusive. We would expect a format-selection would delete the space (if rules apply),
+                // but in order to do that, we need to process the pair ["{", "}"], but we stopped processing
+                // just before getting there. This block handles this trailing edit.
                 var tokenInfo = formattingScanner.isOnEOF() ? formattingScanner.readEOFTokenRange() :
                     formattingScanner.isOnToken() ? formattingScanner.readTokenInfo(enclosingNode).token :
                         undefined;
-                if (tokenInfo) {
+                if (tokenInfo && tokenInfo.pos === previousRangeTriviaEnd) {
+                    // We need to check that tokenInfo and previousRange are contiguous: the `originalRange`
+                    // may have ended in the middle of a token, which means we will have stopped formatting
+                    // on that token, leaving `previousRange` pointing to the token before it, but already
+                    // having moved the formatting scanner (where we just got `tokenInfo`) to the next token.
+                    // If this happens, our supposed pair [previousRange, tokenInfo] actually straddles the
+                    // token that intersects the end of the range we're supposed to format, so the pair will
+                    // produce bogus edits if we try to `processPair`. Recall that the point of this logic is
+                    // to perform a trailing edit at the end of the selection range: but there can be no valid
+                    // edit in the middle of a token where the range ended, so if we have a non-contiguous
+                    // pair here, we're already done and we can ignore it.
                     var parent = ((_b = ts.findPrecedingToken(tokenInfo.end, sourceFile, enclosingNode)) === null || _b === void 0 ? void 0 : _b.parent) || previousParent;
                     processPair(tokenInfo, sourceFile.getLineAndCharacterOfPosition(tokenInfo.pos).line, parent, previousRange, previousRangeStartLine, previousParent, parent, 
                     /*dynamicIndentation*/ undefined);
@@ -149021,6 +149044,7 @@ var ts;
                         }
                     }
                     if (currentTokenInfo.trailingTrivia) {
+                        previousRangeTriviaEnd = ts.last(currentTokenInfo.trailingTrivia).end;
                         processTrivia(currentTokenInfo.trailingTrivia, parent, childContextNode, dynamicIndentation);
                     }
                     if (indentToken) {
@@ -149091,6 +149115,7 @@ var ts;
                     }
                 }
                 previousRange = range;
+                previousRangeTriviaEnd = range.end;
                 previousParent = parent;
                 previousRangeStartLine = rangeStart.line;
                 return lineAction;
@@ -178440,7 +178465,7 @@ var ts;
                         var packageDirectory = fileName.substring(0, nodeModulesPathParts.packageRootIndex);
                         var packageJsonCache = (_a = project.getModuleResolutionCache()) === null || _a === void 0 ? void 0 : _a.getPackageJsonInfoCache();
                         var compilerOptions = project.getCompilationSettings();
-                        var packageJson = ts.getPackageScopeForPath(project.toPath(packageDirectory + "/package.json"), packageJsonCache, project, compilerOptions);
+                        var packageJson = ts.getPackageScopeForPath(project.toPath(packageDirectory + "/package.json"), ts.getTemporaryModuleResolutionState(packageJsonCache, project, compilerOptions));
                         if (!packageJson)
                             return undefined;
                         // Use fake options instead of actual compiler options to avoid following export map if the project uses node16 or nodenext -