typescript 4.7.0-dev.20220227 → 4.7.0-dev.20220302

package/lib/lib.es2020.bigint.d.ts

@@ -18,6 +18,8 @@ and limitations under the License.
 /// <reference no-default-lib="true"/>
 
 
+/// <reference lib="es2020.intl" />
+
 interface BigIntToLocaleStringOptions {
     /**
      * The locale matching algorithm to use.The default is "best fit". For information about this option, see the {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl#Locale_negotiation Intl page}.
@@ -112,7 +114,7 @@ interface BigInt {
     toString(radix?: number): string;
 
     /** Returns a string representation appropriate to the host environment's current locale. */
-    toLocaleString(locales?: string, options?: BigIntToLocaleStringOptions): string;
+    toLocaleString(locales?: Intl.LocalesArgument, options?: BigIntToLocaleStringOptions): string;
 
     /** Returns the primitive value of the specified object. */
     valueOf(): bigint;

package/lib/lib.es2020.d.ts

@@ -20,6 +20,8 @@ and limitations under the License.
 
 /// <reference lib="es2019" />
 /// <reference lib="es2020.bigint" />
+/// <reference lib="es2020.date" />
+/// <reference lib="es2020.number" />
 /// <reference lib="es2020.promise" />
 /// <reference lib="es2020.sharedmemory" />
 /// <reference lib="es2020.string" />

package/lib/lib.es2020.date.d.ts

@@ -0,0 +1,44 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0
+
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+MERCHANTABLITY OR NON-INFRINGEMENT.
+
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+
+
+/// <reference no-default-lib="true"/>
+
+
+/// <reference lib="es2020.intl" />
+
+interface Date {
+    /**
+     * Converts a date and time to a string by using the current or specified locale.
+     * @param locales A locale string, array of locale strings, Intl.Locale object, or array of Intl.Locale objects that contain one or more language or locale tags. If you include more than one locale string, list them in descending order of priority so that the first entry is the preferred locale. If you omit this parameter, the default locale of the JavaScript runtime is used.
+     * @param options An object that contains one or more properties that specify comparison options.
+     */
+    toLocaleString(locales?: Intl.LocalesArgument, options?: Intl.DateTimeFormatOptions): string;
+
+    /**
+     * Converts a date to a string by using the current or specified locale.
+     * @param locales A locale string, array of locale strings, Intl.Locale object, or array of Intl.Locale objects that contain one or more language or locale tags. If you include more than one locale string, list them in descending order of priority so that the first entry is the preferred locale. If you omit this parameter, the default locale of the JavaScript runtime is used.
+     * @param options An object that contains one or more properties that specify comparison options.
+     */
+    toLocaleDateString(locales?: Intl.LocalesArgument, options?: Intl.DateTimeFormatOptions): string;
+
+    /**
+     * Converts a time to a string by using the current or specified locale.
+     * @param locales A locale string, array of locale strings, Intl.Locale object, or array of Intl.Locale objects that contain one or more language or locale tags. If you include more than one locale string, list them in descending order of priority so that the first entry is the preferred locale. If you omit this parameter, the default locale of the JavaScript runtime is used.
+     * @param options An object that contains one or more properties that specify comparison options.
+     */
+    toLocaleTimeString(locales?: Intl.LocalesArgument, options?: Intl.DateTimeFormatOptions): string;
+}

package/lib/lib.es2020.intl.d.ts

@@ -78,6 +78,13 @@ declare namespace Intl {
      */
     type BCP47LanguageTag = string;
 
+    /**
+     * The locale(s) to use
+     *
+     * [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl#locales_argument).
+     */
+    type LocalesArgument = UnicodeBCP47LocaleIdentifier | UnicodeBCP47LocaleIdentifier[] | Locale | Locale[] | undefined;
+
     /**
      * An object with some or all of properties of `options` parameter
      * of `Intl.RelativeTimeFormat` constructor.

package/lib/lib.es2020.number.d.ts

@@ -0,0 +1,30 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0
+
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+MERCHANTABLITY OR NON-INFRINGEMENT.
+
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+
+
+/// <reference no-default-lib="true"/>
+
+
+/// <reference lib="es2020.intl" />
+
+interface Number {
+    /**
+     * Converts a number to a string by using the current or specified locale.
+     * @param locales A locale string, array of locale strings, Intl.Locale object, or array of Intl.Locale objects that contain one or more language or locale tags. If you include more than one locale string, list them in descending order of priority so that the first entry is the preferred locale. If you omit this parameter, the default locale of the JavaScript runtime is used.
+     * @param options An object that contains one or more properties that specify comparison options.
+     */
+    toLocaleString(locales?: Intl.LocalesArgument, options?: Intl.NumberFormatOptions): string;
+}

package/lib/tsc.js

@@ -69,7 +69,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var ts;
 (function (ts) {
     ts.versionMajorMinor = "4.7";
-    ts.version = ts.versionMajorMinor + ".0-dev.20220227";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220302";
     var NativeCollections;
     (function (NativeCollections) {
         var globals = typeof globalThis !== "undefined" ? globalThis :
@@ -25279,9 +25279,7 @@ var ts;
                 return;
             }
             if (initializer) {
-                if (token() === 18) {
-                    parseErrorAtCurrentToken(ts.Diagnostics._0_expected, ts.tokenToString(26));
-                }
+                parseErrorAtCurrentToken(ts.Diagnostics._0_expected, ts.tokenToString(26));
                 return;
             }
             parseErrorForMissingSemicolonAfter(name);
@@ -30944,11 +30942,13 @@ var ts;
         ["es2019.string", "lib.es2019.string.d.ts"],
         ["es2019.symbol", "lib.es2019.symbol.d.ts"],
         ["es2020.bigint", "lib.es2020.bigint.d.ts"],
+        ["es2020.date", "lib.es2020.date.d.ts"],
         ["es2020.promise", "lib.es2020.promise.d.ts"],
         ["es2020.sharedmemory", "lib.es2020.sharedmemory.d.ts"],
         ["es2020.string", "lib.es2020.string.d.ts"],
         ["es2020.symbol.wellknown", "lib.es2020.symbol.wellknown.d.ts"],
         ["es2020.intl", "lib.es2020.intl.d.ts"],
+        ["es2020.number", "lib.es2020.number.d.ts"],
         ["es2021.promise", "lib.es2021.promise.d.ts"],
         ["es2021.string", "lib.es2021.string.d.ts"],
         ["es2021.weakref", "lib.es2021.weakref.d.ts"],
@@ -45581,8 +45581,8 @@ var ts;
             var memberDeclaration = root.kind === 163 ? root.parent : root;
             return isPrivateWithinAmbient(memberDeclaration);
         }
-        function tryGetTypeFromEffectiveTypeNode(declaration) {
-            var typeNode = ts.getEffectiveTypeAnnotationNode(declaration);
+        function tryGetTypeFromEffectiveTypeNode(node) {
+            var typeNode = ts.getEffectiveTypeAnnotationNode(node);
             if (typeNode) {
                 return getTypeFromTypeNode(typeNode);
             }
@@ -51786,7 +51786,7 @@ var ts;
                     var checkType_1 = root.checkType;
                     var distributionType = root.isDistributive ? getMappedType(checkType_1, newMapper_1) : undefined;
                     result = distributionType && checkType_1 !== distributionType && distributionType.flags & (1048576 | 131072) ?
-                        mapTypeWithAlias(distributionType, function (t) { return getConditionalType(root, prependTypeMapping(checkType_1, t, newMapper_1)); }, aliasSymbol, aliasTypeArguments) :
+                        mapTypeWithAlias(getReducedType(distributionType), function (t) { return getConditionalType(root, prependTypeMapping(checkType_1, t, newMapper_1)); }, aliasSymbol, aliasTypeArguments) :
                         getConditionalType(root, newMapper_1, aliasSymbol, aliasTypeArguments);
                     root.instantiations.set(id, result);
                 }
@@ -54127,8 +54127,8 @@ var ts;
                     }
                     return 0;
                 }
-                if ((relation === subtypeRelation || relation === strictSubtypeRelation) &&
-                    !!(sourcePropFlags & 64) && !(targetPropFlags & 64)) {
+                if (relation === strictSubtypeRelation &&
+                    isReadonlySymbol(sourceProp) && !isReadonlySymbol(targetProp)) {
                     return 0;
                 }
                 var related = isPropertySymbolTypeRelated(sourceProp, targetProp, getTypeOfSourceProperty, reportErrors, intersectionState);
@@ -59756,6 +59756,8 @@ var ts;
                 }
                 case 229:
                     return getContextualType(parent, contextFlags);
+                case 270:
+                    return tryGetTypeFromEffectiveTypeNode(parent);
                 case 287:
                     return getContextualTypeForJsxExpression(parent);
                 case 284:

package/lib/tsserver.js

@@ -100,7 +100,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.20220227";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220302";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -31377,18 +31377,8 @@ var ts;
             if (tryParseSemicolon()) {
                 return;
             }
-            // If an initializer was parsed but there is still an error in finding the next semicolon,
-            // we generally know there was an error already reported in the initializer...
-            //   class Example { a = new Map([), ) }
-            //                                ~
             if (initializer) {
-                // ...unless we've found the start of a block after a property declaration, in which
-                // case we can know that regardless of the initializer we should complain on the block.
-                //   class Example { a = 0 {} }
-                //                         ~
-                if (token() === 18 /* OpenBraceToken */) {
-                    parseErrorAtCurrentToken(ts.Diagnostics._0_expected, ts.tokenToString(26 /* SemicolonToken */));
-                }
+                parseErrorAtCurrentToken(ts.Diagnostics._0_expected, ts.tokenToString(26 /* SemicolonToken */));
                 return;
             }
             parseErrorForMissingSemicolonAfter(name);
@@ -38325,11 +38315,13 @@ var ts;
         ["es2019.string", "lib.es2019.string.d.ts"],
         ["es2019.symbol", "lib.es2019.symbol.d.ts"],
         ["es2020.bigint", "lib.es2020.bigint.d.ts"],
+        ["es2020.date", "lib.es2020.date.d.ts"],
         ["es2020.promise", "lib.es2020.promise.d.ts"],
         ["es2020.sharedmemory", "lib.es2020.sharedmemory.d.ts"],
         ["es2020.string", "lib.es2020.string.d.ts"],
         ["es2020.symbol.wellknown", "lib.es2020.symbol.wellknown.d.ts"],
         ["es2020.intl", "lib.es2020.intl.d.ts"],
+        ["es2020.number", "lib.es2020.number.d.ts"],
         ["es2021.promise", "lib.es2021.promise.d.ts"],
         ["es2021.string", "lib.es2021.string.d.ts"],
         ["es2021.weakref", "lib.es2021.weakref.d.ts"],
@@ -55263,8 +55255,8 @@ var ts;
             var memberDeclaration = root.kind === 163 /* Parameter */ ? root.parent : root;
             return isPrivateWithinAmbient(memberDeclaration);
         }
-        function tryGetTypeFromEffectiveTypeNode(declaration) {
-            var typeNode = ts.getEffectiveTypeAnnotationNode(declaration);
+        function tryGetTypeFromEffectiveTypeNode(node) {
+            var typeNode = ts.getEffectiveTypeAnnotationNode(node);
             if (typeNode) {
                 return getTypeFromTypeNode(typeNode);
             }
@@ -62283,7 +62275,7 @@ var ts;
                     // distributive conditional type T extends U ? X : Y is instantiated with A | B for T, the
                     // result is (A extends U ? X : Y) | (B extends U ? X : Y).
                     result = distributionType && checkType_1 !== distributionType && distributionType.flags & (1048576 /* Union */ | 131072 /* Never */) ?
-                        mapTypeWithAlias(distributionType, function (t) { return getConditionalType(root, prependTypeMapping(checkType_1, t, newMapper_1)); }, aliasSymbol, aliasTypeArguments) :
+                        mapTypeWithAlias(getReducedType(distributionType), function (t) { return getConditionalType(root, prependTypeMapping(checkType_1, t, newMapper_1)); }, aliasSymbol, aliasTypeArguments) :
                         getConditionalType(root, newMapper_1, aliasSymbol, aliasTypeArguments);
                     root.instantiations.set(id, result);
                 }
@@ -65026,8 +65018,9 @@ var ts;
                 // This ensures the subtype relationship is ordered, and preventing declaration order
                 // from deciding which type "wins" in union subtype reduction.
                 // They're still assignable to one another, since `readonly` doesn't affect assignability.
-                if ((relation === subtypeRelation || relation === strictSubtypeRelation) &&
-                    !!(sourcePropFlags & 64 /* Readonly */) && !(targetPropFlags & 64 /* Readonly */)) {
+                // This is only applied during the strictSubtypeRelation -- currently used in subtype reduction
+                if (relation === strictSubtypeRelation &&
+                    isReadonlySymbol(sourceProp) && !isReadonlySymbol(targetProp)) {
                     return 0 /* False */;
                 }
                 // If the target comes from a partial union prop, allow `undefined` in the target type
@@ -71587,6 +71580,8 @@ var ts;
                 }
                 case 229 /* NonNullExpression */:
                     return getContextualType(parent, contextFlags);
+                case 270 /* ExportAssignment */:
+                    return tryGetTypeFromEffectiveTypeNode(parent);
                 case 287 /* JsxExpression */:
                     return getContextualTypeForJsxExpression(parent);
                 case 284 /* JsxAttribute */:
@@ -130118,7 +130113,7 @@ var ts;
                 completionKind === 3 /* MemberLike */ &&
                 isClassLikeMemberCompletion(symbol, location)) {
                 var importAdder = void 0;
-                (_b = getEntryForMemberCompletion(host, program, options, preferences, name, symbol, location, contextToken, formatContext), insertText = _b.insertText, isSnippet = _b.isSnippet, importAdder = _b.importAdder);
+                (_b = getEntryForMemberCompletion(host, program, options, preferences, name, symbol, location, contextToken, formatContext), insertText = _b.insertText, isSnippet = _b.isSnippet, importAdder = _b.importAdder, replacementSpan = _b.replacementSpan);
                 if (importAdder === null || importAdder === void 0 ? void 0 : importAdder.hasFixes()) {
                     hasAction = true;
                     source = CompletionSource.ClassMemberSnippet;
@@ -130222,6 +130217,7 @@ var ts;
                 return { insertText: name };
             }
             var isSnippet;
+            var replacementSpan;
             var insertText = name;
             var checker = program.getTypeChecker();
             var sourceFile = location.getSourceFile();
@@ -130250,10 +130246,8 @@ var ts;
             var modifiers = 0 /* None */;
             // Whether the suggested member should be abstract.
             // e.g. in `abstract class C { abstract | }`, we should offer abstract method signatures at position `|`.
-            // Note: We are relying on checking if the context token is `abstract`,
-            // since other visibility modifiers (e.g. `protected`) should come *before* `abstract`.
-            // However, that is not true for the e.g. `override` modifier, so this check has its limitations.
-            var isAbstract = contextToken && isModifierLike(contextToken) === 126 /* AbstractKeyword */;
+            var _a = getPresentModifiers(contextToken), presentModifiers = _a.modifiers, modifiersSpan = _a.span;
+            var isAbstract = !!(presentModifiers & 128 /* Abstract */);
             var completionNodes = [];
             ts.codefix.addNewNodeForMemberSymbol(symbol, classLikeDeclaration, sourceFile, { program: program, host: host }, preferences, importAdder, 
             // `addNewNodeForMemberSymbol` calls this callback function for each new member node
@@ -130272,22 +130266,18 @@ var ts;
                     && checker.getMemberOverrideModifierStatus(classLikeDeclaration, node) === 1 /* NeedsOverride */) {
                     requiredModifiers |= 16384 /* Override */;
                 }
-                var presentModifiers = 0 /* None */;
                 if (!completionNodes.length) {
-                    // Omit already present modifiers from the first completion node/signature.
-                    if (contextToken) {
-                        presentModifiers = getPresentModifiers(contextToken);
-                    }
                     // Keep track of added missing required modifiers and modifiers already present.
                     // This is needed when we have overloaded signatures,
                     // so this callback will be called for multiple nodes/signatures,
                     // and we need to make sure the modifiers are uniform for all nodes/signatures.
                     modifiers = node.modifierFlagsCache | requiredModifiers | presentModifiers;
                 }
-                node = ts.factory.updateModifiers(node, modifiers & (~presentModifiers));
+                node = ts.factory.updateModifiers(node, modifiers);
                 completionNodes.push(node);
             }, body, 2 /* Property */, isAbstract);
             if (completionNodes.length) {
+                replacementSpan = modifiersSpan;
                 // If we have access to formatting settings, we print the nodes using the emitter,
                 // and then format the printed text.
                 if (formatContext) {
@@ -130310,10 +130300,14 @@ var ts;
                     insertText = printer.printSnippetList(1 /* MultiLine */ | 131072 /* NoTrailingNewLine */, ts.factory.createNodeArray(completionNodes), sourceFile);
                 }
             }
