Simplifying fileSuggestions in session.ts

src/server/session.ts

@@ -2714,24 +2714,11 @@ export class Session<TMessage = string> implements EventSender {
         return result;
     }
 
-    private getMoveToRefactoringFileSuggestions(args: protocol.GetMoveToRefactoringFileSuggestionsRequestArgs): { newFilename: string, files: string[] }{
+    private getMoveToRefactoringFileSuggestions(args: protocol.GetMoveToRefactoringFileSuggestionsRequestArgs): { newFileName: string, files: string[] }{
         const { file, project } = this.getFileAndProject(args);
-        const allFiles: string[] = [];
-        let fileName = "";
-        updateProjectIfDirty(project);
-        const scriptInfo = project.getScriptInfoForNormalizedPath(file);
-        if (scriptInfo) {
-            const { newFileName, files } = project.getLanguageService().getMoveToRefactoringFileSuggestions(file, this.extractPositionOrRange(args, scriptInfo), this.getPreferences(file));
-            if (files) {
-                for (const file of files) {
-                    if (!allFiles.includes(file)) {
-                        allFiles.push(file);
-                    }
-                }
-            }
-            fileName = newFileName;
-        }
-        return { newFilename: fileName, files: allFiles };
+        const scriptInfo = project.getScriptInfoForNormalizedPath(file)!;
+        const { newFileName, files } = project.getLanguageService().getMoveToRefactoringFileSuggestions(file, this.extractPositionOrRange(args, scriptInfo), this.getPreferences(file));
+        return { newFileName, files };
     }
 
     private organizeImports(args: protocol.OrganizeImportsRequestArgs, simplifiedResult: boolean): readonly protocol.FileCodeEdits[] | readonly FileTextChanges[] {

tests/baselines/reference/tsserver/getMoveToRefactoringFileSuggestions/skips-lib.d.ts-files.js

@@ -108,7 +108,7 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] response:
     {
       "response": {
-        "newFilename": "/C.d.ts",
+        "newFileName": "/C.d.ts",
         "files": [
           "/a/file3.d.ts"
         ]

tests/baselines/reference/tsserver/getMoveToRefactoringFileSuggestions/suggests-only-.js-file-for-a-.js-filepath.js

@@ -118,7 +118,7 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] response:
     {
       "response": {
-        "newFilename": "/C.js",
+        "newFileName": "/C.js",
         "files": [
           "/file2.js",
           "/file5.js"

tests/baselines/reference/tsserver/getMoveToRefactoringFileSuggestions/suggests-only-.ts-file-for-a-.ts-filepath.js

@@ -141,7 +141,7 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] response:
     {
       "response": {
-        "newFilename": "/ka.ts",
+        "newFileName": "/ka.ts",
         "files": [
           "/file7.ts"
         ]

tests/baselines/reference/tsserver/getMoveToRefactoringFileSuggestions/works-for-suggesting-a-list-of-files,-excluding-node_modules-within-a-project.js

@@ -134,7 +134,7 @@ Info seq  [hh:mm:ss:mss] request:
 Info seq  [hh:mm:ss:mss] response:
     {
       "response": {
-        "newFilename": "/project/a/ka.ts",
+        "newFileName": "/project/a/ka.ts",
         "files": [
           "/project/a/file4.ts",
           "/project/b/file2.ts",