microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-16 05:58:32 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

addressed PR feedback

Browse Source
This commit is contained in:
Vladimir Matveev 2016-03-29 09:28:36 -07:00
parent 646daac6d4
commit 5d8d3b85bd
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/compiler/printer.ts
View File

@ -1759,6 +1759,7 @@ const _super = (function (geti, seti) {
nodeIsSynthesized(statements[0]) ||
rangeStartPositionsAreOnSameLine(parentNode, statements[0], currentSourceFile)
);
if (emitAsSingleStatement) {
write(" ");
emit(statements[0]);

10
src/compiler/transformers/es6.ts
View File

@ -111,7 +111,7 @@ namespace ts {
thisName?: Identifier;
/*
* set to true if node contains lexical 'this' so we can mark function that wraps convered loop body as 'CapturedThis' for subsequence substitution.
* set to true if node contains lexical 'this' so we can mark function that wraps convered loop body as 'CapturedThis' for subsequent substitution.
*/
containsLexicalThis?: boolean;
@ -445,7 +445,7 @@ namespace ts {
Debug.assert(convertedLoopState !== undefined);
if (useCapturedThis) {
// if useCapturedThis is true then 'this' keyword is contained inside the arrow function.
// if useCapturedThis is true then 'this' keyword is contained inside an arrow function.
convertedLoopState.containsLexicalThis = true;
return node;
}
@ -467,10 +467,10 @@ namespace ts {
function visitBreakOrContinueStatement(node: BreakOrContinueStatement): Statement {
if (convertedLoopState) {
// check if we can emit break\continue as is
// check if we can emit break/continue as is
// it is possible if either
// - break\continue is labeled and label is located inside the converted loop
// - break\continue is non-labeled and located in non-converted loop\switch statement
// - break/continue is labeled and label is located inside the converted loop
// - break/continue is non-labeled and located in non-converted loop/switch statement
const jump = node.kind === SyntaxKind.BreakStatement ? Jump.Break : Jump.Continue;
const canUseBreakOrContinue =
(node.label && convertedLoopState.labels && convertedLoopState.labels[node.label.text]) ||