-            return { insertText: insertText, isSnippet: isSnippet, importAdder: importAdder };
+            return { insertText: insertText, isSnippet: isSnippet, importAdder: importAdder, replacementSpan: replacementSpan };
         }
         function getPresentModifiers(contextToken) {
+            if (!contextToken) {
+                return { modifiers: 0 /* None */ };
+            }
             var modifiers = 0 /* None */;
+            var span;
             var contextMod;
             /*
             Cases supported:
@@ -130336,11 +130330,13 @@ var ts;
             */
             if (contextMod = isModifierLike(contextToken)) {
                 modifiers |= ts.modifierToFlag(contextMod);
+                span = ts.createTextSpanFromNode(contextToken);
             }
             if (ts.isPropertyDeclaration(contextToken.parent)) {
                 modifiers |= ts.modifiersToFlags(contextToken.parent.modifiers);
+                span = ts.createTextSpanFromNode(contextToken.parent);
             }
-            return modifiers;
+            return { modifiers: modifiers, span: span };
         }
         function isModifierLike(node) {
             if (ts.isModifier(node)) {
@@ -160491,7 +160487,7 @@ var ts;
                             var isLastSpan = index === currentNode.templateSpans.length - 1;
                             var text = span.literal.text + (isLastSpan ? subsequentText : "");
                             var rawText = getRawTextOfTemplate(span.literal) + (isLastSpan ? rawSubsequentText : "");
-                            return ts.factory.createTemplateSpan(span.expression, isLast
+                            return ts.factory.createTemplateSpan(span.expression, isLast && isLastSpan
                                 ? ts.factory.createTemplateTail(text, rawText)
                                 : ts.factory.createTemplateMiddle(text, rawText));
                         });

package/lib/tsserverlibrary.js

@@ -294,7 +294,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = ts.versionMajorMinor + ".0-dev.20220227";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220302";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -31571,18 +31571,8 @@ var ts;
             if (tryParseSemicolon()) {
                 return;
             }
-            // If an initializer was parsed but there is still an error in finding the next semicolon,
-            // we generally know there was an error already reported in the initializer...
-            //   class Example { a = new Map([), ) }
-            //                                ~
             if (initializer) {
-                // ...unless we've found the start of a block after a property declaration, in which
-                // case we can know that regardless of the initializer we should complain on the block.
-                //   class Example { a = 0 {} }
-                //                         ~
-                if (token() === 18 /* OpenBraceToken */) {
-                    parseErrorAtCurrentToken(ts.Diagnostics._0_expected, ts.tokenToString(26 /* SemicolonToken */));
-                }
+                parseErrorAtCurrentToken(ts.Diagnostics._0_expected, ts.tokenToString(26 /* SemicolonToken */));
                 return;
             }
             parseErrorForMissingSemicolonAfter(name);
@@ -38519,11 +38509,13 @@ var ts;
         ["es2019.string", "lib.es2019.string.d.ts"],
         ["es2019.symbol", "lib.es2019.symbol.d.ts"],
         ["es2020.bigint", "lib.es2020.bigint.d.ts"],
+        ["es2020.date", "lib.es2020.date.d.ts"],
         ["es2020.promise", "lib.es2020.promise.d.ts"],
         ["es2020.sharedmemory", "lib.es2020.sharedmemory.d.ts"],
         ["es2020.string", "lib.es2020.string.d.ts"],
         ["es2020.symbol.wellknown", "lib.es2020.symbol.wellknown.d.ts"],
         ["es2020.intl", "lib.es2020.intl.d.ts"],
+        ["es2020.number", "lib.es2020.number.d.ts"],
         ["es2021.promise", "lib.es2021.promise.d.ts"],
         ["es2021.string", "lib.es2021.string.d.ts"],
         ["es2021.weakref", "lib.es2021.weakref.d.ts"],
@@ -55457,8 +55449,8 @@ var ts;
             var memberDeclaration = root.kind === 163 /* Parameter */ ? root.parent : root;
             return isPrivateWithinAmbient(memberDeclaration);
         }
