Some projectInfo tests

Author: sheetalkamat

src/testRunner/unittests/helpers/tsserver.ts

@@ -462,6 +462,19 @@ export function openFilesForSession(
     }
 }
 
+export function projectInfoForSession(
+    session: TestSession,
+    file: string | File,
+) {
+    return session.executeCommandSeq<ts.server.protocol.ProjectInfoRequest>({
+        command: ts.server.protocol.CommandTypes.ProjectInfo,
+        arguments: {
+            file: ts.isString(file) ? file : file.path,
+            needFileNameList: false,
+        },
+    }).response as ts.server.protocol.ProjectInfo;
+}
+
 export function closeFilesForSession(files: readonly (File | string)[], session: TestSession): void {
     for (const file of files) {
         session.executeCommandSeq<ts.server.protocol.CloseRequest>({

src/testRunner/unittests/tsserver/cancellationToken.ts

@@ -2,6 +2,7 @@ import * as ts from "../../_namespaces/ts.js";
 import { jsonToReadableText } from "../helpers.js";
 import {
     baselineTsserverLogs,
+    projectInfoForSession,
     TestSession,
     TestSessionRequest,
 } from "../helpers/tsserver.js";
@@ -88,10 +89,7 @@ describe("unittests:: tsserver:: cancellationToken::", () => {
             });
 
             // run new request
-            session.executeCommandSeq<ts.server.protocol.ProjectInfoRequest>({
-                command: ts.server.protocol.CommandTypes.ProjectInfo,
-                arguments: { file: f1.path, needFileNameList: false },
-            });
+            projectInfoForSession(session, f1);
 
             // cancel previously issued Geterr
             session.serverCancellationToken.setRequestToCancel(getErrId);

src/testRunner/unittests/tsserver/configuredProjects.ts

@@ -6,6 +6,7 @@ import {
     baselineTsserverLogs,
     closeFilesForSession,
     openFilesForSession,
+    projectInfoForSession,
     TestSession,
     verifyGetErrRequest,
 } from "../helpers/tsserver.js";
@@ -152,6 +153,7 @@ describe("unittests:: tsserver:: configuredProjects::", () => {
                 const { host, session, commonFile1, commonFile2, configFile } = setup(parentOrSiblingConfigFile);
 
                 openFilesForSession([commonFile1], session);
+                projectInfoForSession(session, commonFile1);
 
                 session.logger.log("1: When config file is deleted and then another file is opened");
                 // remove the tsconfig file
@@ -236,13 +238,35 @@ describe("unittests:: tsserver:: configuredProjects::", () => {
                 openFilesForSession([commonFile1, commonFile2], session);
                 closeFilesForSession([commonFile2], session);
                 openFilesForSession([{ file: "/user/username/projects/random/random.ts", content: "export const y = 10;" }], session);
+                closeFilesForSession(["/user/username/projects/random/random.ts"], session);
+
+                session.logger.log("7: When config file is deleted and then another file is opened and projectInfo");
+                // remove the tsconfig file
+                host.deleteFile(configFile.path);
+                openFilesForSession([commonFile2], session);
+
+                projectInfoForSession(session, commonFile1);
+                projectInfoForSession(session, commonFile2);
+
+                // Add a tsconfig file
+                host.writeFile(configFile.path, configFile.content);
+                host.runQueuedTimeoutCallbacks();
+
+                session.logger.log("8: When both files are open and config file is deleted and projectInfo");
+                // remove the tsconfig file
+                host.deleteFile(configFile.path);
+                host.runQueuedTimeoutCallbacks();
+
+                projectInfoForSession(session, commonFile1);
+                projectInfoForSession(session, commonFile2);
 
                 baselineTsserverLogs("configuredProjects", `add and then remove a config file ${scenario}`, session);
             });
 
             it(`add and then remove a config file ${scenario} and file from first config is not open`, () => {
                 const { host, session, commonFile2, configFile } = setup(parentOrSiblingConfigFile);
                 openFilesForSession([commonFile2], session);
+                projectInfoForSession(session, commonFile2);
 
                 session.logger.log("1: When config file is deleted");
                 // remove the tsconfig file
@@ -271,6 +295,27 @@ describe("unittests:: tsserver:: configuredProjects::", () => {
                 closeFilesForSession([commonFile2], session);
                 openFilesForSession([{ file: "/user/username/projects/random/random.ts", content: "export const y = 10;" }], session);
 
+                // Add a tsconfig file
+                host.writeFile(configFile.path, configFile.content);
+                host.runQueuedTimeoutCallbacks();
+                closeFilesForSession(["/user/username/projects/random/random.ts"], session);
+                openFilesForSession([commonFile2], session);
+
+                session.logger.log("3: When config file is deleted and projectInfo");
+                // remove the tsconfig file
+                host.deleteFile(configFile.path);
+                host.runQueuedTimeoutCallbacks();
+                projectInfoForSession(session, commonFile2);
+
+                // Add a tsconfig file
+                host.writeFile(configFile.path, configFile.content);
+                host.runQueuedTimeoutCallbacks();
+
+                session.logger.log("4: Check when file is closed when config file is deleted and projectInfo");
+                // remove the tsconfig file
+                host.deleteFile(configFile.path);
+                projectInfoForSession(session, commonFile2);
+
                 baselineTsserverLogs("configuredProjects", `add and then remove a config file ${scenario} and file from first config is not open`, session);
             });
         }
@@ -995,7 +1040,7 @@ foo();`,
                 endOffset: 1,
             },
         });
-        session.logger.log(`Default project for file: ${fooDts}: ${session.getProjectService().tryGetDefaultProjectForFile(ts.server.toNormalizedPath(fooDts))?.projectName}`);
+        projectInfoForSession(session, fooDts);
         baselineTsserverLogs("configuredProjects", "when default configured project does not contain the file", session);
     });
 

src/testRunner/unittests/tsserver/projectReferences.ts

@@ -7,6 +7,7 @@ import {
     closeFilesForSession,
     createHostWithSolutionBuild,
     openFilesForSession,
+    projectInfoForSession,
     protocolFileLocationFromSubstring,
     protocolLocationFromSubstring,
     TestSession,
@@ -23,7 +24,10 @@ function logDefaultProjectAndDefaultConfiguredProject(session: TestSession, file
     const defaultProject = session.getProjectService().tryGetDefaultProjectForFile(file.path as ts.server.NormalizedPath);
     const defaultConfiguredProject = info && session.getProjectService().findDefaultConfiguredProject(info);
     session.logger.info(`File: ${file.path}:\n\tgetDefaultProjectForFile:\n\t\t${defaultProject?.projectName}\n\tfindDefaultConfiguredProject:\n\t\t${defaultConfiguredProject?.projectName}`);
-    return { defaultProject, defaultConfiguredProject };
+    if (info) {
+        const projectInfo = projectInfoForSession(session, file);
+        return session.getProjectService().findProject(projectInfo.configFileName);
+    }
 }
 
 describe("unittests:: tsserver:: with projectReferences:: and tsbuild", () => {
@@ -1080,7 +1084,7 @@ export function bar() {}`,
 
         function verifySolutionScenario(input: Setup) {
             const { session, host } = setup(input);
-            const { defaultProject } = logDefaultProjectAndDefaultConfiguredProject(session, main);
+            const defaultProject = logDefaultProjectAndDefaultConfiguredProject(session, main);
 
             // Verify errors
             verifyGetErrRequest({ session, files: [main] });