Fix issue with unnecessary project update even with same source info file origination query

Author: sheetalkamat

src/server/project.ts

@@ -2185,14 +2185,15 @@ export abstract class Project implements LanguageServiceHost, ModuleResolutionHo
     }
 
     /** @internal */
-    getNoDtsResolutionProject(rootFileNames: readonly string[]): AuxiliaryProject {
+    getNoDtsResolutionProject(rootFile: NormalizedPath): AuxiliaryProject {
         Debug.assert(this.projectService.serverMode === LanguageServiceMode.Semantic);
         if (!this.noDtsResolutionProject) {
             this.noDtsResolutionProject = new AuxiliaryProject(this.projectService, this.documentRegistry, this.getCompilerOptionsForNoDtsResolutionProject(), this.currentDirectory);
         }
-
-        this.projectService.setFileNamesOfAutpImportProviderOrAuxillaryProject(this.noDtsResolutionProject, rootFileNames);
-
+        if (this.noDtsResolutionProject.rootFile !== rootFile) {
+            this.projectService.setFileNamesOfAutpImportProviderOrAuxillaryProject(this.noDtsResolutionProject, [rootFile]);
+            this.noDtsResolutionProject.rootFile = rootFile;
+        }
         return this.noDtsResolutionProject;
     }
 
@@ -2373,6 +2374,7 @@ export class InferredProject extends Project {
 
 /** @internal */
 export class AuxiliaryProject extends Project {
+    /** @internal */ rootFile: NormalizedPath | undefined;
     constructor(projectService: ProjectService, documentRegistry: DocumentRegistry, compilerOptions: CompilerOptions, currentDirectory: string) {
         super(projectService.newAuxiliaryProjectName(), ProjectKind.Auxiliary, projectService, documentRegistry, /*hasExplicitListOfFiles*/ false, /*lastFileExceededProgramSize*/ undefined, compilerOptions, /*compileOnSaveEnabled*/ false, /*watchOptions*/ undefined, projectService.host, currentDirectory);
     }

src/server/session.ts

@@ -1543,7 +1543,7 @@ export class Session<TMessage = string> implements EventSender {
         if (needsJsResolution) {
             const definitionSet = createSet<DefinitionInfo>(d => d.textSpan.start, documentSpansEqual);
             definitions?.forEach(d => definitionSet.add(d));
-            const noDtsProject = project.getNoDtsResolutionProject([file]);
+            const noDtsProject = project.getNoDtsResolutionProject(file);
             const ls = noDtsProject.getLanguageService();
             const jsDefinitions = ls.getDefinitionAtPosition(file, position, /*searchOtherFilesOnly*/ true, /*stopAtAlias*/ false)
                 ?.filter(d => toNormalizedPath(d.fileName) !== file);

src/testRunner/unittests/tsserver/auxiliaryProject.ts

@@ -42,7 +42,7 @@ describe("unittests:: tsserver:: auxiliaryProject::", () => {
             command: ts.server.protocol.CommandTypes.FindSourceDefinition,
             arguments: protocolFileLocationFromSubstring(aTs, "B"),
         });
-        const auxProject = inferredProject.getNoDtsResolutionProject([aTs.path]);
+        const auxProject = inferredProject.getNoDtsResolutionProject(aTs.path as ts.server.NormalizedPath);
 
         // b.js ScriptInfo is now available because it's contained by the AuxiliaryProject.
         // The AuxiliaryProject should never be the default project for anything, so
@@ -119,6 +119,10 @@ describe("unittests:: tsserver:: auxiliaryProject::", () => {
             command: ts.server.protocol.CommandTypes.FindSourceDefinition,
             arguments: protocolFileLocationFromSubstring(indexFile, "positional"),
         });
+        session.executeCommandSeq<ts.server.protocol.FindSourceDefinitionRequest>({
+            command: ts.server.protocol.CommandTypes.FindSourceDefinition,
+            arguments: protocolFileLocationFromSubstring(indexFile, "command", { index: 1 }),
+        });
         baselineTsserverLogs("auxiliaryProject", "file is added later through finding definition", session);
     });
 });

tests/baselines/reference/tsserver/auxiliaryProject/file-is-added-later-through-finding-definition.js

@@ -249,37 +249,6 @@ Info seq  [hh:mm:ss:mss] request:
       "seq": 3,
       "type": "request"
     }
-Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/auxiliaryProject1*
-Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/auxiliaryProject1* Version: 3 structureChanged: true structureIsReused:: Not Elapsed:: *ms
-Info seq  [hh:mm:ss:mss] Project '/dev/null/auxiliaryProject1*' (Auxiliary)
-Info seq  [hh:mm:ss:mss] 	Files (2)
-	/user/users/projects/myproject/node_modules/yargs/index.js Text-1 "// Specifically didnt have ./callback import to ensure that resolving module sepcifier adds the file to project at later stage\nexport function command(cmd, cb) { cb(Yargs) }\n"
-	/user/users/projects/myproject/index.ts SVC-1-0 "import { command } from \"yargs\";\ncommand(\"foo\", yargs => {\n    yargs.positional();\n});\n"
-
-
-	node_modules/yargs/index.js
-	  Imported via "yargs" from file 'index.ts' with packageId 'yargs/index.js@1.0.0'
-	index.ts
-	  Root file specified for compilation
-
-Info seq  [hh:mm:ss:mss] -----------------------------------------------
-Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/auxiliaryProject1*
-Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/auxiliaryProject1* Version: 4 structureChanged: true structureIsReused:: Not Elapsed:: *ms
-Info seq  [hh:mm:ss:mss] Project '/dev/null/auxiliaryProject1*' (Auxiliary)
-Info seq  [hh:mm:ss:mss] 	Files (3)
-	/user/users/projects/myproject/node_modules/yargs/index.js Text-1 "// Specifically didnt have ./callback import to ensure that resolving module sepcifier adds the file to project at later stage\nexport function command(cmd, cb) { cb(Yargs) }\n"
-	/user/users/projects/myproject/index.ts SVC-1-0 "import { command } from \"yargs\";\ncommand(\"foo\", yargs => {\n    yargs.positional();\n});\n"
-	/user/users/projects/myproject/node_modules/yargs/callback.js Text-1 "export class Yargs { positional() { } }\n"
-
-
-	node_modules/yargs/index.js
-	  Imported via "yargs" from file 'index.ts' with packageId 'yargs/index.js@1.0.0'
-	index.ts
-	  Root file specified for compilation
-	node_modules/yargs/callback.js
-	  Root file specified for compilation
-
-Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] response:
     {
       "response": [
@@ -307,3 +276,43 @@ Info seq  [hh:mm:ss:mss] response:
       "responseRequired": true
     }
 After request
+
+Before request
+
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "command": "findSourceDefinition",
+      "arguments": {
+        "file": "/user/users/projects/myproject/index.ts",
+        "line": 2,
+        "offset": 1
+      },
+      "seq": 4,
+      "type": "request"
+    }
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "response": [
+        {
+          "file": "/user/users/projects/myproject/node_modules/yargs/index.js",
+          "start": {
+            "line": 2,
+            "offset": 17
+          },
+          "end": {
+            "line": 2,
+            "offset": 24
+          },
+          "contextStart": {
+            "line": 2,
+            "offset": 1
+          },
+          "contextEnd": {
+            "line": 2,
+            "offset": 47
+          }
+        }
+      ],
+      "responseRequired": true
+    }
+After request