-        function tryGetTypeFromEffectiveTypeNode(declaration) {
-            var typeNode = ts.getEffectiveTypeAnnotationNode(declaration);
+        function tryGetTypeFromEffectiveTypeNode(node) {
+            var typeNode = ts.getEffectiveTypeAnnotationNode(node);
             if (typeNode) {
                 return getTypeFromTypeNode(typeNode);
             }
@@ -62477,7 +62469,7 @@ var ts;
                     // distributive conditional type T extends U ? X : Y is instantiated with A | B for T, the
                     // result is (A extends U ? X : Y) | (B extends U ? X : Y).
                     result = distributionType && checkType_1 !== distributionType && distributionType.flags & (1048576 /* Union */ | 131072 /* Never */) ?
-                        mapTypeWithAlias(distributionType, function (t) { return getConditionalType(root, prependTypeMapping(checkType_1, t, newMapper_1)); }, aliasSymbol, aliasTypeArguments) :
+                        mapTypeWithAlias(getReducedType(distributionType), function (t) { return getConditionalType(root, prependTypeMapping(checkType_1, t, newMapper_1)); }, aliasSymbol, aliasTypeArguments) :
                         getConditionalType(root, newMapper_1, aliasSymbol, aliasTypeArguments);
                     root.instantiations.set(id, result);
                 }
@@ -65220,8 +65212,9 @@ var ts;
                 // This ensures the subtype relationship is ordered, and preventing declaration order
                 // from deciding which type "wins" in union subtype reduction.
                 // They're still assignable to one another, since `readonly` doesn't affect assignability.
-                if ((relation === subtypeRelation || relation === strictSubtypeRelation) &&
-                    !!(sourcePropFlags & 64 /* Readonly */) && !(targetPropFlags & 64 /* Readonly */)) {
+                // This is only applied during the strictSubtypeRelation -- currently used in subtype reduction
+                if (relation === strictSubtypeRelation &&
+                    isReadonlySymbol(sourceProp) && !isReadonlySymbol(targetProp)) {
                     return 0 /* False */;
                 }
                 // If the target comes from a partial union prop, allow `undefined` in the target type
@@ -71781,6 +71774,8 @@ var ts;
                 }
                 case 229 /* NonNullExpression */:
                     return getContextualType(parent, contextFlags);
+                case 270 /* ExportAssignment */:
+                    return tryGetTypeFromEffectiveTypeNode(parent);
                 case 287 /* JsxExpression */:
                     return getContextualTypeForJsxExpression(parent);
                 case 284 /* JsxAttribute */:
@@ -130729,7 +130724,7 @@ var ts;
                 completionKind === 3 /* MemberLike */ &&
                 isClassLikeMemberCompletion(symbol, location)) {
                 var importAdder = void 0;
-                (_b = getEntryForMemberCompletion(host, program, options, preferences, name, symbol, location, contextToken, formatContext), insertText = _b.insertText, isSnippet = _b.isSnippet, importAdder = _b.importAdder);
+                (_b = getEntryForMemberCompletion(host, program, options, preferences, name, symbol, location, contextToken, formatContext), insertText = _b.insertText, isSnippet = _b.isSnippet, importAdder = _b.importAdder, replacementSpan = _b.replacementSpan);
                 if (importAdder === null || importAdder === void 0 ? void 0 : importAdder.hasFixes()) {
                     hasAction = true;
                     source = CompletionSource.ClassMemberSnippet;
@@ -130833,6 +130828,7 @@ var ts;
                 return { insertText: name };
             }
             var isSnippet;
+            var replacementSpan;
             var insertText = name;
             var checker = program.getTypeChecker();
             var sourceFile = location.getSourceFile();
@@ -130861,10 +130857,8 @@ var ts;
             var modifiers = 0 /* None */;
             // Whether the suggested member should be abstract.
             // e.g. in `abstract class C { abstract | }`, we should offer abstract method signatures at position `|`.
-            // Note: We are relying on checking if the context token is `abstract`,
-            // since other visibility modifiers (e.g. `protected`) should come *before* `abstract`.
-            // However, that is not true for the e.g. `override` modifier, so this check has its limitations.
-            var isAbstract = contextToken && isModifierLike(contextToken) === 126 /* AbstractKeyword */;
+            var _a = getPresentModifiers(contextToken), presentModifiers = _a.modifiers, modifiersSpan = _a.span;
+            var isAbstract = !!(presentModifiers & 128 /* Abstract */);
             var completionNodes = [];
             ts.codefix.addNewNodeForMemberSymbol(symbol, classLikeDeclaration, sourceFile, { program: program, host: host }, preferences, importAdder, 
             // `addNewNodeForMemberSymbol` calls this callback function for each new member node
@@ -130883,22 +130877,18 @@ var ts;
                     && checker.getMemberOverrideModifierStatus(classLikeDeclaration, node) === 1 /* NeedsOverride */) {
                     requiredModifiers |= 16384 /* Override */;
                 }
-                var presentModifiers = 0 /* None */;
                 if (!completionNodes.length) {
-                    // Omit already present modifiers from the first completion node/signature.
-                    if (contextToken) {
-                        presentModifiers = getPresentModifiers(contextToken);
-                    }
                     // Keep track of added missing required modifiers and modifiers already present.
                     // This is needed when we have overloaded signatures,
                     // so this callback will be called for multiple nodes/signatures,
                     // and we need to make sure the modifiers are uniform for all nodes/signatures.
                     modifiers = node.modifierFlagsCache | requiredModifiers | presentModifiers;
                 }
-                node = ts.factory.updateModifiers(node, modifiers & (~presentModifiers));
+                node = ts.factory.updateModifiers(node, modifiers);
                 completionNodes.push(node);
             }, body, 2 /* Property */, isAbstract);
             if (completionNodes.length) {
+                replacementSpan = modifiersSpan;
                 // If we have access to formatting settings, we print the nodes using the emitter,
                 // and then format the printed text.
                 if (formatContext) {
@@ -130921,10 +130911,14 @@ var ts;
                     insertText = printer.printSnippetList(1 /* MultiLine */ | 131072 /* NoTrailingNewLine */, ts.factory.createNodeArray(completionNodes), sourceFile);
                 }
             }
