Skip to content

Commit 2dbc531

Browse files
mhegazymhegazy
committed
Update LKG
1 parent c26f402 commit 2dbc531

File tree

5 files changed

+72
-48
lines changed

5 files changed

+72
-48
lines changed

‎lib/tsc.js

+13-9
Original file line numberDiff line numberDiff line change
@@ -39606,6 +39606,9 @@ var ts;
3960639606
return decoded ? ts.createLiteral(decoded, node) : node;
3960739607
}
3960839608
else if (node.kind === 252) {
39609+
if (node.expression === undefined) {
39610+
return ts.createLiteral(true);
39611+
}
3960939612
return visitJsxExpression(node);
3961039613
}
3961139614
else {
@@ -40699,7 +40702,8 @@ var ts;
4069940702
addRestParameterIfNeeded(statements, constructor, hasSynthesizedSuper);
4070040703
ts.Debug.assert(statementOffset >= 0, "statementOffset not initialized correctly!");
4070140704
}
40702-
var superCaptureStatus = declareOrCaptureOrReturnThisForConstructorIfNeeded(statements, constructor, !!extendsClauseElement, hasSynthesizedSuper, statementOffset);
40705+
var isDerivedClass = extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 94;
40706+
var superCaptureStatus = declareOrCaptureOrReturnThisForConstructorIfNeeded(statements, constructor, isDerivedClass, hasSynthesizedSuper, statementOffset);
4070340707
if (superCaptureStatus === 1 || superCaptureStatus === 2) {
4070440708
statementOffset++;
4070540709
}
@@ -40710,7 +40714,7 @@ var ts;
4071040714
});
4071140715
ts.addRange(statements, body);
4071240716
}
40713-
if (extendsClauseElement
40717+
if (isDerivedClass
4071440718
&& superCaptureStatus !== 2
4071540719
&& !(constructor && isSufficientlyCoveredByReturnStatements(constructor.body))) {
4071640720
statements.push(ts.createReturn(ts.createIdentifier("_this")));
@@ -40741,8 +40745,8 @@ var ts;
4074140745
}
4074240746
return false;
4074340747
}
40744-
function declareOrCaptureOrReturnThisForConstructorIfNeeded(statements, ctor, hasExtendsClause, hasSynthesizedSuper, statementOffset) {
40745-
if (!hasExtendsClause) {
40748+
function declareOrCaptureOrReturnThisForConstructorIfNeeded(statements, ctor, isDerivedClass, hasSynthesizedSuper, statementOffset) {
40749+
if (!isDerivedClass) {
4074640750
if (ctor) {
4074740751
addCaptureThisForNodeIfNeeded(statements, ctor);
4074840752
}
@@ -40779,17 +40783,17 @@ var ts;
4077940783
statements.push(returnStatement);
4078040784
return 2;
4078140785
}
40782-
captureThisForNode(statements, ctor, superCallExpression, firstStatement);
40786+
captureThisForNode(statements, ctor, superCallExpression || createActualThis(), firstStatement);
4078340787
if (superCallExpression) {
4078440788
return 1;
4078540789
}
4078640790
return 0;
4078740791
}
40792+
function createActualThis() {
40793+
return ts.setEmitFlags(ts.createThis(), 4);
40794+
}
4078840795
function createDefaultSuperCallOrThis() {
40789-
var actualThis = ts.createThis();
40790-
ts.setEmitFlags(actualThis, 4);
40791-
var superCall = ts.createFunctionApply(ts.createIdentifier("_super"), actualThis, ts.createIdentifier("arguments"));
40792-
return ts.createLogicalOr(superCall, actualThis);
40796+
return ts.createLogicalOr(ts.createLogicalAnd(ts.createStrictInequality(ts.createIdentifier("_super"), ts.createNull()), ts.createFunctionApply(ts.createIdentifier("_super"), createActualThis(), ts.createIdentifier("arguments"))), createActualThis());
4079340797
}
4079440798
function visitParameter(node) {
4079540799
if (node.dotDotDotToken) {

‎lib/tsserver.js

+15-11
Original file line numberDiff line numberDiff line change
@@ -41116,6 +41116,9 @@ var ts;
4111641116
return decoded ? ts.createLiteral(decoded, node) : node;
4111741117
}
4111841118
else if (node.kind === 252) {
41119+
if (node.expression === undefined) {
41120+
return ts.createLiteral(true);
41121+
}
4111941122
return visitJsxExpression(node);
4112041123
}
4112141124
else {
@@ -42209,7 +42212,8 @@ var ts;
4220942212
addRestParameterIfNeeded(statements, constructor, hasSynthesizedSuper);
4221042213
ts.Debug.assert(statementOffset >= 0, "statementOffset not initialized correctly!");
4221142214
}
42212-
var superCaptureStatus = declareOrCaptureOrReturnThisForConstructorIfNeeded(statements, constructor, !!extendsClauseElement, hasSynthesizedSuper, statementOffset);
42215+
var isDerivedClass = extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 94;
42216+
var superCaptureStatus = declareOrCaptureOrReturnThisForConstructorIfNeeded(statements, constructor, isDerivedClass, hasSynthesizedSuper, statementOffset);
4221342217
if (superCaptureStatus === 1 || superCaptureStatus === 2) {
4221442218
statementOffset++;
4221542219
}
@@ -42220,7 +42224,7 @@ var ts;
4222042224
});
4222142225
ts.addRange(statements, body);
4222242226
}
42223-
if (extendsClauseElement
42227+
if (isDerivedClass
4222442228
&& superCaptureStatus !== 2
4222542229
&& !(constructor && isSufficientlyCoveredByReturnStatements(constructor.body))) {
4222642230
statements.push(ts.createReturn(ts.createIdentifier("_this")));
@@ -42251,8 +42255,8 @@ var ts;
4225142255
}
4225242256
return false;
4225342257
}
42254-
function declareOrCaptureOrReturnThisForConstructorIfNeeded(statements, ctor, hasExtendsClause, hasSynthesizedSuper, statementOffset) {
42255-
if (!hasExtendsClause) {
42258+
function declareOrCaptureOrReturnThisForConstructorIfNeeded(statements, ctor, isDerivedClass, hasSynthesizedSuper, statementOffset) {
42259+
if (!isDerivedClass) {
4225642260
if (ctor) {
4225742261
addCaptureThisForNodeIfNeeded(statements, ctor);
4225842262
}
@@ -42289,17 +42293,17 @@ var ts;
4228942293
statements.push(returnStatement);
4229042294
return 2;
4229142295
}
42292-
captureThisForNode(statements, ctor, superCallExpression, firstStatement);
42296+
captureThisForNode(statements, ctor, superCallExpression || createActualThis(), firstStatement);
4229342297
if (superCallExpression) {
4229442298
return 1;
4229542299
}
4229642300
return 0;
4229742301
}
42302+
function createActualThis() {
42303+
return ts.setEmitFlags(ts.createThis(), 4);
42304+
}
4229842305
function createDefaultSuperCallOrThis() {
42299-
var actualThis = ts.createThis();
42300-
ts.setEmitFlags(actualThis, 4);
42301-
var superCall = ts.createFunctionApply(ts.createIdentifier("_super"), actualThis, ts.createIdentifier("arguments"));
42302-
return ts.createLogicalOr(superCall, actualThis);
42306+
return ts.createLogicalOr(ts.createLogicalAnd(ts.createStrictInequality(ts.createIdentifier("_super"), ts.createNull()), ts.createFunctionApply(ts.createIdentifier("_super"), createActualThis(), ts.createIdentifier("arguments"))), createActualThis());
4230342307
}
4230442308
function visitParameter(node) {
4230542309
if (node.dotDotDotToken) {
@@ -65201,7 +65205,7 @@ var ts;
6520165205
var ModuleBuilderFileInfo = (function (_super) {
6520265206
__extends(ModuleBuilderFileInfo, _super);
6520365207
function ModuleBuilderFileInfo() {
65204-
var _this = _super.apply(this, arguments) || this;
65208+
var _this = _super !== null && _super.apply(this, arguments) || this;
6520565209
_this.references = [];
6520665210
_this.referencedBy = [];
6520765211
return _this;
@@ -69807,7 +69811,7 @@ var ts;
6980769811
var IOSession = (function (_super) {
6980869812
__extends(IOSession, _super);
6980969813
function IOSession(host, cancellationToken, installerEventPort, canUseEvents, useSingleInferredProject, disableAutomaticTypingAcquisition, globalTypingsCacheLocation, telemetryEnabled, logger) {
69810-
var _this;
69814+
var _this = this;
6981169815
var typingsInstaller = disableAutomaticTypingAcquisition
6981269816
? undefined
6981369817
: new NodeTypingsInstaller(telemetryEnabled, logger, host, installerEventPort, globalTypingsCacheLocation, host.newLine);

‎lib/tsserverlibrary.js

+14-10
Original file line numberDiff line numberDiff line change
@@ -41116,6 +41116,9 @@ var ts;
4111641116
return decoded ? ts.createLiteral(decoded, node) : node;
4111741117
}
4111841118
else if (node.kind === 252) {
41119+
if (node.expression === undefined) {
41120+
return ts.createLiteral(true);
41121+
}
4111941122
return visitJsxExpression(node);
4112041123
}
4112141124
else {
@@ -42209,7 +42212,8 @@ var ts;
4220942212
addRestParameterIfNeeded(statements, constructor, hasSynthesizedSuper);
4221042213
ts.Debug.assert(statementOffset >= 0, "statementOffset not initialized correctly!");
4221142214
}
42212-
var superCaptureStatus = declareOrCaptureOrReturnThisForConstructorIfNeeded(statements, constructor, !!extendsClauseElement, hasSynthesizedSuper, statementOffset);
42215+
var isDerivedClass = extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 94;
42216+
var superCaptureStatus = declareOrCaptureOrReturnThisForConstructorIfNeeded(statements, constructor, isDerivedClass, hasSynthesizedSuper, statementOffset);
4221342217
if (superCaptureStatus === 1 || superCaptureStatus === 2) {
4221442218
statementOffset++;
4221542219
}
@@ -42220,7 +42224,7 @@ var ts;
4222042224
});
4222142225
ts.addRange(statements, body);
4222242226
}
42223-
if (extendsClauseElement
42227+
if (isDerivedClass
4222442228
&& superCaptureStatus !== 2
4222542229
&& !(constructor && isSufficientlyCoveredByReturnStatements(constructor.body))) {
4222642230
statements.push(ts.createReturn(ts.createIdentifier("_this")));
@@ -42251,8 +42255,8 @@ var ts;
4225142255
}
4225242256
return false;
4225342257
}
42254-
function declareOrCaptureOrReturnThisForConstructorIfNeeded(statements, ctor, hasExtendsClause, hasSynthesizedSuper, statementOffset) {
42255-
if (!hasExtendsClause) {
42258+
function declareOrCaptureOrReturnThisForConstructorIfNeeded(statements, ctor, isDerivedClass, hasSynthesizedSuper, statementOffset) {
42259+
if (!isDerivedClass) {
4225642260
if (ctor) {
4225742261
addCaptureThisForNodeIfNeeded(statements, ctor);
4225842262
}
@@ -42289,17 +42293,17 @@ var ts;
4228942293
statements.push(returnStatement);
4229042294
return 2;
4229142295
}
42292-
captureThisForNode(statements, ctor, superCallExpression, firstStatement);
42296+
captureThisForNode(statements, ctor, superCallExpression || createActualThis(), firstStatement);
4229342297
if (superCallExpression) {
4229442298
return 1;
4229542299
}
4229642300
return 0;
4229742301
}
42302+
function createActualThis() {
42303+
return ts.setEmitFlags(ts.createThis(), 4);
42304+
}
4229842305
function createDefaultSuperCallOrThis() {
42299-
var actualThis = ts.createThis();
42300-
ts.setEmitFlags(actualThis, 4);
42301-
var superCall = ts.createFunctionApply(ts.createIdentifier("_super"), actualThis, ts.createIdentifier("arguments"));
42302-
return ts.createLogicalOr(superCall, actualThis);
42306+
return ts.createLogicalOr(ts.createLogicalAnd(ts.createStrictInequality(ts.createIdentifier("_super"), ts.createNull()), ts.createFunctionApply(ts.createIdentifier("_super"), createActualThis(), ts.createIdentifier("arguments"))), createActualThis());
4230342307
}
4230442308
function visitParameter(node) {
4230542309
if (node.dotDotDotToken) {
@@ -65201,7 +65205,7 @@ var ts;
6520165205
var ModuleBuilderFileInfo = (function (_super) {
6520265206
__extends(ModuleBuilderFileInfo, _super);
6520365207
function ModuleBuilderFileInfo() {
65204-
var _this = _super.apply(this, arguments) || this;
65208+
var _this = _super !== null && _super.apply(this, arguments) || this;
6520565209
_this.references = [];
6520665210
_this.referencedBy = [];
6520765211
return _this;

‎lib/typescript.js

+15-9
Original file line numberDiff line numberDiff line change
@@ -48649,6 +48649,9 @@ var ts;
4864948649
return decoded ? ts.createLiteral(decoded, /*location*/ node) : node;
4865048650
}
4865148651
else if (node.kind === 252 /* JsxExpression */) {
48652+
if (node.expression === undefined) {
48653+
return ts.createLiteral(true);
48654+
}
4865248655
return visitJsxExpression(node);
4865348656
}
4865448657
else {
@@ -50079,7 +50082,10 @@ var ts;
5007950082
addRestParameterIfNeeded(statements, constructor, hasSynthesizedSuper);
5008050083
ts.Debug.assert(statementOffset >= 0, "statementOffset not initialized correctly!");
5008150084
}
50082-
var superCaptureStatus = declareOrCaptureOrReturnThisForConstructorIfNeeded(statements, constructor, !!extendsClauseElement, hasSynthesizedSuper, statementOffset);
50085+
// determine whether the class is known syntactically to be a derived class (e.g. a
50086+
// class that extends a value that is not syntactically known to be `null`).
50087+
var isDerivedClass = extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 94 /* NullKeyword */;
50088+
var superCaptureStatus = declareOrCaptureOrReturnThisForConstructorIfNeeded(statements, constructor, isDerivedClass, hasSynthesizedSuper, statementOffset);
5008350089
// The last statement expression was replaced. Skip it.
5008450090
if (superCaptureStatus === 1 /* ReplaceSuperCapture */ || superCaptureStatus === 2 /* ReplaceWithReturn */) {
5008550091
statementOffset++;
@@ -50093,7 +50099,7 @@ var ts;
5009350099
}
5009450100
// Return `_this` unless we're sure enough that it would be pointless to add a return statement.
5009550101
// If there's a constructor that we can tell returns in enough places, then we *do not* want to add a return.
50096-
if (extendsClauseElement
50102+
if (isDerivedClass
5009750103
&& superCaptureStatus !== 2 /* ReplaceWithReturn */
5009850104
&& !(constructor && isSufficientlyCoveredByReturnStatements(constructor.body))) {
5009950105
statements.push(ts.createReturn(ts.createIdentifier("_this")));
@@ -50138,9 +50144,9 @@ var ts;
5013850144
*
5013950145
* @returns The new statement offset into the `statements` array.
5014050146
*/
50141-
function declareOrCaptureOrReturnThisForConstructorIfNeeded(statements, ctor, hasExtendsClause, hasSynthesizedSuper, statementOffset) {
50147+
function declareOrCaptureOrReturnThisForConstructorIfNeeded(statements, ctor, isDerivedClass, hasSynthesizedSuper, statementOffset) {
5014250148
// If this isn't a derived class, just capture 'this' for arrow functions if necessary.
50143-
if (!hasExtendsClause) {
50149+
if (!isDerivedClass) {
5014450150
if (ctor) {
5014550151
addCaptureThisForNodeIfNeeded(statements, ctor);
5014650152
}
@@ -50204,18 +50210,18 @@ var ts;
5020450210
return 2 /* ReplaceWithReturn */;
5020550211
}
5020650212
// Perform the capture.
50207-
captureThisForNode(statements, ctor, superCallExpression, firstStatement);
50213+
captureThisForNode(statements, ctor, superCallExpression || createActualThis(), firstStatement);
5020850214
// If we're actually replacing the original statement, we need to signal this to the caller.
5020950215
if (superCallExpression) {
5021050216
return 1 /* ReplaceSuperCapture */;
5021150217
}
5021250218
return 0 /* NoReplacement */;
5021350219
}
50220+
function createActualThis() {
50221+
return ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */);
50222+
}
5021450223
function createDefaultSuperCallOrThis() {
50215-
var actualThis = ts.createThis();
50216-
ts.setEmitFlags(actualThis, 4 /* NoSubstitution */);
50217-
var superCall = ts.createFunctionApply(ts.createIdentifier("_super"), actualThis, ts.createIdentifier("arguments"));
50218-
return ts.createLogicalOr(superCall, actualThis);
50224+
return ts.createLogicalOr(ts.createLogicalAnd(ts.createStrictInequality(ts.createIdentifier("_super"), ts.createNull()), ts.createFunctionApply(ts.createIdentifier("_super"), createActualThis(), ts.createIdentifier("arguments"))), createActualThis());
5021950225
}
5022050226
/**
5022150227
* Visits a parameter declaration.

‎lib/typescriptServices.js

+15-9
Original file line numberDiff line numberDiff line change
@@ -48649,6 +48649,9 @@ var ts;
4864948649
return decoded ? ts.createLiteral(decoded, /*location*/ node) : node;
4865048650
}
4865148651
else if (node.kind === 252 /* JsxExpression */) {
48652+
if (node.expression === undefined) {
48653+
return ts.createLiteral(true);
48654+
}
4865248655
return visitJsxExpression(node);
4865348656
}
4865448657
else {
@@ -50079,7 +50082,10 @@ var ts;
5007950082
addRestParameterIfNeeded(statements, constructor, hasSynthesizedSuper);
5008050083
ts.Debug.assert(statementOffset >= 0, "statementOffset not initialized correctly!");
5008150084
}
50082-
var superCaptureStatus = declareOrCaptureOrReturnThisForConstructorIfNeeded(statements, constructor, !!extendsClauseElement, hasSynthesizedSuper, statementOffset);
50085+
// determine whether the class is known syntactically to be a derived class (e.g. a
50086+
// class that extends a value that is not syntactically known to be `null`).
50087+
var isDerivedClass = extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 94 /* NullKeyword */;
50088+
var superCaptureStatus = declareOrCaptureOrReturnThisForConstructorIfNeeded(statements, constructor, isDerivedClass, hasSynthesizedSuper, statementOffset);
5008350089
// The last statement expression was replaced. Skip it.
5008450090
if (superCaptureStatus === 1 /* ReplaceSuperCapture */ || superCaptureStatus === 2 /* ReplaceWithReturn */) {
5008550091
statementOffset++;
@@ -50093,7 +50099,7 @@ var ts;
5009350099
}
5009450100
// Return `_this` unless we're sure enough that it would be pointless to add a return statement.
5009550101
// If there's a constructor that we can tell returns in enough places, then we *do not* want to add a return.
50096-
if (extendsClauseElement
50102+
if (isDerivedClass
5009750103
&& superCaptureStatus !== 2 /* ReplaceWithReturn */
5009850104
&& !(constructor && isSufficientlyCoveredByReturnStatements(constructor.body))) {
5009950105
statements.push(ts.createReturn(ts.createIdentifier("_this")));
@@ -50138,9 +50144,9 @@ var ts;
5013850144
*
5013950145
* @returns The new statement offset into the `statements` array.
5014050146
*/
50141-
function declareOrCaptureOrReturnThisForConstructorIfNeeded(statements, ctor, hasExtendsClause, hasSynthesizedSuper, statementOffset) {
50147+
function declareOrCaptureOrReturnThisForConstructorIfNeeded(statements, ctor, isDerivedClass, hasSynthesizedSuper, statementOffset) {
5014250148
// If this isn't a derived class, just capture 'this' for arrow functions if necessary.
50143-
if (!hasExtendsClause) {
50149+
if (!isDerivedClass) {
5014450150
if (ctor) {
5014550151
addCaptureThisForNodeIfNeeded(statements, ctor);
5014650152
}
@@ -50204,18 +50210,18 @@ var ts;
5020450210
return 2 /* ReplaceWithReturn */;
5020550211
}
5020650212
// Perform the capture.
50207-
captureThisForNode(statements, ctor, superCallExpression, firstStatement);
50213+
captureThisForNode(statements, ctor, superCallExpression || createActualThis(), firstStatement);
5020850214
// If we're actually replacing the original statement, we need to signal this to the caller.
5020950215
if (superCallExpression) {
5021050216
return 1 /* ReplaceSuperCapture */;
5021150217
}
5021250218
return 0 /* NoReplacement */;
5021350219
}
50220+
function createActualThis() {
50221+
return ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */);
50222+
}
5021450223
function createDefaultSuperCallOrThis() {
50215-
var actualThis = ts.createThis();
50216-
ts.setEmitFlags(actualThis, 4 /* NoSubstitution */);
50217-
var superCall = ts.createFunctionApply(ts.createIdentifier("_super"), actualThis, ts.createIdentifier("arguments"));
50218-
return ts.createLogicalOr(superCall, actualThis);
50224+
return ts.createLogicalOr(ts.createLogicalAnd(ts.createStrictInequality(ts.createIdentifier("_super"), ts.createNull()), ts.createFunctionApply(ts.createIdentifier("_super"), createActualThis(), ts.createIdentifier("arguments"))), createActualThis());
5021950225
}
5022050226
/**
5022150227
* Visits a parameter declaration.

0 commit comments

Comments
 (0)