typescript 4.9.0-dev.20221017 → 4.9.0-dev.20221019

package/lib/tsserverlibrary.js

@@ -108,7 +108,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20221017");
+    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20221019");
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -21719,13 +21719,11 @@ var ts;
      * Creates a `BaseNodeFactory` which can be used to create `Node` instances from the constructors provided by the object allocator.
      */
     function createBaseNodeFactory() {
-        // tslint:disable variable-name
         var NodeConstructor;
         var TokenConstructor;
         var IdentifierConstructor;
         var PrivateIdentifierConstructor;
         var SourceFileConstructor;
-        // tslint:enable variable-name
         return {
             createBaseSourceFileNode: createBaseSourceFileNode,
             createBaseIdentifierNode: createBaseIdentifierNode,
@@ -27657,11 +27655,9 @@ var ts;
                 rawTextScanner.setText("`" + rawText + "`");
                 break;
             case 15 /* SyntaxKind.TemplateHead */:
-                // tslint:disable-next-line no-invalid-template-strings
                 rawTextScanner.setText("`" + rawText + "${");
                 break;
             case 16 /* SyntaxKind.TemplateMiddle */:
-                // tslint:disable-next-line no-invalid-template-strings
                 rawTextScanner.setText("}" + rawText + "${");
                 break;
             case 17 /* SyntaxKind.TemplateTail */:
@@ -28020,7 +28016,6 @@ var ts;
         return node;
     }
     ts.createInputFiles = createInputFiles;
-    // tslint:disable-next-line variable-name
     var SourceMapSource;
     /**
      * Create an external source map source file reference
@@ -32154,13 +32149,11 @@ var ts;
         var scanner = ts.createScanner(99 /* ScriptTarget.Latest */, /*skipTrivia*/ true);
         var disallowInAndDecoratorContext = 4096 /* NodeFlags.DisallowInContext */ | 16384 /* NodeFlags.DecoratorContext */;
         // capture constructors in 'initializeState' to avoid null checks
-        // tslint:disable variable-name
         var NodeConstructor;
         var TokenConstructor;
         var IdentifierConstructor;
         var PrivateIdentifierConstructor;
         var SourceFileConstructor;