-            return { insertText: insertText, isSnippet: isSnippet, importAdder: importAdder };
+            return { insertText: insertText, isSnippet: isSnippet, importAdder: importAdder, replacementSpan: replacementSpan };
         }
         function getPresentModifiers(contextToken) {
+            if (!contextToken) {
+                return { modifiers: 0 /* None */ };
+            }
             var modifiers = 0 /* None */;
+            var span;
             var contextMod;
             /*
             Cases supported:
@@ -130947,11 +130941,13 @@ var ts;
             */
             if (contextMod = isModifierLike(contextToken)) {
                 modifiers |= ts.modifierToFlag(contextMod);
+                span = ts.createTextSpanFromNode(contextToken);
             }
             if (ts.isPropertyDeclaration(contextToken.parent)) {
                 modifiers |= ts.modifiersToFlags(contextToken.parent.modifiers);
+                span = ts.createTextSpanFromNode(contextToken.parent);
             }
-            return modifiers;
+            return { modifiers: modifiers, span: span };
         }
         function isModifierLike(node) {
             if (ts.isModifier(node)) {
@@ -161102,7 +161098,7 @@ var ts;
                             var isLastSpan = index === currentNode.templateSpans.length - 1;
                             var text = span.literal.text + (isLastSpan ? subsequentText : "");
                             var rawText = getRawTextOfTemplate(span.literal) + (isLastSpan ? rawSubsequentText : "");
-                            return ts.factory.createTemplateSpan(span.expression, isLast
+                            return ts.factory.createTemplateSpan(span.expression, isLast && isLastSpan
                                 ? ts.factory.createTemplateTail(text, rawText)
                                 : ts.factory.createTemplateMiddle(text, rawText));
                         });

package/lib/typescript.js

@@ -294,7 +294,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = ts.versionMajorMinor + ".0-dev.20220227";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220302";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -31571,18 +31571,8 @@ var ts;
             if (tryParseSemicolon()) {
                 return;
             }
-            // If an initializer was parsed but there is still an error in finding the next semicolon,
-            // we generally know there was an error already reported in the initializer...
-            //   class Example { a = new Map([), ) }
-            //                                ~
             if (initializer) {
-                // ...unless we've found the start of a block after a property declaration, in which
-                // case we can know that regardless of the initializer we should complain on the block.
-                //   class Example { a = 0 {} }
-                //                         ~
-                if (token() === 18 /* OpenBraceToken */) {
-                    parseErrorAtCurrentToken(ts.Diagnostics._0_expected, ts.tokenToString(26 /* SemicolonToken */));
-                }
+                parseErrorAtCurrentToken(ts.Diagnostics._0_expected, ts.tokenToString(26 /* SemicolonToken */));
                 return;
             }
             parseErrorForMissingSemicolonAfter(name);
@@ -38519,11 +38509,13 @@ var ts;
         ["es2019.string", "lib.es2019.string.d.ts"],
         ["es2019.symbol", "lib.es2019.symbol.d.ts"],
         ["es2020.bigint", "lib.es2020.bigint.d.ts"],
+        ["es2020.date", "lib.es2020.date.d.ts"],
         ["es2020.promise", "lib.es2020.promise.d.ts"],
         ["es2020.sharedmemory", "lib.es2020.sharedmemory.d.ts"],
         ["es2020.string", "lib.es2020.string.d.ts"],
         ["es2020.symbol.wellknown", "lib.es2020.symbol.wellknown.d.ts"],
         ["es2020.intl", "lib.es2020.intl.d.ts"],
+        ["es2020.number", "lib.es2020.number.d.ts"],
         ["es2021.promise", "lib.es2021.promise.d.ts"],
         ["es2021.string", "lib.es2021.string.d.ts"],
         ["es2021.weakref", "lib.es2021.weakref.d.ts"],
@@ -55457,8 +55449,8 @@ var ts;
             var memberDeclaration = root.kind === 163 /* Parameter */ ? root.parent : root;
             return isPrivateWithinAmbient(memberDeclaration);
         }
