typescript 4.7.0-dev.20220301 → 4.7.0-dev.20220302

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.20220301";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220302";
     var NativeCollections;
     (function (NativeCollections) {
         var globals = typeof globalThis !== "undefined" ? globalThis :
@@ -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);
             }
@@ -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.20220301";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220302";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -55255,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);
             }
@@ -71580,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 */:
@@ -130111,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;
@@ -130215,6 +130217,7 @@ var ts;
                 return { insertText: name };
             }
             var isSnippet;
+            var replacementSpan;
             var insertText = name;
             var checker = program.getTypeChecker();
             var sourceFile = location.getSourceFile();
@@ -130243,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
@@ -130265,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) {
@@ -130303,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:
@@ -130329,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)) {

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.20220301";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220302";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -55449,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);
             }
@@ -71774,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 */:
@@ -130722,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;
@@ -130826,6 +130828,7 @@ var ts;
                 return { insertText: name };
             }
             var isSnippet;
+            var replacementSpan;
             var insertText = name;
             var checker = program.getTypeChecker();
             var sourceFile = location.getSourceFile();
@@ -130854,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
@@ -130876,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) {
@@ -130914,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:
@@ -130940,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)) {

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.20220301";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220302";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -55449,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);
             }
@@ -71774,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 */:
@@ -130722,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;
@@ -130826,6 +130828,7 @@ var ts;
                 return { insertText: name };
             }
             var isSnippet;
+            var replacementSpan;
             var insertText = name;
             var checker = program.getTypeChecker();
             var sourceFile = location.getSourceFile();
@@ -130854,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
@@ -130876,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) {
@@ -130914,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:
@@ -130940,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)) {

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.20220301";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220302";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -55449,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);
             }
@@ -71774,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 */:
@@ -130722,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;
@@ -130826,6 +130828,7 @@ var ts;
                 return { insertText: name };
             }
             var isSnippet;
+            var replacementSpan;
             var insertText = name;
             var checker = program.getTypeChecker();
             var sourceFile = location.getSourceFile();
@@ -130854,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
@@ -130876,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) {
@@ -130914,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:
@@ -130940,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)) {

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.20220301";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220302";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -55244,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);
             }
@@ -71569,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.20220301",
+    "version": "4.7.0-dev.20220302",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [