Merge pull request microsoft#14508 from Busyrev/fix-function-parameter-default-value

mhegazy · web-flow · commit 4610dc7e3bf5 · 2017-03-07T10:34:33.000-08:00
FIX: microsoft#14507 Function parameter default value wrongly emmited by Printer
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
@@ -819,8 +819,8 @@ namespace ts {
             writeIfPresent(node.dotDotDotToken, "...");
             emit(node.name);
             writeIfPresent(node.questionToken, "?");
-            emitExpressionWithPrefix(" = ", node.initializer);
             emitWithPrefix(": ", node.type);
+            emitExpressionWithPrefix(" = ", node.initializer);
         }
 
         function emitDecorator(decorator: Decorator) {
diff --git a/src/harness/unittests/printer.ts b/src/harness/unittests/printer.ts
@@ -45,6 +45,9 @@ namespace ts {
 
                 // comment9
                 console.log(1 + 2);
+
+                // comment10
+                function functionWithDefaultArgValue(argument: string = "defaultValue"): void { }
             `, ScriptTarget.ES2015);
 
             printsCorrectly("default", {}, printer => printer.printFile(sourceFile));
diff --git a/tests/baselines/reference/printerApi/printsFileCorrectly.default.js b/tests/baselines/reference/printerApi/printsFileCorrectly.default.js
@@ -23,3 +23,5 @@ const enum E2 {
 }
 // comment9
 console.log(1 + 2);
+// comment10
+function functionWithDefaultArgValue(argument: string = "defaultValue"): void { }
diff --git a/tests/baselines/reference/printerApi/printsFileCorrectly.removeComments.js b/tests/baselines/reference/printerApi/printsFileCorrectly.removeComments.js
@@ -15,3 +15,4 @@ const enum E2 {
     second
 }
 console.log(1 + 2);
+function functionWithDefaultArgValue(argument: string = "defaultValue"): void { }

Original file line number	Diff line number	Diff line change
`@@ -819,8 +819,8 @@ namespace ts {`
`819`	`819`	`writeIfPresent(node.dotDotDotToken, "...");`
`820`	`820`	`emit(node.name);`
`821`	`821`	`writeIfPresent(node.questionToken, "?");`
`822`		`- emitExpressionWithPrefix(" = ", node.initializer);`
`823`	`822`	`emitWithPrefix(": ", node.type);`
	`823`	`+ emitExpressionWithPrefix(" = ", node.initializer);`
`824`	`824`	`}`
`825`	`825`
`826`	`826`	`function emitDecorator(decorator: Decorator) {`
Original file line number	Diff line number	Diff line change
`@@ -23,3 +23,5 @@ const enum E2 {`
`23`	`23`	`}`
`24`	`24`	`// comment9`
`25`	`25`	`console.log(1 + 2);`
	`26`	`+// comment10`
	`27`	`+function functionWithDefaultArgValue(argument: string = "defaultValue"): void { }`
Original file line number	Diff line number	Diff line change
`@@ -15,3 +15,4 @@ const enum E2 {`
`15`	`15`	`second`
`16`	`16`	`}`
`17`	`17`	`console.log(1 + 2);`
	`18`	`+function functionWithDefaultArgValue(argument: string = "defaultValue"): void { }`