Have args extend scope so it is not a breaking change

Author: Josh Goldberg

src/harness/fourslashImpl.ts

@@ -528,7 +528,7 @@ namespace FourSlash {
         }
 
         public verifyOrganizeImports(newContent: string) {
-            const changes = this.languageService.organizeImports({ scope: { fileName: this.activeFile.fileName, type: "file" } }, this.formatCodeSettings, ts.emptyOptions);
+            const changes = this.languageService.organizeImports({ fileName: this.activeFile.fileName, type: "file" }, this.formatCodeSettings, ts.emptyOptions);
             this.applyChanges(changes);
             this.verifyFileContent(this.activeFile.fileName, newContent);
         }

src/server/session.ts

@@ -2171,7 +2171,8 @@ namespace ts.server {
             const changes = project.getLanguageService().organizeImports(
                 {
                     allowDestructiveCodeActions: args.allowDestructiveCodeActions,
-                    scope: { type: "file", fileName: file },
+                    fileName: file,
+                    type: "file",
                 },
                 this.getFormatOptions(file),
                 this.getPreferences(file)

src/services/services.ts

@@ -1975,8 +1975,8 @@ namespace ts {
 
         function organizeImports(args: OrganizeImportsArgs, formatOptions: FormatCodeSettings, preferences: UserPreferences = emptyOptions): readonly FileTextChanges[] {
             synchronizeHostData();
-            Debug.assert(args.scope.type === "file");
-            const sourceFile = getValidSourceFile(args.scope.fileName);
+            Debug.assert(args.type === "file");
+            const sourceFile = getValidSourceFile(args.fileName);
             const formatContext = formatting.getFormatContext(formatOptions, host);
 
             return OrganizeImports.organizeImports(sourceFile, formatContext, host, program, preferences, args.allowDestructiveCodeActions);

src/services/types.ts

@@ -548,9 +548,8 @@ namespace ts {
 
     export interface CombinedCodeFixScope { type: "file"; fileName: string; }
 
-    export interface OrganizeImportsArgs {
+    export interface OrganizeImportsArgs extends CombinedCodeFixScope {
         allowDestructiveCodeActions?: boolean;
-        scope: CombinedCodeFixScope;
     }
 
     export type CompletionsTriggerCharacter = "." | '"' | "'" | "`" | "/" | "@" | "<" | "#";