-        // tslint:enable variable-name
         function countNode(node) {
             nodeCount++;
             return node;
@@ -72130,7 +72123,7 @@ var ts;
                     type = narrowTypeBySwitchOnDiscriminant(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
                 }
                 else if (expr.kind === 218 /* SyntaxKind.TypeOfExpression */ && isMatchingReference(reference, expr.expression)) {
-                    type = narrowBySwitchOnTypeOf(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
+                    type = narrowTypeBySwitchOnTypeOf(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
                 }
                 else {
                     if (strictNullChecks) {
@@ -72411,7 +72404,7 @@ var ts;
                     !!(prop.flags & 16777216 /* SymbolFlags.Optional */) || assumeTrue :
                     !!getApplicableIndexInfoForName(type, propName) || !assumeTrue;
             }
-            function narrowByInKeyword(type, nameType, assumeTrue) {
+            function narrowTypeByInKeyword(type, nameType, assumeTrue) {
                 var name = getPropertyNameFromType(nameType);
                 var isKnownProperty = someType(type, function (t) { return isTypePresencePossible(t, name, /*assumeTrue*/ true); });
                 if (isKnownProperty) {
@@ -72492,7 +72485,7 @@ var ts;
                                 return getTypeWithFacts(type, assumeTrue ? 524288 /* TypeFacts.NEUndefined */ : 65536 /* TypeFacts.EQUndefined */);
                             }
                             if (isMatchingReference(reference, target)) {
-                                return narrowByInKeyword(type, leftType, assumeTrue);
+                                return narrowTypeByInKeyword(type, leftType, assumeTrue);
                             }
                         }
                         break;
@@ -72681,7 +72674,7 @@ var ts;
                                 neverType;
                 });
             }
-            function narrowBySwitchOnTypeOf(type, switchStatement, clauseStart, clauseEnd) {
+            function narrowTypeBySwitchOnTypeOf(type, switchStatement, clauseStart, clauseEnd) {
                 var witnesses = getSwitchClauseTypeOfWitnesses(switchStatement);
                 if (!witnesses) {
                     return type;
@@ -83048,7 +83041,7 @@ var ts;
                 // We only need `Awaited<T>` if `T` is a type variable that has no base constraint, or the base constraint of `T` is `any`, `unknown`, `{}`, `object`,
                 // or is promise-like.
                 if (baseConstraint ?
-                    baseConstraint.flags & 3 /* TypeFlags.AnyOrUnknown */ || isEmptyObjectType(baseConstraint) || isThenableType(baseConstraint) :
+                    baseConstraint.flags & 3 /* TypeFlags.AnyOrUnknown */ || isEmptyObjectType(baseConstraint) || someType(baseConstraint, isThenableType) :
                     maybeTypeOfKind(type, 8650752 /* TypeFlags.TypeVariable */)) {
                     return true;
                 }
@@ -86863,12 +86856,11 @@ var ts;
             }
         }
         function checkModuleAugmentationElement(node, isGlobalAugmentation) {
-            var _a;
             switch (node.kind) {
                 case 240 /* SyntaxKind.VariableStatement */:
                     // error each individual name in variable statement instead of marking the entire variable statement
-                    for (var _i = 0, _b = node.declarationList.declarations; _i < _b.length; _i++) {
-                        var decl = _b[_i];
+                    for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
+                        var decl = _a[_i];
                         checkModuleAugmentationElement(decl, isGlobalAugmentation);
                     }
                     break;
@@ -86884,8 +86876,8 @@ var ts;
                 case 257 /* SyntaxKind.VariableDeclaration */:
                     var name = node.name;
                     if (ts.isBindingPattern(name)) {
-                        for (var _c = 0, _d = name.elements; _c < _d.length; _c++) {
-                            var el = _d[_c];
+                        for (var _b = 0, _c = name.elements; _b < _c.length; _b++) {
+                            var el = _c[_b];
                             // mark individual names in binding pattern
                             checkModuleAugmentationElement(el, isGlobalAugmentation);
                         }
@@ -86901,18 +86893,6 @@ var ts;
                     if (isGlobalAugmentation) {
                         return;
                     }
-                    var symbol = getSymbolOfNode(node);
-                    if (symbol) {
-                        // module augmentations cannot introduce new names on the top level scope of the module
-                        // this is done it two steps
-                        // 1. quick check - if symbol for node is not merged - this is local symbol to this augmentation - report error
-                        // 2. main check - report error if value declaration of the parent symbol is module augmentation)
-                        var reportError = !(symbol.flags & 33554432 /* SymbolFlags.Transient */);
-                        if (!reportError) {
-                            // symbol should not originate in augmentation
-                            reportError = !!((_a = symbol.parent) === null || _a === void 0 ? void 0 : _a.declarations) && ts.isExternalModuleAugmentation(symbol.parent.declarations[0]);
-                        }
-                    }
                     break;
             }
         }
@@ -107407,7 +107387,7 @@ var ts;
                     return createImportCallExpressionUMD(argument !== null && argument !== void 0 ? argument : factory.createVoidZero(), containsLexicalThis);
                 case ts.ModuleKind.CommonJS:
                 default:
-                    return createImportCallExpressionCommonJS(argument, containsLexicalThis);
+                    return createImportCallExpressionCommonJS(argument);
             }
         }
         function createImportCallExpressionUMD(arg, containsLexicalThis) {
@@ -107430,7 +107410,7 @@ var ts;
                 return factory.createConditionalExpression(
                 /*condition*/ factory.createIdentifier("__syncRequire"), 
                 /*questionToken*/ undefined, 
-                /*whenTrue*/ createImportCallExpressionCommonJS(arg, containsLexicalThis), 
+                /*whenTrue*/ createImportCallExpressionCommonJS(arg), 
                 /*colonToken*/ undefined, 
                 /*whenFalse*/ createImportCallExpressionAMD(argClone, containsLexicalThis));
             }
@@ -107439,7 +107419,7 @@ var ts;
                 return factory.createComma(factory.createAssignment(temp, arg), factory.createConditionalExpression(
                 /*condition*/ factory.createIdentifier("__syncRequire"), 
                 /*questionToken*/ undefined, 
-                /*whenTrue*/ createImportCallExpressionCommonJS(temp, containsLexicalThis), 
+                /*whenTrue*/ createImportCallExpressionCommonJS(temp, /* isInlineable */ true), 
                 /*colonToken*/ undefined, 
                 /*whenFalse*/ createImportCallExpressionAMD(temp, containsLexicalThis)));
             }
@@ -107489,14 +107469,20 @@ var ts;
             }
             return promise;
         }