-        function tryGetTypeFromEffectiveTypeNode(declaration) {
-            var typeNode = ts.getEffectiveTypeAnnotationNode(declaration);
+        function tryGetTypeFromEffectiveTypeNode(node) {
+            var typeNode = ts.getEffectiveTypeAnnotationNode(node);
             if (typeNode) {
                 return getTypeFromTypeNode(typeNode);
             }
@@ -62477,7 +62469,7 @@ var ts;
                     // distributive conditional type T extends U ? X : Y is instantiated with A | B for T, the
                     // result is (A extends U ? X : Y) | (B extends U ? X : Y).
                     result = distributionType && checkType_1 !== distributionType && distributionType.flags & (1048576 /* Union */ | 131072 /* Never */) ?
-                        mapTypeWithAlias(distributionType, function (t) { return getConditionalType(root, prependTypeMapping(checkType_1, t, newMapper_1)); }, aliasSymbol, aliasTypeArguments) :
+                        mapTypeWithAlias(getReducedType(distributionType), function (t) { return getConditionalType(root, prependTypeMapping(checkType_1, t, newMapper_1)); }, aliasSymbol, aliasTypeArguments) :
                         getConditionalType(root, newMapper_1, aliasSymbol, aliasTypeArguments);
                     root.instantiations.set(id, result);
                 }
@@ -65220,8 +65212,9 @@ var ts;
                 // This ensures the subtype relationship is ordered, and preventing declaration order
                 // from deciding which type "wins" in union subtype reduction.
                 // They're still assignable to one another, since `readonly` doesn't affect assignability.
-                if ((relation === subtypeRelation || relation === strictSubtypeRelation) &&
-                    !!(sourcePropFlags & 64 /* Readonly */) && !(targetPropFlags & 64 /* Readonly */)) {
+                // This is only applied during the strictSubtypeRelation -- currently used in subtype reduction
+                if (relation === strictSubtypeRelation &&
+                    isReadonlySymbol(sourceProp) && !isReadonlySymbol(targetProp)) {
                     return 0 /* False */;
                 }
                 // If the target comes from a partial union prop, allow `undefined` in the target type
@@ -71781,6 +71774,8 @@ var ts;
                 }
                 case 229 /* NonNullExpression */:
                     return getContextualType(parent, contextFlags);
+                case 270 /* ExportAssignment */:
+                    return tryGetTypeFromEffectiveTypeNode(parent);
                 case 287 /* JsxExpression */:
                     return getContextualTypeForJsxExpression(parent);
                 case 284 /* JsxAttribute */:
@@ -130729,7 +130724,7 @@ var ts;
                 completionKind === 3 /* MemberLike */ &&
                 isClassLikeMemberCompletion(symbol, location)) {
                 var importAdder = void 0;
-                (_b = getEntryForMemberCompletion(host, program, options, preferences, name, symbol, location, contextToken, formatContext), insertText = _b.insertText, isSnippet = _b.isSnippet, importAdder = _b.importAdder);
+                (_b = getEntryForMemberCompletion(host, program, options, preferences, name, symbol, location, contextToken, formatContext), insertText = _b.insertText, isSnippet = _b.isSnippet, importAdder = _b.importAdder, replacementSpan = _b.replacementSpan);
                 if (importAdder === null || importAdder === void 0 ? void 0 : importAdder.hasFixes()) {
                     hasAction = true;
                     source = CompletionSource.ClassMemberSnippet;
@@ -130833,6 +130828,7 @@ var ts;
                 return { insertText: name };
             }
             var isSnippet;
+            var replacementSpan;
             var insertText = name;
             var checker = program.getTypeChecker();
             var sourceFile = location.getSourceFile();
@@ -130861,10 +130857,8 @@ var ts;
             var modifiers = 0 /* None */;
             // Whether the suggested member should be abstract.
             // e.g. in `abstract class C { abstract | }`, we should offer abstract method signatures at position `|`.
-            // Note: We are relying on checking if the context token is `abstract`,
-            // since other visibility modifiers (e.g. `protected`) should come *before* `abstract`.
-            // However, that is not true for the e.g. `override` modifier, so this check has its limitations.
-            var isAbstract = contextToken && isModifierLike(contextToken) === 126 /* AbstractKeyword */;
+            var _a = getPresentModifiers(contextToken), presentModifiers = _a.modifiers, modifiersSpan = _a.span;
+            var isAbstract = !!(presentModifiers & 128 /* Abstract */);
             var completionNodes = [];
             ts.codefix.addNewNodeForMemberSymbol(symbol, classLikeDeclaration, sourceFile, { program: program, host: host }, preferences, importAdder, 
             // `addNewNodeForMemberSymbol` calls this callback function for each new member node
@@ -130883,22 +130877,18 @@ var ts;
                     && checker.getMemberOverrideModifierStatus(classLikeDeclaration, node) === 1 /* NeedsOverride */) {
                     requiredModifiers |= 16384 /* Override */;
                 }
-                var presentModifiers = 0 /* None */;
                 if (!completionNodes.length) {
-                    // Omit already present modifiers from the first completion node/signature.
-                    if (contextToken) {
-                        presentModifiers = getPresentModifiers(contextToken);
-                    }
                     // Keep track of added missing required modifiers and modifiers already present.
                     // This is needed when we have overloaded signatures,
                     // so this callback will be called for multiple nodes/signatures,
                     // and we need to make sure the modifiers are uniform for all nodes/signatures.
                     modifiers = node.modifierFlagsCache | requiredModifiers | presentModifiers;
                 }
-                node = ts.factory.updateModifiers(node, modifiers & (~presentModifiers));
+                node = ts.factory.updateModifiers(node, modifiers);
                 completionNodes.push(node);
             }, body, 2 /* Property */, isAbstract);
             if (completionNodes.length) {
+                replacementSpan = modifiersSpan;
                 // If we have access to formatting settings, we print the nodes using the emitter,
                 // and then format the printed text.
                 if (formatContext) {
@@ -130921,10 +130911,14 @@ var ts;
                     insertText = printer.printSnippetList(1 /* MultiLine */ | 131072 /* NoTrailingNewLine */, ts.factory.createNodeArray(completionNodes), sourceFile);
                 }
             }
