Some extra tests before the change

Author: sheetalkamat

src/testRunner/unittests/tsserver/configuredProjects.ts

@@ -2,6 +2,9 @@ import * as ts from "../../_namespaces/ts";
 import {
  jsonToReadableText,
 } from "../helpers";
+import {
+ compilerOptionsToConfigJson,
+} from "../helpers/contents";
 import {
  ensureErrorFreeBuild,
 } from "../helpers/solutionBuilder";
@@ -27,13 +30,10 @@ describe("unittests:: tsserver:: ConfiguredProjects", () => {
  it("create configured project without file list", () => {
  const configFile: File = {
  path: "/a/b/tsconfig.json",
- content: `
- {
- "compilerOptions": {},
- "exclude": [
- "e"
- ]
- }`,
+ content: jsonToReadableText({
+ compilerOptions: {},
+ exclude: ["e"],
+ }),
  };
  const file1: File = {
  path: "/a/b/c/f1.ts",
@@ -57,11 +57,10 @@ describe("unittests:: tsserver:: ConfiguredProjects", () => {
  it("create configured project with the file list", () => {
  const configFile: File = {
  path: "/a/b/tsconfig.json",
- content: `
- {
- "compilerOptions": {},
- "include": ["*.ts"]
- }`,
+ content: jsonToReadableText({
+ compilerOptions: {},
+ include: ["*.ts"],
+ }),
  };
  const file1: File = {
  path: "/a/b/f1.ts",
@@ -85,9 +84,7 @@ describe("unittests:: tsserver:: ConfiguredProjects", () => {
  it("add and then remove a config file in a folder with loose files", () => {
  const configFile: File = {
  path: `/user/username/projects/myproject/tsconfig.json`,
- content: `{
- "files": ["commonFile1.ts"]
- }`,
+ content: jsonToReadableText({ files: ["commonFile1.ts"] }),
  };
  const commonFile1: File = {
  path: `/user/username/projects/myproject/commonFile1.ts`,
@@ -101,6 +98,7 @@ describe("unittests:: tsserver:: ConfiguredProjects", () => {
  const host = createServerHost([libFile, commonFile1, commonFile2]);
 
  const session = new TestSession(host);
+ // 1: when both files are open
  openFilesForSession([commonFile1, commonFile2], session);
 
  // Add a tsconfig file
@@ -111,9 +109,139 @@ describe("unittests:: tsserver:: ConfiguredProjects", () => {
  host.deleteFile(configFile.path);
  host.runQueuedTimeoutCallbacks(); // Refresh inferred projects
 
+ // Add a tsconfig file
+ host.writeFile(configFile.path, configFile.content);
+ host.runQueuedTimeoutCallbacks(); // load configured project from disk + ensureProjectsForOpenFiles
+
+ openFilesForSession([{ file: "/random/random.ts", content: "export const y = 10;" }], session);
+ // Check status when all files are closed
+ closeFilesForSession([commonFile1, commonFile2, "/random/random.ts"], session);
+ openFilesForSession([{ file: "/random/random.ts", content: "export const y = 10;" }], session);
+
+ // 2: when file is opened while config file is deleted
+ closeFilesForSession(["/random/random.ts"], session);
+ openFilesForSession([commonFile1], session);
+
+ // remove the tsconfig file
+ host.deleteFile(configFile.path);
+ openFilesForSession([commonFile2], session);
+
+ // Add a tsconfig file
+ host.writeFile(configFile.path, configFile.content);
+ host.runQueuedTimeoutCallbacks(); // load configured project from disk + ensureProjectsForOpenFiles
+
+ openFilesForSession([{ file: "/random/random.ts", content: "export const y = 10;" }], session);
+ // Check status when all files are closed
+ closeFilesForSession([commonFile1, commonFile2, "/random/random.ts"], session);
+ openFilesForSession([{ file: "/random/random.ts", content: "export const y = 10;" }], session);
+
  baselineTsserverLogs("configuredProjects", "add and then remove a config file in a folder with loose files", session);
  });
 
+ it("add and then remove a config file when parent folder has config file", () => {
+ const configFile: File = {
+ path: `/user/username/projects/myproject/folder/tsconfig.json`,
+ content: jsonToReadableText({ files: ["commonFile1.ts"] }),
+ };
+ const parentConfigFile: File = {
+ path: `/user/username/projects/myproject/tsconfig.json`,
+ content: jsonToReadableText({ files: ["folder/commonFile2.ts"] }),
+ };
+ const commonFile1: File = {
+ path: `/user/username/projects/myproject/folder/commonFile1.ts`,
+ content: "let x = 1",
+ };
+ const commonFile2: File = {
+ path: `/user/username/projects/myproject/folder/commonFile2.ts`,
+ content: "let y = 1",
+ };
+
+ const host = createServerHost([libFile, commonFile1, commonFile2, configFile, parentConfigFile]);
+
+ const session = new TestSession(host);
+
+ // 1: When config file is deleted and then another file is opened
+ openFilesForSession([commonFile1], session);
+
+ // remove the tsconfig file
+ host.deleteFile(configFile.path);
+ openFilesForSession([commonFile2], session);
+
+ // Add a tsconfig file
+ host.writeFile(configFile.path, configFile.content);
+ host.runQueuedTimeoutCallbacks();
+
+ // Check the state after files collected
+ openFilesForSession([{ file: "/random/random.ts", content: "export const y = 10;" }], session);
+
+ // Check status when all files are closed
+ closeFilesForSession([commonFile1, commonFile2, "/random/random.ts"], session);
+ openFilesForSession([{ file: "/random/random.ts", content: "export const y = 10;" }], session);
+
+ // 2: When both files are open and config file is deleted
+ closeFilesForSession(["/random/random.ts"], session);
+ openFilesForSession([commonFile1, commonFile2], session);
+
+ // remove the tsconfig file
+ host.deleteFile(configFile.path);
+ host.runQueuedTimeoutCallbacks();
+
+ // Add a tsconfig file
+ host.writeFile(configFile.path, configFile.content);
+ host.runQueuedTimeoutCallbacks(); // load configured project from disk + ensureProjectsForOpenFiles
+
+ openFilesForSession([{ file: "/random/random.ts", content: "export const y = 10;" }], session);
+
+ closeFilesForSession([commonFile1, commonFile2, "/random/random.ts"], session);
+ openFilesForSession([{ file: "/random/random.ts", content: "export const y = 10;" }], session);
+
+ // 3: Check when both files are closed when config file is deleted
+ closeFilesForSession(["/random/random.ts"], session);
+ openFilesForSession([commonFile1], session);
+
+ // remove the tsconfig file
+ host.deleteFile(configFile.path);
+ openFilesForSession([commonFile2], session);
+
+ // State after open files are closed
+ closeFilesForSession([commonFile1, commonFile2], session);
+ openFilesForSession([{ file: "/random/random.ts", content: "export const y = 10;" }], session);
+
+ // 4: Check when both files are closed one by one when file is deleted
+ host.writeFile(configFile.path, configFile.content);
+ closeFilesForSession(["/random/random.ts"], session);
+ openFilesForSession([commonFile1], session);
+
+ // remove the tsconfig file
+ host.deleteFile(configFile.path);
+ openFilesForSession([commonFile2], session);
+
+ // State after open files are closed
+ closeFilesForSession([commonFile1], session);
+ openFilesForSession([{ file: "/random/random.ts", content: "export const y = 10;" }], session);
+
+ closeFilesForSession([commonFile2, "random/random.ts"], session);
+ openFilesForSession([{ file: "/random/random.ts", content: "export const y = 10;" }], session);
+
+ // 5: Check when both files are closed one by one when file is deleted order changed
+ host.writeFile(configFile.path, configFile.content);
+ closeFilesForSession(["/random/random.ts"], session);
+ openFilesForSession([commonFile1], session);
+
+ // remove the tsconfig file
+ host.deleteFile(configFile.path);
+ openFilesForSession([commonFile2], session);
+
+ // State after open files are closed
+ closeFilesForSession([commonFile2], session);
+ openFilesForSession([{ file: "/random/random.ts", content: "export const y = 10;" }], session);
+
+ closeFilesForSession([commonFile1, "random/random.ts"], session);
+ openFilesForSession([{ file: "/random/random.ts", content: "export const y = 10;" }], session);
+
+ baselineTsserverLogs("configuredProjects", "add and then remove a config file when parent folder has config file", session);
+ });
+
  it("add new files to a configured project without file list", () => {
  const configFile: File = {
  path: "/a/b/tsconfig.json",
@@ -132,13 +260,13 @@ describe("unittests:: tsserver:: ConfiguredProjects", () => {
  it("should ignore non-existing files specified in the config file", () => {
  const configFile: File = {
  path: "/a/b/tsconfig.json",
- content: `{
-  "compilerOptions": {},
-  "files": [
-  "commonFile1.ts",
-  "commonFile3.ts"
-  ]
-  }`,
+ content: jsonToReadableText({
+ compilerOptions: {},
+ files: [
+ "commonFile1.ts",
+ "commonFile3.ts",
+ ],
+ }),
  };
  const host = createServerHost([commonFile1, commonFile2, configFile]);
  const session = new TestSession(host);
@@ -168,10 +296,10 @@ describe("unittests:: tsserver:: ConfiguredProjects", () => {
  it("files explicitly excluded in config file", () => {
  const configFile: File = {
  path: "/a/b/tsconfig.json",
- content: `{
-  "compilerOptions": {},
-  "exclude": ["/a/c"]
-  }`,
+ content: jsonToReadableText({
+ compilerOptions: {},
+ exclude: ["/a/c"],
+ }),
  };
  const excludedFile1: File = {
  path: "/a/c/excluedFile1.ts",
@@ -204,12 +332,10 @@ describe("unittests:: tsserver:: ConfiguredProjects", () => {
  };
  const configFile: File = {
  path: "/a/b/tsconfig.json",
- content: `{
- "compilerOptions": {
- "moduleResolution": "node"
- },
- "files": ["${file1.path}"]
- }`,
+ content: jsonToReadableText({
+ compilerOptions: compilerOptionsToConfigJson({ moduleResolution: ts.ModuleResolutionKind.Node10 }),
+ files: [file1.path],
+ }),
  };
  const files = [file1, nodeModuleFile, classicModuleFile, configFile, randomFile];
  const host = createServerHost(files);
@@ -218,12 +344,10 @@ describe("unittests:: tsserver:: ConfiguredProjects", () => {
 
  host.writeFile(
  configFile.path,
- `{
- "compilerOptions": {
- "moduleResolution": "classic"
- },
- "files": ["${file1.path}"]
- }`,
+ jsonToReadableText({
+ compilerOptions: compilerOptionsToConfigJson({ moduleResolution: ts.ModuleResolutionKind.Classic }),
+ files: [file1.path],
+ }),
  );
  host.runQueuedTimeoutCallbacks();
 
@@ -244,12 +368,12 @@ describe("unittests:: tsserver:: ConfiguredProjects", () => {
  };
  const configFile: File = {
  path: "/a/b/tsconfig.json",
- content: `{
-  "compilerOptions": {
-  "target": "es6"
-  },
-  "files": [ "main.ts" ]
-  }`,
+ content: jsonToReadableText({
+ compilerOptions: {
+ target: "es6",
+ },
+ files: ["main.ts"],
+ }),
  };
  const host = createServerHost([file1, file2, configFile]);
  const session = new TestSession(host);
@@ -262,13 +386,13 @@ describe("unittests:: tsserver:: ConfiguredProjects", () => {
  it("should tolerate config file errors and still try to build a project", () => {
  const configFile: File = {
  path: "/a/b/tsconfig.json",
- content: `{
-  "compilerOptions": {
-  "target": "es6",
-  "allowAnything": true
-  },
-  "someOtherProperty": {}
-  }`,
+ content: jsonToReadableText({
+ compilerOptions: {
+ target: "es6",
+ allowAnything: true,
+ },
+ someOtherProperty: {},
+ }),
  };
  const host = createServerHost([commonFile1, commonFile2, libFile, configFile]);
  const session = new TestSession(host);
@@ -287,12 +411,12 @@ describe("unittests:: tsserver:: ConfiguredProjects", () => {
  };
  const configFile: File = {
  path: "/a/b/tsconfig.json",
- content: `{
-  "compilerOptions": {
-  "target": "es6"
-  },
-  "files": [ "main.ts", "main2.ts" ]
-  }`,
+ content: jsonToReadableText({
+ compilerOptions: {
+ target: "es6",
+ },
+ files: ["main.ts", "main2.ts"],
+ }),
  };
  const host = createServerHost([file1, file2, configFile, libFile]);
  const session = new TestSession({ host, useSingleInferredProject: true });
@@ -309,12 +433,12 @@ describe("unittests:: tsserver:: ConfiguredProjects", () => {
  };
  const configFile: File = {
  path: "/a/b/tsconfig.json",
- content: `{
-  "compilerOptions": {
-  "target": "es6"
-  },
-  "files": [ "main.ts" ]
-  }`,
+ content: jsonToReadableText({
+ compilerOptions: {
+ target: "es6",
+ },
+ files: ["main.ts"],
+ }),
  };
  const host = createServerHost([file1, configFile, libFile]);
  const session = new TestSession({ host, useSingleInferredProject: true });