-        function createImportCallExpressionCommonJS(arg, containsLexicalThis) {
-            // import("./blah")
+        function createImportCallExpressionCommonJS(arg, isInlineable) {
+            // import(x)
             // emit as
-            // Promise.resolve().then(function () { return require(x); }) /*CommonJs Require*/
+            // var _a;
+            // (_a = x, Promise.resolve().then(() => require(_a)) /*CommonJs Require*/
             // We have to wrap require in then callback so that require is done in asynchronously
             // if we simply do require in resolve callback in Promise constructor. We will execute the loading immediately
-            var promiseResolveCall = factory.createCallExpression(factory.createPropertyAccessExpression(factory.createIdentifier("Promise"), "resolve"), /*typeArguments*/ undefined, /*argumentsArray*/ []);
-            var requireCall = factory.createCallExpression(factory.createIdentifier("require"), /*typeArguments*/ undefined, arg ? [arg] : []);
+            // If the arg is not inlineable, we have to evaluate it in the current scope with a temp var
+            var temp = arg && !ts.isSimpleInlineableExpression(arg) && !isInlineable ? factory.createTempVariable(hoistVariableDeclaration) : undefined;
+            var promiseResolveCall = factory.createCallExpression(factory.createPropertyAccessExpression(factory.createIdentifier("Promise"), "resolve"), 
+            /*typeArguments*/ undefined, 
+            /*argumentsArray*/ []);
+            var requireCall = factory.createCallExpression(factory.createIdentifier("require"), 
+            /*typeArguments*/ undefined, temp ? [temp] : arg ? [arg] : []);
             if (ts.getESModuleInterop(compilerOptions)) {
                 requireCall = emitHelpers().createImportStarHelper(requireCall);
             }
@@ -107517,14 +107503,9 @@ var ts;
                 /*typeParameters*/ undefined, 
                 /*parameters*/ [], 
                 /*type*/ undefined, factory.createBlock([factory.createReturnStatement(requireCall)]));
-                // if there is a lexical 'this' in the import call arguments, ensure we indicate
-                // that this new function expression indicates it captures 'this' so that the
-                // es2015 transformer will properly substitute 'this' with '_this'.
-                if (containsLexicalThis) {
-                    ts.setEmitFlags(func, 8 /* EmitFlags.CapturesThis */);
-                }
             }
