Do not emit comments if container had a comment suppression.

mprobst · mprobst · commit a7224ec612d7 · 2018-07-18T17:23:27.000+02:00
diff --git a/src/compiler/comments.ts b/src/compiler/comments.ts
@@ -72,11 +72,13 @@ namespace ts {
                     const savedContainerEnd = containerEnd;
                     const savedDeclarationListContainerEnd = declarationListContainerEnd;
 
-                    if (!skipLeadingComments) {
+                    if (!skipLeadingComments || (pos >= 0 && (emitFlags & EmitFlags.NoLeadingComments) !== 0)) {
+                        // Advance the container position of comments get emitted or if they've been disabled explicitly using NoLeadingComments.
                         containerPos = pos;
                     }
 
-                    if (!skipTrailingComments) {
+                    if (!skipTrailingComments || (end >= 0 && (emitFlags & EmitFlags.NoTrailingComments) !== 0)) {
+                        // As above.
                         containerEnd = end;
 
                         // To avoid invalid comment emit in a down-level binding pattern, we
@@ -426,4 +428,4 @@ namespace ts {
             return isRecognizedTripleSlashComment(currentText, commentPos, commentEnd);
         }
     }
-}
+}
diff --git a/src/compiler/transformers/es2015.ts b/src/compiler/transformers/es2015.ts
@@ -1121,7 +1121,7 @@ namespace ts {
             }
 
             // Perform the capture.
-            captureThisForNode(statements, ctor, superCallExpression || createActualThis(), firstStatement);
+            captureThisForNode(statements, ctor, superCallExpression || createActualThis());
 
             // If we're actually replacing the original statement, we need to signal this to the caller.
             if (superCallExpression) {
@@ -1443,7 +1443,7 @@ namespace ts {
             }
         }
 
-        function captureThisForNode(statements: Statement[], node: Node, initializer: Expression | undefined, originalStatement?: Statement): void {
+        function captureThisForNode(statements: Statement[], node: Node, initializer: Expression | undefined): void {
             enableSubstitutionsForCapturedThis();
             const captureThisStatement = createVariableStatement(
                 /*modifiers*/ undefined,
@@ -1456,7 +1456,6 @@ namespace ts {
                 ])
             );
             setEmitFlags(captureThisStatement, EmitFlags.NoComments | EmitFlags.CustomPrologue);
-            setTextRange(captureThisStatement, originalStatement);
             setSourceMapRange(captureThisStatement, node);
             statements.push(captureThisStatement);
         }

Original file line number	Diff line number	Diff line change
`@@ -72,11 +72,13 @@ namespace ts {`
`72`	`72`	`const savedContainerEnd = containerEnd;`
`73`	`73`	`const savedDeclarationListContainerEnd = declarationListContainerEnd;`
`74`	`74`
`75`		`- if (!skipLeadingComments) {`
	`75`	`+ if (!skipLeadingComments \|\| (pos >= 0 && (emitFlags & EmitFlags.NoLeadingComments) !== 0)) {`
	`76`	`+ // Advance the container position of comments get emitted or if they've been disabled explicitly using NoLeadingComments.`
`76`	`77`	`containerPos = pos;`
`77`	`78`	`}`
`78`	`79`
`79`		`- if (!skipTrailingComments) {`
	`80`	`+ if (!skipTrailingComments \|\| (end >= 0 && (emitFlags & EmitFlags.NoTrailingComments) !== 0)) {`
	`81`	`+ // As above.`
`80`	`82`	`containerEnd = end;`
`81`	`83`
`82`	`84`	`// To avoid invalid comment emit in a down-level binding pattern, we`
`@@ -426,4 +428,4 @@ namespace ts {`
`426`	`428`	`return isRecognizedTripleSlashComment(currentText, commentPos, commentEnd);`
`427`	`429`	`}`
`428`	`430`	`}`
`429`		`-}`
	`431`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1121,7 +1121,7 @@ namespace ts {`
`1121`	`1121`	`}`
`1122`	`1122`
`1123`	`1123`	`// Perform the capture.`
`1124`		`- captureThisForNode(statements, ctor, superCallExpression \|\| createActualThis(), firstStatement);`
	`1124`	`+ captureThisForNode(statements, ctor, superCallExpression \|\| createActualThis());`
`1125`	`1125`
`1126`	`1126`	`// If we're actually replacing the original statement, we need to signal this to the caller.`
`1127`	`1127`	`if (superCallExpression) {`
`@@ -1443,7 +1443,7 @@ namespace ts {`
`1443`	`1443`	`}`
`1444`	`1444`	`}`
`1445`	`1445`
`1446`		`- function captureThisForNode(statements: Statement[], node: Node, initializer: Expression \| undefined, originalStatement?: Statement): void {`
	`1446`	`+ function captureThisForNode(statements: Statement[], node: Node, initializer: Expression \| undefined): void {`
`1447`	`1447`	`enableSubstitutionsForCapturedThis();`
`1448`	`1448`	`const captureThisStatement = createVariableStatement(`
`1449`	`1449`	`/modifiers/ undefined,`
`@@ -1456,7 +1456,6 @@ namespace ts {`
`1456`	`1456`	`])`
`1457`	`1457`	`);`
`1458`	`1458`	`setEmitFlags(captureThisStatement, EmitFlags.NoComments \| EmitFlags.CustomPrologue);`
`1459`		`- setTextRange(captureThisStatement, originalStatement);`
`1460`	`1459`	`setSourceMapRange(captureThisStatement, node);`
`1461`	`1460`	`statements.push(captureThisStatement);`
`1462`	`1461`	`}`