From 80ab111685e3e0c10d8d13cdd18d8dffa8328895 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 9 Nov 2023 12:16:29 -0800 Subject: [PATCH] If the project is orphan dont queue up TI reqquest (#56355) --- src/server/project.ts | 2 +- .../tsconfig-for-the-file-does-not-exist.js | 164 +-------- .../tsconfig-for-the-file-exists.js | 154 +-------- ...-are-all-closed-when-the-update-happens.js | 138 +------- ...oject-as-part-of-configured-file-update.js | 164 +-------- ...onfig-file-in-a-folder-with-loose-files.js | 134 -------- ...ject-if-it-is-referenced-from-root-file.js | 316 +++--------------- ...odule-resolution-changes-in-config-file.js | 130 +------ .../project-settings-for-inferred-projects.js | 119 ------- ...ting-inferred-project-has-no-root-files.js | 170 +++------- ...iles-are-reflected-in-project-structure.js | 126 ------- ...orrectly-migrate-files-between-projects.js | 140 +------- 12 files changed, 109 insertions(+), 1648 deletions(-) diff --git a/src/server/project.ts b/src/server/project.ts index e0a21ed7701..49aaeece0f4 100644 --- a/src/server/project.ts +++ b/src/server/project.ts @@ -1353,7 +1353,7 @@ export abstract class Project implements LanguageServiceHost, ModuleResolutionHo // update builder only if language service is enabled // otherwise tell it to drop its internal state - if (this.languageServiceEnabled && this.projectService.serverMode === LanguageServiceMode.Semantic) { + if (this.languageServiceEnabled && this.projectService.serverMode === LanguageServiceMode.Semantic && !this.isOrphan()) { // 1. no changes in structure, no changes in unresolved imports - do nothing // 2. no changes in structure, unresolved imports were changed - collect unresolved imports for all files // (can reuse cached imports for files that were not changed) diff --git a/tests/baselines/reference/tsserver/configFileSearch/tsconfig-for-the-file-does-not-exist.js b/tests/baselines/reference/tsserver/configFileSearch/tsconfig-for-the-file-does-not-exist.js index 373f78d787e..c1bccabaeb8 100644 --- a/tests/baselines/reference/tsserver/configFileSearch/tsconfig-for-the-file-does-not-exist.js +++ b/tests/baselines/reference/tsserver/configFileSearch/tsconfig-for-the-file-does-not-exist.js @@ -261,146 +261,6 @@ Info seq [hh:mm:ss:mss] Files (0) Info seq [hh:mm:ss:mss] ----------------------------------------------- -TI:: Creating typing installer - -PolledWatches:: -/a/b/projects/node_modules/@types: - {"pollingInterval":500} -/a/b/projects/project/node_modules/@types: - {"pollingInterval":500} -/a/b/projects/project/src/node_modules/@types: - {"pollingInterval":500} - -PolledWatches *deleted*:: -/a/b/projects/project/jsconfig.json: - {"pollingInterval":2000} -/a/b/projects/project/src/jsconfig.json: - {"pollingInterval":2000} -/a/b/projects/project/src/tsconfig.json: - {"pollingInterval":2000} - -FsWatches:: -/a/b/projects/project/tsconfig.json: - {} -/a/lib/lib.d.ts: - {} - -FsWatchesRecursive:: -/a/b/projects/project: *new* - {} - -TI:: [hh:mm:ss:mss] Global cache location '/a/data', safe file path '/safeList.json', types map path /typesMap.json -TI:: [hh:mm:ss:mss] Processing cache location '/a/data' -TI:: [hh:mm:ss:mss] Trying to find '/a/data/package.json'... -TI:: [hh:mm:ss:mss] Finished processing cache location '/a/data' -TI:: [hh:mm:ss:mss] Npm config file: /a/data/package.json -TI:: [hh:mm:ss:mss] Npm config file: '/a/data/package.json' is missing, creating new one... -TI:: [hh:mm:ss:mss] Updating types-registry npm package... -TI:: [hh:mm:ss:mss] npm install --ignore-scripts types-registry@latest -TI:: [hh:mm:ss:mss] Updated types-registry npm package -TI:: typing installer creation complete -//// [/a/data/package.json] -{ "private": true } - -//// [/a/data/node_modules/types-registry/index.json] -{ - "entries": {} -} - - -TI:: [hh:mm:ss:mss] Got install request - { - "projectName": "/dev/null/inferredProject1*", - "fileNames": [], - "compilerOptions": { - "target": 1, - "jsx": 1, - "allowNonTsExtensions": true, - "allowJs": true, - "noEmitForJsFiles": true - }, - "typeAcquisition": { - "enable": true, - "include": [], - "exclude": [] - }, - "unresolvedImports": [], - "projectRootPath": "/a/b/projects/project/src", - "cachePath": "/a/data", - "kind": "discover" - } -TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information... -TI:: [hh:mm:ss:mss] Processing cache location '/a/data' -TI:: [hh:mm:ss:mss] Cache location was already processed... -TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json' -TI:: [hh:mm:ss:mss] Explicitly included types: [] -TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: [] -TI:: [hh:mm:ss:mss] Finished typings discovery: - { - "cachedTypingPaths": [], - "newTypingNames": [], - "filesToWatch": [ - "/a/b/projects/project/src/bower_components", - "/a/b/projects/project/src/node_modules" - ] - } -TI:: [hh:mm:ss:mss] Sending response: - { - "kind": "action::watchTypingLocations", - "projectName": "/dev/null/inferredProject1*", - "files": [ - "/a/b/projects/project/src/bower_components", - "/a/b/projects/project/src/node_modules" - ] - } -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project/src/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project/src/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project/src/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project/src/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer -TI:: [hh:mm:ss:mss] Sending response: - { - "projectName": "/dev/null/inferredProject1*", - "typeAcquisition": { - "enable": true, - "include": [], - "exclude": [] - }, - "compilerOptions": { - "target": 1, - "jsx": 1, - "allowNonTsExtensions": true, - "allowJs": true, - "noEmitForJsFiles": true - }, - "typings": [], - "unresolvedImports": [], - "kind": "action::set" - } -Info seq [hh:mm:ss:mss] event: - { - "seq": 0, - "type": "event", - "event": "setTypings", - "body": { - "projectName": "/dev/null/inferredProject1*", - "typeAcquisition": { - "enable": true, - "include": [], - "exclude": [] - }, - "compilerOptions": { - "target": 1, - "jsx": 1, - "allowNonTsExtensions": true, - "allowJs": true, - "noEmitForJsFiles": true - }, - "typings": [], - "unresolvedImports": [], - "kind": "action::set" - } - } -TI:: [hh:mm:ss:mss] No new typings were requested as a result of typings discovery Info seq [hh:mm:ss:mss] After ensureProjectForOpenFiles: Info seq [hh:mm:ss:mss] Project '/a/b/projects/project/tsconfig.json' (Configured) Info seq [hh:mm:ss:mss] Files (2) @@ -432,13 +292,17 @@ PolledWatches:: {"pollingInterval":500} /a/b/projects/project/node_modules/@types: {"pollingInterval":500} -/a/b/projects/project/src/bower_components: *new* - {"pollingInterval":500} -/a/b/projects/project/src/node_modules: *new* - {"pollingInterval":500} /a/b/projects/project/src/node_modules/@types: {"pollingInterval":500} +PolledWatches *deleted*:: +/a/b/projects/project/jsconfig.json: + {"pollingInterval":2000} +/a/b/projects/project/src/jsconfig.json: + {"pollingInterval":2000} +/a/b/projects/project/src/tsconfig.json: + {"pollingInterval":2000} + FsWatches:: /a/b/projects/project/tsconfig.json: {} @@ -446,7 +310,7 @@ FsWatches:: {} FsWatchesRecursive:: -/a/b/projects/project: +/a/b/projects/project: *new* {} Info seq [hh:mm:ss:mss] FileWatcher:: Triggered with /a/b/projects/project/tsconfig.json 2:: WatchInfo: /a/b/projects/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root @@ -466,8 +330,6 @@ Info seq [hh:mm:ss:mss] ----------------------------------------------- Info seq [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /a/b/projects/project 1 undefined Config: /a/b/projects/project/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /a/b/projects/project 1 undefined Config: /a/b/projects/project/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /a/b/projects/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root -TI:: [hh:mm:ss:mss] Closing file watchers for project '/a/b/projects/project/tsconfig.json' -TI:: [hh:mm:ss:mss] No watchers are registered for project '/a/b/projects/project/tsconfig.json' Info seq [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /a/b/projects/project/node_modules/@types 1 undefined Project: /a/b/projects/project/tsconfig.json WatchType: Type roots Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /a/b/projects/project/node_modules/@types 1 undefined Project: /a/b/projects/project/tsconfig.json WatchType: Type roots Info seq [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /a/b/projects/node_modules/@types 1 undefined Project: /a/b/projects/project/tsconfig.json WatchType: Type roots @@ -485,10 +347,6 @@ PolledWatches:: {"pollingInterval":500} /a/b/projects/project/node_modules/@types: {"pollingInterval":500} -/a/b/projects/project/src/bower_components: - {"pollingInterval":500} -/a/b/projects/project/src/node_modules: - {"pollingInterval":500} /a/b/projects/project/src/node_modules/@types: {"pollingInterval":500} @@ -564,12 +422,8 @@ PolledWatches:: {"pollingInterval":2000} /a/b/projects/project/node_modules/@types: {"pollingInterval":500} -/a/b/projects/project/src/bower_components: - {"pollingInterval":500} /a/b/projects/project/src/jsconfig.json: *new* {"pollingInterval":2000} -/a/b/projects/project/src/node_modules: - {"pollingInterval":500} /a/b/projects/project/src/node_modules/@types: {"pollingInterval":500} /a/b/projects/project/src/tsconfig.json: *new* diff --git a/tests/baselines/reference/tsserver/configFileSearch/tsconfig-for-the-file-exists.js b/tests/baselines/reference/tsserver/configFileSearch/tsconfig-for-the-file-exists.js index 0a6e9b5e99e..7487172801f 100644 --- a/tests/baselines/reference/tsserver/configFileSearch/tsconfig-for-the-file-exists.js +++ b/tests/baselines/reference/tsserver/configFileSearch/tsconfig-for-the-file-exists.js @@ -418,146 +418,6 @@ Info seq [hh:mm:ss:mss] Files (0) Info seq [hh:mm:ss:mss] ----------------------------------------------- -TI:: Creating typing installer - -PolledWatches:: -/a/b/projects/node_modules/@types: - {"pollingInterval":500} -/a/b/projects/project/node_modules/@types: - {"pollingInterval":500} -/a/b/projects/project/src/node_modules/@types: - {"pollingInterval":500} - -PolledWatches *deleted*:: -/a/b/projects/project/jsconfig.json: - {"pollingInterval":2000} -/a/b/projects/project/src/jsconfig.json: - {"pollingInterval":2000} -/a/b/projects/project/src/tsconfig.json: - {"pollingInterval":2000} - -FsWatches:: -/a/b/projects/project/tsconfig.json: - {} -/a/lib/lib.d.ts: - {} - -FsWatchesRecursive:: -/a/b/projects/project: *new* - {} - -TI:: [hh:mm:ss:mss] Global cache location '/a/data', safe file path '/safeList.json', types map path /typesMap.json -TI:: [hh:mm:ss:mss] Processing cache location '/a/data' -TI:: [hh:mm:ss:mss] Trying to find '/a/data/package.json'... -TI:: [hh:mm:ss:mss] Finished processing cache location '/a/data' -TI:: [hh:mm:ss:mss] Npm config file: /a/data/package.json -TI:: [hh:mm:ss:mss] Npm config file: '/a/data/package.json' is missing, creating new one... -TI:: [hh:mm:ss:mss] Updating types-registry npm package... -TI:: [hh:mm:ss:mss] npm install --ignore-scripts types-registry@latest -TI:: [hh:mm:ss:mss] Updated types-registry npm package -TI:: typing installer creation complete -//// [/a/data/package.json] -{ "private": true } - -//// [/a/data/node_modules/types-registry/index.json] -{ - "entries": {} -} - - -TI:: [hh:mm:ss:mss] Got install request - { - "projectName": "/dev/null/inferredProject1*", - "fileNames": [], - "compilerOptions": { - "target": 1, - "jsx": 1, - "allowNonTsExtensions": true, - "allowJs": true, - "noEmitForJsFiles": true - }, - "typeAcquisition": { - "enable": true, - "include": [], - "exclude": [] - }, - "unresolvedImports": [], - "projectRootPath": "/a/b/projects/project/src", - "cachePath": "/a/data", - "kind": "discover" - } -TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information... -TI:: [hh:mm:ss:mss] Processing cache location '/a/data' -TI:: [hh:mm:ss:mss] Cache location was already processed... -TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json' -TI:: [hh:mm:ss:mss] Explicitly included types: [] -TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: [] -TI:: [hh:mm:ss:mss] Finished typings discovery: - { - "cachedTypingPaths": [], - "newTypingNames": [], - "filesToWatch": [ - "/a/b/projects/project/src/bower_components", - "/a/b/projects/project/src/node_modules" - ] - } -TI:: [hh:mm:ss:mss] Sending response: - { - "kind": "action::watchTypingLocations", - "projectName": "/dev/null/inferredProject1*", - "files": [ - "/a/b/projects/project/src/bower_components", - "/a/b/projects/project/src/node_modules" - ] - } -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project/src/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project/src/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project/src/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project/src/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer -TI:: [hh:mm:ss:mss] Sending response: - { - "projectName": "/dev/null/inferredProject1*", - "typeAcquisition": { - "enable": true, - "include": [], - "exclude": [] - }, - "compilerOptions": { - "target": 1, - "jsx": 1, - "allowNonTsExtensions": true, - "allowJs": true, - "noEmitForJsFiles": true - }, - "typings": [], - "unresolvedImports": [], - "kind": "action::set" - } -Info seq [hh:mm:ss:mss] event: - { - "seq": 0, - "type": "event", - "event": "setTypings", - "body": { - "projectName": "/dev/null/inferredProject1*", - "typeAcquisition": { - "enable": true, - "include": [], - "exclude": [] - }, - "compilerOptions": { - "target": 1, - "jsx": 1, - "allowNonTsExtensions": true, - "allowJs": true, - "noEmitForJsFiles": true - }, - "typings": [], - "unresolvedImports": [], - "kind": "action::set" - } - } -TI:: [hh:mm:ss:mss] No new typings were requested as a result of typings discovery Info seq [hh:mm:ss:mss] After ensureProjectForOpenFiles: Info seq [hh:mm:ss:mss] Project '/a/b/projects/project/tsconfig.json' (Configured) Info seq [hh:mm:ss:mss] Files (2) @@ -589,13 +449,17 @@ PolledWatches:: {"pollingInterval":500} /a/b/projects/project/node_modules/@types: {"pollingInterval":500} -/a/b/projects/project/src/bower_components: *new* - {"pollingInterval":500} -/a/b/projects/project/src/node_modules: *new* - {"pollingInterval":500} /a/b/projects/project/src/node_modules/@types: {"pollingInterval":500} +PolledWatches *deleted*:: +/a/b/projects/project/jsconfig.json: + {"pollingInterval":2000} +/a/b/projects/project/src/jsconfig.json: + {"pollingInterval":2000} +/a/b/projects/project/src/tsconfig.json: + {"pollingInterval":2000} + FsWatches:: /a/b/projects/project/tsconfig.json: {} @@ -603,5 +467,5 @@ FsWatches:: {} FsWatchesRecursive:: -/a/b/projects/project: +/a/b/projects/project: *new* {} diff --git a/tests/baselines/reference/tsserver/configuredProjects/Open-ref-of-configured-project-when-open-file-gets-added-to-the-project-as-part-of-configured-file-update-buts-its-open-file-references-are-all-closed-when-the-update-happens.js b/tests/baselines/reference/tsserver/configuredProjects/Open-ref-of-configured-project-when-open-file-gets-added-to-the-project-as-part-of-configured-file-update-buts-its-open-file-references-are-all-closed-when-the-update-happens.js index 01bc5f54edd..0fda394d59a 100644 --- a/tests/baselines/reference/tsserver/configuredProjects/Open-ref-of-configured-project-when-open-file-gets-added-to-the-project-as-part-of-configured-file-update-buts-its-open-file-references-are-all-closed-when-the-update-happens.js +++ b/tests/baselines/reference/tsserver/configuredProjects/Open-ref-of-configured-project-when-open-file-gets-added-to-the-project-as-part-of-configured-file-update-buts-its-open-file-references-are-all-closed-when-the-update-happens.js @@ -657,138 +657,6 @@ Info seq [hh:mm:ss:mss] Files (0) Info seq [hh:mm:ss:mss] ----------------------------------------------- -TI:: Creating typing installer - -PolledWatches:: -/a/b/src/node_modules/@types: - {"pollingInterval":500} -/a/lib/lib.d.ts: - {"pollingInterval":500} - -FsWatches:: -/a/b/file3.ts: - {} -/a/b/src/file1.ts: - {} -/a/b/tsconfig.json: - {} - -FsWatchesRecursive:: -/a/b: *new* - {} - -TI:: [hh:mm:ss:mss] Global cache location '/a/data', safe file path '/safeList.json', types map path /typesMap.json -TI:: [hh:mm:ss:mss] Processing cache location '/a/data' -TI:: [hh:mm:ss:mss] Trying to find '/a/data/package.json'... -TI:: [hh:mm:ss:mss] Finished processing cache location '/a/data' -TI:: [hh:mm:ss:mss] Npm config file: /a/data/package.json -TI:: [hh:mm:ss:mss] Npm config file: '/a/data/package.json' is missing, creating new one... -TI:: [hh:mm:ss:mss] Updating types-registry npm package... -TI:: [hh:mm:ss:mss] npm install --ignore-scripts types-registry@latest -TI:: [hh:mm:ss:mss] Updated types-registry npm package -TI:: typing installer creation complete -//// [/a/data/package.json] -{ "private": true } - -//// [/a/data/node_modules/types-registry/index.json] -{ - "entries": {} -} - - -TI:: [hh:mm:ss:mss] Got install request - { - "projectName": "/dev/null/inferredProject1*", - "fileNames": [], - "compilerOptions": { - "target": 1, - "jsx": 1, - "allowNonTsExtensions": true, - "allowJs": true, - "noEmitForJsFiles": true - }, - "typeAcquisition": { - "enable": true, - "include": [], - "exclude": [] - }, - "unresolvedImports": [], - "projectRootPath": "/a/b/src", - "cachePath": "/a/data", - "kind": "discover" - } -TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information... -TI:: [hh:mm:ss:mss] Processing cache location '/a/data' -TI:: [hh:mm:ss:mss] Cache location was already processed... -TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json' -TI:: [hh:mm:ss:mss] Explicitly included types: [] -TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: [] -TI:: [hh:mm:ss:mss] Finished typings discovery: - { - "cachedTypingPaths": [], - "newTypingNames": [], - "filesToWatch": [ - "/a/b/src/bower_components", - "/a/b/src/node_modules" - ] - } -TI:: [hh:mm:ss:mss] Sending response: - { - "kind": "action::watchTypingLocations", - "projectName": "/dev/null/inferredProject1*", - "files": [ - "/a/b/src/bower_components", - "/a/b/src/node_modules" - ] - } -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/b/src/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/src/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/b/src/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/src/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer -TI:: [hh:mm:ss:mss] Sending response: - { - "projectName": "/dev/null/inferredProject1*", - "typeAcquisition": { - "enable": true, - "include": [], - "exclude": [] - }, - "compilerOptions": { - "target": 1, - "jsx": 1, - "allowNonTsExtensions": true, - "allowJs": true, - "noEmitForJsFiles": true - }, - "typings": [], - "unresolvedImports": [], - "kind": "action::set" - } -Info seq [hh:mm:ss:mss] event: - { - "seq": 0, - "type": "event", - "event": "setTypings", - "body": { - "projectName": "/dev/null/inferredProject1*", - "typeAcquisition": { - "enable": true, - "include": [], - "exclude": [] - }, - "compilerOptions": { - "target": 1, - "jsx": 1, - "allowNonTsExtensions": true, - "allowJs": true, - "noEmitForJsFiles": true - }, - "typings": [], - "unresolvedImports": [], - "kind": "action::set" - } - } -TI:: [hh:mm:ss:mss] No new typings were requested as a result of typings discovery Info seq [hh:mm:ss:mss] After ensureProjectForOpenFiles: Info seq [hh:mm:ss:mss] Project '/a/b/tsconfig.json' (Configured) Info seq [hh:mm:ss:mss] Files (3) @@ -823,10 +691,6 @@ Info seq [hh:mm:ss:mss] event: After running Timeout callback:: count: 0 PolledWatches:: -/a/b/src/bower_components: *new* - {"pollingInterval":500} -/a/b/src/node_modules: *new* - {"pollingInterval":500} /a/b/src/node_modules/@types: {"pollingInterval":500} /a/lib/lib.d.ts: @@ -841,7 +705,7 @@ FsWatches:: {} FsWatchesRecursive:: -/a/b: +/a/b: *new* {} Configured project: /a/b/tsconfig.json hasOpenRef:: true isClosed: false diff --git a/tests/baselines/reference/tsserver/configuredProjects/Open-ref-of-configured-project-when-open-file-gets-added-to-the-project-as-part-of-configured-file-update.js b/tests/baselines/reference/tsserver/configuredProjects/Open-ref-of-configured-project-when-open-file-gets-added-to-the-project-as-part-of-configured-file-update.js index f8e301a6da0..90ca74b2189 100644 --- a/tests/baselines/reference/tsserver/configuredProjects/Open-ref-of-configured-project-when-open-file-gets-added-to-the-project-as-part-of-configured-file-update.js +++ b/tests/baselines/reference/tsserver/configuredProjects/Open-ref-of-configured-project-when-open-file-gets-added-to-the-project-as-part-of-configured-file-update.js @@ -574,134 +574,6 @@ Info seq [hh:mm:ss:mss] Files (0) Info seq [hh:mm:ss:mss] ----------------------------------------------- -TI:: Creating typing installer - -PolledWatches:: -/a/b/src/node_modules/@types: - {"pollingInterval":500} -/a/lib/lib.d.ts: - {"pollingInterval":500} - -FsWatches:: -/a/b/tsconfig.json: - {} - -FsWatchesRecursive:: -/a/b: *new* - {} - -TI:: [hh:mm:ss:mss] Global cache location '/a/data', safe file path '/safeList.json', types map path /typesMap.json -TI:: [hh:mm:ss:mss] Processing cache location '/a/data' -TI:: [hh:mm:ss:mss] Trying to find '/a/data/package.json'... -TI:: [hh:mm:ss:mss] Finished processing cache location '/a/data' -TI:: [hh:mm:ss:mss] Npm config file: /a/data/package.json -TI:: [hh:mm:ss:mss] Npm config file: '/a/data/package.json' is missing, creating new one... -TI:: [hh:mm:ss:mss] Updating types-registry npm package... -TI:: [hh:mm:ss:mss] npm install --ignore-scripts types-registry@latest -TI:: [hh:mm:ss:mss] Updated types-registry npm package -TI:: typing installer creation complete -//// [/a/data/package.json] -{ "private": true } - -//// [/a/data/node_modules/types-registry/index.json] -{ - "entries": {} -} - - -TI:: [hh:mm:ss:mss] Got install request - { - "projectName": "/dev/null/inferredProject1*", - "fileNames": [], - "compilerOptions": { - "target": 1, - "jsx": 1, - "allowNonTsExtensions": true, - "allowJs": true, - "noEmitForJsFiles": true - }, - "typeAcquisition": { - "enable": true, - "include": [], - "exclude": [] - }, - "unresolvedImports": [], - "projectRootPath": "/a/b/src", - "cachePath": "/a/data", - "kind": "discover" - } -TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information... -TI:: [hh:mm:ss:mss] Processing cache location '/a/data' -TI:: [hh:mm:ss:mss] Cache location was already processed... -TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json' -TI:: [hh:mm:ss:mss] Explicitly included types: [] -TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: [] -TI:: [hh:mm:ss:mss] Finished typings discovery: - { - "cachedTypingPaths": [], - "newTypingNames": [], - "filesToWatch": [ - "/a/b/src/bower_components", - "/a/b/src/node_modules" - ] - } -TI:: [hh:mm:ss:mss] Sending response: - { - "kind": "action::watchTypingLocations", - "projectName": "/dev/null/inferredProject1*", - "files": [ - "/a/b/src/bower_components", - "/a/b/src/node_modules" - ] - } -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/b/src/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/src/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/b/src/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/src/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer -TI:: [hh:mm:ss:mss] Sending response: - { - "projectName": "/dev/null/inferredProject1*", - "typeAcquisition": { - "enable": true, - "include": [], - "exclude": [] - }, - "compilerOptions": { - "target": 1, - "jsx": 1, - "allowNonTsExtensions": true, - "allowJs": true, - "noEmitForJsFiles": true - }, - "typings": [], - "unresolvedImports": [], - "kind": "action::set" - } -Info seq [hh:mm:ss:mss] event: - { - "seq": 0, - "type": "event", - "event": "setTypings", - "body": { - "projectName": "/dev/null/inferredProject1*", - "typeAcquisition": { - "enable": true, - "include": [], - "exclude": [] - }, - "compilerOptions": { - "target": 1, - "jsx": 1, - "allowNonTsExtensions": true, - "allowJs": true, - "noEmitForJsFiles": true - }, - "typings": [], - "unresolvedImports": [], - "kind": "action::set" - } - } -TI:: [hh:mm:ss:mss] No new typings were requested as a result of typings discovery Info seq [hh:mm:ss:mss] After ensureProjectForOpenFiles: Info seq [hh:mm:ss:mss] Project '/a/b/tsconfig.json' (Configured) Info seq [hh:mm:ss:mss] Files (3) @@ -742,10 +614,6 @@ Info seq [hh:mm:ss:mss] event: After running Timeout callback:: count: 0 PolledWatches:: -/a/b/src/bower_components: *new* - {"pollingInterval":500} -/a/b/src/node_modules: *new* - {"pollingInterval":500} /a/b/src/node_modules/@types: {"pollingInterval":500} /a/lib/lib.d.ts: @@ -756,7 +624,7 @@ FsWatches:: {} FsWatchesRecursive:: -/a/b: +/a/b: *new* {} Configured project: /a/b/tsconfig.json hasOpenRef:: true isClosed: false @@ -800,10 +668,6 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/a/b/src/bower_components: - {"pollingInterval":500} -/a/b/src/node_modules: - {"pollingInterval":500} /a/b/src/node_modules/@types: {"pollingInterval":500} /a/lib/lib.d.ts: @@ -855,10 +719,6 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/a/b/src/bower_components: - {"pollingInterval":500} -/a/b/src/node_modules: - {"pollingInterval":500} /a/b/src/node_modules/@types: {"pollingInterval":500} /a/lib/lib.d.ts: @@ -910,10 +770,6 @@ Info seq [hh:mm:ss:mss] response: After request PolledWatches:: -/a/b/src/bower_components: - {"pollingInterval":500} -/a/b/src/node_modules: - {"pollingInterval":500} /a/b/src/node_modules/@types: {"pollingInterval":500} /a/lib/lib.d.ts: @@ -960,18 +816,6 @@ Info seq [hh:mm:ss:mss] Files (0) Info seq [hh:mm:ss:mss] ----------------------------------------------- -TI:: [hh:mm:ss:mss] Closing file watchers for project '/dev/null/inferredProject1*' -TI:: [hh:mm:ss:mss] Sending response: - { - "kind": "action::watchTypingLocations", - "projectName": "/dev/null/inferredProject1*", - "files": [] - } -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /a/b/src/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /a/b/src/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /a/b/src/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /a/b/src/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer -TI:: [hh:mm:ss:mss] Closing file watchers for project '/dev/null/inferredProject1*' - done. Info seq [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /a/b/src/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /a/b/src/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots Info seq [hh:mm:ss:mss] Project '/a/b/tsconfig.json' (Configured) @@ -998,10 +842,6 @@ PolledWatches:: {"pollingInterval":500} PolledWatches *deleted*:: -/a/b/src/bower_components: - {"pollingInterval":500} -/a/b/src/node_modules: - {"pollingInterval":500} /a/b/src/node_modules/@types: {"pollingInterval":500} @@ -1119,8 +959,6 @@ Info seq [hh:mm:ss:mss] ----------------------------------------------- Info seq [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /a/b/tsconfig.json 2000 undefined Project: /a/b/tsconfig.json WatchType: Config file -TI:: [hh:mm:ss:mss] Closing file watchers for project '/a/b/tsconfig.json' -TI:: [hh:mm:ss:mss] No watchers are registered for project '/a/b/tsconfig.json' Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/b/tsconfig.json WatchType: Missing file Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /a/b/src/file1.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /a/b/file3.ts 500 undefined WatchType: Closed Script info diff --git a/tests/baselines/reference/tsserver/configuredProjects/add-and-then-remove-a-config-file-in-a-folder-with-loose-files.js b/tests/baselines/reference/tsserver/configuredProjects/add-and-then-remove-a-config-file-in-a-folder-with-loose-files.js index 33f31e79b41..f06bcfd5eb3 100644 --- a/tests/baselines/reference/tsserver/configuredProjects/add-and-then-remove-a-config-file-in-a-folder-with-loose-files.js +++ b/tests/baselines/reference/tsserver/configuredProjects/add-and-then-remove-a-config-file-in-a-folder-with-loose-files.js @@ -304,120 +304,6 @@ Info seq [hh:mm:ss:mss] Files (0) Info seq [hh:mm:ss:mss] ----------------------------------------------- -TI:: Creating typing installer - -TI:: [hh:mm:ss:mss] Global cache location '/a/data', safe file path '/safeList.json', types map path /typesMap.json -TI:: [hh:mm:ss:mss] Processing cache location '/a/data' -TI:: [hh:mm:ss:mss] Trying to find '/a/data/package.json'... -TI:: [hh:mm:ss:mss] Finished processing cache location '/a/data' -TI:: [hh:mm:ss:mss] Npm config file: /a/data/package.json -TI:: [hh:mm:ss:mss] Npm config file: '/a/data/package.json' is missing, creating new one... -TI:: [hh:mm:ss:mss] Updating types-registry npm package... -TI:: [hh:mm:ss:mss] npm install --ignore-scripts types-registry@latest -TI:: [hh:mm:ss:mss] Updated types-registry npm package -TI:: typing installer creation complete -//// [/a/data/package.json] -{ "private": true } - -//// [/a/data/node_modules/types-registry/index.json] -{ - "entries": {} -} - - -TI:: [hh:mm:ss:mss] Got install request - { - "projectName": "/dev/null/inferredProject1*", - "fileNames": [], - "compilerOptions": { - "target": 1, - "jsx": 1, - "allowNonTsExtensions": true, - "allowJs": true, - "noEmitForJsFiles": true - }, - "typeAcquisition": { - "enable": true, - "include": [], - "exclude": [] - }, - "unresolvedImports": [], - "projectRootPath": "/user/username/projects/myproject", - "cachePath": "/a/data", - "kind": "discover" - } -TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information... -TI:: [hh:mm:ss:mss] Processing cache location '/a/data' -TI:: [hh:mm:ss:mss] Cache location was already processed... -TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json' -TI:: [hh:mm:ss:mss] Explicitly included types: [] -TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: [] -TI:: [hh:mm:ss:mss] Finished typings discovery: - { - "cachedTypingPaths": [], - "newTypingNames": [], - "filesToWatch": [ - "/user/username/projects/myproject/bower_components", - "/user/username/projects/myproject/node_modules" - ] - } -TI:: [hh:mm:ss:mss] Sending response: - { - "kind": "action::watchTypingLocations", - "projectName": "/dev/null/inferredProject1*", - "files": [ - "/user/username/projects/myproject/bower_components", - "/user/username/projects/myproject/node_modules" - ] - } -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer -TI:: [hh:mm:ss:mss] Sending response: - { - "projectName": "/dev/null/inferredProject1*", - "typeAcquisition": { - "enable": true, - "include": [], - "exclude": [] - }, - "compilerOptions": { - "target": 1, - "jsx": 1, - "allowNonTsExtensions": true, - "allowJs": true, - "noEmitForJsFiles": true - }, - "typings": [], - "unresolvedImports": [], - "kind": "action::set" - } -Info seq [hh:mm:ss:mss] event: - { - "seq": 0, - "type": "event", - "event": "setTypings", - "body": { - "projectName": "/dev/null/inferredProject1*", - "typeAcquisition": { - "enable": true, - "include": [], - "exclude": [] - }, - "compilerOptions": { - "target": 1, - "jsx": 1, - "allowNonTsExtensions": true, - "allowJs": true, - "noEmitForJsFiles": true - }, - "typings": [], - "unresolvedImports": [], - "kind": "action::set" - } - } -TI:: [hh:mm:ss:mss] No new typings were requested as a result of typings discovery Info seq [hh:mm:ss:mss] After ensureProjectForOpenFiles: Info seq [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured) Info seq [hh:mm:ss:mss] Files (2) @@ -451,24 +337,6 @@ Info seq [hh:mm:ss:mss] event: } After running Timeout callback:: count: 0 -PolledWatches:: -/user/username/projects/myproject/bower_components: *new* - {"pollingInterval":500} -/user/username/projects/myproject/jsconfig.json: - {"pollingInterval":2000} -/user/username/projects/myproject/node_modules: *new* - {"pollingInterval":500} -/user/username/projects/myproject/node_modules/@types: - {"pollingInterval":500} -/user/username/projects/node_modules/@types: - {"pollingInterval":500} - -FsWatches:: -/a/lib/lib.d.ts: - {} -/user/username/projects/myproject/tsconfig.json: - {} - Info seq [hh:mm:ss:mss] FileWatcher:: Triggered with /user/username/projects/myproject/tsconfig.json 2:: WatchInfo: /user/username/projects/myproject/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root Info seq [hh:mm:ss:mss] `remove Project:: Info seq [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured) @@ -483,8 +351,6 @@ Info seq [hh:mm:ss:mss] Files (2) Part of 'files' list in tsconfig.json Info seq [hh:mm:ss:mss] ----------------------------------------------- -TI:: [hh:mm:ss:mss] Closing file watchers for project '/user/username/projects/myproject/tsconfig.json' -TI:: [hh:mm:ss:mss] No watchers are registered for project '/user/username/projects/myproject/tsconfig.json' Info seq [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Type roots Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Type roots Info seq [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/node_modules/@types 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Type roots diff --git a/tests/baselines/reference/tsserver/configuredProjects/open-file-become-a-part-of-configured-project-if-it-is-referenced-from-root-file.js b/tests/baselines/reference/tsserver/configuredProjects/open-file-become-a-part-of-configured-project-if-it-is-referenced-from-root-file.js index 0d87cae41ec..bc1b886c21a 100644 --- a/tests/baselines/reference/tsserver/configuredProjects/open-file-become-a-part-of-configured-project-if-it-is-referenced-from-root-file.js +++ b/tests/baselines/reference/tsserver/configuredProjects/open-file-become-a-part-of-configured-project-if-it-is-referenced-from-root-file.js @@ -425,7 +425,47 @@ Info seq [hh:mm:ss:mss] Files (0) Info seq [hh:mm:ss:mss] ----------------------------------------------- -TI:: Creating typing installer +Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject2* +Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /dev/null/inferredProject2* WatchType: Missing file +Info seq [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* Version: 2 structureChanged: true structureIsReused:: Not Elapsed:: *ms +Info seq [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred) +Info seq [hh:mm:ss:mss] Files (0) + + + +Info seq [hh:mm:ss:mss] ----------------------------------------------- +Info seq [hh:mm:ss:mss] After ensureProjectForOpenFiles: +Info seq [hh:mm:ss:mss] Project '/user/username/projects/myproject/a/c/tsconfig.json' (Configured) +Info seq [hh:mm:ss:mss] Files (3) + +Info seq [hh:mm:ss:mss] ----------------------------------------------- +Info seq [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred) +Info seq [hh:mm:ss:mss] Files (0) + +Info seq [hh:mm:ss:mss] ----------------------------------------------- +Info seq [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred) +Info seq [hh:mm:ss:mss] Files (0) + +Info seq [hh:mm:ss:mss] ----------------------------------------------- +Info seq [hh:mm:ss:mss] Open files: +Info seq [hh:mm:ss:mss] FileName: /user/username/projects/myproject/a/b/f1.ts ProjectRootPath: undefined +Info seq [hh:mm:ss:mss] Projects: /user/username/projects/myproject/a/c/tsconfig.json +Info seq [hh:mm:ss:mss] FileName: /user/username/projects/myproject/a/c/f3.ts ProjectRootPath: undefined +Info seq [hh:mm:ss:mss] Projects: /user/username/projects/myproject/a/c/tsconfig.json +Info seq [hh:mm:ss:mss] got projects updated in background /user/username/projects/myproject/a/b/f1.ts,/user/username/projects/myproject/a/c/f3.ts +Info seq [hh:mm:ss:mss] event: + { + "seq": 0, + "type": "event", + "event": "projectsUpdatedInBackground", + "body": { + "openFiles": [ + "/user/username/projects/myproject/a/b/f1.ts", + "/user/username/projects/myproject/a/c/f3.ts" + ] + } + } +After running Timeout callback:: count: 0 PolledWatches:: /a/lib/lib.d.ts: @@ -463,279 +503,5 @@ FsWatches:: /user/username/projects/myproject/a/c/tsconfig.json: {} -TI:: [hh:mm:ss:mss] Global cache location '/a/data', safe file path '/safeList.json', types map path /typesMap.json -TI:: [hh:mm:ss:mss] Processing cache location '/a/data' -TI:: [hh:mm:ss:mss] Trying to find '/a/data/package.json'... -TI:: [hh:mm:ss:mss] Finished processing cache location '/a/data' -TI:: [hh:mm:ss:mss] Npm config file: /a/data/package.json -TI:: [hh:mm:ss:mss] Npm config file: '/a/data/package.json' is missing, creating new one... -TI:: [hh:mm:ss:mss] Updating types-registry npm package... -TI:: [hh:mm:ss:mss] npm install --ignore-scripts types-registry@latest -TI:: [hh:mm:ss:mss] Updated types-registry npm package -TI:: typing installer creation complete -//// [/a/data/package.json] -{ "private": true } - -//// [/a/data/node_modules/types-registry/index.json] -{ - "entries": {} -} - - -TI:: [hh:mm:ss:mss] Got install request - { - "projectName": "/dev/null/inferredProject1*", - "fileNames": [], - "compilerOptions": { - "target": 1, - "jsx": 1, - "allowNonTsExtensions": true, - "allowJs": true, - "noEmitForJsFiles": true - }, - "typeAcquisition": { - "enable": true, - "include": [], - "exclude": [] - }, - "unresolvedImports": [], - "projectRootPath": "/user/username/projects/myproject/a/b", - "cachePath": "/a/data", - "kind": "discover" - } -TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information... -TI:: [hh:mm:ss:mss] Processing cache location '/a/data' -TI:: [hh:mm:ss:mss] Cache location was already processed... -TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json' -TI:: [hh:mm:ss:mss] Explicitly included types: [] -TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: [] -TI:: [hh:mm:ss:mss] Finished typings discovery: - { - "cachedTypingPaths": [], - "newTypingNames": [], - "filesToWatch": [ - "/user/username/projects/myproject/a/b/bower_components", - "/user/username/projects/myproject/a/b/node_modules" - ] - } -TI:: [hh:mm:ss:mss] Sending response: - { - "kind": "action::watchTypingLocations", - "projectName": "/dev/null/inferredProject1*", - "files": [ - "/user/username/projects/myproject/a/b/bower_components", - "/user/username/projects/myproject/a/b/node_modules" - ] - } -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a/b/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a/b/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a/b/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a/b/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer -TI:: [hh:mm:ss:mss] Sending response: - { - "projectName": "/dev/null/inferredProject1*", - "typeAcquisition": { - "enable": true, - "include": [], - "exclude": [] - }, - "compilerOptions": { - "target": 1, - "jsx": 1, - "allowNonTsExtensions": true, - "allowJs": true, - "noEmitForJsFiles": true - }, - "typings": [], - "unresolvedImports": [], - "kind": "action::set" - } -Info seq [hh:mm:ss:mss] event: - { - "seq": 0, - "type": "event", - "event": "setTypings", - "body": { - "projectName": "/dev/null/inferredProject1*", - "typeAcquisition": { - "enable": true, - "include": [], - "exclude": [] - }, - "compilerOptions": { - "target": 1, - "jsx": 1, - "allowNonTsExtensions": true, - "allowJs": true, - "noEmitForJsFiles": true - }, - "typings": [], - "unresolvedImports": [], - "kind": "action::set" - } - } -TI:: [hh:mm:ss:mss] No new typings were requested as a result of typings discovery -Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject2* -Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /dev/null/inferredProject2* WatchType: Missing file -Info seq [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* Version: 2 structureChanged: true structureIsReused:: Not Elapsed:: *ms -Info seq [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred) -Info seq [hh:mm:ss:mss] Files (0) - - - -Info seq [hh:mm:ss:mss] ----------------------------------------------- -TI:: [hh:mm:ss:mss] Got install request - { - "projectName": "/dev/null/inferredProject2*", - "fileNames": [], - "compilerOptions": { - "target": 1, - "jsx": 1, - "allowNonTsExtensions": true, - "allowJs": true, - "noEmitForJsFiles": true - }, - "typeAcquisition": { - "enable": true, - "include": [], - "exclude": [] - }, - "unresolvedImports": [], - "projectRootPath": "/user/username/projects/myproject/a/c", - "cachePath": "/a/data", - "kind": "discover" - } -TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information... -TI:: [hh:mm:ss:mss] Processing cache location '/a/data' -TI:: [hh:mm:ss:mss] Cache location was already processed... -TI:: [hh:mm:ss:mss] Explicitly included types: [] -TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: [] -TI:: [hh:mm:ss:mss] Finished typings discovery: - { - "cachedTypingPaths": [], - "newTypingNames": [], - "filesToWatch": [ - "/user/username/projects/myproject/a/c/bower_components", - "/user/username/projects/myproject/a/c/node_modules" - ] - } -TI:: [hh:mm:ss:mss] Sending response: - { - "kind": "action::watchTypingLocations", - "projectName": "/dev/null/inferredProject2*", - "files": [ - "/user/username/projects/myproject/a/c/bower_components", - "/user/username/projects/myproject/a/c/node_modules" - ] - } -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a/c/bower_components 1 undefined Project: /dev/null/inferredProject2* WatchType: Directory location for typing installer -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a/c/bower_components 1 undefined Project: /dev/null/inferredProject2* WatchType: Directory location for typing installer -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a/c/node_modules 1 undefined Project: /dev/null/inferredProject2* WatchType: Directory location for typing installer -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a/c/node_modules 1 undefined Project: /dev/null/inferredProject2* WatchType: Directory location for typing installer -TI:: [hh:mm:ss:mss] Sending response: - { - "projectName": "/dev/null/inferredProject2*", - "typeAcquisition": { - "enable": true, - "include": [], - "exclude": [] - }, - "compilerOptions": { - "target": 1, - "jsx": 1, - "allowNonTsExtensions": true, - "allowJs": true, - "noEmitForJsFiles": true - }, - "typings": [], - "unresolvedImports": [], - "kind": "action::set" - } -Info seq [hh:mm:ss:mss] event: - { - "seq": 0, - "type": "event", - "event": "setTypings", - "body": { - "projectName": "/dev/null/inferredProject2*", - "typeAcquisition": { - "enable": true, - "include": [], - "exclude": [] - }, - "compilerOptions": { - "target": 1, - "jsx": 1, - "allowNonTsExtensions": true, - "allowJs": true, - "noEmitForJsFiles": true - }, - "typings": [], - "unresolvedImports": [], - "kind": "action::set" - } - } -TI:: [hh:mm:ss:mss] No new typings were requested as a result of typings discovery -Info seq [hh:mm:ss:mss] After ensureProjectForOpenFiles: -Info seq [hh:mm:ss:mss] Project '/user/username/projects/myproject/a/c/tsconfig.json' (Configured) -Info seq [hh:mm:ss:mss] Files (3) - -Info seq [hh:mm:ss:mss] ----------------------------------------------- -Info seq [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred) -Info seq [hh:mm:ss:mss] Files (0) - -Info seq [hh:mm:ss:mss] ----------------------------------------------- -Info seq [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred) -Info seq [hh:mm:ss:mss] Files (0) - -Info seq [hh:mm:ss:mss] ----------------------------------------------- -Info seq [hh:mm:ss:mss] Open files: -Info seq [hh:mm:ss:mss] FileName: /user/username/projects/myproject/a/b/f1.ts ProjectRootPath: undefined -Info seq [hh:mm:ss:mss] Projects: /user/username/projects/myproject/a/c/tsconfig.json -Info seq [hh:mm:ss:mss] FileName: /user/username/projects/myproject/a/c/f3.ts ProjectRootPath: undefined -Info seq [hh:mm:ss:mss] Projects: /user/username/projects/myproject/a/c/tsconfig.json -Info seq [hh:mm:ss:mss] got projects updated in background /user/username/projects/myproject/a/b/f1.ts,/user/username/projects/myproject/a/c/f3.ts -Info seq [hh:mm:ss:mss] event: - { - "seq": 0, - "type": "event", - "event": "projectsUpdatedInBackground", - "body": { - "openFiles": [ - "/user/username/projects/myproject/a/b/f1.ts", - "/user/username/projects/myproject/a/c/f3.ts" - ] - } - } -After running Timeout callback:: count: 0 - -PolledWatches:: -/a/lib/lib.d.ts: - {"pollingInterval":500} -/user/username/projects/myproject/a/b/bower_components: *new* - {"pollingInterval":500} -/user/username/projects/myproject/a/b/node_modules: *new* - {"pollingInterval":500} -/user/username/projects/myproject/a/b/node_modules/@types: - {"pollingInterval":500} -/user/username/projects/myproject/a/c/bower_components: *new* - {"pollingInterval":500} -/user/username/projects/myproject/a/c/node_modules: *new* - {"pollingInterval":500} -/user/username/projects/myproject/a/c/node_modules/@types: - {"pollingInterval":500} -/user/username/projects/myproject/a/node_modules/@types: - {"pollingInterval":500} -/user/username/projects/myproject/node_modules/@types: - {"pollingInterval":500} -/user/username/projects/node_modules/@types: - {"pollingInterval":500} - -FsWatches:: -/user/username/projects/myproject/a/c/f2.ts: - {} -/user/username/projects/myproject/a/c/tsconfig.json: - {} - Inferred project: /dev/null/inferredProject1* isOrphan:: true isClosed: false Inferred project: /dev/null/inferredProject2* isOrphan:: true isClosed: false \ No newline at end of file diff --git a/tests/baselines/reference/tsserver/configuredProjects/should-properly-handle-module-resolution-changes-in-config-file.js b/tests/baselines/reference/tsserver/configuredProjects/should-properly-handle-module-resolution-changes-in-config-file.js index 679ade6a449..9b211fad383 100644 --- a/tests/baselines/reference/tsserver/configuredProjects/should-properly-handle-module-resolution-changes-in-config-file.js +++ b/tests/baselines/reference/tsserver/configuredProjects/should-properly-handle-module-resolution-changes-in-config-file.js @@ -454,130 +454,6 @@ Info seq [hh:mm:ss:mss] Files (0) Info seq [hh:mm:ss:mss] ----------------------------------------------- -TI:: Creating typing installer - -PolledWatches:: -/a/b/node_modules/node_modules/@types: *new* - {"pollingInterval":500} -/a/lib/lib.d.ts: - {"pollingInterval":500} - -FsWatches:: -/a/b/tsconfig.json: - {} - -TI:: [hh:mm:ss:mss] Global cache location '/a/data', safe file path '/safeList.json', types map path /typesMap.json -TI:: [hh:mm:ss:mss] Processing cache location '/a/data' -TI:: [hh:mm:ss:mss] Trying to find '/a/data/package.json'... -TI:: [hh:mm:ss:mss] Finished processing cache location '/a/data' -TI:: [hh:mm:ss:mss] Npm config file: /a/data/package.json -TI:: [hh:mm:ss:mss] Npm config file: '/a/data/package.json' is missing, creating new one... -TI:: [hh:mm:ss:mss] Updating types-registry npm package... -TI:: [hh:mm:ss:mss] npm install --ignore-scripts types-registry@latest -TI:: [hh:mm:ss:mss] Updated types-registry npm package -TI:: typing installer creation complete -//// [/a/data/package.json] -{ "private": true } - -//// [/a/data/node_modules/types-registry/index.json] -{ - "entries": {} -} - - -TI:: [hh:mm:ss:mss] Got install request - { - "projectName": "/dev/null/inferredProject1*", - "fileNames": [], - "compilerOptions": { - "target": 1, - "jsx": 1, - "allowNonTsExtensions": true, - "allowJs": true, - "noEmitForJsFiles": true - }, - "typeAcquisition": { - "enable": true, - "include": [], - "exclude": [] - }, - "unresolvedImports": [], - "projectRootPath": "/a", - "cachePath": "/a/data", - "kind": "discover" - } -TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information... -TI:: [hh:mm:ss:mss] Processing cache location '/a/data' -TI:: [hh:mm:ss:mss] Cache location was already processed... -TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json' -TI:: [hh:mm:ss:mss] Explicitly included types: [] -TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: [] -TI:: [hh:mm:ss:mss] Finished typings discovery: - { - "cachedTypingPaths": [], - "newTypingNames": [], - "filesToWatch": [ - "/a/bower_components", - "/a/node_modules" - ] - } -TI:: [hh:mm:ss:mss] Sending response: - { - "kind": "action::watchTypingLocations", - "projectName": "/dev/null/inferredProject1*", - "files": [ - "/a/bower_components", - "/a/node_modules" - ] - } -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/bower_components 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Directory location for typing installer -TI:: [hh:mm:ss:mss] Sending response: - { - "projectName": "/dev/null/inferredProject1*", - "typeAcquisition": { - "enable": true, - "include": [], - "exclude": [] - }, - "compilerOptions": { - "target": 1, - "jsx": 1, - "allowNonTsExtensions": true, - "allowJs": true, - "noEmitForJsFiles": true - }, - "typings": [], - "unresolvedImports": [], - "kind": "action::set" - } -Info seq [hh:mm:ss:mss] event: - { - "seq": 0, - "type": "event", - "event": "setTypings", - "body": { - "projectName": "/dev/null/inferredProject1*", - "typeAcquisition": { - "enable": true, - "include": [], - "exclude": [] - }, - "compilerOptions": { - "target": 1, - "jsx": 1, - "allowNonTsExtensions": true, - "allowJs": true, - "noEmitForJsFiles": true - }, - "typings": [], - "unresolvedImports": [], - "kind": "action::set" - } - } -TI:: [hh:mm:ss:mss] No new typings were requested as a result of typings discovery Info seq [hh:mm:ss:mss] After ensureProjectForOpenFiles: Info seq [hh:mm:ss:mss] Project '/a/b/tsconfig.json' (Configured) Info seq [hh:mm:ss:mss] Files (2) @@ -615,14 +491,10 @@ Info seq [hh:mm:ss:mss] event: After running Timeout callback:: count: 0 PolledWatches:: -/a/b/node_modules/node_modules/@types: - {"pollingInterval":500} -/a/bower_components: *new* +/a/b/node_modules/node_modules/@types: *new* {"pollingInterval":500} /a/lib/lib.d.ts: {"pollingInterval":500} -/a/node_modules: *new* - {"pollingInterval":500} FsWatches:: /a/b/tsconfig.json: diff --git a/tests/baselines/reference/tsserver/inferredProjects/project-settings-for-inferred-projects.js b/tests/baselines/reference/tsserver/inferredProjects/project-settings-for-inferred-projects.js index 8a228cdaa2e..cf71ed275ac 100644 --- a/tests/baselines/reference/tsserver/inferredProjects/project-settings-for-inferred-projects.js +++ b/tests/baselines/reference/tsserver/inferredProjects/project-settings-for-inferred-projects.js @@ -172,117 +172,6 @@ Info seq [hh:mm:ss:mss] Files (0) Info seq [hh:mm:ss:mss] ----------------------------------------------- -TI:: Creating typing installer - -TI:: [hh:mm:ss:mss] Global cache location '/a/data', safe file path '/safeList.json', types map path /typesMap.json -TI:: [hh:mm:ss:mss] Processing cache location '/a/data' -TI:: [hh:mm:ss:mss] Trying to find '/a/data/package.json'... -TI:: [hh:mm:ss:mss] Finished processing cache location '/a/data' -TI:: [hh:mm:ss:mss] Npm config file: /a/data/package.json -TI:: [hh:mm:ss:mss] Npm config file: '/a/data/package.json' is missing, creating new one... -TI:: [hh:mm:ss:mss] Updating types-registry npm package... -TI:: [hh:mm:ss:mss] npm install --ignore-scripts types-registry@latest -TI:: [hh:mm:ss:mss] Updated types-registry npm package -TI:: typing installer creation complete -//// [/a/data/package.json] -{ "private": true } - -//// [/a/data/node_modules/types-registry/index.json] -{ - "entries": {} -} - - -TI:: [hh:mm:ss:mss] Got install request - { - "projectName": "/dev/null/inferredProject2*", - "fileNames": [], - "compilerOptions": { - "moduleResolution": 1, - "allowNonTsExtensions": true, - "allowJs": true, - "noEmitForJsFiles": true - }, - "typeAcquisition": { - "enable": true, - "include": [], - "exclude": [] - }, - "unresolvedImports": [], - "projectRootPath": "/a", - "cachePath": "/a/data", - "kind": "discover" - } -TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information... -TI:: [hh:mm:ss:mss] Processing cache location '/a/data' -TI:: [hh:mm:ss:mss] Cache location was already processed... -TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json' -TI:: [hh:mm:ss:mss] Explicitly included types: [] -TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: [] -TI:: [hh:mm:ss:mss] Finished typings discovery: - { - "cachedTypingPaths": [], - "newTypingNames": [], - "filesToWatch": [ - "/a/bower_components", - "/a/node_modules" - ] - } -TI:: [hh:mm:ss:mss] Sending response: - { - "kind": "action::watchTypingLocations", - "projectName": "/dev/null/inferredProject2*", - "files": [ - "/a/bower_components", - "/a/node_modules" - ] - } -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/bower_components 1 undefined Project: /dev/null/inferredProject2* WatchType: Directory location for typing installer -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/bower_components 1 undefined Project: /dev/null/inferredProject2* WatchType: Directory location for typing installer -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/node_modules 1 undefined Project: /dev/null/inferredProject2* WatchType: Directory location for typing installer -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/node_modules 1 undefined Project: /dev/null/inferredProject2* WatchType: Directory location for typing installer -TI:: [hh:mm:ss:mss] Sending response: - { - "projectName": "/dev/null/inferredProject2*", - "typeAcquisition": { - "enable": true, - "include": [], - "exclude": [] - }, - "compilerOptions": { - "moduleResolution": 1, - "allowNonTsExtensions": true, - "allowJs": true, - "noEmitForJsFiles": true - }, - "typings": [], - "unresolvedImports": [], - "kind": "action::set" - } -Info seq [hh:mm:ss:mss] event: - { - "seq": 0, - "type": "event", - "event": "setTypings", - "body": { - "projectName": "/dev/null/inferredProject2*", - "typeAcquisition": { - "enable": true, - "include": [], - "exclude": [] - }, - "compilerOptions": { - "moduleResolution": 1, - "allowNonTsExtensions": true, - "allowJs": true, - "noEmitForJsFiles": true - }, - "typings": [], - "unresolvedImports": [], - "kind": "action::set" - } - } -TI:: [hh:mm:ss:mss] No new typings were requested as a result of typings discovery Info seq [hh:mm:ss:mss] After ensureProjectForOpenFiles: Info seq [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred) Info seq [hh:mm:ss:mss] Files (2) @@ -312,13 +201,5 @@ Info seq [hh:mm:ss:mss] event: } After running Timeout callback:: count: 0 -PolledWatches:: -/a/bower_components: *new* - {"pollingInterval":500} -/a/lib/lib.d.ts: - {"pollingInterval":500} -/a/node_modules: *new* - {"pollingInterval":500} - Inferred project: /dev/null/inferredProject1* isOrphan:: false isClosed: false Inferred project: /dev/null/inferredProject2* isOrphan:: true isClosed: false \ No newline at end of file diff --git a/tests/baselines/reference/tsserver/inferredProjects/when-existing-inferred-project-has-no-root-files.js b/tests/baselines/reference/tsserver/inferredProjects/when-existing-inferred-project-has-no-root-files.js index d199a9faa4d..91059398652 100644 --- a/tests/baselines/reference/tsserver/inferredProjects/when-existing-inferred-project-has-no-root-files.js +++ b/tests/baselines/reference/tsserver/inferredProjects/when-existing-inferred-project-has-no-root-files.js @@ -212,22 +212,57 @@ Info seq [hh:mm:ss:mss] Files (0) +Info seq [hh:mm:ss:mss] ----------------------------------------------- +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root +Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1* +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations +Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations +Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations +Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/module3/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution +Info seq [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 3 structureChanged: true structureIsReused:: Not Elapsed:: *ms +Info seq [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred) +Info seq [hh:mm:ss:mss] Files (4) + /a/lib/lib.d.ts Text-1 "/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }" + /user/username/projects/myproject/module2.d.ts Text-1 "export const y = 10;\n" + /user/username/projects/myproject/node_modules/module3/index.d.ts Text-1 "export const a = 10;\n" + /user/username/projects/myproject/module.d.ts Text-1 "import {y} from \"./module2\";\nimport {a} from \"module3\";\nexport const x = y;\nexport const b = a;\n" + + + ../../../../a/lib/lib.d.ts + Default library for target 'es5' + module2.d.ts + Imported via "./module2" from file 'module.d.ts' + node_modules/module3/index.d.ts + Imported via "module3" from file 'module.d.ts' with packageId 'module3/index.d.ts@1.0.0' + module.d.ts + Root file specified for compilation + Info seq [hh:mm:ss:mss] ----------------------------------------------- TI:: Creating typing installer PolledWatches:: +/user/username/projects/myproject/jsconfig.json: *new* + {"pollingInterval":2000} /user/username/projects/myproject/node_modules/@types: {"pollingInterval":500} +/user/username/projects/myproject/tsconfig.json: *new* + {"pollingInterval":2000} /user/username/projects/node_modules/@types: {"pollingInterval":500} FsWatches:: /a/lib/lib.d.ts: {} +/user/username/projects/myproject: + {} *new* /user/username/projects/myproject/app.ts: {} /user/username/projects/myproject/module2.d.ts: {} +/user/username/projects/myproject/node_modules/module3/package.json: + {} *new* FsWatches *deleted*:: /user/username/projects/myproject: @@ -263,7 +298,11 @@ TI:: typing installer creation complete TI:: [hh:mm:ss:mss] Got install request { "projectName": "/dev/null/inferredProject1*", - "fileNames": [], + "fileNames": [ + "/a/lib/lib.d.ts", + "/user/username/projects/myproject/module2.d.ts", + "/user/username/projects/myproject/module.d.ts" + ], "compilerOptions": { "target": 1, "jsx": 1, @@ -316,127 +355,6 @@ Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /us TI:: [hh:mm:ss:mss] Installing typings ["module3"] TI:: [hh:mm:ss:mss] 'module3':: Entry for package 'module3' does not exist in local types registry - skipping... TI:: [hh:mm:ss:mss] All typings are known to be missing or invalid - no need to install more typings -TI:: [hh:mm:ss:mss] Sending response: - { - "projectName": "/dev/null/inferredProject1*", - "typeAcquisition": { - "enable": true, - "include": [], - "exclude": [] - }, - "compilerOptions": { - "target": 1, - "jsx": 1, - "allowNonTsExtensions": true, - "allowJs": true, - "noEmitForJsFiles": true - }, - "typings": [], - "unresolvedImports": [], - "kind": "action::set" - } -Info seq [hh:mm:ss:mss] event: - { - "seq": 0, - "type": "event", - "event": "setTypings", - "body": { - "projectName": "/dev/null/inferredProject1*", - "typeAcquisition": { - "enable": true, - "include": [], - "exclude": [] - }, - "compilerOptions": { - "target": 1, - "jsx": 1, - "allowNonTsExtensions": true, - "allowJs": true, - "noEmitForJsFiles": true - }, - "typings": [], - "unresolvedImports": [], - "kind": "action::set" - } - } -Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root -Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root -Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1* -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations -Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/module3/package.json 2000 undefined Project: /dev/null/inferredProject1* WatchType: File location affecting resolution -Info seq [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 3 structureChanged: true structureIsReused:: Not Elapsed:: *ms -Info seq [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred) -Info seq [hh:mm:ss:mss] Files (4) - /a/lib/lib.d.ts Text-1 "/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }" - /user/username/projects/myproject/module2.d.ts Text-1 "export const y = 10;\n" - /user/username/projects/myproject/node_modules/module3/index.d.ts Text-1 "export const a = 10;\n" - /user/username/projects/myproject/module.d.ts Text-1 "import {y} from \"./module2\";\nimport {a} from \"module3\";\nexport const x = y;\nexport const b = a;\n" - - - ../../../../a/lib/lib.d.ts - Default library for target 'es5' - module2.d.ts - Imported via "./module2" from file 'module.d.ts' - node_modules/module3/index.d.ts - Imported via "module3" from file 'module.d.ts' with packageId 'module3/index.d.ts@1.0.0' - module.d.ts - Root file specified for compilation - -Info seq [hh:mm:ss:mss] ----------------------------------------------- -TI:: [hh:mm:ss:mss] Got install request - { - "projectName": "/dev/null/inferredProject1*", - "fileNames": [ - "/a/lib/lib.d.ts", - "/user/username/projects/myproject/module2.d.ts", - "/user/username/projects/myproject/module.d.ts" - ], - "compilerOptions": { - "target": 1, - "jsx": 1, - "allowNonTsExtensions": true, - "allowJs": true, - "noEmitForJsFiles": true - }, - "typeAcquisition": { - "enable": true, - "include": [], - "exclude": [] - }, - "unresolvedImports": [], - "projectRootPath": "/user/username/projects/myproject", - "cachePath": "/a/data", - "kind": "discover" - } -TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information... -TI:: [hh:mm:ss:mss] Processing cache location '/a/data' -TI:: [hh:mm:ss:mss] Cache location was already processed... -TI:: [hh:mm:ss:mss] Explicitly included types: [] -TI:: [hh:mm:ss:mss] Searching for typing names in /user/username/projects/myproject/node_modules; all files: ["/user/username/projects/myproject/node_modules/module3/package.json"] -TI:: [hh:mm:ss:mss] Found package names: ["module3"] -TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: [] -TI:: [hh:mm:ss:mss] Finished typings discovery: - { - "cachedTypingPaths": [], - "newTypingNames": [ - "module3" - ], - "filesToWatch": [ - "/user/username/projects/myproject/bower_components", - "/user/username/projects/myproject/node_modules" - ] - } -TI:: [hh:mm:ss:mss] Sending response: - { - "kind": "action::watchTypingLocations", - "projectName": "/dev/null/inferredProject1*" - } -TI:: [hh:mm:ss:mss] Installing typings ["module3"] -TI:: [hh:mm:ss:mss] 'module3':: Entry for package 'module3' does not exist in local types registry - skipping... -TI:: [hh:mm:ss:mss] All typings are known to be missing or invalid - no need to install more typings TI:: [hh:mm:ss:mss] Sending response: { "projectName": "/dev/null/inferredProject1*", @@ -497,11 +415,11 @@ After request PolledWatches:: /user/username/projects/myproject/bower_components: *new* {"pollingInterval":500} -/user/username/projects/myproject/jsconfig.json: *new* +/user/username/projects/myproject/jsconfig.json: {"pollingInterval":2000} /user/username/projects/myproject/node_modules/@types: {"pollingInterval":500} -/user/username/projects/myproject/tsconfig.json: *new* +/user/username/projects/myproject/tsconfig.json: {"pollingInterval":2000} /user/username/projects/node_modules/@types: {"pollingInterval":500} @@ -509,11 +427,11 @@ PolledWatches:: FsWatches:: /a/lib/lib.d.ts: {} -/user/username/projects/myproject: *new* +/user/username/projects/myproject: {} /user/username/projects/myproject/module2.d.ts: {} -/user/username/projects/myproject/node_modules/module3/package.json: *new* +/user/username/projects/myproject/node_modules/module3/package.json: {} FsWatches *deleted*:: diff --git a/tests/baselines/reference/tsserver/projects/changes-in-closed-files-are-reflected-in-project-structure.js b/tests/baselines/reference/tsserver/projects/changes-in-closed-files-are-reflected-in-project-structure.js index e41b08275d4..d83386a0343 100644 --- a/tests/baselines/reference/tsserver/projects/changes-in-closed-files-are-reflected-in-project-structure.js +++ b/tests/baselines/reference/tsserver/projects/changes-in-closed-files-are-reflected-in-project-structure.js @@ -160,120 +160,6 @@ Info seq [hh:mm:ss:mss] Files (0) Info seq [hh:mm:ss:mss] ----------------------------------------------- -TI:: Creating typing installer - -TI:: [hh:mm:ss:mss] Global cache location '/a/data', safe file path '/safeList.json', types map path /typesMap.json -TI:: [hh:mm:ss:mss] Processing cache location '/a/data' -TI:: [hh:mm:ss:mss] Trying to find '/a/data/package.json'... -TI:: [hh:mm:ss:mss] Finished processing cache location '/a/data' -TI:: [hh:mm:ss:mss] Npm config file: /a/data/package.json -TI:: [hh:mm:ss:mss] Npm config file: '/a/data/package.json' is missing, creating new one... -TI:: [hh:mm:ss:mss] Updating types-registry npm package... -TI:: [hh:mm:ss:mss] npm install --ignore-scripts types-registry@latest -TI:: [hh:mm:ss:mss] Updated types-registry npm package -TI:: typing installer creation complete -//// [/a/data/package.json] -{ "private": true } - -//// [/a/data/node_modules/types-registry/index.json] -{ - "entries": {} -} - - -TI:: [hh:mm:ss:mss] Got install request - { - "projectName": "/dev/null/inferredProject2*", - "fileNames": [], - "compilerOptions": { - "target": 1, - "jsx": 1, - "allowNonTsExtensions": true, - "allowJs": true, - "noEmitForJsFiles": true - }, - "typeAcquisition": { - "enable": true, - "include": [], - "exclude": [] - }, - "unresolvedImports": [], - "projectRootPath": "/a/c", - "cachePath": "/a/data", - "kind": "discover" - } -TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information... -TI:: [hh:mm:ss:mss] Processing cache location '/a/data' -TI:: [hh:mm:ss:mss] Cache location was already processed... -TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json' -TI:: [hh:mm:ss:mss] Explicitly included types: [] -TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: [] -TI:: [hh:mm:ss:mss] Finished typings discovery: - { - "cachedTypingPaths": [], - "newTypingNames": [], - "filesToWatch": [ - "/a/c/bower_components", - "/a/c/node_modules" - ] - } -TI:: [hh:mm:ss:mss] Sending response: - { - "kind": "action::watchTypingLocations", - "projectName": "/dev/null/inferredProject2*", - "files": [ - "/a/c/bower_components", - "/a/c/node_modules" - ] - } -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/c/bower_components 1 undefined Project: /dev/null/inferredProject2* WatchType: Directory location for typing installer -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/c/bower_components 1 undefined Project: /dev/null/inferredProject2* WatchType: Directory location for typing installer -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/c/node_modules 1 undefined Project: /dev/null/inferredProject2* WatchType: Directory location for typing installer -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/c/node_modules 1 undefined Project: /dev/null/inferredProject2* WatchType: Directory location for typing installer -TI:: [hh:mm:ss:mss] Sending response: - { - "projectName": "/dev/null/inferredProject2*", - "typeAcquisition": { - "enable": true, - "include": [], - "exclude": [] - }, - "compilerOptions": { - "target": 1, - "jsx": 1, - "allowNonTsExtensions": true, - "allowJs": true, - "noEmitForJsFiles": true - }, - "typings": [], - "unresolvedImports": [], - "kind": "action::set" - } -Info seq [hh:mm:ss:mss] event: - { - "seq": 0, - "type": "event", - "event": "setTypings", - "body": { - "projectName": "/dev/null/inferredProject2*", - "typeAcquisition": { - "enable": true, - "include": [], - "exclude": [] - }, - "compilerOptions": { - "target": 1, - "jsx": 1, - "allowNonTsExtensions": true, - "allowJs": true, - "noEmitForJsFiles": true - }, - "typings": [], - "unresolvedImports": [], - "kind": "action::set" - } - } -TI:: [hh:mm:ss:mss] No new typings were requested as a result of typings discovery Info seq [hh:mm:ss:mss] After ensureProjectForOpenFiles: Info seq [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred) Info seq [hh:mm:ss:mss] Files (3) @@ -303,17 +189,5 @@ Info seq [hh:mm:ss:mss] event: } After running Timeout callback:: count: 0 -PolledWatches:: -/a/c/bower_components: *new* - {"pollingInterval":500} -/a/c/node_modules: *new* - {"pollingInterval":500} -/a/lib/lib.d.ts: - {"pollingInterval":500} - -FsWatches:: -/a/b/f2.ts: - {} - Inferred project: /dev/null/inferredProject1* isOrphan:: false isClosed: false Inferred project: /dev/null/inferredProject2* isOrphan:: true isClosed: false \ No newline at end of file diff --git a/tests/baselines/reference/tsserver/projects/correctly-migrate-files-between-projects.js b/tests/baselines/reference/tsserver/projects/correctly-migrate-files-between-projects.js index 428c628067d..4b85ef2a5e7 100644 --- a/tests/baselines/reference/tsserver/projects/correctly-migrate-files-between-projects.js +++ b/tests/baselines/reference/tsserver/projects/correctly-migrate-files-between-projects.js @@ -310,132 +310,6 @@ Info seq [hh:mm:ss:mss] Files (0) Info seq [hh:mm:ss:mss] ----------------------------------------------- -TI:: Creating typing installer - -PolledWatches:: -/a/lib/lib.d.ts: - {"pollingInterval":500} - -FsWatches:: -/a/b/f1.ts: - {} - -FsWatches *deleted*:: -/a/d/f3.ts: - {} - -TI:: [hh:mm:ss:mss] Global cache location '/a/data', safe file path '/safeList.json', types map path /typesMap.json -TI:: [hh:mm:ss:mss] Processing cache location '/a/data' -TI:: [hh:mm:ss:mss] Trying to find '/a/data/package.json'... -TI:: [hh:mm:ss:mss] Finished processing cache location '/a/data' -TI:: [hh:mm:ss:mss] Npm config file: /a/data/package.json -TI:: [hh:mm:ss:mss] Npm config file: '/a/data/package.json' is missing, creating new one... -TI:: [hh:mm:ss:mss] Updating types-registry npm package... -TI:: [hh:mm:ss:mss] npm install --ignore-scripts types-registry@latest -TI:: [hh:mm:ss:mss] Updated types-registry npm package -TI:: typing installer creation complete -//// [/a/data/package.json] -{ "private": true } - -//// [/a/data/node_modules/types-registry/index.json] -{ - "entries": {} -} - - -TI:: [hh:mm:ss:mss] Got install request - { - "projectName": "/dev/null/inferredProject3*", - "fileNames": [], - "compilerOptions": { - "target": 1, - "jsx": 1, - "allowNonTsExtensions": true, - "allowJs": true, - "noEmitForJsFiles": true - }, - "typeAcquisition": { - "enable": true, - "include": [], - "exclude": [] - }, - "unresolvedImports": [], - "projectRootPath": "/a/b", - "cachePath": "/a/data", - "kind": "discover" - } -TI:: [hh:mm:ss:mss] Request specifies cache path '/a/data', loading cached information... -TI:: [hh:mm:ss:mss] Processing cache location '/a/data' -TI:: [hh:mm:ss:mss] Cache location was already processed... -TI:: [hh:mm:ss:mss] Failed to load safelist from types map file '/typesMap.json' -TI:: [hh:mm:ss:mss] Explicitly included types: [] -TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: [] -TI:: [hh:mm:ss:mss] Finished typings discovery: - { - "cachedTypingPaths": [], - "newTypingNames": [], - "filesToWatch": [ - "/a/b/bower_components", - "/a/b/node_modules" - ] - } -TI:: [hh:mm:ss:mss] Sending response: - { - "kind": "action::watchTypingLocations", - "projectName": "/dev/null/inferredProject3*", - "files": [ - "/a/b/bower_components", - "/a/b/node_modules" - ] - } -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/b/bower_components 1 undefined Project: /dev/null/inferredProject3* WatchType: Directory location for typing installer -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/bower_components 1 undefined Project: /dev/null/inferredProject3* WatchType: Directory location for typing installer -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules 1 undefined Project: /dev/null/inferredProject3* WatchType: Directory location for typing installer -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules 1 undefined Project: /dev/null/inferredProject3* WatchType: Directory location for typing installer -TI:: [hh:mm:ss:mss] Sending response: - { - "projectName": "/dev/null/inferredProject3*", - "typeAcquisition": { - "enable": true, - "include": [], - "exclude": [] - }, - "compilerOptions": { - "target": 1, - "jsx": 1, - "allowNonTsExtensions": true, - "allowJs": true, - "noEmitForJsFiles": true - }, - "typings": [], - "unresolvedImports": [], - "kind": "action::set" - } -Info seq [hh:mm:ss:mss] event: - { - "seq": 0, - "type": "event", - "event": "setTypings", - "body": { - "projectName": "/dev/null/inferredProject3*", - "typeAcquisition": { - "enable": true, - "include": [], - "exclude": [] - }, - "compilerOptions": { - "target": 1, - "jsx": 1, - "allowNonTsExtensions": true, - "allowJs": true, - "noEmitForJsFiles": true - }, - "typings": [], - "unresolvedImports": [], - "kind": "action::set" - } - } -TI:: [hh:mm:ss:mss] No new typings were requested as a result of typings discovery Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject5* Info seq [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject5* Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms Info seq [hh:mm:ss:mss] Same program as before @@ -446,18 +320,6 @@ Info seq [hh:mm:ss:mss] Files (0) Info seq [hh:mm:ss:mss] ----------------------------------------------- -TI:: [hh:mm:ss:mss] Closing file watchers for project '/dev/null/inferredProject3*' -TI:: [hh:mm:ss:mss] Sending response: - { - "kind": "action::watchTypingLocations", - "projectName": "/dev/null/inferredProject3*", - "files": [] - } -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /a/b/bower_components 1 undefined Project: /dev/null/inferredProject3* WatchType: Directory location for typing installer -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /a/b/bower_components 1 undefined Project: /dev/null/inferredProject3* WatchType: Directory location for typing installer -Info seq [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /a/b/node_modules 1 undefined Project: /dev/null/inferredProject3* WatchType: Directory location for typing installer -Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /a/b/node_modules 1 undefined Project: /dev/null/inferredProject3* WatchType: Directory location for typing installer -TI:: [hh:mm:ss:mss] Closing file watchers for project '/dev/null/inferredProject3*' - done. Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /a/b/f1.ts 500 undefined WatchType: Closed Script info Info seq [hh:mm:ss:mss] Project '/dev/null/inferredProject5*' (Inferred) Info seq [hh:mm:ss:mss] Files (1) @@ -485,6 +347,8 @@ PolledWatches:: FsWatches *deleted*:: /a/b/f1.ts: {} +/a/d/f3.ts: + {} Inferred project: /dev/null/inferredProject5* isOrphan:: false isClosed: false Inferred project: /dev/null/inferredProject4* isOrphan:: false isClosed: false \ No newline at end of file