-            return { insertText: insertText, isSnippet: isSnippet, importAdder: importAdder };
+            return { insertText: insertText, isSnippet: isSnippet, importAdder: importAdder, replacementSpan: replacementSpan };
         }
         function getPresentModifiers(contextToken) {
+            if (!contextToken) {
+                return { modifiers: 0 /* None */ };
+            }
             var modifiers = 0 /* None */;
+            var span;
             var contextMod;
             /*
             Cases supported:
@@ -130947,11 +130941,13 @@ var ts;
             */
             if (contextMod = isModifierLike(contextToken)) {
                 modifiers |= ts.modifierToFlag(contextMod);
+                span = ts.createTextSpanFromNode(contextToken);
             }
             if (ts.isPropertyDeclaration(contextToken.parent)) {
                 modifiers |= ts.modifiersToFlags(contextToken.parent.modifiers);
+                span = ts.createTextSpanFromNode(contextToken.parent);
             }
-            return modifiers;
+            return { modifiers: modifiers, span: span };
         }
         function isModifierLike(node) {
             if (ts.isModifier(node)) {
@@ -161102,7 +161098,7 @@ var ts;
                             var isLastSpan = index === currentNode.templateSpans.length - 1;
                             var text = span.literal.text + (isLastSpan ? subsequentText : "");
                             var rawText = getRawTextOfTemplate(span.literal) + (isLastSpan ? rawSubsequentText : "");
-                            return ts.factory.createTemplateSpan(span.expression, isLast
+                            return ts.factory.createTemplateSpan(span.expression, isLast && isLastSpan
                                 ? ts.factory.createTemplateTail(text, rawText)
                                 : ts.factory.createTemplateMiddle(text, rawText));
                         });

package/lib/typescriptServices.js

@@ -294,7 +294,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = ts.versionMajorMinor + ".0-dev.20220227";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220302";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -31571,18 +31571,8 @@ var ts;
             if (tryParseSemicolon()) {
                 return;
             }
-            // If an initializer was parsed but there is still an error in finding the next semicolon,
-            // we generally know there was an error already reported in the initializer...
-            //   class Example { a = new Map([), ) }
-            //                                ~
             if (initializer) {
-                // ...unless we've found the start of a block after a property declaration, in which
-                // case we can know that regardless of the initializer we should complain on the block.
-                //   class Example { a = 0 {} }
-                //                         ~
-                if (token() === 18 /* OpenBraceToken */) {
-                    parseErrorAtCurrentToken(ts.Diagnostics._0_expected, ts.tokenToString(26 /* SemicolonToken */));
-                }
+                parseErrorAtCurrentToken(ts.Diagnostics._0_expected, ts.tokenToString(26 /* SemicolonToken */));
                 return;
             }
             parseErrorForMissingSemicolonAfter(name);
@@ -38519,11 +38509,13 @@ var ts;
         ["es2019.string", "lib.es2019.string.d.ts"],
         ["es2019.symbol", "lib.es2019.symbol.d.ts"],
         ["es2020.bigint", "lib.es2020.bigint.d.ts"],
+        ["es2020.date", "lib.es2020.date.d.ts"],
         ["es2020.promise", "lib.es2020.promise.d.ts"],
         ["es2020.sharedmemory", "lib.es2020.sharedmemory.d.ts"],
         ["es2020.string", "lib.es2020.string.d.ts"],
         ["es2020.symbol.wellknown", "lib.es2020.symbol.wellknown.d.ts"],
         ["es2020.intl", "lib.es2020.intl.d.ts"],
+        ["es2020.number", "lib.es2020.number.d.ts"],
         ["es2021.promise", "lib.es2021.promise.d.ts"],
         ["es2021.string", "lib.es2021.string.d.ts"],
         ["es2021.weakref", "lib.es2021.weakref.d.ts"],
@@ -55457,8 +55449,8 @@ var ts;
             var memberDeclaration = root.kind === 163 /* Parameter */ ? root.parent : root;
             return isPrivateWithinAmbient(memberDeclaration);
         }