-            return factory.createCallExpression(factory.createPropertyAccessExpression(promiseResolveCall, "then"), /*typeArguments*/ undefined, [func]);
+            var downleveledImport = factory.createCallExpression(factory.createPropertyAccessExpression(promiseResolveCall, "then"), /*typeArguments*/ undefined, [func]);
+            return temp === undefined ? downleveledImport : factory.createCommaListExpression([factory.createAssignment(temp, arg), downleveledImport]);
         }
         function getHelperExpressionForExport(node, innerExpr) {
             if (!ts.getESModuleInterop(compilerOptions) || ts.getEmitFlags(node) & 67108864 /* EmitFlags.NeverApplyImportHelper */) {
@@ -135899,7 +135880,7 @@ var ts;
             if (preferences.includeCompletionsWithClassMemberSnippets &&
                 preferences.includeCompletionsWithInsertText &&
                 completionKind === 3 /* CompletionKind.MemberLike */ &&
-                isClassLikeMemberCompletion(symbol, location)) {
+                isClassLikeMemberCompletion(symbol, location, sourceFile)) {
                 var importAdder = void 0;
                 (_b = getEntryForMemberCompletion(host, program, options, preferences, name, symbol, location, contextToken, formatContext), insertText = _b.insertText, isSnippet = _b.isSnippet, importAdder = _b.importAdder, replacementSpan = _b.replacementSpan);
                 sortText = Completions.SortText.ClassMemberSnippets; // sortText has to be lower priority than the sortText for keywords. See #47852.
@@ -135971,7 +135952,7 @@ var ts;
                 data: data,
             };
         }
-        function isClassLikeMemberCompletion(symbol, location) {
+        function isClassLikeMemberCompletion(symbol, location, sourceFile) {
             // TODO: support JS files.
             if (ts.isInJSFile(location)) {
                 return false;
@@ -136005,6 +135986,7 @@ var ts;
                         location.parent.parent &&
                         ts.isClassElement(location.parent) &&
                         location === location.parent.name &&
+                        location.parent.getLastToken(sourceFile) === location.parent.name &&
                         ts.isClassLike(location.parent.parent)) ||
                     (location.parent &&
                         ts.isSyntaxList(location) &&
@@ -144017,19 +143999,24 @@ var ts;
                     return getCommentOwnerInfoWorker(commentOwner.initializer, options);
                 case 260 /* SyntaxKind.ClassDeclaration */:
                 case 261 /* SyntaxKind.InterfaceDeclaration */:
-                case 168 /* SyntaxKind.PropertySignature */:
                 case 263 /* SyntaxKind.EnumDeclaration */:
                 case 302 /* SyntaxKind.EnumMember */:
                 case 262 /* SyntaxKind.TypeAliasDeclaration */:
                     return { commentOwner: commentOwner };
+                case 168 /* SyntaxKind.PropertySignature */: {
+                    var host_1 = commentOwner;
+                    return host_1.type && ts.isFunctionTypeNode(host_1.type)
+                        ? { commentOwner: commentOwner, parameters: host_1.type.parameters, hasReturn: hasReturn(host_1.type, options) }
+                        : { commentOwner: commentOwner };
+                }
                 case 240 /* SyntaxKind.VariableStatement */: {
                     var varStatement = commentOwner;
                     var varDeclarations = varStatement.declarationList.declarations;
-                    var host_1 = varDeclarations.length === 1 && varDeclarations[0].initializer
+                    var host_2 = varDeclarations.length === 1 && varDeclarations[0].initializer
                         ? getRightHandSideOfAssignment(varDeclarations[0].initializer)
                         : undefined;
-                    return host_1
-                        ? { commentOwner: commentOwner, parameters: host_1.parameters, hasReturn: hasReturn(host_1, options) }
+                    return host_2
+                        ? { commentOwner: commentOwner, parameters: host_2.parameters, hasReturn: hasReturn(host_2, options) }
                         : { commentOwner: commentOwner };
                 }
                 case 308 /* SyntaxKind.SourceFile */:
@@ -144059,7 +144046,7 @@ var ts;
         }
         function hasReturn(node, options) {
             return !!(options === null || options === void 0 ? void 0 : options.generateReturnInDocTemplate) &&
-                (ts.isArrowFunction(node) && ts.isExpression(node.body)
+                (ts.isFunctionTypeNode(node) || ts.isArrowFunction(node) && ts.isExpression(node.body)
                     || ts.isFunctionLikeDeclaration(node) && node.body && ts.isBlock(node.body) && !!ts.forEachReturnStatement(node.body, function (n) { return n; }));
         }
         function getRightHandSideOfAssignment(rightHandSide) {

package/lib/typescript.js

@@ -99,7 +99,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20221017");
+    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20221019");
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -21710,13 +21710,11 @@ var ts;
      * Creates a `BaseNodeFactory` which can be used to create `Node` instances from the constructors provided by the object allocator.
      */
     function createBaseNodeFactory() {
-        // tslint:disable variable-name
         var NodeConstructor;
         var TokenConstructor;
         var IdentifierConstructor;
         var PrivateIdentifierConstructor;
         var SourceFileConstructor;
-        // tslint:enable variable-name
         return {
             createBaseSourceFileNode: createBaseSourceFileNode,
             createBaseIdentifierNode: createBaseIdentifierNode,
@@ -27648,11 +27646,9 @@ var ts;
                 rawTextScanner.setText("`" + rawText + "`");
                 break;
             case 15 /* SyntaxKind.TemplateHead */:
-                // tslint:disable-next-line no-invalid-template-strings
                 rawTextScanner.setText("`" + rawText + "${");
                 break;
             case 16 /* SyntaxKind.TemplateMiddle */:
-                // tslint:disable-next-line no-invalid-template-strings
                 rawTextScanner.setText("}" + rawText + "${");
                 break;
             case 17 /* SyntaxKind.TemplateTail */:
@@ -28011,7 +28007,6 @@ var ts;
         return node;
     }
     ts.createInputFiles = createInputFiles;
-    // tslint:disable-next-line variable-name
     var SourceMapSource;
     /**
      * Create an external source map source file reference
@@ -32145,13 +32140,11 @@ var ts;
         var scanner = ts.createScanner(99 /* ScriptTarget.Latest */, /*skipTrivia*/ true);
         var disallowInAndDecoratorContext = 4096 /* NodeFlags.DisallowInContext */ | 16384 /* NodeFlags.DecoratorContext */;
         // capture constructors in 'initializeState' to avoid null checks
-        // tslint:disable variable-name
         var NodeConstructor;
         var TokenConstructor;
         var IdentifierConstructor;
         var PrivateIdentifierConstructor;
         var SourceFileConstructor;
-        // tslint:enable variable-name
         function countNode(node) {
             nodeCount++;
             return node;
@@ -72121,7 +72114,7 @@ var ts;
                     type = narrowTypeBySwitchOnDiscriminant(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
                 }
                 else if (expr.kind === 218 /* SyntaxKind.TypeOfExpression */ && isMatchingReference(reference, expr.expression)) {
-                    type = narrowBySwitchOnTypeOf(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
+                    type = narrowTypeBySwitchOnTypeOf(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
                 }
                 else {
                     if (strictNullChecks) {
@@ -72402,7 +72395,7 @@ var ts;
                     !!(prop.flags & 16777216 /* SymbolFlags.Optional */) || assumeTrue :
                     !!getApplicableIndexInfoForName(type, propName) || !assumeTrue;
             }
-            function narrowByInKeyword(type, nameType, assumeTrue) {
+            function narrowTypeByInKeyword(type, nameType, assumeTrue) {
                 var name = getPropertyNameFromType(nameType);
                 var isKnownProperty = someType(type, function (t) { return isTypePresencePossible(t, name, /*assumeTrue*/ true); });
                 if (isKnownProperty) {
@@ -72483,7 +72476,7 @@ var ts;
                                 return getTypeWithFacts(type, assumeTrue ? 524288 /* TypeFacts.NEUndefined */ : 65536 /* TypeFacts.EQUndefined */);
                             }
                             if (isMatchingReference(reference, target)) {
-                                return narrowByInKeyword(type, leftType, assumeTrue);
+                                return narrowTypeByInKeyword(type, leftType, assumeTrue);
                             }
                         }
                         break;
@@ -72672,7 +72665,7 @@ var ts;
                                 neverType;
                 });
             }
-            function narrowBySwitchOnTypeOf(type, switchStatement, clauseStart, clauseEnd) {
+            function narrowTypeBySwitchOnTypeOf(type, switchStatement, clauseStart, clauseEnd) {
                 var witnesses = getSwitchClauseTypeOfWitnesses(switchStatement);
                 if (!witnesses) {
                     return type;
@@ -83039,7 +83032,7 @@ var ts;
                 // We only need `Awaited<T>` if `T` is a type variable that has no base constraint, or the base constraint of `T` is `any`, `unknown`, `{}`, `object`,
                 // or is promise-like.
                 if (baseConstraint ?
-                    baseConstraint.flags & 3 /* TypeFlags.AnyOrUnknown */ || isEmptyObjectType(baseConstraint) || isThenableType(baseConstraint) :
+                    baseConstraint.flags & 3 /* TypeFlags.AnyOrUnknown */ || isEmptyObjectType(baseConstraint) || someType(baseConstraint, isThenableType) :
                     maybeTypeOfKind(type, 8650752 /* TypeFlags.TypeVariable */)) {
                     return true;
                 }
@@ -86854,12 +86847,11 @@ var ts;
             }
         }
         function checkModuleAugmentationElement(node, isGlobalAugmentation) {
-            var _a;
             switch (node.kind) {
                 case 240 /* SyntaxKind.VariableStatement */:
                     // error each individual name in variable statement instead of marking the entire variable statement
-                    for (var _i = 0, _b = node.declarationList.declarations; _i < _b.length; _i++) {
-                        var decl = _b[_i];
+                    for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
+                        var decl = _a[_i];
                         checkModuleAugmentationElement(decl, isGlobalAugmentation);
                     }
                     break;
@@ -86875,8 +86867,8 @@ var ts;
                 case 257 /* SyntaxKind.VariableDeclaration */:
                     var name = node.name;
                     if (ts.isBindingPattern(name)) {
-                        for (var _c = 0, _d = name.elements; _c < _d.length; _c++) {
-                            var el = _d[_c];
+                        for (var _b = 0, _c = name.elements; _b < _c.length; _b++) {
+                            var el = _c[_b];
                             // mark individual names in binding pattern
                             checkModuleAugmentationElement(el, isGlobalAugmentation);
                         }
@@ -86892,18 +86884,6 @@ var ts;
                     if (isGlobalAugmentation) {
                         return;
                     }
-                    var symbol = getSymbolOfNode(node);
-                    if (symbol) {
-                        // module augmentations cannot introduce new names on the top level scope of the module
-                        // this is done it two steps
-                        // 1. quick check - if symbol for node is not merged - this is local symbol to this augmentation - report error
-                        // 2. main check - report error if value declaration of the parent symbol is module augmentation)
-                        var reportError = !(symbol.flags & 33554432 /* SymbolFlags.Transient */);
-                        if (!reportError) {
-                            // symbol should not originate in augmentation
-                            reportError = !!((_a = symbol.parent) === null || _a === void 0 ? void 0 : _a.declarations) && ts.isExternalModuleAugmentation(symbol.parent.declarations[0]);
-                        }
-                    }
                     break;
             }
         }
@@ -107398,7 +107378,7 @@ var ts;
                     return createImportCallExpressionUMD(argument !== null && argument !== void 0 ? argument : factory.createVoidZero(), containsLexicalThis);
                 case ts.ModuleKind.CommonJS:
                 default:
-                    return createImportCallExpressionCommonJS(argument, containsLexicalThis);
+                    return createImportCallExpressionCommonJS(argument);
             }
         }
         function createImportCallExpressionUMD(arg, containsLexicalThis) {
@@ -107421,7 +107401,7 @@ var ts;
                 return factory.createConditionalExpression(
                 /*condition*/ factory.createIdentifier("__syncRequire"), 
                 /*questionToken*/ undefined, 
-                /*whenTrue*/ createImportCallExpressionCommonJS(arg, containsLexicalThis), 
+                /*whenTrue*/ createImportCallExpressionCommonJS(arg), 
                 /*colonToken*/ undefined, 
                 /*whenFalse*/ createImportCallExpressionAMD(argClone, containsLexicalThis));
             }
@@ -107430,7 +107410,7 @@ var ts;
                 return factory.createComma(factory.createAssignment(temp, arg), factory.createConditionalExpression(
                 /*condition*/ factory.createIdentifier("__syncRequire"), 
                 /*questionToken*/ undefined, 
-                /*whenTrue*/ createImportCallExpressionCommonJS(temp, containsLexicalThis), 
+                /*whenTrue*/ createImportCallExpressionCommonJS(temp, /* isInlineable */ true), 
                 /*colonToken*/ undefined, 
                 /*whenFalse*/ createImportCallExpressionAMD(temp, containsLexicalThis)));
             }
@@ -107480,14 +107460,20 @@ var ts;
             }
             return promise;
         }
-        function createImportCallExpressionCommonJS(arg, containsLexicalThis) {
-            // import("./blah")
+        function createImportCallExpressionCommonJS(arg, isInlineable) {
+            // import(x)
             // emit as
-            // Promise.resolve().then(function () { return require(x); }) /*CommonJs Require*/
+            // var _a;
+            // (_a = x, Promise.resolve().then(() => require(_a)) /*CommonJs Require*/
             // We have to wrap require in then callback so that require is done in asynchronously
             // if we simply do require in resolve callback in Promise constructor. We will execute the loading immediately
-            var promiseResolveCall = factory.createCallExpression(factory.createPropertyAccessExpression(factory.createIdentifier("Promise"), "resolve"), /*typeArguments*/ undefined, /*argumentsArray*/ []);
-            var requireCall = factory.createCallExpression(factory.createIdentifier("require"), /*typeArguments*/ undefined, arg ? [arg] : []);
+            // If the arg is not inlineable, we have to evaluate it in the current scope with a temp var
+            var temp = arg && !ts.isSimpleInlineableExpression(arg) && !isInlineable ? factory.createTempVariable(hoistVariableDeclaration) : undefined;
+            var promiseResolveCall = factory.createCallExpression(factory.createPropertyAccessExpression(factory.createIdentifier("Promise"), "resolve"), 
+            /*typeArguments*/ undefined, 
+            /*argumentsArray*/ []);
+            var requireCall = factory.createCallExpression(factory.createIdentifier("require"), 
+            /*typeArguments*/ undefined, temp ? [temp] : arg ? [arg] : []);
             if (ts.getESModuleInterop(compilerOptions)) {
                 requireCall = emitHelpers().createImportStarHelper(requireCall);
             }
@@ -107508,14 +107494,9 @@ var ts;
                 /*typeParameters*/ undefined, 
                 /*parameters*/ [], 
                 /*type*/ undefined, factory.createBlock([factory.createReturnStatement(requireCall)]));
-                // if there is a lexical 'this' in the import call arguments, ensure we indicate
-                // that this new function expression indicates it captures 'this' so that the
-                // es2015 transformer will properly substitute 'this' with '_this'.
-                if (containsLexicalThis) {
-                    ts.setEmitFlags(func, 8 /* EmitFlags.CapturesThis */);
-                }
             }
-            return factory.createCallExpression(factory.createPropertyAccessExpression(promiseResolveCall, "then"), /*typeArguments*/ undefined, [func]);
+            var downleveledImport = factory.createCallExpression(factory.createPropertyAccessExpression(promiseResolveCall, "then"), /*typeArguments*/ undefined, [func]);
+            return temp === undefined ? downleveledImport : factory.createCommaListExpression([factory.createAssignment(temp, arg), downleveledImport]);
         }
         function getHelperExpressionForExport(node, innerExpr) {
             if (!ts.getESModuleInterop(compilerOptions) || ts.getEmitFlags(node) & 67108864 /* EmitFlags.NeverApplyImportHelper */) {
@@ -135890,7 +135871,7 @@ var ts;
             if (preferences.includeCompletionsWithClassMemberSnippets &&
                 preferences.includeCompletionsWithInsertText &&
                 completionKind === 3 /* CompletionKind.MemberLike */ &&
-                isClassLikeMemberCompletion(symbol, location)) {
+                isClassLikeMemberCompletion(symbol, location, sourceFile)) {
                 var importAdder = void 0;
                 (_b = getEntryForMemberCompletion(host, program, options, preferences, name, symbol, location, contextToken, formatContext), insertText = _b.insertText, isSnippet = _b.isSnippet, importAdder = _b.importAdder, replacementSpan = _b.replacementSpan);
                 sortText = Completions.SortText.ClassMemberSnippets; // sortText has to be lower priority than the sortText for keywords. See #47852.
@@ -135962,7 +135943,7 @@ var ts;
                 data: data,
             };
         }
-        function isClassLikeMemberCompletion(symbol, location) {
+        function isClassLikeMemberCompletion(symbol, location, sourceFile) {
             // TODO: support JS files.
             if (ts.isInJSFile(location)) {
                 return false;
@@ -135996,6 +135977,7 @@ var ts;
                         location.parent.parent &&
                         ts.isClassElement(location.parent) &&
                         location === location.parent.name &&
+                        location.parent.getLastToken(sourceFile) === location.parent.name &&
                         ts.isClassLike(location.parent.parent)) ||
                     (location.parent &&
                         ts.isSyntaxList(location) &&
@@ -144008,19 +143990,24 @@ var ts;
                     return getCommentOwnerInfoWorker(commentOwner.initializer, options);
                 case 260 /* SyntaxKind.ClassDeclaration */:
                 case 261 /* SyntaxKind.InterfaceDeclaration */:
-                case 168 /* SyntaxKind.PropertySignature */:
                 case 263 /* SyntaxKind.EnumDeclaration */:
                 case 302 /* SyntaxKind.EnumMember */:
                 case 262 /* SyntaxKind.TypeAliasDeclaration */:
                     return { commentOwner: commentOwner };
+                case 168 /* SyntaxKind.PropertySignature */: {
+                    var host_1 = commentOwner;
+                    return host_1.type && ts.isFunctionTypeNode(host_1.type)
+                        ? { commentOwner: commentOwner, parameters: host_1.type.parameters, hasReturn: hasReturn(host_1.type, options) }
+                        : { commentOwner: commentOwner };
+                }
                 case 240 /* SyntaxKind.VariableStatement */: {
                     var varStatement = commentOwner;
                     var varDeclarations = varStatement.declarationList.declarations;
-                    var host_1 = varDeclarations.length === 1 && varDeclarations[0].initializer
+                    var host_2 = varDeclarations.length === 1 && varDeclarations[0].initializer
                         ? getRightHandSideOfAssignment(varDeclarations[0].initializer)
                         : undefined;
-                    return host_1
-                        ? { commentOwner: commentOwner, parameters: host_1.parameters, hasReturn: hasReturn(host_1, options) }
+                    return host_2
+                        ? { commentOwner: commentOwner, parameters: host_2.parameters, hasReturn: hasReturn(host_2, options) }
                         : { commentOwner: commentOwner };
                 }
                 case 308 /* SyntaxKind.SourceFile */:
@@ -144050,7 +144037,7 @@ var ts;
         }
         function hasReturn(node, options) {
             return !!(options === null || options === void 0 ? void 0 : options.generateReturnInDocTemplate) &&
-                (ts.isArrowFunction(node) && ts.isExpression(node.body)
+                (ts.isFunctionTypeNode(node) || ts.isArrowFunction(node) && ts.isExpression(node.body)
                     || ts.isFunctionLikeDeclaration(node) && node.body && ts.isBlock(node.body) && !!ts.forEachReturnStatement(node.body, function (n) { return n; }));
         }
         function getRightHandSideOfAssignment(rightHandSide) {