typescript 4.9.0-dev.20220920 → 4.9.0-dev.20220922

package/lib/typescriptServices.js

@@ -99,7 +99,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 = "".concat(ts.versionMajorMinor, ".0-dev.20220920");
+    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20220922");
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -3008,7 +3008,7 @@ var ts;
             ];
             for (var _i = 0, nodeConstructors_1 = nodeConstructors; _i < nodeConstructors_1.length; _i++) {
                 var ctor = nodeConstructors_1[_i];
-                if (!ts.hasProperty(ctor, "__debugKind")) {
+                if (!ts.hasProperty(ctor.prototype, "__debugKind")) {
                     Object.defineProperties(ctor.prototype, {
                         // for use with vscode-js-debug's new customDescriptionGenerator in launch.json
                         __tsDebuggerDisplay: {
@@ -9123,6 +9123,7 @@ var ts;
         _0_is_an_unused_renaming_of_1_Did_you_intend_to_use_it_as_a_type_annotation: diag(2842, ts.DiagnosticCategory.Error, "_0_is_an_unused_renaming_of_1_Did_you_intend_to_use_it_as_a_type_annotation_2842", "'{0}' is an unused renaming of '{1}'. Did you intend to use it as a type annotation?"),
         We_can_only_write_a_type_for_0_by_adding_a_type_for_the_entire_parameter_here: diag(2843, ts.DiagnosticCategory.Error, "We_can_only_write_a_type_for_0_by_adding_a_type_for_the_entire_parameter_here_2843", "We can only write a type for '{0}' by adding a type for the entire parameter here."),
         Type_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: diag(2844, ts.DiagnosticCategory.Error, "Type_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor_2844", "Type of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor."),
+        This_condition_will_always_return_0: diag(2845, ts.DiagnosticCategory.Error, "This_condition_will_always_return_0_2845", "This condition will always return '{0}'."),
         Import_declaration_0_is_using_private_name_1: diag(4000, ts.DiagnosticCategory.Error, "Import_declaration_0_is_using_private_name_1_4000", "Import declaration '{0}' is using private name '{1}'."),
         Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: diag(4002, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002", "Type parameter '{0}' of exported class has or is using private name '{1}'."),
         Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: diag(4004, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004", "Type parameter '{0}' of exported interface has or is using private name '{1}'."),
@@ -10065,6 +10066,8 @@ var ts;
         Delete_unused_param_tag_0: diag(95171, ts.DiagnosticCategory.Message, "Delete_unused_param_tag_0_95171", "Delete unused '@param' tag '{0}'"),
         Delete_all_unused_param_tags: diag(95172, ts.DiagnosticCategory.Message, "Delete_all_unused_param_tags_95172", "Delete all unused '@param' tags"),
         Rename_param_tag_name_0_to_1: diag(95173, ts.DiagnosticCategory.Message, "Rename_param_tag_name_0_to_1_95173", "Rename '@param' tag name '{0}' to '{1}'"),
+        Use_0: diag(95174, ts.DiagnosticCategory.Message, "Use_0_95174", "Use `{0}`."),
+        Use_Number_isNaN_in_all_conditions: diag(95175, ts.DiagnosticCategory.Message, "Use_Number_isNaN_in_all_conditions_95175", "Use `Number.isNaN` in all conditions."),
         No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer: diag(18004, ts.DiagnosticCategory.Error, "No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer_18004", "No value exists in scope for the shorthand property '{0}'. Either declare one or provide an initializer."),
         Classes_may_not_have_a_field_named_constructor: diag(18006, ts.DiagnosticCategory.Error, "Classes_may_not_have_a_field_named_constructor_18006", "Classes may not have a field named 'constructor'."),
         JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array: diag(18007, ts.DiagnosticCategory.Error, "JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array_18007", "JSX expressions may not use the comma operator. Did you mean to write an array?"),
@@ -11887,12 +11890,36 @@ var ts;
                             pos++;
                             return token = 0 /* SyntaxKind.Unknown */;
                         }
-                        if (isIdentifierStart(codePointAt(text, pos + 1), languageVersion)) {
+                        var charAfterHash = codePointAt(text, pos + 1);
+                        if (charAfterHash === 92 /* CharacterCodes.backslash */) {
                             pos++;
-                            scanIdentifier(codePointAt(text, pos), languageVersion);
+                            var extendedCookedChar_1 = peekExtendedUnicodeEscape();
+                            if (extendedCookedChar_1 >= 0 && isIdentifierStart(extendedCookedChar_1, languageVersion)) {
+                                pos += 3;
+                                tokenFlags |= 8 /* TokenFlags.ExtendedUnicodeEscape */;
+                                tokenValue = "#" + scanExtendedUnicodeEscape() + scanIdentifierParts();
+                                return token = 80 /* SyntaxKind.PrivateIdentifier */;
+                            }
+                            var cookedChar_1 = peekUnicodeEscape();
+                            if (cookedChar_1 >= 0 && isIdentifierStart(cookedChar_1, languageVersion)) {
+                                pos += 6;
+                                tokenFlags |= 1024 /* TokenFlags.UnicodeEscape */;
+                                tokenValue = "#" + String.fromCharCode(cookedChar_1) + scanIdentifierParts();
+                                return token = 80 /* SyntaxKind.PrivateIdentifier */;
+                            }
+                            pos--;
+                        }
+                        if (isIdentifierStart(charAfterHash, languageVersion)) {
+                            pos++;
+                            // We're relying on scanIdentifier's behavior and adjusting the token kind after the fact.
+                            // Notably absent from this block is the fact that calling a function named "scanIdentifier",
+                            // but identifiers don't include '#', and that function doesn't deal with it at all.
+                            // This works because 'scanIdentifier' tries to reuse source characters and builds up substrings;
+                            // however, it starts at the 'tokenPos' which includes the '#', and will "accidentally" prepend the '#' for us.
+                            scanIdentifier(charAfterHash, languageVersion);
                         }
                         else {
-                            tokenValue = String.fromCharCode(codePointAt(text, pos));
+                            tokenValue = "#";
                             error(ts.Diagnostics.Invalid_character, pos++, charSize(ch));
                         }
                         return token = 80 /* SyntaxKind.PrivateIdentifier */;
@@ -33130,7 +33157,7 @@ var ts;
         }
         function parsePrivateIdentifier() {
             var pos = getNodePos();
-            var node = factory.createPrivateIdentifier(internPrivateIdentifier(scanner.getTokenText()));
+            var node = factory.createPrivateIdentifier(internPrivateIdentifier(scanner.getTokenValue()));
             nextToken();
             return finishNode(node, pos);
         }
@@ -45216,6 +45243,7 @@ var ts;
         }
     }
     function loadModuleFromSpecificNodeModulesDirectory(extensions, moduleName, nodeModulesDirectory, nodeModulesDirectoryExists, state, cache, redirectedReference) {
+        var _a;
         var candidate = ts.normalizePath(ts.combinePaths(nodeModulesDirectory, moduleName));
         // First look for a nested package.json, as in `node_modules/foo/bar/package.json`.
         var packageInfo = getPackageJsonInfo(candidate, !nodeModulesDirectoryExists, state);
@@ -45230,13 +45258,7 @@ var ts;
                 return withPackageId(packageInfo, fromDirectory);
             }
         }
-        var _a = parsePackageName(moduleName), packageName = _a.packageName, rest = _a.rest;
         var loader = function (extensions, candidate, onlyRecordFailures, state) {
-            var _a;
-            // package exports are higher priority than file/directory lookups (and, if there's exports present, blocks them)
-            if (packageInfo && packageInfo.contents.packageJsonContent.exports && state.features & NodeResolutionFeatures.Exports) {
-                return (_a = loadModuleFromExports(packageInfo, extensions, ts.combinePaths(".", rest), state, cache, redirectedReference)) === null || _a === void 0 ? void 0 : _a.value;
-            }
             var pathAndExtension = loadModuleFromFile(extensions, candidate, onlyRecordFailures, state) ||
                 loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageInfo && packageInfo.contents.packageJsonContent, packageInfo && packageInfo.contents.versionPaths);
             if (!pathAndExtension && packageInfo
@@ -45249,19 +45271,24 @@ var ts;
             }
             return withPackageId(packageInfo, pathAndExtension);
         };
-        if (rest !== "") { // If "rest" is empty, we just did this search above.
-            var packageDirectory = ts.combinePaths(nodeModulesDirectory, packageName);
-            // Don't use a "types" or "main" from here because we're not loading the root, but a subdirectory -- just here for the packageId and path mappings.
+        var _b = parsePackageName(moduleName), packageName = _b.packageName, rest = _b.rest;
+        var packageDirectory = ts.combinePaths(nodeModulesDirectory, packageName);
+        if (rest !== "") {
+            // Previous `packageInfo` may have been from a nested package.json; ensure we have the one from the package root now.
             packageInfo = getPackageJsonInfo(packageDirectory, !nodeModulesDirectoryExists, state);
-            if (packageInfo && packageInfo.contents.versionPaths) {
-                if (state.traceEnabled) {
-                    trace(state.host, ts.Diagnostics.package_json_has_a_typesVersions_entry_0_that_matches_compiler_version_1_looking_for_a_pattern_to_match_module_name_2, packageInfo.contents.versionPaths.version, ts.version, rest);
-                }
-                var packageDirectoryExists = nodeModulesDirectoryExists && ts.directoryProbablyExists(packageDirectory, state.host);
-                var fromPaths = tryLoadModuleUsingPaths(extensions, rest, packageDirectory, packageInfo.contents.versionPaths.paths, /*pathPatterns*/ undefined, loader, !packageDirectoryExists, state);
-                if (fromPaths) {
-                    return fromPaths.value;
-                }
+        }
+        // package exports are higher priority than file/directory/typesVersions lookups and (and, if there's exports present, blocks them)
+        if (packageInfo && packageInfo.contents.packageJsonContent.exports && state.features & NodeResolutionFeatures.Exports) {
+            return (_a = loadModuleFromExports(packageInfo, extensions, ts.combinePaths(".", rest), state, cache, redirectedReference)) === null || _a === void 0 ? void 0 : _a.value;
+        }
+        if (rest !== "" && packageInfo && packageInfo.contents.versionPaths) {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.package_json_has_a_typesVersions_entry_0_that_matches_compiler_version_1_looking_for_a_pattern_to_match_module_name_2, packageInfo.contents.versionPaths.version, ts.version, rest);
+            }
+            var packageDirectoryExists = nodeModulesDirectoryExists && ts.directoryProbablyExists(packageDirectory, state.host);
+            var fromPaths = tryLoadModuleUsingPaths(extensions, rest, packageDirectory, packageInfo.contents.versionPaths.paths, /*pathPatterns*/ undefined, loader, !packageDirectoryExists, state);
+            if (fromPaths) {
+                return fromPaths.value;
             }
         }
         return loader(extensions, candidate, !nodeModulesDirectoryExists, state);
@@ -49763,6 +49790,7 @@ var ts;
         var deferredGlobalOmitSymbol;
         var deferredGlobalAwaitedSymbol;
         var deferredGlobalBigIntType;
+        var deferredGlobalNaNSymbol;
         var deferredGlobalRecordSymbol;
         var allPotentiallyUnusedIdentifiers = new ts.Map(); // key is file name
         var flowLoopStart = 0;
@@ -55441,6 +55469,7 @@ var ts;
                         && symbol.escapedName !== "export=" /* InternalSymbolName.ExportEquals */
                         && !(symbol.flags & 4194304 /* SymbolFlags.Prototype */)
                         && !(symbol.flags & 32 /* SymbolFlags.Class */)
+                        && !(symbol.flags & 8192 /* SymbolFlags.Method */)
                         && !isConstMergedWithNSPrintableAsSignatureMerge) {
                         if (propertyAsAlias) {
                             var createdExport = serializeMaybeAliasAssignment(symbol);
@@ -60251,7 +60280,7 @@ var ts;
                             var isInstantiation = (getTargetSymbol(prop) || prop) === (getTargetSymbol(singleProp) || singleProp);
                             // If the symbols are instances of one another with identical types - consider the symbols
                             // equivalent and just use the first one, which thus allows us to avoid eliding private
-                            // members when intersecting a (this-)instantiations of a class with it's raw base or another instance
+                            // members when intersecting a (this-)instantiations of a class with its raw base or another instance
                             if (isInstantiation && compareProperties(singleProp, prop, function (a, b) { return a === b ? -1 /* Ternary.True */ : 0 /* Ternary.False */; }) === -1 /* Ternary.True */) {
                                 // If we merged instantiations of a generic type, we replicate the symbol parent resetting behavior we used
                                 // to do when we recorded multiple distinct symbols so that we still get, eg, `Array<T>.length` printed
@@ -60299,7 +60328,11 @@ var ts;
                     }
                 }
             }
-            if (!singleProp || isUnion && (propSet || checkFlags & 48 /* CheckFlags.Partial */) && checkFlags & (1024 /* CheckFlags.ContainsPrivate */ | 512 /* CheckFlags.ContainsProtected */)) {
+            if (!singleProp ||
+                isUnion &&
+                    (propSet || checkFlags & 48 /* CheckFlags.Partial */) &&
+                    checkFlags & (1024 /* CheckFlags.ContainsPrivate */ | 512 /* CheckFlags.ContainsProtected */) &&
+                    !(propSet && getCommonDeclarationsOfSymbols(ts.arrayFrom(propSet.values())))) {
                 // No property was found, or, in a union, a property has a private or protected declaration in one
                 // constituent, but is missing or has a different declaration in another constituent.
                 return undefined;
@@ -60401,6 +60434,33 @@ var ts;
             }
             return property;
         }
+        function getCommonDeclarationsOfSymbols(symbols) {
+            var commonDeclarations;
+            var _loop_14 = function (symbol) {
+                if (!symbol.declarations) {
+                    return { value: undefined };
+                }
+                if (!commonDeclarations) {
+                    commonDeclarations = new ts.Set(symbol.declarations);
+                    return "continue";
+                }
+                commonDeclarations.forEach(function (declaration) {
+                    if (!ts.contains(symbol.declarations, declaration)) {
+                        commonDeclarations.delete(declaration);
+                    }
+                });
+                if (commonDeclarations.size === 0) {
+                    return { value: undefined };
+                }
+            };
+            for (var _i = 0, symbols_3 = symbols; _i < symbols_3.length; _i++) {
+                var symbol = symbols_3[_i];
+                var state_4 = _loop_14(symbol);
+                if (typeof state_4 === "object")
+                    return state_4.value;
+            }
+            return commonDeclarations;
+        }
         function getPropertyOfUnionOrIntersectionType(type, name, skipObjectFunctionPropertyAugment) {
             var property = getUnionOrIntersectionProperty(type, name, skipObjectFunctionPropertyAugment);
             // We need to filter out partial properties in union types
@@ -61115,7 +61175,7 @@ var ts;
         function getIndexInfosOfIndexSymbol(indexSymbol) {
             if (indexSymbol.declarations) {
                 var indexInfos_4 = [];
-                var _loop_14 = function (declaration) {
+                var _loop_15 = function (declaration) {
                     if (declaration.parameters.length === 1) {
                         var parameter = declaration.parameters[0];
                         if (parameter.type) {
@@ -61129,7 +61189,7 @@ var ts;
                 };
                 for (var _i = 0, _a = indexSymbol.declarations; _i < _a.length; _i++) {
                     var declaration = _a[_i];
-                    _loop_14(declaration);
+                    _loop_15(declaration);
                 }
                 return indexInfos_4;
             }
@@ -61146,7 +61206,7 @@ var ts;
             var _a;
             var inferences;
             if ((_a = typeParameter.symbol) === null || _a === void 0 ? void 0 : _a.declarations) {
-                var _loop_15 = function (declaration) {
+                var _loop_16 = function (declaration) {
                     if (declaration.parent.kind === 192 /* SyntaxKind.InferType */) {
                         // When an 'infer T' declaration is immediately contained in a type reference node
                         // (such as 'Foo<infer T>'), T's constraint is inferred from the constraint of the
@@ -61210,7 +61270,7 @@ var ts;
                 };
                 for (var _i = 0, _b = typeParameter.symbol.declarations; _i < _b.length; _i++) {
                     var declaration = _b[_i];
-                    _loop_15(declaration);
+                    _loop_16(declaration);
                 }
             }
             return inferences && getIntersectionType(inferences);
@@ -61867,6 +61927,9 @@ var ts;
         function getGlobalBigIntType() {
             return (deferredGlobalBigIntType || (deferredGlobalBigIntType = getGlobalType("BigInt", /*arity*/ 0, /*reportErrors*/ false))) || emptyObjectType;
         }
+        function getGlobalNaNSymbol() {
+            return (deferredGlobalNaNSymbol || (deferredGlobalNaNSymbol = getGlobalValueSymbol("NaN", /*reportErrors*/ false)));
+        }
         function getGlobalRecordSymbol() {
             deferredGlobalRecordSymbol || (deferredGlobalRecordSymbol = getGlobalTypeAliasSymbol("Record", /*arity*/ 2, /*reportErrors*/ true) || unknownSymbol);
             return deferredGlobalRecordSymbol === unknownSymbol ? undefined : deferredGlobalRecordSymbol;
@@ -62107,7 +62170,7 @@ var ts;
             var lastRequiredIndex = -1;
             var firstRestIndex = -1;
             var lastOptionalOrRestIndex = -1;
-            var _loop_16 = function (i) {
+            var _loop_17 = function (i) {
                 var type = elementTypes[i];
                 var flags = target.elementFlags[i];
                 if (flags & 8 /* ElementFlags.Variadic */) {
@@ -62137,9 +62200,9 @@ var ts;
                 }
             };
             for (var i = 0; i < elementTypes.length; i++) {
-                var state_4 = _loop_16(i);
-                if (typeof state_4 === "object")
-                    return state_4.value;
+                var state_5 = _loop_17(i);
+                if (typeof state_5 === "object")
+                    return state_5.value;
             }
             // Turn optional elements preceding the last required element into required elements
             for (var i = 0; i < lastRequiredIndex; i++) {
@@ -62167,7 +62230,7 @@ var ts;
                 if (flags & (2 /* ElementFlags.Optional */ | 4 /* ElementFlags.Rest */)) {
                     lastOptionalOrRestIndex = expandedFlags.length;
                 }
-                expandedTypes.push(type);
+                expandedTypes.push(flags & 2 /* ElementFlags.Optional */ ? addOptionality(type, /*isProperty*/ true) : type);
                 expandedFlags.push(flags);
                 if (expandedDeclarations && declaration) {
                     expandedDeclarations.push(declaration);
@@ -62333,7 +62396,7 @@ var ts;
             var templates = ts.filter(types, isPatternLiteralType);
             if (templates.length) {
                 var i = types.length;
-                var _loop_17 = function () {
+                var _loop_18 = function () {
                     i--;
                     var t = types[i];
                     if (t.flags & 128 /* TypeFlags.StringLiteral */ && ts.some(templates, function (template) { return isTypeMatchedByTemplateLiteralType(t, template); })) {
@@ -62341,7 +62404,7 @@ var ts;
                     }
                 };
                 while (i > 0) {
-                    _loop_17();
+                    _loop_18();
                 }
             }
         }
@@ -62418,14 +62481,14 @@ var ts;
                 var namedUnions = [];
                 addNamedUnions(namedUnions, types);
                 var reducedTypes = [];
-                var _loop_18 = function (t) {
+                var _loop_19 = function (t) {
                     if (!ts.some(namedUnions, function (union) { return containsType(union.types, t); })) {
                         reducedTypes.push(t);
                     }
                 };
                 for (var _i = 0, typeSet_1 = typeSet; _i < typeSet_1.length; _i++) {
                     var t = typeSet_1[_i];
-                    _loop_18(t);
+                    _loop_19(t);
                 }
                 if (!aliasSymbol && namedUnions.length === 1 && reducedTypes.length === 0) {
                     return namedUnions[0];
@@ -63655,7 +63718,7 @@ var ts;
             var result;
             var extraTypes;
             var tailCount = 0;
-            var _loop_19 = function () {
+            var _loop_20 = function () {
                 if (tailCount === 1000) {
                     error(currentNode, ts.Diagnostics.Type_instantiation_is_excessively_deep_and_possibly_infinite);
                     result = errorType;
@@ -63776,10 +63839,10 @@ var ts;
             // another (or, through recursion, possibly the same) conditional type. In the potentially tail-recursive
             // cases we increment the tail recursion counter and stop after 1000 iterations.
             while (true) {
-                var state_5 = _loop_19();
-                if (typeof state_5 === "object")
-                    return state_5.value;
-                if (state_5 === "break")
+                var state_6 = _loop_20();
+                if (typeof state_6 === "object")
+                    return state_6.value;
+                if (state_6 === "break")
                     break;
             }
             return extraTypes ? getUnionType(ts.append(extraTypes, result)) : result;
@@ -66394,7 +66457,7 @@ var ts;
                     reducedTarget = findMatchingDiscriminantType(source, target, isRelatedTo) || filterPrimitivesIfContainsNonPrimitive(target);
                     checkTypes = reducedTarget.flags & 1048576 /* TypeFlags.Union */ ? reducedTarget.types : [reducedTarget];
                 }
-                var _loop_20 = function (prop) {
+                var _loop_21 = function (prop) {
                     if (shouldCheckAsExcessProperty(prop, source.symbol) && !isIgnoredJsxProperty(source, prop)) {
                         if (!isKnownProperty(reducedTarget, prop.escapedName, isComparingJsxAttributes)) {
                             if (reportErrors) {
@@ -66457,9 +66520,9 @@ var ts;
                 };
                 for (var _i = 0, _b = getPropertiesOfType(source); _i < _b.length; _i++) {
                     var prop = _b[_i];
-                    var state_6 = _loop_20(prop);
-                    if (typeof state_6 === "object")
-                        return state_6.value;
+                    var state_7 = _loop_21(prop);
+                    if (typeof state_7 === "object")
+                        return state_7.value;
                 }
                 return false;
             }
@@ -67450,11 +67513,11 @@ var ts;
                 // constituents of 'target'. If any combination does not have a match then 'source' is not relatable.
                 var discriminantCombinations = ts.cartesianProduct(sourceDiscriminantTypes);
                 var matchingTypes = [];
-                var _loop_21 = function (combination) {
+                var _loop_22 = function (combination) {
                     var hasMatch = false;
                     outer: for (var _c = 0, _d = target.types; _c < _d.length; _c++) {
                         var type = _d[_c];
-                        var _loop_22 = function (i) {
+                        var _loop_23 = function (i) {
                             var sourceProperty = sourcePropertiesFiltered[i];
                             var targetProperty = getPropertyOfType(type, sourceProperty.escapedName);
                             if (!targetProperty)
@@ -67470,8 +67533,8 @@ var ts;
                             }
                         };
                         for (var i = 0; i < sourcePropertiesFiltered.length; i++) {
-                            var state_8 = _loop_22(i);
-                            switch (state_8) {
+                            var state_9 = _loop_23(i);
+                            switch (state_9) {
                                 case "continue-outer": continue outer;
                             }
                         }
@@ -67484,9 +67547,9 @@ var ts;
                 };
                 for (var _a = 0, discriminantCombinations_1 = discriminantCombinations; _a < discriminantCombinations_1.length; _a++) {
                     var combination = discriminantCombinations_1[_a];
-                    var state_7 = _loop_21(combination);
-                    if (typeof state_7 === "object")
-                        return state_7.value;
+                    var state_8 = _loop_22(combination);
+                    if (typeof state_8 === "object")
+                        return state_8.value;
                 }
                 // Compare the remaining non-discriminant properties of each match.
                 var result = -1 /* Ternary.True */;
@@ -68191,7 +68254,7 @@ var ts;
                 ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.push("checkTypes" /* tracing.Phase.CheckTypes */, "getVariancesWorker", { arity: typeParameters.length, id: getTypeId(getDeclaredTypeOfSymbol(symbol)) });
                 links.variances = ts.emptyArray;
                 var variances = [];
-                var _loop_23 = function (tp) {
+                var _loop_24 = function (tp) {
                     var modifiers = getVarianceModifiers(tp);
                     var variance = modifiers & 65536 /* ModifierFlags.Out */ ?
                         modifiers & 32768 /* ModifierFlags.In */ ? 0 /* VarianceFlags.Invariant */ : 1 /* VarianceFlags.Covariant */ :
@@ -68229,7 +68292,7 @@ var ts;
                 };
                 for (var _i = 0, typeParameters_2 = typeParameters; _i < typeParameters_2.length; _i++) {
                     var tp = typeParameters_2[_i];
-                    _loop_23(tp);
+                    _loop_24(tp);
                 }
                 links.variances = variances;
                 ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.pop({ variances: variances.map(ts.Debug.formatVariance) });
@@ -68821,7 +68884,8 @@ var ts;
         function getOptionalType(type, isProperty) {
             if (isProperty === void 0) { isProperty = false; }
             ts.Debug.assert(strictNullChecks);
-            return type.flags & 32768 /* TypeFlags.Undefined */ ? type : getUnionType([type, isProperty ? missingType : undefinedType]);
+            var missingOrUndefined = isProperty ? missingType : undefinedType;
+            return type.flags & 32768 /* TypeFlags.Undefined */ || type.flags & 1048576 /* TypeFlags.Union */ && type.types[0] === missingOrUndefined ? type : getUnionType([type, missingOrUndefined]);
         }
         function getGlobalNonNullableTypeInstantiation(type) {
             if (!deferredGlobalNonNullableTypeAlias) {
@@ -70186,7 +70250,7 @@ var ts;
                 // upon instantiation, would collapse all the placeholders to just 'string', and an assignment check might
                 // succeed. That would be a pointless and confusing outcome.
                 if (matches || ts.every(target.texts, function (s) { return s.length === 0; })) {
-                    var _loop_24 = function (i) {
+                    var _loop_25 = function (i) {
                         var source_1 = matches ? matches[i] : neverType;
                         var target_3 = types[i];
                         // If we are inferring from a string literal type to a type variable whose constraint includes one of the
@@ -70236,7 +70300,7 @@ var ts;
                         inferFromTypes(source_1, target_3);
                     };
                     for (var i = 0; i < types.length; i++) {
-                        _loop_24(i);
+                        _loop_25(i);
                     }
                 }
             }
@@ -70700,7 +70764,7 @@ var ts;
                         return name;
                     }
                 }
-                if (ts.hasOnlyExpressionInitializer(declaration)) {
+                if (ts.hasOnlyExpressionInitializer(declaration) && isBlockScopedNameDeclaredBeforeUse(declaration, node.argumentExpression)) {
                     var initializer = ts.getEffectiveInitializer(declaration);
                     return initializer && tryGetNameFromType(getTypeOfExpression(initializer));
                 }
@@ -70760,7 +70824,7 @@ var ts;
         function mapTypesByKeyProperty(types, name) {
             var map = new ts.Map();
             var count = 0;
-            var _loop_25 = function (type) {
+            var _loop_26 = function (type) {
                 if (type.flags & (524288 /* TypeFlags.Object */ | 2097152 /* TypeFlags.Intersection */ | 58982400 /* TypeFlags.InstantiableNonPrimitive */)) {
                     var discriminant = getTypeOfPropertyOfType(type, name);
                     if (discriminant) {
@@ -70786,9 +70850,9 @@ var ts;
             };
             for (var _i = 0, types_15 = types; _i < types_15.length; _i++) {
                 var type = types_15[_i];
-                var state_9 = _loop_25(type);
-                if (typeof state_9 === "object")
-                    return state_9.value;
+                var state_10 = _loop_26(type);
+                if (typeof state_10 === "object")
+                    return state_10.value;
             }
             return count >= 10 && count * 2 >= types.length ? map : undefined;
         }
@@ -77243,7 +77307,7 @@ var ts;
             if (spreadIndex >= 0) {
                 // Create synthetic arguments from spreads of tuple types.
                 var effectiveArgs_1 = args.slice(0, spreadIndex);
-                var _loop_26 = function (i) {
+                var _loop_27 = function (i) {
                     var arg = args[i];
                     // We can call checkExpressionCached because spread expressions never have a contextual type.
                     var spreadType = arg.kind === 227 /* SyntaxKind.SpreadElement */ && (flowLoopCount ? checkExpression(arg.expression) : checkExpressionCached(arg.expression));
@@ -77260,7 +77324,7 @@ var ts;
                     }
                 };
                 for (var i = spreadIndex; i < args.length; i++) {
-                    _loop_26(i);
+                    _loop_27(i);
                 }
                 return effectiveArgs_1;
             }
@@ -77589,7 +77653,7 @@ var ts;
                         var min_3 = Number.MAX_VALUE;
                         var minIndex = 0;
                         var i_1 = 0;
-                        var _loop_27 = function (c) {
+                        var _loop_28 = function (c) {
                             var chain_2 = function () { return ts.chainDiagnosticMessages(/*details*/ undefined, ts.Diagnostics.Overload_0_of_1_2_gave_the_following_error, i_1 + 1, candidates.length, signatureToString(c)); };
                             var diags_2 = getSignatureApplicabilityError(node, args, c, assignableRelation, 0 /* CheckMode.Normal */, /*reportErrors*/ true, chain_2);
                             if (diags_2) {
@@ -77607,7 +77671,7 @@ var ts;
                         };
                         for (var _a = 0, candidatesForArgumentError_1 = candidatesForArgumentError; _a < candidatesForArgumentError_1.length; _a++) {
                             var c = candidatesForArgumentError_1[_a];
-                            _loop_27(c);
+                            _loop_28(c);
                         }
                         var diags_3 = max > 1 ? allDiagnostics[minIndex] : ts.flatten(allDiagnostics);
                         ts.Debug.assert(diags_3.length > 0, "No errors reported for 3 or fewer overload signatures");
@@ -77765,7 +77829,7 @@ var ts;
             }
             var _a = ts.minAndMax(candidates, getNumNonRestParameters), minArgumentCount = _a.min, maxNonRestParam = _a.max;
             var parameters = [];
-            var _loop_28 = function (i) {
+            var _loop_29 = function (i) {
                 var symbols = ts.mapDefined(candidates, function (s) { return signatureHasRestParameter(s) ?
                     i < s.parameters.length - 1 ? s.parameters[i] : ts.last(s.parameters) :
                     i < s.parameters.length ? s.parameters[i] : undefined; });
@@ -77773,7 +77837,7 @@ var ts;
                 parameters.push(createCombinedSymbolFromTypes(symbols, ts.mapDefined(candidates, function (candidate) { return tryGetTypeAtPosition(candidate, i); })));
             };
             for (var i = 0; i < maxNonRestParam; i++) {
-                _loop_28(i);
+                _loop_29(i);
             }
             var restParameterSymbols = ts.mapDefined(candidates, function (c) { return signatureHasRestParameter(c) ? ts.last(c.parameters) : undefined; });
             var flags = 0 /* SignatureFlags.None */;
@@ -80555,6 +80619,7 @@ var ts;
                         var eqType = operator === 34 /* SyntaxKind.EqualsEqualsToken */ || operator === 36 /* SyntaxKind.EqualsEqualsEqualsToken */;
                         error(errorNode, ts.Diagnostics.This_condition_will_always_return_0_since_JavaScript_compares_objects_by_reference_not_value, eqType ? "false" : "true");
                     }
+                    checkNaNEquality(errorNode, operator, left, right);
                     reportOperatorErrorUnless(function (left, right) { return isTypeEqualityComparableTo(left, right) || isTypeEqualityComparableTo(right, left); });
                     return booleanType;
                 case 102 /* SyntaxKind.InstanceOfKeyword */:
@@ -80760,6 +80825,26 @@ var ts;
                         return undefined;
                 }
             }
+            function checkNaNEquality(errorNode, operator, left, right) {
+                var isLeftNaN = isGlobalNaN(ts.skipParentheses(left));
+                var isRightNaN = isGlobalNaN(ts.skipParentheses(right));
+                if (isLeftNaN || isRightNaN) {
+                    var err = error(errorNode, ts.Diagnostics.This_condition_will_always_return_0, ts.tokenToString(operator === 36 /* SyntaxKind.EqualsEqualsEqualsToken */ || operator === 34 /* SyntaxKind.EqualsEqualsToken */ ? 95 /* SyntaxKind.FalseKeyword */ : 110 /* SyntaxKind.TrueKeyword */));
+                    if (isLeftNaN && isRightNaN)
+                        return;
+                    var operatorString = operator === 37 /* SyntaxKind.ExclamationEqualsEqualsToken */ || operator === 35 /* SyntaxKind.ExclamationEqualsToken */ ? ts.tokenToString(53 /* SyntaxKind.ExclamationToken */) : "";
+                    var location = isLeftNaN ? right : left;
+                    var expression = ts.skipParentheses(location);
+                    ts.addRelatedInfo(err, ts.createDiagnosticForNode(location, ts.Diagnostics.Did_you_mean_0, "".concat(operatorString, "Number.isNaN(").concat(ts.isEntityNameExpression(expression) ? ts.entityNameToString(expression) : "...", ")")));
+                }
+            }
+            function isGlobalNaN(expr) {
+                if (ts.isIdentifier(expr) && expr.escapedText === "NaN") {
+                    var globalNaNSymbol = getGlobalNaNSymbol();
+                    return !!globalNaNSymbol && globalNaNSymbol === getResolvedSymbol(expr);
+                }
+                return false;
+            }
         }
         function getBaseTypesIfUnrelated(leftType, rightType, isRelated) {
             var effectiveLeft = leftType;
@@ -81797,7 +81882,7 @@ var ts;
             var indexSymbol = getIndexSymbol(getSymbolOfNode(node));
             if (indexSymbol === null || indexSymbol === void 0 ? void 0 : indexSymbol.declarations) {
                 var indexSignatureMap_1 = new ts.Map();
-                var _loop_29 = function (declaration) {
+                var _loop_30 = function (declaration) {
                     if (declaration.parameters.length === 1 && declaration.parameters[0].type) {
                         forEachType(getTypeFromTypeNode(declaration.parameters[0].type), function (type) {
                             var entry = indexSignatureMap_1.get(getTypeId(type));
@@ -81812,7 +81897,7 @@ var ts;
                 };
                 for (var _i = 0, _a = indexSymbol.declarations; _i < _a.length; _i++) {
                     var declaration = _a[_i];
-                    _loop_29(declaration);
+                    _loop_30(declaration);
                 }
                 indexSignatureMap_1.forEach(function (entry) {
                     if (entry.declarations.length > 1) {
@@ -85412,7 +85497,7 @@ var ts;
             var propDeclaration = declaration && declaration.kind === 223 /* SyntaxKind.BinaryExpression */ ||
                 name && name.kind === 164 /* SyntaxKind.ComputedPropertyName */ ? declaration : undefined;
             var localPropDeclaration = getParentOfSymbol(prop) === type.symbol ? declaration : undefined;
-            var _loop_30 = function (info) {
+            var _loop_31 = function (info) {
                 var localIndexDeclaration = info.declaration && getParentOfSymbol(getSymbolOfNode(info.declaration)) === type.symbol ? info.declaration : undefined;
                 // We check only when (a) the property is declared in the containing type, or (b) the applicable index signature is declared
                 // in the containing type, or (c) the containing type is an interface and no base interface contains both the property and
@@ -85429,7 +85514,7 @@ var ts;
             };
             for (var _i = 0, indexInfos_9 = indexInfos; _i < indexInfos_9.length; _i++) {
                 var info = indexInfos_9[_i];
-                _loop_30(info);
+                _loop_31(info);
             }
         }
         function checkIndexConstraintForIndexSignature(type, checkInfo) {
@@ -85437,7 +85522,7 @@ var ts;
             var indexInfos = getApplicableIndexInfos(type, checkInfo.keyType);
             var interfaceDeclaration = ts.getObjectFlags(type) & 2 /* ObjectFlags.Interface */ ? ts.getDeclarationOfKind(type.symbol, 261 /* SyntaxKind.InterfaceDeclaration */) : undefined;
             var localCheckDeclaration = declaration && getParentOfSymbol(getSymbolOfNode(declaration)) === type.symbol ? declaration : undefined;
-            var _loop_31 = function (info) {
+            var _loop_32 = function (info) {
                 if (info === checkInfo)
                     return "continue";
                 var localIndexDeclaration = info.declaration && getParentOfSymbol(getSymbolOfNode(info.declaration)) === type.symbol ? info.declaration : undefined;
@@ -85452,7 +85537,7 @@ var ts;
             };
             for (var _i = 0, indexInfos_10 = indexInfos; _i < indexInfos_10.length; _i++) {
                 var info = indexInfos_10[_i];
-                _loop_31(info);
+                _loop_32(info);
             }
         }
         function checkTypeNameIsReserved(name, message) {
@@ -85772,7 +85857,7 @@ var ts;
             var baseTypes = baseTypeNode && getBaseTypes(type);
             var baseWithThis = (baseTypes === null || baseTypes === void 0 ? void 0 : baseTypes.length) ? getTypeWithThisArgument(ts.first(baseTypes), type.thisType) : undefined;
             var baseStaticType = getBaseConstructorTypeOfClass(type);
-            var _loop_32 = function (member) {
+            var _loop_33 = function (member) {
                 if (ts.hasAmbientModifier(member)) {
                     return "continue";
                 }
@@ -85789,7 +85874,7 @@ var ts;
             };
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                _loop_32(member);
+                _loop_33(member);
             }
         }
         /**
@@ -85877,7 +85962,7 @@ var ts;
         function issueMemberSpecificError(node, typeWithThis, baseWithThis, broadDiag) {
             // iterate over all implemented properties and issue errors on each one which isn't compatible, rather than the class as a whole, if possible
             var issuedMemberError = false;
-            var _loop_33 = function (member) {
+            var _loop_34 = function (member) {
                 if (ts.isStatic(member)) {
                     return "continue";
                 }
@@ -85896,7 +85981,7 @@ var ts;
             };
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                _loop_33(member);
+                _loop_34(member);
             }
             if (!issuedMemberError) {
                 // check again with diagnostics to generate a less-specific error
@@ -85967,7 +86052,7 @@ var ts;
             var _a, _b, _c, _d;
             // NOTE: assignability is checked in checkClassDeclaration
             var baseProperties = getPropertiesOfType(baseType);
-            var _loop_34 = function (baseProperty) {
+            var _loop_35 = function (baseProperty) {
                 var base = getTargetSymbol(baseProperty);
                 if (base.flags & 4194304 /* SymbolFlags.Prototype */) {
                     return "continue";
@@ -86077,8 +86162,8 @@ var ts;
             };
             basePropertyCheck: for (var _i = 0, baseProperties_1 = baseProperties; _i < baseProperties_1.length; _i++) {
                 var baseProperty = baseProperties_1[_i];
-                var state_10 = _loop_34(baseProperty);
-                switch (state_10) {
+                var state_11 = _loop_35(baseProperty);
+                switch (state_11) {
                     case "continue-basePropertyCheck": continue basePropertyCheck;
                 }
             }
@@ -115319,6 +115404,7 @@ var ts;
             writeTrailingSemicolon();
         }
         function emitExportDeclaration(node) {
+            emitModifiers(node, node.modifiers);
             var nextPos = emitTokenWithComment(93 /* SyntaxKind.ExportKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             if (node.isTypeOnly) {
@@ -124921,7 +125007,7 @@ var ts;
             });
             // Sort by paths closest to importing file Name directory
             var sortedPaths = [];
-            var _loop_35 = function (directory) {
+            var _loop_36 = function (directory) {
                 var directoryStart = ts.ensureTrailingDirectorySeparator(directory);
                 var pathsInDirectory;
                 allFileNames.forEach(function (_a, fileName) {
@@ -124945,9 +125031,9 @@ var ts;
             };
             var out_directory_1;
             for (var directory = ts.getDirectoryPath(importingFileName); allFileNames.size !== 0;) {
-                var state_11 = _loop_35(directory);
+                var state_12 = _loop_36(directory);
                 directory = out_directory_1;
-                if (state_11 === "break")
+                if (state_12 === "break")
                     break;
             }
             if (allFileNames.size) {
@@ -125016,7 +125102,7 @@ var ts;
         }
         function tryGetModuleNameFromPaths(relativeToBaseUrl, paths, allowedEndings, host, compilerOptions) {
             for (var key in paths) {
-                var _loop_36 = function (patternText_1) {
+                var _loop_37 = function (patternText_1) {
                     var pattern = ts.normalizePath(patternText_1);
                     var indexOfStar = pattern.indexOf("*");
                     // In module resolution, if `pattern` itself has an extension, a file with that extension is looked up directly,
@@ -125083,9 +125169,9 @@ var ts;
                 };
                 for (var _i = 0, _a = paths[key]; _i < _a.length; _i++) {
                     var patternText_1 = _a[_i];
-                    var state_12 = _loop_36(patternText_1);
-                    if (typeof state_12 === "object")
-                        return state_12.value;
+                    var state_13 = _loop_37(patternText_1);
+                    if (typeof state_13 === "object")
+                        return state_13.value;
                 }
             }
             function validateEnding(_a) {
@@ -135424,7 +135510,7 @@ var ts;
             return (location === null || location === void 0 ? void 0 : location.kind) === 79 /* SyntaxKind.Identifier */ ? ts.createTextSpanFromNode(location) : undefined;
         }
         function completionInfoFromData(sourceFile, host, program, compilerOptions, log, completionData, preferences, formatContext, position) {
-            var symbols = completionData.symbols, contextToken = completionData.contextToken, completionKind = completionData.completionKind, isInSnippetScope = completionData.isInSnippetScope, isNewIdentifierLocation = completionData.isNewIdentifierLocation, location = completionData.location, propertyAccessToConvert = completionData.propertyAccessToConvert, keywordFilters = completionData.keywordFilters, literals = completionData.literals, symbolToOriginInfoMap = completionData.symbolToOriginInfoMap, recommendedCompletion = completionData.recommendedCompletion, isJsxInitializer = completionData.isJsxInitializer, isTypeOnlyLocation = completionData.isTypeOnlyLocation, isJsxIdentifierExpected = completionData.isJsxIdentifierExpected, isRightOfOpenTag = completionData.isRightOfOpenTag, importCompletionNode = completionData.importCompletionNode, insideJsDocTagTypeExpression = completionData.insideJsDocTagTypeExpression, symbolToSortTextMap = completionData.symbolToSortTextMap, hasUnresolvedAutoImports = completionData.hasUnresolvedAutoImports;
+            var symbols = completionData.symbols, contextToken = completionData.contextToken, completionKind = completionData.completionKind, isInSnippetScope = completionData.isInSnippetScope, isNewIdentifierLocation = completionData.isNewIdentifierLocation, location = completionData.location, propertyAccessToConvert = completionData.propertyAccessToConvert, keywordFilters = completionData.keywordFilters, literals = completionData.literals, symbolToOriginInfoMap = completionData.symbolToOriginInfoMap, recommendedCompletion = completionData.recommendedCompletion, isJsxInitializer = completionData.isJsxInitializer, isTypeOnlyLocation = completionData.isTypeOnlyLocation, isJsxIdentifierExpected = completionData.isJsxIdentifierExpected, isRightOfOpenTag = completionData.isRightOfOpenTag, importStatementCompletion = completionData.importStatementCompletion, insideJsDocTagTypeExpression = completionData.insideJsDocTagTypeExpression, symbolToSortTextMap = completionData.symbolToSortTextMap, hasUnresolvedAutoImports = completionData.hasUnresolvedAutoImports;
             // Verify if the file is JSX language variant
             if (ts.getLanguageVariant(sourceFile.scriptKind) === 1 /* LanguageVariant.JSX */) {
                 var completionInfo = getJsxClosingTagCompletion(location, sourceFile);
@@ -135438,7 +135524,7 @@ var ts;
                 return undefined;
             }
             var uniqueNames = getCompletionEntriesFromSymbols(symbols, entries, 
-            /*replacementToken*/ undefined, contextToken, location, sourceFile, host, program, ts.getEmitScriptTarget(compilerOptions), log, completionKind, preferences, compilerOptions, formatContext, isTypeOnlyLocation, propertyAccessToConvert, isJsxIdentifierExpected, isJsxInitializer, importCompletionNode, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap, isJsxIdentifierExpected, isRightOfOpenTag);
+            /*replacementToken*/ undefined, contextToken, location, sourceFile, host, program, ts.getEmitScriptTarget(compilerOptions), log, completionKind, preferences, compilerOptions, formatContext, isTypeOnlyLocation, propertyAccessToConvert, isJsxIdentifierExpected, isJsxInitializer, importStatementCompletion, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap, isJsxIdentifierExpected, isRightOfOpenTag);
             if (keywordFilters !== 0 /* KeywordCompletionFilters.None */) {
                 for (var _i = 0, _a = getKeywordCompletions(keywordFilters, !insideJsDocTagTypeExpression && ts.isSourceFileJS(sourceFile)); _i < _a.length; _i++) {
                     var keywordEntry = _a[_i];
@@ -135556,7 +135642,7 @@ var ts;
         function createCompletionEntryForLiteral(sourceFile, preferences, literal) {
             return { name: completionNameForLiteral(sourceFile, preferences, literal), kind: "string" /* ScriptElementKind.string */, kindModifiers: "" /* ScriptElementKindModifier.none */, sortText: Completions.SortText.LocationPriority };
         }
-        function createCompletionEntry(symbol, sortText, replacementToken, contextToken, location, sourceFile, host, program, name, needsConvertPropertyAccess, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, importCompletionNode, useSemicolons, options, preferences, completionKind, formatContext, isJsxIdentifierExpected, isRightOfOpenTag) {
+        function createCompletionEntry(symbol, sortText, replacementToken, contextToken, location, sourceFile, host, program, name, needsConvertPropertyAccess, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, importStatementCompletion, useSemicolons, options, preferences, completionKind, formatContext, isJsxIdentifierExpected, isRightOfOpenTag) {
             var _a, _b;
             var insertText;
             var replacementSpan = ts.getReplacementSpanForContextToken(replacementToken);
@@ -135612,8 +135698,8 @@ var ts;
             }
             if (originIsResolvedExport(origin)) {
                 sourceDisplay = [ts.textPart(origin.moduleSpecifier)];
-                if (importCompletionNode) {
-                    (_a = getInsertTextAndReplacementSpanForImportCompletion(name, importCompletionNode, contextToken, origin, useSemicolons, options, preferences), insertText = _a.insertText, replacementSpan = _a.replacementSpan);
+                if (importStatementCompletion) {
+                    (_a = getInsertTextAndReplacementSpanForImportCompletion(name, importStatementCompletion, origin, useSemicolons, sourceFile, options, preferences), insertText = _a.insertText, replacementSpan = _a.replacementSpan);
                     isSnippet = preferences.includeCompletionsWithSnippetText ? true : undefined;
                 }
             }
@@ -135668,7 +135754,7 @@ var ts;
             }
             if (originIsExport(origin) || originIsResolvedExport(origin)) {
                 data = originToCompletionEntryData(origin);
-                hasAction = !importCompletionNode;
+                hasAction = !importStatementCompletion;
             }
             // TODO(drosen): Right now we just permit *all* semantic meanings when calling
             // 'getSymbolKind' which is permissible given that it is backwards compatible; but
@@ -135691,7 +135777,7 @@ var ts;
                 labelDetails: labelDetails,
                 isSnippet: isSnippet,
                 isPackageJsonImport: originIsPackageJsonImport(origin) || undefined,
-                isImportStatementCompletion: !!importCompletionNode || undefined,
+                isImportStatementCompletion: !!importStatementCompletion || undefined,
                 data: data,
             };
         }
@@ -136063,19 +136149,16 @@ var ts;
             };
             return unresolvedOrigin;
         }
-        function getInsertTextAndReplacementSpanForImportCompletion(name, importCompletionNode, contextToken, origin, useSemicolons, options, preferences) {
-            var _a, _b, _c;
-            var sourceFile = importCompletionNode.getSourceFile();
-            var replacementSpan = ts.createTextSpanFromNode(ts.findAncestor(importCompletionNode, ts.or(ts.isImportDeclaration, ts.isImportEqualsDeclaration)) || importCompletionNode, sourceFile);
+        function getInsertTextAndReplacementSpanForImportCompletion(name, importStatementCompletion, origin, useSemicolons, sourceFile, options, preferences) {
+            var replacementSpan = importStatementCompletion.replacementSpan;
             var quotedModuleSpecifier = ts.quote(sourceFile, preferences, origin.moduleSpecifier);
             var exportKind = origin.isDefaultExport ? 1 /* ExportKind.Default */ :
                 origin.exportName === "export=" /* InternalSymbolName.ExportEquals */ ? 2 /* ExportKind.ExportEquals */ :
                     0 /* ExportKind.Named */;
             var tabStop = preferences.includeCompletionsWithSnippetText ? "$1" : "";
             var importKind = ts.codefix.getImportKind(sourceFile, exportKind, options, /*forceImportKeyword*/ true);
-            var isTopLevelTypeOnly = ((_b = (_a = ts.tryCast(importCompletionNode, ts.isImportDeclaration)) === null || _a === void 0 ? void 0 : _a.importClause) === null || _b === void 0 ? void 0 : _b.isTypeOnly) || ((_c = ts.tryCast(importCompletionNode, ts.isImportEqualsDeclaration)) === null || _c === void 0 ? void 0 : _c.isTypeOnly);
-            var isImportSpecifierTypeOnly = couldBeTypeOnlyImportSpecifier(importCompletionNode, contextToken);
-            var topLevelTypeOnlyText = isTopLevelTypeOnly ? " ".concat(ts.tokenToString(154 /* SyntaxKind.TypeKeyword */), " ") : " ";
+            var isImportSpecifierTypeOnly = importStatementCompletion.couldBeTypeOnlyImportSpecifier;
+            var topLevelTypeOnlyText = importStatementCompletion.isTopLevelTypeOnly ? " ".concat(ts.tokenToString(154 /* SyntaxKind.TypeKeyword */), " ") : " ";
             var importSpecifierTypeOnlyText = isImportSpecifierTypeOnly ? "".concat(ts.tokenToString(154 /* SyntaxKind.TypeKeyword */), " ") : "";
             var suffix = useSemicolons ? ";" : "";
             switch (importKind) {
@@ -136109,7 +136192,7 @@ var ts;
                 return CompletionSource.TypeOnlyAlias;
             }
         }
-        function getCompletionEntriesFromSymbols(symbols, entries, replacementToken, contextToken, location, sourceFile, host, program, target, log, kind, preferences, compilerOptions, formatContext, isTypeOnlyLocation, propertyAccessToConvert, jsxIdentifierExpected, isJsxInitializer, importCompletionNode, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap, isJsxIdentifierExpected, isRightOfOpenTag) {
+        function getCompletionEntriesFromSymbols(symbols, entries, replacementToken, contextToken, location, sourceFile, host, program, target, log, kind, preferences, compilerOptions, formatContext, isTypeOnlyLocation, propertyAccessToConvert, jsxIdentifierExpected, isJsxInitializer, importStatementCompletion, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap, isJsxIdentifierExpected, isRightOfOpenTag) {
             var _a;
             var start = ts.timestamp();
             var variableDeclaration = getVariableDeclaration(location);
@@ -136130,7 +136213,7 @@ var ts;
                 var name = info.name, needsConvertPropertyAccess = info.needsConvertPropertyAccess;
                 var originalSortText = (_a = symbolToSortTextMap === null || symbolToSortTextMap === void 0 ? void 0 : symbolToSortTextMap[ts.getSymbolId(symbol)]) !== null && _a !== void 0 ? _a : Completions.SortText.LocationPriority;
                 var sortText = (isDeprecated(symbol, typeChecker) ? Completions.SortText.Deprecated(originalSortText) : originalSortText);
-                var entry = createCompletionEntry(symbol, sortText, replacementToken, contextToken, location, sourceFile, host, program, name, needsConvertPropertyAccess, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, importCompletionNode, useSemicolons, compilerOptions, preferences, kind, formatContext, isJsxIdentifierExpected, isRightOfOpenTag);
+                var entry = createCompletionEntry(symbol, sortText, replacementToken, contextToken, location, sourceFile, host, program, name, needsConvertPropertyAccess, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, importStatementCompletion, useSemicolons, compilerOptions, preferences, kind, formatContext, isJsxIdentifierExpected, isRightOfOpenTag);
                 if (!entry) {
                     continue;
                 }
@@ -136321,7 +136404,7 @@ var ts;
         Completions.createCompletionDetails = createCompletionDetails;
         function getCompletionEntryCodeActionsAndSourceDisplay(name, location, contextToken, origin, symbol, program, host, compilerOptions, sourceFile, position, previousToken, formatContext, preferences, data, source, cancellationToken) {
             if (data === null || data === void 0 ? void 0 : data.moduleSpecifier) {
-                if (previousToken && getImportStatementCompletionInfo(contextToken || previousToken).replacementNode) {
+                if (previousToken && getImportStatementCompletionInfo(contextToken || previousToken).replacementSpan) {
                     // Import statement completion: 'import c|'
                     return { codeActions: undefined, sourceDisplay: [ts.textPart(data.moduleSpecifier)] };
                 }
@@ -136522,34 +136605,34 @@ var ts;
             var isStartingCloseTag = false;
             var isJsxInitializer = false;
             var isJsxIdentifierExpected = false;
-            var importCompletionNode;
+            var importStatementCompletion;
             var location = ts.getTouchingPropertyName(sourceFile, position);
             var keywordFilters = 0 /* KeywordCompletionFilters.None */;
             var isNewIdentifierLocation = false;
             var flags = 0 /* CompletionInfoFlags.None */;
             if (contextToken) {
-                var importStatementCompletion = getImportStatementCompletionInfo(contextToken);
-                isNewIdentifierLocation = importStatementCompletion.isNewIdentifierLocation;
-                if (importStatementCompletion.keywordCompletion) {
-                    if (importStatementCompletion.isKeywordOnlyCompletion) {
+                var importStatementCompletionInfo = getImportStatementCompletionInfo(contextToken);
+                if (importStatementCompletionInfo.keywordCompletion) {
+                    if (importStatementCompletionInfo.isKeywordOnlyCompletion) {
                         return {
                             kind: 4 /* CompletionDataKind.Keywords */,
-                            keywordCompletions: [keywordToCompletionEntry(importStatementCompletion.keywordCompletion)],
-                            isNewIdentifierLocation: isNewIdentifierLocation,
+                            keywordCompletions: [keywordToCompletionEntry(importStatementCompletionInfo.keywordCompletion)],
+                            isNewIdentifierLocation: importStatementCompletionInfo.isNewIdentifierLocation,
                         };
                     }
-                    keywordFilters = keywordFiltersFromSyntaxKind(importStatementCompletion.keywordCompletion);
+                    keywordFilters = keywordFiltersFromSyntaxKind(importStatementCompletionInfo.keywordCompletion);
                 }
-                if (importStatementCompletion.replacementNode && preferences.includeCompletionsForImportStatements && preferences.includeCompletionsWithInsertText) {
+                if (importStatementCompletionInfo.replacementSpan && preferences.includeCompletionsForImportStatements && preferences.includeCompletionsWithInsertText) {
                     // Import statement completions use `insertText`, and also require the `data` property of `CompletionEntryIdentifier`
                     // added in TypeScript 4.3 to be sent back from the client during `getCompletionEntryDetails`. Since this feature
                     // is not backward compatible with older clients, the language service defaults to disabling it, allowing newer clients
                     // to opt in with the `includeCompletionsForImportStatements` user preference.
-                    importCompletionNode = importStatementCompletion.replacementNode;
                     flags |= 2 /* CompletionInfoFlags.IsImportStatementCompletion */;
+                    importStatementCompletion = importStatementCompletionInfo;
+                    isNewIdentifierLocation = importStatementCompletionInfo.isNewIdentifierLocation;
                 }
                 // Bail out if this is a known invalid completion location
-                if (!importCompletionNode && isCompletionListBlocker(contextToken)) {
+                if (!importStatementCompletionInfo.replacementSpan && isCompletionListBlocker(contextToken)) {
                     log("Returning an empty list because completion was requested in an invalid position.");
                     return keywordFilters
                         ? keywordCompletionData(keywordFilters, isJsOnlyLocation, isNewIdentifierDefinitionLocation())
@@ -136595,7 +136678,7 @@ var ts;
                             return undefined;
                     }
                 }
-                else if (!importCompletionNode && sourceFile.languageVariant === 1 /* LanguageVariant.JSX */) {
+                else if (!importStatementCompletion) {
                     // <UI.Test /* completion position */ />
                     // If the tagname is a property access expression, we will then walk up to the top most of property access expression.
                     // Then, try to get a JSX container and its associated attributes type.
@@ -136738,7 +136821,7 @@ var ts;
                 isTypeOnlyLocation: isTypeOnlyLocation,
                 isJsxIdentifierExpected: isJsxIdentifierExpected,
                 isRightOfOpenTag: isRightOfOpenTag,
-                importCompletionNode: importCompletionNode,
+                importStatementCompletion: importStatementCompletion,
                 hasUnresolvedAutoImports: hasUnresolvedAutoImports,
                 flags: flags,
             };
@@ -136992,7 +137075,7 @@ var ts;
                 return 1 /* GlobalsSearch.Success */;
             }
             function tryGetImportCompletionSymbols() {
-                if (!importCompletionNode)
+                if (!importStatementCompletion)
                     return 0 /* GlobalsSearch.Continue */;
                 isNewIdentifierLocation = true;
                 collectAutoImports();
@@ -137075,7 +137158,7 @@ var ts;
             }
             function shouldOfferImportCompletions() {
                 // If already typing an import statement, provide completions for it.
-                if (importCompletionNode)
+                if (importStatementCompletion)
                     return true;
                 // If current completion is for non-contextual Object literal shortahands, ignore auto-import symbols
                 if (isNonContextualObjectLiteral)
@@ -137105,7 +137188,7 @@ var ts;
             }
             function isTypeOnlyCompletion() {
                 return insideJsDocTagTypeExpression
-                    || !!importCompletionNode && ts.isTypeOnlyImportOrExportDeclaration(location.parent)
+                    || !!importStatementCompletion && ts.isTypeOnlyImportOrExportDeclaration(location.parent)
                     || !isContextTokenValueLocation(contextToken) &&
                         (ts.isPossiblyTypeArgumentPosition(contextToken, sourceFile, typeChecker)
                             || ts.isPartOfTypeNode(location)
@@ -137155,8 +137238,7 @@ var ts;
                 flags |= 1 /* CompletionInfoFlags.MayIncludeAutoImports */;
                 // import { type | -> token text should be blank
                 var isAfterTypeOnlyImportSpecifierModifier = previousToken === contextToken
-                    && importCompletionNode
-                    && couldBeTypeOnlyImportSpecifier(importCompletionNode, contextToken);
+                    && importStatementCompletion;
                 var lowerCaseTokenText = isAfterTypeOnlyImportSpecifierModifier ? "" :
                     previousToken && ts.isIdentifier(previousToken) ? previousToken.text.toLowerCase() :
                         "";
@@ -137164,14 +137246,14 @@ var ts;
                 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) {
+                resolvingModuleSpecifiers("collectAutoImports", host, importSpecifierResolver || (importSpecifierResolver = ts.codefix.createImportSpecifierResolver(sourceFile, program, host, preferences)), program, position, preferences, !!importStatementCompletion, ts.isValidTypeOnlyAliasUseSite(location), function (context) {
                     exportInfo.search(sourceFile.path, 
                     /*preferCapitalized*/ isRightOfOpenTag, function (symbolName, targetFlags) {
                         if (!ts.isIdentifierText(symbolName, ts.getEmitScriptTarget(host.getCompilationSettings())))
                             return false;
                         if (!detailsEntryId && ts.isStringANonContextualKeyword(symbolName))
                             return false;
-                        if (!isTypeOnlyLocation && !importCompletionNode && !(targetFlags & 111551 /* SymbolFlags.Value */))
+                        if (!isTypeOnlyLocation && !importStatementCompletion && !(targetFlags & 111551 /* SymbolFlags.Value */))
                             return false;
                         if (isTypeOnlyLocation && !(targetFlags & (1536 /* SymbolFlags.Module */ | 788968 /* SymbolFlags.Type */)))
                             return false;
@@ -137252,7 +137334,7 @@ var ts;
                     return;
                 }
                 symbolToOriginInfoMap[symbols.length] = origin;
-                symbolToSortTextMap[symbolId] = importCompletionNode ? Completions.SortText.LocationPriority : Completions.SortText.AutoImportSuggestions;
+                symbolToSortTextMap[symbolId] = importStatementCompletion ? Completions.SortText.LocationPriority : Completions.SortText.AutoImportSuggestions;
                 symbols.push(symbol);
             }
             /* Mutates `symbols` and `symbolToOriginInfoMap`. */
@@ -138519,6 +138601,7 @@ var ts;
             return undefined;
         }
         function getImportStatementCompletionInfo(contextToken) {
+            var _a, _b, _c;
             var keywordCompletion;
             var isKeywordOnlyCompletion = false;
             var candidate = getCandidate();
@@ -138526,9 +138609,9 @@ var ts;
                 isKeywordOnlyCompletion: isKeywordOnlyCompletion,
                 keywordCompletion: keywordCompletion,
                 isNewIdentifierLocation: !!(candidate || keywordCompletion === 154 /* SyntaxKind.TypeKeyword */),
-                replacementNode: candidate && ts.rangeIsOnSingleLine(candidate, candidate.getSourceFile())
-                    ? candidate
-                    : undefined
+                isTopLevelTypeOnly: !!((_b = (_a = ts.tryCast(candidate, ts.isImportDeclaration)) === null || _a === void 0 ? void 0 : _a.importClause) === null || _b === void 0 ? void 0 : _b.isTypeOnly) || !!((_c = ts.tryCast(candidate, ts.isImportEqualsDeclaration)) === null || _c === void 0 ? void 0 : _c.isTypeOnly),
+                couldBeTypeOnlyImportSpecifier: !!candidate && couldBeTypeOnlyImportSpecifier(candidate, contextToken),
+                replacementSpan: getSingleLineReplacementSpanForImportCompletionNode(candidate),
             };
             function getCandidate() {
                 var parent = contextToken.parent;
@@ -138570,14 +138653,71 @@ var ts;
                 return undefined;
             }
         }
+        function getSingleLineReplacementSpanForImportCompletionNode(node) {
+            var _a, _b, _c;
+            if (!node)
+                return undefined;
+            var top = (_a = ts.findAncestor(node, ts.or(ts.isImportDeclaration, ts.isImportEqualsDeclaration))) !== null && _a !== void 0 ? _a : node;
+            var sourceFile = top.getSourceFile();
+            if (ts.rangeIsOnSingleLine(top, sourceFile)) {
+                return ts.createTextSpanFromNode(top, sourceFile);
+            }
+            // ImportKeyword was necessarily on one line; ImportSpecifier was necessarily parented in an ImportDeclaration
+            ts.Debug.assert(top.kind !== 100 /* SyntaxKind.ImportKeyword */ && top.kind !== 273 /* SyntaxKind.ImportSpecifier */);
+            // Guess which point in the import might actually be a later statement parsed as part of the import
+            // during parser recovery - either in the middle of named imports, or the module specifier.
+            var potentialSplitPoint = top.kind === 269 /* SyntaxKind.ImportDeclaration */
+                ? (_c = getPotentiallyInvalidImportSpecifier((_b = top.importClause) === null || _b === void 0 ? void 0 : _b.namedBindings)) !== null && _c !== void 0 ? _c : top.moduleSpecifier
+                : top.moduleReference;
+            var withoutModuleSpecifier = {
+                pos: top.getFirstToken().getStart(),
+                end: potentialSplitPoint.pos,
+            };
+            // The module specifier/reference was previously found to be missing, empty, or
+            // not a string literal - in this last case, it's likely that statement on a following
+            // line was parsed as the module specifier of a partially-typed import, e.g.
+            //   import Foo|
+            //   interface Blah {}
+            // This appears to be a multiline-import, and editors can't replace multiple lines.
+            // But if everything but the "module specifier" is on one line, by this point we can
+            // assume that the "module specifier" is actually just another statement, and return
+            // the single-line range of the import excluding that probable statement.
+            if (ts.rangeIsOnSingleLine(withoutModuleSpecifier, sourceFile)) {
+                return ts.createTextSpanFromRange(withoutModuleSpecifier);
+            }
+        }
+        // Tries to identify the first named import that is not really a named import, but rather
+        // just parser recovery for a situation like:
+        //   import { Foo|
+        //   interface Bar {}
+        // in which `Foo`, `interface`, and `Bar` are all parsed as import specifiers. The caller
+        // will also check if this token is on a separate line from the rest of the import.
+        function getPotentiallyInvalidImportSpecifier(namedBindings) {
+            var _a;
+            return ts.find((_a = ts.tryCast(namedBindings, ts.isNamedImports)) === null || _a === void 0 ? void 0 : _a.elements, function (e) {
+                var _a;
+                return !e.propertyName &&
+                    ts.isStringANonContextualKeyword(e.name.text) &&
+                    ((_a = ts.findPrecedingToken(e.name.pos, namedBindings.getSourceFile(), namedBindings)) === null || _a === void 0 ? void 0 : _a.kind) !== 27 /* SyntaxKind.CommaToken */;
+            });
+        }
         function couldBeTypeOnlyImportSpecifier(importSpecifier, contextToken) {
             return ts.isImportSpecifier(importSpecifier)
                 && (importSpecifier.isTypeOnly || contextToken === importSpecifier.name && ts.isTypeKeywordTokenOrIdentifier(contextToken));
         }
         function canCompleteFromNamedBindings(namedBindings) {
-            return isModuleSpecifierMissingOrEmpty(namedBindings.parent.parent.moduleSpecifier)
-                && (ts.isNamespaceImport(namedBindings) || namedBindings.elements.length < 2)
-                && !namedBindings.parent.name;
+            if (!isModuleSpecifierMissingOrEmpty(namedBindings.parent.parent.moduleSpecifier) || namedBindings.parent.name) {
+                return false;
+            }
+            if (ts.isNamedImports(namedBindings)) {
+                // We can only complete on named imports if there are no other named imports already,
+                // but parser recovery sometimes puts later statements in the named imports list, so
+                // we try to only consider the probably-valid ones.
+                var invalidNamedImport = getPotentiallyInvalidImportSpecifier(namedBindings);
+                var validImports = invalidNamedImport ? namedBindings.elements.indexOf(invalidNamedImport) : namedBindings.elements.length;
+                return validImports < 2;
+            }
+            return true;
         }
         function isModuleSpecifierMissingOrEmpty(specifier) {
             var _a;
@@ -146612,6 +146752,10 @@ var ts;
                         pushSelectionCommentRange(comment.pos, comment.end);
                     }
                     if (positionShouldSnapToNode(sourceFile, pos, node)) {
+                        if (ts.isFunctionBody(node)
+                            && ts.isFunctionLikeDeclaration(parentNode) && !ts.positionsAreOnSameLine(node.getStart(sourceFile), node.getEnd(), sourceFile)) {
+                            pushSelectionRange(node.getStart(sourceFile), node.getEnd());
+                        }
                         // 1. Blocks are effectively redundant with SyntaxLists.
                         // 2. TemplateSpans, along with the SyntaxLists containing them, are a somewhat unintuitive grouping
                         //    of things that should be considered independently.
@@ -157310,7 +157454,7 @@ var ts;
             var related = ts.find(diag.relatedInformation, function (related) { return related.code === ts.Diagnostics.This_type_parameter_might_need_an_extends_0_constraint.code; });
             if (related === undefined || related.file === undefined || related.start === undefined || related.length === undefined)
                 return;
-            var declaration = findAncestorMatchingSpan(related.file, ts.createTextSpan(related.start, related.length));
+            var declaration = codefix.findAncestorMatchingSpan(related.file, ts.createTextSpan(related.start, related.length));
             if (declaration === undefined)
                 return;
             if (ts.isIdentifier(declaration) && ts.isTypeParameterDeclaration(declaration.parent)) {
@@ -157344,14 +157488,6 @@ var ts;
                 }
             }
         }
-        function findAncestorMatchingSpan(sourceFile, span) {
-            var end = ts.textSpanEnd(span);
-            var token = ts.getTokenAtPosition(sourceFile, span.start);
-            while (token.end < end) {
-                token = token.parent;
-            }
-            return token;
-        }
         function tryGetConstraintFromDiagnosticMessage(messageText) {
             var _a = ts.flattenDiagnosticMessageText(messageText, "\n", 0).match(/`extends (.*)`/) || [], _ = _a[0], constraint = _a[1];
             return constraint;
@@ -158232,7 +158368,7 @@ var ts;
                 return { kind: InfoKind.TypeLikeDeclaration, token: token, call: call, modifierFlags: modifierFlags, parentDeclaration: declaration, declSourceFile: declSourceFile, isJSFile: isJSFile };
             }
             var enumDeclaration = ts.find(symbol.declarations, ts.isEnumDeclaration);
-            if (enumDeclaration && !ts.isPrivateIdentifier(token) && !isSourceFileFromLibrary(program, enumDeclaration.getSourceFile())) {
+            if (enumDeclaration && !(leftExpressionType.flags & 1056 /* TypeFlags.EnumLike */) && !ts.isPrivateIdentifier(token) && !isSourceFileFromLibrary(program, enumDeclaration.getSourceFile())) {
                 return { kind: InfoKind.Enum, token: token, parentDeclaration: enumDeclaration };
             }
             return undefined;
@@ -158897,6 +159033,63 @@ var ts;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "fixNaNEquality";
+        var errorCodes = [
+            ts.Diagnostics.This_condition_will_always_return_0.code,
+        ];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var sourceFile = context.sourceFile, span = context.span, program = context.program;
+                var info = getInfo(program, sourceFile, span);
+                if (info === undefined)
+                    return;
+                var suggestion = info.suggestion, expression = info.expression, arg = info.arg;
+                var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(t, sourceFile, arg, expression); });
+                return [codefix.createCodeFixAction(fixId, changes, [ts.Diagnostics.Use_0, suggestion], fixId, ts.Diagnostics.Use_Number_isNaN_in_all_conditions)];
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) {
+                return codefix.codeFixAll(context, errorCodes, function (changes, diag) {
+                    var info = getInfo(context.program, diag.file, ts.createTextSpan(diag.start, diag.length));
+                    if (info) {
+                        doChange(changes, diag.file, info.arg, info.expression);
+                    }
+                });
+            }
+        });
+        function getInfo(program, sourceFile, span) {
+            var diag = ts.find(program.getSemanticDiagnostics(sourceFile), function (diag) { return diag.start === span.start && diag.length === span.length; });
+            if (diag === undefined || diag.relatedInformation === undefined)
+                return;
+            var related = ts.find(diag.relatedInformation, function (related) { return related.code === ts.Diagnostics.Did_you_mean_0.code; });
+            if (related === undefined || related.file === undefined || related.start === undefined || related.length === undefined)
+                return;
+            var token = codefix.findAncestorMatchingSpan(related.file, ts.createTextSpan(related.start, related.length));
+            if (token === undefined)
+                return;
+            if (ts.isExpression(token) && ts.isBinaryExpression(token.parent)) {
+                return { suggestion: getSuggestion(related.messageText), expression: token.parent, arg: token };
+            }
+            return undefined;
+        }
+        function doChange(changes, sourceFile, arg, expression) {
+            var callExpression = ts.factory.createCallExpression(ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier("Number"), ts.factory.createIdentifier("isNaN")), /*typeArguments*/ undefined, [arg]);
+            var operator = expression.operatorToken.kind;
+            changes.replaceNode(sourceFile, expression, operator === 37 /* SyntaxKind.ExclamationEqualsEqualsToken */ || operator === 35 /* SyntaxKind.ExclamationEqualsToken */
+                ? ts.factory.createPrefixUnaryExpression(53 /* SyntaxKind.ExclamationToken */, callExpression) : callExpression);
+        }
+        function getSuggestion(messageText) {
+            var _a = ts.flattenDiagnosticMessageText(messageText, "\n", 0).match(/\'(.*)\'/) || [], _ = _a[0], suggestion = _a[1];
+            return suggestion;
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
 (function (ts) {
     var codefix;
     (function (codefix) {
@@ -161614,6 +161807,15 @@ var ts;
             symbols.forEach(function (s) { return importAdder.addImportFromExportedSymbol(s, /*isValidTypeOnlyUseSite*/ true); });
         }
         codefix.importSymbols = importSymbols;
+        function findAncestorMatchingSpan(sourceFile, span) {
+            var end = ts.textSpanEnd(span);
+            var token = ts.getTokenAtPosition(sourceFile, span.start);
+            while (token.end < end) {
+                token = token.parent;
+            }
+            return token;
+        }
+        codefix.findAncestorMatchingSpan = findAncestorMatchingSpan;
     })(codefix = ts.codefix || (ts.codefix = {}));
 })(ts || (ts = {}));
 /* @internal */