Tests with actual persistResolutions

sheetalkamat · sheetalkamat · commit 5d658c67b623 · 2021-06-02T16:35:11.000-07:00
diff --git a/src/testRunner/unittests/tsserver/persistResolutions.ts b/src/testRunner/unittests/tsserver/persistResolutions.ts
@@ -40,7 +40,7 @@ namespace ts.projectSystem {
         const content = JSON.parse(file.content);
         content.compilerOptions = {
             ...content.compilerOptions || {},
-            persistResolutions: false,
+            persistResolutions: true,
             traceResolution: true,
         };
         file.content = JSON.stringify(content, /*replacer*/ undefined, 4);
@@ -317,7 +317,7 @@ namespace ts.projectSystem {
         function setupHost() {
             const coreConfig: File = {
                 path: `${tscWatch.projectRoot}/core/tsconfig.json`,
-                content: JSON.stringify({ compilerOptions: { composite: true, persistResolutions: false, traceResolution: true } })
+                content: JSON.stringify({ compilerOptions: { composite: true, persistResolutions: true, traceResolution: true } })
             };
             const coreIndex: File = {
                 path: `${tscWatch.projectRoot}/core/index.ts`,
@@ -334,7 +334,7 @@ namespace ts.projectSystem {
             const logicConfig: File = {
                 path: `${tscWatch.projectRoot}/logic/tsconfig.json`,
                 content: JSON.stringify({
-                    compilerOptions: { composite: true, persistResolutions: false, traceResolution: true },
+                    compilerOptions: { composite: true, persistResolutions: true, traceResolution: true },
                     references: [{ path: "../core" }]
                 })
             };
@@ -354,7 +354,7 @@ export function returnAnotherClass() {
             const testsConfig: File = {
                 path: `${tscWatch.projectRoot}/tests/tsconfig.json`,
                 content: JSON.stringify({
-                    compilerOptions: { composite: true, persistResolutions: false, traceResolution: true },
+                    compilerOptions: { composite: true, persistResolutions: true, traceResolution: true },
                     references: [{ path: "../logic" }]
                 })
             };
diff --git a/tests/baselines/reference/tsserver/persistResolutions/creates-new-resolutions-for-program-if-tsbuildinfo-is-not-present-with-project-where-dts-file-contains-fewer-modules-than-original-file.js b/tests/baselines/reference/tsserver/persistResolutions/creates-new-resolutions-for-program-if-tsbuildinfo-is-not-present-with-project-where-dts-file-contains-fewer-modules-than-original-file.js
@@ -10,7 +10,7 @@ Config: /user/username/projects/myproject/tests/tsconfig.json : {
  ],
  "options": {
   "composite": true,
-  "persistResolutions": false,
+  "persistResolutions": true,
   "traceResolution": true,
   "configFilePath": "/user/username/projects/myproject/tests/tsconfig.json"
  },
@@ -31,7 +31,7 @@ Config: /user/username/projects/myproject/logic/tsconfig.json : {
  ],
  "options": {
   "composite": true,
-  "persistResolutions": false,
+  "persistResolutions": true,
   "traceResolution": true,
   "configFilePath": "/user/username/projects/myproject/logic/tsconfig.json"
  },
@@ -53,7 +53,7 @@ Config: /user/username/projects/myproject/core/tsconfig.json : {
  ],
  "options": {
   "composite": true,
-  "persistResolutions": false,
+  "persistResolutions": true,
   "traceResolution": true,
   "configFilePath": "/user/username/projects/myproject/core/tsconfig.json"
  }
@@ -70,10 +70,6 @@ File '/user/username/projects/myproject/logic.d.ts' does not exist.
 File '/user/username/projects/myproject/logic/package.json' does not exist.
 File '/user/username/projects/myproject/logic/index.ts' exist - use it as a name resolution result.
 ======== Module name '../logic' was successfully resolved to '/user/username/projects/myproject/logic/index.ts'. ========
-DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/tests/tsconfig.json WatchType: Failed Lookup Locations
-Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/tests/tsconfig.json WatchType: Failed Lookup Locations
-DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/logic 1 undefined Project: /user/username/projects/myproject/tests/tsconfig.json WatchType: Failed Lookup Locations
-Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/logic 1 undefined Project: /user/username/projects/myproject/tests/tsconfig.json WatchType: Failed Lookup Locations
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/logic/index.ts 500 undefined WatchType: Closed Script info
 ======== Resolving module '../core/myClass' from '/user/username/projects/myproject/logic/index.ts'. ========
 Using compiler options of project reference redirect '/user/username/projects/myproject/logic/tsconfig.json'.
@@ -91,8 +87,6 @@ File '/user/username/projects/myproject/core.d.ts' does not exist.
 File '/user/username/projects/myproject/core/package.json' does not exist.
 File '/user/username/projects/myproject/core/index.ts' exist - use it as a name resolution result.
 ======== Module name '../core' was successfully resolved to '/user/username/projects/myproject/core/index.ts'. ========
-DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/core 1 undefined Project: /user/username/projects/myproject/tests/tsconfig.json WatchType: Failed Lookup Locations
-Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/core 1 undefined Project: /user/username/projects/myproject/tests/tsconfig.json WatchType: Failed Lookup Locations
 ======== Resolving module '../core/anotherClass' from '/user/username/projects/myproject/logic/index.ts'. ========
 Using compiler options of project reference redirect '/user/username/projects/myproject/logic/tsconfig.json'.
 Module resolution kind is not specified, using 'NodeJs'.
diff --git a/tests/baselines/reference/tsserver/persistResolutions/creates-new-resolutions-for-program-if-tsbuildinfo-is-not-present-with-sample-project.js b/tests/baselines/reference/tsserver/persistResolutions/creates-new-resolutions-for-program-if-tsbuildinfo-is-not-present-with-sample-project.js
@@ -13,7 +13,7 @@ Config: /user/username/projects/sample1/tests/tsconfig.json : {
   "declaration": true,
   "forceConsistentCasingInFileNames": true,
   "skipDefaultLibCheck": true,
-  "persistResolutions": false,
+  "persistResolutions": true,
   "traceResolution": true,
   "configFilePath": "/user/username/projects/sample1/tests/tsconfig.json"
  },
@@ -41,7 +41,7 @@ Config: /user/username/projects/sample1/core/tsconfig.json : {
   "declaration": true,
   "declarationMap": true,
   "skipDefaultLibCheck": true,
-  "persistResolutions": false,
+  "persistResolutions": true,
   "traceResolution": true,
   "configFilePath": "/user/username/projects/sample1/core/tsconfig.json"
  }
@@ -59,7 +59,7 @@ Config: /user/username/projects/sample1/logic/tsconfig.json : {
   "sourceMap": true,
   "forceConsistentCasingInFileNames": true,
   "skipDefaultLibCheck": true,
-  "persistResolutions": false,
+  "persistResolutions": true,
   "traceResolution": true,
   "configFilePath": "/user/username/projects/sample1/logic/tsconfig.json"
  },
diff --git a/tests/baselines/reference/tsserver/persistResolutions/creates-new-resolutions-for-program-if-tsbuildinfo-is-present-but-program-is-not-persisted-with-project-where-dts-file-contains-fewer-modules-than-original-file.js b/tests/baselines/reference/tsserver/persistResolutions/creates-new-resolutions-for-program-if-tsbuildinfo-is-present-but-program-is-not-persisted-with-project-where-dts-file-contains-fewer-modules-than-original-file.js
@@ -10,7 +10,7 @@ Config: /user/username/projects/myproject/tests/tsconfig.json : {
  ],
  "options": {
   "composite": true,
-  "persistResolutions": false,
+  "persistResolutions": true,
   "traceResolution": true,
   "configFilePath": "/user/username/projects/myproject/tests/tsconfig.json"
  },
@@ -31,7 +31,7 @@ Config: /user/username/projects/myproject/logic/tsconfig.json : {
  ],
  "options": {
   "composite": true,
-  "persistResolutions": false,
+  "persistResolutions": true,
   "traceResolution": true,
   "configFilePath": "/user/username/projects/myproject/logic/tsconfig.json"
  },
@@ -53,7 +53,7 @@ Config: /user/username/projects/myproject/core/tsconfig.json : {
  ],
  "options": {
   "composite": true,
-  "persistResolutions": false,
+  "persistResolutions": true,
   "traceResolution": true,
   "configFilePath": "/user/username/projects/myproject/core/tsconfig.json"
  }
@@ -70,10 +70,6 @@ File '/user/username/projects/myproject/logic.d.ts' does not exist.
 File '/user/username/projects/myproject/logic/package.json' does not exist.
 File '/user/username/projects/myproject/logic/index.ts' exist - use it as a name resolution result.
 ======== Module name '../logic' was successfully resolved to '/user/username/projects/myproject/logic/index.ts'. ========
-DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/tests/tsconfig.json WatchType: Failed Lookup Locations
-Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/tests/tsconfig.json WatchType: Failed Lookup Locations
-DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/logic 1 undefined Project: /user/username/projects/myproject/tests/tsconfig.json WatchType: Failed Lookup Locations
-Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/logic 1 undefined Project: /user/username/projects/myproject/tests/tsconfig.json WatchType: Failed Lookup Locations
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/logic/index.ts 500 undefined WatchType: Closed Script info
 ======== Resolving module '../core/myClass' from '/user/username/projects/myproject/logic/index.ts'. ========
 Using compiler options of project reference redirect '/user/username/projects/myproject/logic/tsconfig.json'.
@@ -91,8 +87,6 @@ File '/user/username/projects/myproject/core.d.ts' does not exist.
 File '/user/username/projects/myproject/core/package.json' does not exist.
 File '/user/username/projects/myproject/core/index.ts' exist - use it as a name resolution result.
 ======== Module name '../core' was successfully resolved to '/user/username/projects/myproject/core/index.ts'. ========
-DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/core 1 undefined Project: /user/username/projects/myproject/tests/tsconfig.json WatchType: Failed Lookup Locations
-Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/core 1 undefined Project: /user/username/projects/myproject/tests/tsconfig.json WatchType: Failed Lookup Locations
 ======== Resolving module '../core/anotherClass' from '/user/username/projects/myproject/logic/index.ts'. ========
 Using compiler options of project reference redirect '/user/username/projects/myproject/logic/tsconfig.json'.
 Module resolution kind is not specified, using 'NodeJs'.
diff --git a/tests/baselines/reference/tsserver/persistResolutions/creates-new-resolutions-for-program-if-tsbuildinfo-is-present-but-program-is-not-persisted-with-sample-project.js b/tests/baselines/reference/tsserver/persistResolutions/creates-new-resolutions-for-program-if-tsbuildinfo-is-present-but-program-is-not-persisted-with-sample-project.js
@@ -13,7 +13,7 @@ Config: /user/username/projects/sample1/tests/tsconfig.json : {
   "declaration": true,
   "forceConsistentCasingInFileNames": true,
   "skipDefaultLibCheck": true,
-  "persistResolutions": false,
+  "persistResolutions": true,
   "traceResolution": true,
   "configFilePath": "/user/username/projects/sample1/tests/tsconfig.json"
  },
@@ -41,7 +41,7 @@ Config: /user/username/projects/sample1/core/tsconfig.json : {
   "declaration": true,
   "declarationMap": true,
   "skipDefaultLibCheck": true,
-  "persistResolutions": false,
+  "persistResolutions": true,
   "traceResolution": true,
   "configFilePath": "/user/username/projects/sample1/core/tsconfig.json"
  }
@@ -59,7 +59,7 @@ Config: /user/username/projects/sample1/logic/tsconfig.json : {
   "sourceMap": true,
   "forceConsistentCasingInFileNames": true,
   "skipDefaultLibCheck": true,
-  "persistResolutions": false,
+  "persistResolutions": true,
   "traceResolution": true,
   "configFilePath": "/user/username/projects/sample1/logic/tsconfig.json"
  },
diff --git a/tests/baselines/reference/tsserver/persistResolutions/uses-saved-resolution-for-program-with-project-where-dts-file-contains-fewer-modules-than-original-file.js b/tests/baselines/reference/tsserver/persistResolutions/uses-saved-resolution-for-program-with-project-where-dts-file-contains-fewer-modules-than-original-file.js
diff --git a/tests/baselines/reference/tsserver/persistResolutions/uses-saved-resolution-for-program-with-sample-project.js b/tests/baselines/reference/tsserver/persistResolutions/uses-saved-resolution-for-program-with-sample-project.js
