Watch extended configs if present by molisani · Pull Request #41493 · microsoft/TypeScript

Michael Molisani (molisani) · 2020-11-11T17:49:56Z

Inspects extendedSourceFiles from configFile in CompilerOptions and starts a watcher for each file. Watch callback invokes scheduleProgramReload just like the watcher for the main config file. Watcher pattern modelled after watcher map for missing files. Also provides shared watcher map for situations where multiple projects are open at once (tsbuild/tsserver).

Added new test cases, including chain of extended configs and ones copied from watchEnvironment/watchOptions with extended configs to verify they are being watched.

Michael Molisani (molisani) · 2020-11-19T23:34:19Z

I've rebased onto master, but I'm now getting some (seemingly) unrelated errors with some jsx baselines. Here are my local copies of the two failing baseline tests: jsFileCompilationTypeArgumentSyntaxOfCall.errors.txt and jsxCheckJsxNoTypeArgumentsAllowed.errors.txt. I'm going to do some more investigating, but wanted to report my local copies here on the PR if anyone could advise in this situation. This appears to be a known issue that is being fixed by #41602

Sheetal Nandi (sheetalkamat) · 2020-12-02T02:35:22Z

+ ) {
+ const extendedSourceFiles = configFile.extendedSourceFiles || emptyArray;
+ // TODO(rbuckton): Should be a `Set` but that requires changing the below code that uses `mutateMap`
+ const newExtendedConfigFilesMap = arrayToMap(extendedSourceFiles, identity, returnTrue);


Key needs to be Path, value needs to be file name to watch

This doesnot create the key with Path

Ah, I missed the meaning of this the first time around. I'll pass something to allow converting from string to Path.

Michael Molisani (molisani)

Will update to correctly account for removals, and add new tests. Had a few questions about latest review.

Michael Molisani (molisani) · 2020-12-04T22:57:05Z

While creating a test case for removing projects, I noticed that I had not considered the builder's watch logic. I'll replicate the "shared" watcher pattern from the server here as well.

Sheetal Nandi (sheetalkamat)

I have some more feedback but i am going to try fixing some of those myself as that might be easier

Sheetal Nandi (sheetalkamat) · 2020-12-10T21:03:34Z

+ ) {
+ const extendedSourceFiles = configFile.extendedSourceFiles || emptyArray;
+ // TODO(rbuckton): Should be a `Set` but that requires changing the below code that uses `mutateMap`
+ const newExtendedConfigFilesMap = arrayToMap(extendedSourceFiles, identity, returnTrue);


This doesnot create the key with Path

Michael Molisani (molisani) · 2020-12-10T21:45:53Z

I have some more feedback but i am going to try fixing some of those myself as that might be easier

Thank you very much for those suggestions. I merged all of them and then applied the toPath conversion.

Sheetal Nandi (sheetalkamat) · 2020-12-11T00:20:41Z

Please cherry pick e2d178f as i dont have permission to update your fork.

Added new `WatchType` for extended config files. Refactored watch map update to separate function, relocated call sites. Removed unnecessary test cases and relocated with new tests in programUpdates.

Update `updateExtendedConfigFilesWatch` to read from a `TsConfigSourceFile` to get `extendedSourceFiles`. Add watcher map to `ConfiguredProject` in the server. New test cases to verify correct events triggered and extended files are being watched properly.

Removes unnecessary actions in extended config watcher callback function. Updates tests to match.

New shared watcher map in ProjectService that stores callbacks per project to be invoked when the file watcher is triggered. The FileWatcher is created with the watch options of the first Project to watch the extended config.

Remove all server-related utility functions/types from watchUtilities. Store config-project mapping and config file watchers inside ProjectService with new private methods to add or remove projects.

Creates SharedExtendedConfigFileWatcher in both editorServices (tsserver) and tsbuildPublic. The file watcher is responsible for triggering a full project reload for the contained projects. Upon reload, any configs that are no longer related to a project have their watchers updated to match. New test cases to confirm that the file watchers for extended configs are closed when the project is closed.

Co-authored-by: Sheetal Nandi <shkamat@microsoft.com>

Michael Molisani (molisani) · 2020-12-11T00:50:06Z

Please cherry pick e2d178f as i dont have permission to update your fork.

The unified SharedExtendedConfigFileWatcher makes a lot more sense now that it's being used by tsbuild and tsserver. I also had to rebase due to a merge conflict in src/server/project.ts but it was a small one. Thanks again for your help.

TypeScript Bot (typescript-bot) assigned Sheetal Nandi (sheetalkamat)Nov 11, 2020

TypeScript Bot (typescript-bot) added the For Milestone Bug PRs that fix a bug with a specific milestone label Nov 11, 2020

Michael Molisani (molisani)force-pushed the watch-tsconfig-extends branch from bdf7c2e to ad2fbaaCompare November 11, 2020 17:59

Sheetal Nandi (sheetalkamat) requested changes Nov 11, 2020
View reviewed changes

Michael Molisani (molisani)force-pushed the watch-tsconfig-extends branch from 053e9b4 to 31f0d50Compare November 13, 2020 03:26

Michael Molisani (molisani) commented Nov 13, 2020
View reviewed changes

Comment threadsrc/server/editorServices.ts
Comment threadsrc/server/editorServices.ts

Michael Molisani (molisani)force-pushed the watch-tsconfig-extends branch from 31f0d50 to 4d59cc6Compare November 13, 2020 04:06

Michael Molisani (molisani) requested a review from Sheetal Nandi (sheetalkamat)November 13, 2020 04:39

Sheetal Nandi (sheetalkamat) requested changes Nov 13, 2020
View reviewed changes

Michael Molisani (molisani)force-pushed the watch-tsconfig-extends branch from 588bee3 to 36c29cbCompare November 14, 2020 06:31

Michael Molisani (molisani) requested a review from Sheetal Nandi (sheetalkamat)November 16, 2020 22:31

Sheetal Nandi (sheetalkamat) requested changes Nov 17, 2020
View reviewed changes

Comment threadsrc/server/editorServices.ts Outdated
Comment threadsrc/server/editorServices.ts Outdated
Comment threadsrc/server/editorServices.ts Outdated
Comment threadsrc/server/editorServices.ts Outdated
Comment threadsrc/server/editorServices.ts Outdated

Joost Koehoorn (JoostK) mentioned this pull request Nov 18, 2020
feat(language-service): watch extended configs for option changes angular/angular#39741
Closed

Michael Molisani (molisani)force-pushed the watch-tsconfig-extends branch from d091cb9 to 4224dd7Compare November 19, 2020 22:42

Michael Molisani (molisani)force-pushed the watch-tsconfig-extends branch 2 times, most recently from 67dcc8e to 86905beCompare November 20, 2020 03:38

Michael Molisani (molisani) requested a review from Sheetal Nandi (sheetalkamat)November 20, 2020 04:17

Sheetal Nandi (sheetalkamat) reviewed Dec 2, 2020
View reviewed changes

Comment threadsrc/compiler/watchUtilities.ts Outdated

Sheetal Nandi (sheetalkamat) requested changes Dec 2, 2020
View reviewed changes

Michael Molisani (molisani) commented Dec 2, 2020
View reviewed changes

Comment threadsrc/compiler/watchUtilities.ts Outdated

Michael Molisani (molisani)force-pushed the watch-tsconfig-extends branch 2 times, most recently from 1acd39c to 2284a6cCompare December 9, 2020 22:49

Michael Molisani (molisani) requested a review from Sheetal Nandi (sheetalkamat)December 9, 2020 23:02

Sheetal Nandi (sheetalkamat) requested changes Dec 10, 2020
View reviewed changes

Michael Molisani (molisani) added 2 commits December 10, 2020 19:46

Watch extended configs if present
c0b6fb5

Address code review comments
55d4e3e
Added new `WatchType` for extended config files. Refactored watch map update to separate function, relocated call sites. Removed unnecessary test cases and relocated with new tests in programUpdates.

Michael Molisani (molisani)and others added 8 commits December 10, 2020 19:46

Simplify watcher callback, fix tests
fa918ed
Removes unnecessary actions in extended config watcher callback function. Updates tests to match.

Share extended config watchers across projects in server
1a527d6
New shared watcher map in ProjectService that stores callbacks per project to be invoked when the file watcher is triggered. The FileWatcher is created with the watch options of the first Project to watch the extended config.

Refactor shared extended config map and watchers
963ccf9
Remove all server-related utility functions/types from watchUtilities. Store config-project mapping and config file watchers inside ProjectService with new private methods to add or remove projects.

Apply suggestions from code review
e7ff4b8
Co-authored-by: Sheetal Nandi <shkamat@microsoft.com>

Map extended config files by path
45f19cc

Move shared watcher into utilities and add more tests
7d25e43

Sheetal Nandi (sheetalkamat) approved these changes Dec 11, 2020
View reviewed changes

Michael Molisani (molisani)force-pushed the watch-tsconfig-extends branch from 3a0c0dd to 7d25e43Compare December 11, 2020 00:49

Sheetal Nandi (sheetalkamat) merged commit 716b167 into microsoft:masterDec 11, 2020

Michael Molisani (molisani) deleted the watch-tsconfig-extends branch December 11, 2020 15:31

Martin Johns (MartinJohns) mentioned this pull request Oct 30, 2022
TS server not reload tsconfig when extended tsconfig is installed #51351
Closed

Microsoft (microsoft) locked as resolved and limited conversation to collaborators Oct 21, 2025

Uh oh!

Conversation

Michael Molisani (molisani) commented Nov 11, 2020• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Michael Molisani (molisani) commented Nov 19, 2020• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Sheetal Nandi (sheetalkamat)Dec 2, 2020

Choose a reason for hiding this comment

Uh oh!

Sheetal Nandi (sheetalkamat)Dec 10, 2020

Choose a reason for hiding this comment

Uh oh!

Michael Molisani (molisani)Dec 10, 2020

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Michael Molisani (molisani) left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Michael Molisani (molisani) commented Dec 4, 2020

Uh oh!

Sheetal Nandi (sheetalkamat) left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Sheetal Nandi (sheetalkamat)Dec 10, 2020

Choose a reason for hiding this comment

Uh oh!

Michael Molisani (molisani) commented Dec 10, 2020

Uh oh!

Sheetal Nandi (sheetalkamat) commented Dec 11, 2020

Uh oh!

Michael Molisani (molisani) commented Dec 11, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Michael Molisani (molisani) commented Nov 11, 2020•
edited
Loading

Michael Molisani (molisani) commented Nov 19, 2020•
edited
Loading