Handle CodeFixAction in mapCodeAction (microsoft#21247)

Andy · web-flow · commit 6d051f82fd24 · 2018-01-18T12:14:47.000-08:00
* Handle CodeFixAction in mapCodeAction

* Update API baseline
diff --git a/src/server/session.ts b/src/server/session.ts
@@ -1665,9 +1665,9 @@ namespace ts.server {
             return { startPosition, endPosition };
         }
 
-        private mapCodeAction(project: Project, { description, changes: unmappedChanges, commands }: CodeAction): protocol.CodeAction {
+        private mapCodeAction(project: Project, { description, changes: unmappedChanges, commands, fixId }: CodeFixAction): protocol.CodeFixAction {
             const changes = unmappedChanges.map(change => this.mapTextChangesToCodeEditsUsingScriptinfo(change, project.getScriptInfoForNormalizedPath(toNormalizedPath(change.fileName))));
-            return { description, changes, commands };
+            return { description, changes, commands, fixId };
         }
 
         private mapTextChangesToCodeEdits(project: Project, textChanges: ReadonlyArray<FileTextChanges>): protocol.FileCodeEdits[] {
diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -7256,7 +7256,7 @@ declare namespace ts.server {
         private getCombinedCodeFix({scope, fixId}, simplifiedResult);
         private applyCodeActionCommand(args);
         private getStartAndEndPosition(args, scriptInfo);
-        private mapCodeAction(project, {description, changes: unmappedChanges, commands});
+        private mapCodeAction(project, {description, changes: unmappedChanges, commands, fixId});
         private mapTextChangesToCodeEdits(project, textChanges);
         private mapTextChangesToCodeEditsUsingScriptinfo(textChanges, scriptInfo);
         private convertTextChangeToCodeEdit(change, scriptInfo);

Original file line number	Diff line number	Diff line change
`@@ -1665,9 +1665,9 @@ namespace ts.server {`
`1665`	`1665`	`return { startPosition, endPosition };`
`1666`	`1666`	`}`
`1667`	`1667`
`1668`		`- private mapCodeAction(project: Project, { description, changes: unmappedChanges, commands }: CodeAction): protocol.CodeAction {`
	`1668`	`+ private mapCodeAction(project: Project, { description, changes: unmappedChanges, commands, fixId }: CodeFixAction): protocol.CodeFixAction {`
`1669`	`1669`	`const changes = unmappedChanges.map(change => this.mapTextChangesToCodeEditsUsingScriptinfo(change, project.getScriptInfoForNormalizedPath(toNormalizedPath(change.fileName))));`
`1670`		`- return { description, changes, commands };`
	`1670`	`+ return { description, changes, commands, fixId };`
`1671`	`1671`	`}`
`1672`	`1672`
`1673`	`1673`	`private mapTextChangesToCodeEdits(project: Project, textChanges: ReadonlyArray<FileTextChanges>): protocol.FileCodeEdits[] {`