Merge pull request microsoft#10543 from Microsoft/port10212

mhegazy · web-flow · commit c72f5e28e819 · 2016-08-25T21:01:10.000-07:00
Port microsoft#10212
diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts
@@ -1132,8 +1132,10 @@ namespace ts {
                     // it if it's not a well known symbol. In that case, the text of the name will be exactly
                     // what we want, namely the name expression enclosed in brackets.
                     writeTextOfNode(currentText, node.name);
-                    // If optional property emit ?
-                    if ((node.kind === SyntaxKind.PropertyDeclaration || node.kind === SyntaxKind.PropertySignature || node.kind === SyntaxKind.Parameter) && hasQuestionToken(node)) {
+                    // If optional property emit ? but in the case of parameterProperty declaration with "?" indicating optional parameter for the constructor
+                    // we don't want to emit property declaration with "?"
+                    if ((node.kind === SyntaxKind.PropertyDeclaration || node.kind === SyntaxKind.PropertySignature ||
+                        (node.kind === SyntaxKind.Parameter && !isParameterPropertyDeclaration(node))) && hasQuestionToken(node)) {
                         write("?");
                     }
                     if ((node.kind === SyntaxKind.PropertyDeclaration || node.kind === SyntaxKind.PropertySignature) && node.parent.kind === SyntaxKind.TypeLiteral) {
diff --git a/tests/baselines/reference/declFileConstructors.js b/tests/baselines/reference/declFileConstructors.js
@@ -247,7 +247,7 @@ export declare class ConstructorWithPrivateParameterProperty {
     constructor(x: string);
 }
 export declare class ConstructorWithOptionalParameterProperty {
-    x?: string;
+    x: string;
     constructor(x?: string);
 }
 export declare class ConstructorWithParameterInitializer {
@@ -281,7 +281,7 @@ declare class GlobalConstructorWithPrivateParameterProperty {
     constructor(x: string);
 }
 declare class GlobalConstructorWithOptionalParameterProperty {
-    x?: string;
+    x: string;
     constructor(x?: string);
 }
 declare class GlobalConstructorWithParameterInitializer {
diff --git a/tests/baselines/reference/optionalMethods.js b/tests/baselines/reference/optionalMethods.js
@@ -126,7 +126,7 @@ interface Foo {
 }
 declare function test1(x: Foo): void;
 declare class Bar {
-    d?: number;
+    d: number;
     e: number;
     a: number;
     b?: number;

Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@ export declare class ConstructorWithPrivateParameterProperty {`
`247`	`247`	`constructor(x: string);`
`248`	`248`	`}`
`249`	`249`	`export declare class ConstructorWithOptionalParameterProperty {`
`250`		`- x?: string;`
	`250`	`+ x: string;`
`251`	`251`	`constructor(x?: string);`
`252`	`252`	`}`
`253`	`253`	`export declare class ConstructorWithParameterInitializer {`
`@@ -281,7 +281,7 @@ declare class GlobalConstructorWithPrivateParameterProperty {`
`281`	`281`	`constructor(x: string);`
`282`	`282`	`}`
`283`	`283`	`declare class GlobalConstructorWithOptionalParameterProperty {`
`284`		`- x?: string;`
	`284`	`+ x: string;`
`285`	`285`	`constructor(x?: string);`
`286`	`286`	`}`
`287`	`287`	`declare class GlobalConstructorWithParameterInitializer {`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ interface Foo {`
`126`	`126`	`}`
`127`	`127`	`declare function test1(x: Foo): void;`
`128`	`128`	`declare class Bar {`
`129`		`- d?: number;`
	`129`	`+ d: number;`
`130`	`130`	`e: number;`
`131`	`131`	`a: number;`
`132`	`132`	`b?: number;`