diff --git a/lib/tsc.js b/lib/tsc.js index d2c1c23fed4..558b17647b3 100644 --- a/lib/tsc.js +++ b/lib/tsc.js @@ -61,7 +61,7 @@ var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cook var ts; (function (ts) { ts.versionMajorMinor = "3.3"; - ts.version = ts.versionMajorMinor + ".3"; + ts.version = ts.versionMajorMinor + ".3333"; })(ts || (ts = {})); (function (ts) { ts.emptyArray = []; @@ -22903,15 +22903,19 @@ var ts; flowAfterCatch = currentFlow; } if (node.finallyBlock) { + var preFinallyPrior = preTryFlow; if (!node.catchClause) { if (tryPriors.length) { + var preFinallyFlow_1 = createBranchLabel(); + addAntecedent(preFinallyFlow_1, preTryFlow); for (var _a = 0, tryPriors_2 = tryPriors; _a < tryPriors_2.length; _a++) { var p = tryPriors_2[_a]; - addAntecedent(preFinallyLabel, p); + addAntecedent(preFinallyFlow_1, p); } + preFinallyPrior = finishFlowLabel(preFinallyFlow_1); } } - var preFinallyFlow = { flags: 2048, antecedent: preTryFlow, lock: {} }; + var preFinallyFlow = { flags: 2048, antecedent: preFinallyPrior, lock: {} }; addAntecedent(preFinallyLabel, preFinallyFlow); currentFlow = finishFlowLabel(preFinallyLabel); bind(node.finallyBlock); diff --git a/lib/tsserver.js b/lib/tsserver.js index 3b376eef552..990d0f296ca 100644 --- a/lib/tsserver.js +++ b/lib/tsserver.js @@ -88,7 +88,7 @@ var ts; // If changing the text in this section, be sure to test `configureNightly` too. ts.versionMajorMinor = "3.3"; /** The version of the TypeScript compiler release */ - ts.version = ts.versionMajorMinor + ".3"; + ts.version = ts.versionMajorMinor + ".3333"; })(ts || (ts = {})); (function (ts) { /* @internal */ @@ -28107,12 +28107,16 @@ var ts; // We add the nodes within the `try` block to the `finally`'s antecedents if there's no catch block // (If there is a `catch` block, it will have all these antecedents instead, and the `finally` will // have the end of the `try` block and the end of the `catch` block) + var preFinallyPrior = preTryFlow; if (!node.catchClause) { if (tryPriors.length) { + var preFinallyFlow_1 = createBranchLabel(); + addAntecedent(preFinallyFlow_1, preTryFlow); for (var _a = 0, tryPriors_2 = tryPriors; _a < tryPriors_2.length; _a++) { var p = tryPriors_2[_a]; - addAntecedent(preFinallyLabel, p); + addAntecedent(preFinallyFlow_1, p); } + preFinallyPrior = finishFlowLabel(preFinallyFlow_1); } } // in finally flow is combined from pre-try/flow from try/flow from catch @@ -28141,7 +28145,7 @@ var ts; // // extra edges that we inject allows to control this behavior // if when walking the flow we step on post-finally edge - we can mark matching pre-finally edge as locked so it will be skipped. - var preFinallyFlow = { flags: 2048 /* PreFinally */, antecedent: preTryFlow, lock: {} }; + var preFinallyFlow = { flags: 2048 /* PreFinally */, antecedent: preFinallyPrior, lock: {} }; addAntecedent(preFinallyLabel, preFinallyFlow); currentFlow = finishFlowLabel(preFinallyLabel); bind(node.finallyBlock); diff --git a/lib/tsserverlibrary.js b/lib/tsserverlibrary.js index b248dbc8593..f3a488d117b 100644 --- a/lib/tsserverlibrary.js +++ b/lib/tsserverlibrary.js @@ -84,7 +84,7 @@ var ts; // If changing the text in this section, be sure to test `configureNightly` too. ts.versionMajorMinor = "3.3"; /** The version of the TypeScript compiler release */ - ts.version = ts.versionMajorMinor + ".3"; + ts.version = ts.versionMajorMinor + ".3333"; })(ts || (ts = {})); (function (ts) { /* @internal */ @@ -28103,12 +28103,16 @@ var ts; // We add the nodes within the `try` block to the `finally`'s antecedents if there's no catch block // (If there is a `catch` block, it will have all these antecedents instead, and the `finally` will // have the end of the `try` block and the end of the `catch` block) + var preFinallyPrior = preTryFlow; if (!node.catchClause) { if (tryPriors.length) { + var preFinallyFlow_1 = createBranchLabel(); + addAntecedent(preFinallyFlow_1, preTryFlow); for (var _a = 0, tryPriors_2 = tryPriors; _a < tryPriors_2.length; _a++) { var p = tryPriors_2[_a]; - addAntecedent(preFinallyLabel, p); + addAntecedent(preFinallyFlow_1, p); } + preFinallyPrior = finishFlowLabel(preFinallyFlow_1); } } // in finally flow is combined from pre-try/flow from try/flow from catch @@ -28137,7 +28141,7 @@ var ts; // // extra edges that we inject allows to control this behavior // if when walking the flow we step on post-finally edge - we can mark matching pre-finally edge as locked so it will be skipped. - var preFinallyFlow = { flags: 2048 /* PreFinally */, antecedent: preTryFlow, lock: {} }; + var preFinallyFlow = { flags: 2048 /* PreFinally */, antecedent: preFinallyPrior, lock: {} }; addAntecedent(preFinallyLabel, preFinallyFlow); currentFlow = finishFlowLabel(preFinallyLabel); bind(node.finallyBlock); diff --git a/lib/typescript.js b/lib/typescript.js index bcf37b570fd..d2e2e7ecb40 100644 --- a/lib/typescript.js +++ b/lib/typescript.js @@ -75,7 +75,7 @@ var ts; // If changing the text in this section, be sure to test `configureNightly` too. ts.versionMajorMinor = "3.3"; /** The version of the TypeScript compiler release */ - ts.version = ts.versionMajorMinor + ".3"; + ts.version = ts.versionMajorMinor + ".3333"; })(ts || (ts = {})); (function (ts) { /* @internal */ @@ -28094,12 +28094,16 @@ var ts; // We add the nodes within the `try` block to the `finally`'s antecedents if there's no catch block // (If there is a `catch` block, it will have all these antecedents instead, and the `finally` will // have the end of the `try` block and the end of the `catch` block) + var preFinallyPrior = preTryFlow; if (!node.catchClause) { if (tryPriors.length) { + var preFinallyFlow_1 = createBranchLabel(); + addAntecedent(preFinallyFlow_1, preTryFlow); for (var _a = 0, tryPriors_2 = tryPriors; _a < tryPriors_2.length; _a++) { var p = tryPriors_2[_a]; - addAntecedent(preFinallyLabel, p); + addAntecedent(preFinallyFlow_1, p); } + preFinallyPrior = finishFlowLabel(preFinallyFlow_1); } } // in finally flow is combined from pre-try/flow from try/flow from catch @@ -28128,7 +28132,7 @@ var ts; // // extra edges that we inject allows to control this behavior // if when walking the flow we step on post-finally edge - we can mark matching pre-finally edge as locked so it will be skipped. - var preFinallyFlow = { flags: 2048 /* PreFinally */, antecedent: preTryFlow, lock: {} }; + var preFinallyFlow = { flags: 2048 /* PreFinally */, antecedent: preFinallyPrior, lock: {} }; addAntecedent(preFinallyLabel, preFinallyFlow); currentFlow = finishFlowLabel(preFinallyLabel); bind(node.finallyBlock); diff --git a/lib/typescriptServices.js b/lib/typescriptServices.js index bcf37b570fd..d2e2e7ecb40 100644 --- a/lib/typescriptServices.js +++ b/lib/typescriptServices.js @@ -75,7 +75,7 @@ var ts; // If changing the text in this section, be sure to test `configureNightly` too. ts.versionMajorMinor = "3.3"; /** The version of the TypeScript compiler release */ - ts.version = ts.versionMajorMinor + ".3"; + ts.version = ts.versionMajorMinor + ".3333"; })(ts || (ts = {})); (function (ts) { /* @internal */ @@ -28094,12 +28094,16 @@ var ts; // We add the nodes within the `try` block to the `finally`'s antecedents if there's no catch block // (If there is a `catch` block, it will have all these antecedents instead, and the `finally` will // have the end of the `try` block and the end of the `catch` block) + var preFinallyPrior = preTryFlow; if (!node.catchClause) { if (tryPriors.length) { + var preFinallyFlow_1 = createBranchLabel(); + addAntecedent(preFinallyFlow_1, preTryFlow); for (var _a = 0, tryPriors_2 = tryPriors; _a < tryPriors_2.length; _a++) { var p = tryPriors_2[_a]; - addAntecedent(preFinallyLabel, p); + addAntecedent(preFinallyFlow_1, p); } + preFinallyPrior = finishFlowLabel(preFinallyFlow_1); } } // in finally flow is combined from pre-try/flow from try/flow from catch @@ -28128,7 +28132,7 @@ var ts; // // extra edges that we inject allows to control this behavior // if when walking the flow we step on post-finally edge - we can mark matching pre-finally edge as locked so it will be skipped. - var preFinallyFlow = { flags: 2048 /* PreFinally */, antecedent: preTryFlow, lock: {} }; + var preFinallyFlow = { flags: 2048 /* PreFinally */, antecedent: preFinallyPrior, lock: {} }; addAntecedent(preFinallyLabel, preFinallyFlow); currentFlow = finishFlowLabel(preFinallyLabel); bind(node.finallyBlock); diff --git a/lib/typingsInstaller.js b/lib/typingsInstaller.js index 6bcd2683839..a01adc7fa3a 100644 --- a/lib/typingsInstaller.js +++ b/lib/typingsInstaller.js @@ -88,7 +88,7 @@ var ts; // If changing the text in this section, be sure to test `configureNightly` too. ts.versionMajorMinor = "3.3"; /** The version of the TypeScript compiler release */ - ts.version = ts.versionMajorMinor + ".3"; + ts.version = ts.versionMajorMinor + ".3333"; })(ts || (ts = {})); (function (ts) { /* @internal */ @@ -28107,12 +28107,16 @@ var ts; // We add the nodes within the `try` block to the `finally`'s antecedents if there's no catch block // (If there is a `catch` block, it will have all these antecedents instead, and the `finally` will // have the end of the `try` block and the end of the `catch` block) + var preFinallyPrior = preTryFlow; if (!node.catchClause) { if (tryPriors.length) { + var preFinallyFlow_1 = createBranchLabel(); + addAntecedent(preFinallyFlow_1, preTryFlow); for (var _a = 0, tryPriors_2 = tryPriors; _a < tryPriors_2.length; _a++) { var p = tryPriors_2[_a]; - addAntecedent(preFinallyLabel, p); + addAntecedent(preFinallyFlow_1, p); } + preFinallyPrior = finishFlowLabel(preFinallyFlow_1); } } // in finally flow is combined from pre-try/flow from try/flow from catch @@ -28141,7 +28145,7 @@ var ts; // // extra edges that we inject allows to control this behavior // if when walking the flow we step on post-finally edge - we can mark matching pre-finally edge as locked so it will be skipped. - var preFinallyFlow = { flags: 2048 /* PreFinally */, antecedent: preTryFlow, lock: {} }; + var preFinallyFlow = { flags: 2048 /* PreFinally */, antecedent: preFinallyPrior, lock: {} }; addAntecedent(preFinallyLabel, preFinallyFlow); currentFlow = finishFlowLabel(preFinallyLabel); bind(node.finallyBlock);