Merge pull request #18501 from Microsoft/formatOptions

amcasey · web-flow · commit 0ac8406cd789 · 2017-09-15T17:11:08.000-07:00
Make formatOptions optional in GetEditsForRefactorRequestArgs
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