-        function tryGetTypeFromEffectiveTypeNode(declaration) {
-            var typeNode = ts.getEffectiveTypeAnnotationNode(declaration);
+        function tryGetTypeFromEffectiveTypeNode(node) {
+            var typeNode = ts.getEffectiveTypeAnnotationNode(node);
             if (typeNode) {
                 return getTypeFromTypeNode(typeNode);
             }
@@ -62477,7 +62469,7 @@ var ts;
                     // distributive conditional type T extends U ? X : Y is instantiated with A | B for T, the
                     // result is (A extends U ? X : Y) | (B extends U ? X : Y).
                     result = distributionType && checkType_1 !== distributionType && distributionType.flags & (1048576 /* Union */ | 131072 /* Never */) ?
-                        mapTypeWithAlias(distributionType, function (t) { return getConditionalType(root, prependTypeMapping(checkType_1, t, newMapper_1)); }, aliasSymbol, aliasTypeArguments) :
+                        mapTypeWithAlias(getReducedType(distributionType), function (t) { return getConditionalType(root, prependTypeMapping(checkType_1, t, newMapper_1)); }, aliasSymbol, aliasTypeArguments) :
                         getConditionalType(root, newMapper_1, aliasSymbol, aliasTypeArguments);
                     root.instantiations.set(id, result);
                 }
@@ -65220,8 +65212,9 @@ var ts;
                 // This ensures the subtype relationship is ordered, and preventing declaration order
                 // from deciding which type "wins" in union subtype reduction.
                 // They're still assignable to one another, since `readonly` doesn't affect assignability.
-                if ((relation === subtypeRelation || relation === strictSubtypeRelation) &&
-                    !!(sourcePropFlags & 64 /* Readonly */) && !(targetPropFlags & 64 /* Readonly */)) {
+                // This is only applied during the strictSubtypeRelation -- currently used in subtype reduction
+                if (relation === strictSubtypeRelation &&
+                    isReadonlySymbol(sourceProp) && !isReadonlySymbol(targetProp)) {
                     return 0 /* False */;
                 }
                 // If the target comes from a partial union prop, allow `undefined` in the target type
@@ -71781,6 +71774,8 @@ var ts;
                 }
                 case 229 /* NonNullExpression */:
                     return getContextualType(parent, contextFlags);
+                case 270 /* ExportAssignment */:
+                    return tryGetTypeFromEffectiveTypeNode(parent);
                 case 287 /* JsxExpression */:
                     return getContextualTypeForJsxExpression(parent);
                 case 284 /* JsxAttribute */:
@@ -130729,7 +130724,7 @@ var ts;
                 completionKind === 3 /* MemberLike */ &&
                 isClassLikeMemberCompletion(symbol, location)) {
                 var importAdder = void 0;
-                (_b = getEntryForMemberCompletion(host, program, options, preferences, name, symbol, location, contextToken, formatContext), insertText = _b.insertText, isSnippet = _b.isSnippet, importAdder = _b.importAdder);
+                (_b = getEntryForMemberCompletion(host, program, options, preferences, name, symbol, location, contextToken, formatContext), insertText = _b.insertText, isSnippet = _b.isSnippet, importAdder = _b.importAdder, replacementSpan = _b.replacementSpan);
                 if (importAdder === null || importAdder === void 0 ? void 0 : importAdder.hasFixes()) {
                     hasAction = true;
                     source = CompletionSource.ClassMemberSnippet;
@@ -130833,6 +130828,7 @@ var ts;
                 return { insertText: name };
             }
             var isSnippet;
+            var replacementSpan;
             var insertText = name;
             var checker = program.getTypeChecker();
             var sourceFile = location.getSourceFile();
@@ -130861,10 +130857,8 @@ var ts;
             var modifiers = 0 /* None */;
             // Whether the suggested member should be abstract.
             // e.g. in `abstract class C { abstract | }`, we should offer abstract method signatures at position `|`.
-            // Note: We are relying on checking if the context token is `abstract`,
-            // since other visibility modifiers (e.g. `protected`) should come *before* `abstract`.
-            // However, that is not true for the e.g. `override` modifier, so this check has its limitations.
-            var isAbstract = contextToken && isModifierLike(contextToken) === 126 /* AbstractKeyword */;
+            var _a = getPresentModifiers(contextToken), presentModifiers = _a.modifiers, modifiersSpan = _a.span;
+            var isAbstract = !!(presentModifiers & 128 /* Abstract */);
             var completionNodes = [];
             ts.codefix.addNewNodeForMemberSymbol(symbol, classLikeDeclaration, sourceFile, { program: program, host: host }, preferences, importAdder, 
             // `addNewNodeForMemberSymbol` calls this callback function for each new member node
@@ -130883,22 +130877,18 @@ var ts;
                     && checker.getMemberOverrideModifierStatus(classLikeDeclaration, node) === 1 /* NeedsOverride */) {
                     requiredModifiers |= 16384 /* Override */;
                 }
-                var presentModifiers = 0 /* None */;
                 if (!completionNodes.length) {
-                    // Omit already present modifiers from the first completion node/signature.
-                    if (contextToken) {
-                        presentModifiers = getPresentModifiers(contextToken);
-                    }
                     // Keep track of added missing required modifiers and modifiers already present.
                     // This is needed when we have overloaded signatures,
                     // so this callback will be called for multiple nodes/signatures,
                     // and we need to make sure the modifiers are uniform for all nodes/signatures.
                     modifiers = node.modifierFlagsCache | requiredModifiers | presentModifiers;
                 }
-                node = ts.factory.updateModifiers(node, modifiers & (~presentModifiers));
+                node = ts.factory.updateModifiers(node, modifiers);
                 completionNodes.push(node);
             }, body, 2 /* Property */, isAbstract);
             if (completionNodes.length) {
+                replacementSpan = modifiersSpan;
                 // If we have access to formatting settings, we print the nodes using the emitter,
                 // and then format the printed text.
                 if (formatContext) {
@@ -130921,10 +130911,14 @@ var ts;
                     insertText = printer.printSnippetList(1 /* MultiLine */ | 131072 /* NoTrailingNewLine */, ts.factory.createNodeArray(completionNodes), sourceFile);
                 }
             }
