Merge pull request #18501 from Microsoft/formatOptions

Make formatOptions optional in GetEditsForRefactorRequestArgs
microsoft · Sep 16, 2017 · 0ac8406 · 0ac8406
2 parents 83f2401 + 0b76e43
commit 0ac8406
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/server/protocol.ts b/src/server/protocol.ts
@@ -494,7 +494,7 @@ namespace ts.server.protocol {
         refactor: string;
         /* The 'name' property from the refactoring action */
         action: string;
-        formatOptions: FormatCodeSettings,
+        formatOptions?: FormatCodeSettings,
     };
 
 

diff --git a/src/server/session.ts b/src/server/session.ts
@@ -1488,7 +1488,7 @@ namespace ts.server {
 
             const result = project.getLanguageService().getEditsForRefactor(
                 file,
-                convertFormatOptions(args.formatOptions),
+                args.formatOptions ? convertFormatOptions(args.formatOptions) : this.projectService.getFormatCodeOptions(),
                 position || textRange,
                 args.refactor,
                 args.action