-            return { insertText: insertText, isSnippet: isSnippet, importAdder: importAdder };
+            return { insertText: insertText, isSnippet: isSnippet, importAdder: importAdder, replacementSpan: replacementSpan };
         }
         function getPresentModifiers(contextToken) {
+            if (!contextToken) {
+                return { modifiers: 0 /* None */ };
+            }
             var modifiers = 0 /* None */;
+            var span;
             var contextMod;
             /*
             Cases supported:
@@ -130947,11 +130941,13 @@ var ts;
             */
             if (contextMod = isModifierLike(contextToken)) {
                 modifiers |= ts.modifierToFlag(contextMod);
+                span = ts.createTextSpanFromNode(contextToken);
             }
             if (ts.isPropertyDeclaration(contextToken.parent)) {
                 modifiers |= ts.modifiersToFlags(contextToken.parent.modifiers);
+                span = ts.createTextSpanFromNode(contextToken.parent);
             }
-            return modifiers;
+            return { modifiers: modifiers, span: span };
         }
         function isModifierLike(node) {
             if (ts.isModifier(node)) {
@@ -161102,7 +161098,7 @@ var ts;
                             var isLastSpan = index === currentNode.templateSpans.length - 1;
                             var text = span.literal.text + (isLastSpan ? subsequentText : "");
                             var rawText = getRawTextOfTemplate(span.literal) + (isLastSpan ? rawSubsequentText : "");
-                            return ts.factory.createTemplateSpan(span.expression, isLast
+                            return ts.factory.createTemplateSpan(span.expression, isLast && isLastSpan
                                 ? ts.factory.createTemplateTail(text, rawText)
                                 : ts.factory.createTemplateMiddle(text, rawText));
                         });

package/lib/typingsInstaller.js

@@ -89,7 +89,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.20220227";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220302";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -31366,18 +31366,8 @@ var ts;
             if (tryParseSemicolon()) {
                 return;
             }
-            // If an initializer was parsed but there is still an error in finding the next semicolon,
-            // we generally know there was an error already reported in the initializer...
-            //   class Example { a = new Map([), ) }
-            //                                ~
             if (initializer) {
-                // ...unless we've found the start of a block after a property declaration, in which
-                // case we can know that regardless of the initializer we should complain on the block.
-                //   class Example { a = 0 {} }
-                //                         ~
-                if (token() === 18 /* OpenBraceToken */) {
-                    parseErrorAtCurrentToken(ts.Diagnostics._0_expected, ts.tokenToString(26 /* SemicolonToken */));
-                }
+                parseErrorAtCurrentToken(ts.Diagnostics._0_expected, ts.tokenToString(26 /* SemicolonToken */));
                 return;
             }
             parseErrorForMissingSemicolonAfter(name);
@@ -38314,11 +38304,13 @@ var ts;
         ["es2019.string", "lib.es2019.string.d.ts"],
         ["es2019.symbol", "lib.es2019.symbol.d.ts"],
         ["es2020.bigint", "lib.es2020.bigint.d.ts"],
+        ["es2020.date", "lib.es2020.date.d.ts"],
         ["es2020.promise", "lib.es2020.promise.d.ts"],
         ["es2020.sharedmemory", "lib.es2020.sharedmemory.d.ts"],
         ["es2020.string", "lib.es2020.string.d.ts"],
         ["es2020.symbol.wellknown", "lib.es2020.symbol.wellknown.d.ts"],
         ["es2020.intl", "lib.es2020.intl.d.ts"],
+        ["es2020.number", "lib.es2020.number.d.ts"],
         ["es2021.promise", "lib.es2021.promise.d.ts"],
         ["es2021.string", "lib.es2021.string.d.ts"],
         ["es2021.weakref", "lib.es2021.weakref.d.ts"],
@@ -55252,8 +55244,8 @@ var ts;
             var memberDeclaration = root.kind === 163 /* Parameter */ ? root.parent : root;
             return isPrivateWithinAmbient(memberDeclaration);
         }
-        function tryGetTypeFromEffectiveTypeNode(declaration) {
-            var typeNode = ts.getEffectiveTypeAnnotationNode(declaration);
+        function tryGetTypeFromEffectiveTypeNode(node) {
+            var typeNode = ts.getEffectiveTypeAnnotationNode(node);
             if (typeNode) {
                 return getTypeFromTypeNode(typeNode);
             }
@@ -62272,7 +62264,7 @@ var ts;
                     // distributive conditional type T extends U ? X : Y is instantiated with A | B for T, the
                     // result is (A extends U ? X : Y) | (B extends U ? X : Y).
                     result = distributionType && checkType_1 !== distributionType && distributionType.flags & (1048576 /* Union */ | 131072 /* Never */) ?
-                        mapTypeWithAlias(distributionType, function (t) { return getConditionalType(root, prependTypeMapping(checkType_1, t, newMapper_1)); }, aliasSymbol, aliasTypeArguments) :
+                        mapTypeWithAlias(getReducedType(distributionType), function (t) { return getConditionalType(root, prependTypeMapping(checkType_1, t, newMapper_1)); }, aliasSymbol, aliasTypeArguments) :
                         getConditionalType(root, newMapper_1, aliasSymbol, aliasTypeArguments);
                     root.instantiations.set(id, result);
                 }
@@ -65015,8 +65007,9 @@ var ts;
                 // This ensures the subtype relationship is ordered, and preventing declaration order
                 // from deciding which type "wins" in union subtype reduction.
                 // They're still assignable to one another, since `readonly` doesn't affect assignability.
-                if ((relation === subtypeRelation || relation === strictSubtypeRelation) &&
-                    !!(sourcePropFlags & 64 /* Readonly */) && !(targetPropFlags & 64 /* Readonly */)) {
+                // This is only applied during the strictSubtypeRelation -- currently used in subtype reduction
+                if (relation === strictSubtypeRelation &&
+                    isReadonlySymbol(sourceProp) && !isReadonlySymbol(targetProp)) {
                     return 0 /* False */;
                 }
                 // If the target comes from a partial union prop, allow `undefined` in the target type
@@ -71576,6 +71569,8 @@ var ts;
                 }
                 case 229 /* NonNullExpression */:
                     return getContextualType(parent, contextFlags);
+                case 270 /* ExportAssignment */:
+                    return tryGetTypeFromEffectiveTypeNode(parent);
                 case 287 /* JsxExpression */:
                     return getContextualTypeForJsxExpression(parent);
                 case 284 /* JsxAttribute */:

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "4.7.0-dev.20220227",
+    "version": "4.7.0-dev.20220302",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [