Skip to content

Commit f96a044

Browse files
committed
Print initial load pending for project state changes
1 parent adf073f commit f96a044

File tree

45 files changed

+153
-30
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+153
-30
lines changed

src/harness/projectServiceStateLogger.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ interface ProjectData {
3131
projectStateVersion: Project["projectStateVersion"];
3232
projectProgramVersion: Project["projectProgramVersion"];
3333
dirty: Project["dirty"];
34+
initialLoadPending: Project["initialLoadPending"];
3435
isClosed: ReturnType<Project["isClosed"]>;
3536
isOrphan: ReturnType<Project["isOrphan"]>;
3637
noOpenRef: boolean;
@@ -123,6 +124,7 @@ export function patchServiceForStateBaseline(service: ProjectService) {
123124
projectDiff = printProperty(PrintPropertyWhen.Always, data, "projectStateVersion", project.projectStateVersion, projectDiff, projectPropertyLogs);
124125
projectDiff = printProperty(PrintPropertyWhen.Always, data, "projectProgramVersion", project.projectProgramVersion, projectDiff, projectPropertyLogs);
125126
projectDiff = printProperty(PrintPropertyWhen.TruthyOrChangedOrNew, data, "dirty", project.dirty, projectDiff, projectPropertyLogs);
127+
projectDiff = printProperty(PrintPropertyWhen.TruthyOrChangedOrNew, data, "initialLoadPending", project.initialLoadPending, projectDiff, projectPropertyLogs);
126128
projectDiff = printProperty(PrintPropertyWhen.TruthyOrChangedOrNew, data, "isClosed", project.isClosed(), projectDiff, projectPropertyLogs);
127129
projectDiff = printProperty(PrintPropertyWhen.TruthyOrChangedOrNew, data, "isOrphan", !isBackgroundProject(project) && project.isOrphan(), projectDiff, projectPropertyLogs);
128130
projectDiff = printProperty(PrintPropertyWhen.TruthyOrChangedOrNew, data, "noOpenRef", noOpenRef(project), projectDiff, projectPropertyLogs);
@@ -154,6 +156,7 @@ export function patchServiceForStateBaseline(service: ProjectService) {
154156
projectStateVersion: project.projectStateVersion,
155157
projectProgramVersion: project.projectProgramVersion,
156158
dirty: project.dirty,
159+
initialLoadPending: project.initialLoadPending,
157160
isClosed: project.isClosed(),
158161
isOrphan: !isBackgroundProject(project) && project.isOrphan(),
159162
noOpenRef: noOpenRef(project),

tests/baselines/reference/tsserver/autoImportProvider/Does-not-create-auto-import-providers-upon-opening-projects-for-find-all-references.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,7 @@ Projects::
294294
projectStateVersion: 1
295295
projectProgramVersion: 0
296296
dirty: true
297+
initialLoadPending: true
297298
298299
ScriptInfos::
299300
/node_modules/@angular/forms/forms.d.ts *new*
@@ -740,6 +741,7 @@ Projects::
740741
projectStateVersion: 1
741742
projectProgramVersion: 1 *changed*
742743
dirty: false *changed*
744+
initialLoadPending: false *changed*
743745
originalConfiguredProjects: 3 *changed*
744746
/packages/b/tsconfig.json *new*
745747
/tsconfig.json *new*

tests/baselines/reference/tsserver/configFileSearch/tsconfig-for-the-file-does-not-exist.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ Projects::
159159
projectStateVersion: 1
160160
projectProgramVersion: 0
161161
dirty: true
162+
initialLoadPending: true
162163
/dev/null/inferredProject1* (Inferred)
163164
projectStateVersion: 1
164165
projectProgramVersion: 1
@@ -344,6 +345,7 @@ Projects::
344345
projectStateVersion: 1
345346
projectProgramVersion: 1 *changed*
346347
dirty: false *changed*
348+
initialLoadPending: false *changed*
347349
/dev/null/inferredProject1* (Inferred) *changed*
348350
projectStateVersion: 2 *changed*
349351
projectProgramVersion: 2 *changed*

tests/baselines/reference/tsserver/configuredProjects/add-and-then-remove-a-config-file-in-a-folder-with-loose-files.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ Projects::
236236
projectStateVersion: 1
237237
projectProgramVersion: 0
238238
dirty: true
239+
initialLoadPending: true
239240

240241
Info seq [hh:mm:ss:mss] Running: /user/username/projects/myproject/tsconfig.json
241242
Info seq [hh:mm:ss:mss] event:
@@ -407,6 +408,7 @@ Projects::
407408
projectStateVersion: 1
408409
projectProgramVersion: 1 *changed*
409410
dirty: false *changed*
411+
initialLoadPending: false *changed*
410412

411413
ScriptInfos::
412414
/a/lib/lib.d.ts *changed*

tests/baselines/reference/tsserver/configuredProjects/add-and-then-remove-a-config-file-when-parent-folder-has-config-file-and-file-from-first-config-is-not-open.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,7 @@ Projects::
271271
projectStateVersion: 1
272272
projectProgramVersion: 0
273273
dirty: true
274+
initialLoadPending: true
274275

275276
Info seq [hh:mm:ss:mss] Running: /user/username/projects/myproject/tsconfig.json
276277
Info seq [hh:mm:ss:mss] event:
@@ -465,6 +466,7 @@ Projects::
465466
projectStateVersion: 1
466467
projectProgramVersion: 1 *changed*
467468
dirty: false *changed*
469+
initialLoadPending: false *changed*
468470

469471
ScriptInfos::
470472
/a/lib/lib.d.ts *changed*
@@ -1213,6 +1215,7 @@ Projects::
12131215
projectStateVersion: 1
12141216
projectProgramVersion: 0
12151217
dirty: true
1218+
initialLoadPending: true
12161219

12171220
Info seq [hh:mm:ss:mss] request:
12181221
{
@@ -1291,6 +1294,7 @@ Projects::
12911294
projectStateVersion: 1
12921295
projectProgramVersion: 0
12931296
dirty: true
1297+
initialLoadPending: true
12941298
noOpenRef: true *changed*
12951299

12961300
ScriptInfos::
@@ -1446,6 +1450,7 @@ Projects::
14461450
projectStateVersion: 1
14471451
projectProgramVersion: 0
14481452
dirty: true
1453+
initialLoadPending: true
14491454
isClosed: true *changed*
14501455
noOpenRef: true
14511456

tests/baselines/reference/tsserver/configuredProjects/add-and-then-remove-a-config-file-when-parent-folder-has-config-file.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ Projects::
237237
projectStateVersion: 1
238238
projectProgramVersion: 0
239239
dirty: true
240+
initialLoadPending: true
240241

241242
Info seq [hh:mm:ss:mss] request:
242243
{
@@ -381,6 +382,7 @@ Projects::
381382
projectStateVersion: 1
382383
projectProgramVersion: 1 *changed*
383384
dirty: false *changed*
385+
initialLoadPending: false *changed*
384386

385387
ScriptInfos::
386388
/a/lib/lib.d.ts *changed*
@@ -1311,6 +1313,7 @@ Projects::
13111313
projectStateVersion: 1
13121314
projectProgramVersion: 0
13131315
dirty: true
1316+
initialLoadPending: true
13141317
13151318
Info seq [hh:mm:ss:mss] Running: /user/username/projects/myproject/tsconfig.json
13161319
Info seq [hh:mm:ss:mss] event:
@@ -1478,6 +1481,7 @@ Projects::
14781481
projectStateVersion: 1
14791482
projectProgramVersion: 1 *changed*
14801483
dirty: false *changed*
1484+
initialLoadPending: false *changed*
14811485
14821486
ScriptInfos::
14831487
/a/lib/lib.d.ts *changed*
@@ -2385,6 +2389,7 @@ Projects::
23852389
projectStateVersion: 1
23862390
projectProgramVersion: 0
23872391
dirty: true
2392+
initialLoadPending: true
23882393
23892394
Info seq [hh:mm:ss:mss] request:
23902395
{
@@ -2488,6 +2493,7 @@ Projects::
24882493
projectStateVersion: 1
24892494
projectProgramVersion: 1 *changed*
24902495
dirty: false *changed*
2496+
initialLoadPending: false *changed*
24912497
24922498
ScriptInfos::
24932499
/a/lib/lib.d.ts *changed*
@@ -3031,6 +3037,7 @@ Projects::
30313037
projectStateVersion: 1
30323038
projectProgramVersion: 0
30333039
dirty: true
3040+
initialLoadPending: true
30343041

30353042
Info seq [hh:mm:ss:mss] request:
30363043
{
@@ -3134,6 +3141,7 @@ Projects::
31343141
projectStateVersion: 1
31353142
projectProgramVersion: 1 *changed*
31363143
dirty: false *changed*
3144+
initialLoadPending: false *changed*
31373145

31383146
ScriptInfos::
31393147
/a/lib/lib.d.ts *changed*
@@ -3859,6 +3867,7 @@ Projects::
38593867
projectStateVersion: 1
38603868
projectProgramVersion: 0
38613869
dirty: true
3870+
initialLoadPending: true
38623871
38633872
Info seq [hh:mm:ss:mss] request:
38643873
{
@@ -3962,6 +3971,7 @@ Projects::
39623971
projectStateVersion: 1
39633972
projectProgramVersion: 1 *changed*
39643973
dirty: false *changed*
3974+
initialLoadPending: false *changed*
39653975
39663976
ScriptInfos::
39673977
/a/lib/lib.d.ts *changed*

tests/baselines/reference/tsserver/configuredProjects/add-and-then-remove-a-config-file-with-sibling-jsconfig-file-and-file-from-first-config-is-not-open.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,7 @@ Projects::
268268
projectStateVersion: 1
269269
projectProgramVersion: 0
270270
dirty: true
271+
initialLoadPending: true
271272
/user/username/projects/myproject/folder/tsconfig.json (Configured) *changed*
272273
projectStateVersion: 1
273274
projectProgramVersion: 1
@@ -476,6 +477,7 @@ Projects::
476477
projectStateVersion: 1
477478
projectProgramVersion: 1 *changed*
478479
dirty: false *changed*
480+
initialLoadPending: false *changed*
479481
/user/username/projects/myproject/folder/tsconfig.json (Configured)
480482
projectStateVersion: 1
481483
projectProgramVersion: 1
@@ -1225,6 +1227,7 @@ Projects::
12251227
projectStateVersion: 1
12261228
projectProgramVersion: 0
12271229
dirty: true
1230+
initialLoadPending: true
12281231
/user/username/projects/myproject/folder/tsconfig.json (Configured) *changed*
12291232
projectStateVersion: 1
12301233
projectProgramVersion: 1
@@ -1303,6 +1306,7 @@ Projects::
13031306
projectStateVersion: 1
13041307
projectProgramVersion: 0
13051308
dirty: true
1309+
initialLoadPending: true
13061310
noOpenRef: true *changed*
13071311
/user/username/projects/myproject/folder/tsconfig.json (Configured) *changed*
13081312
projectStateVersion: 1
@@ -1457,6 +1461,7 @@ Projects::
14571461
projectStateVersion: 1
14581462
projectProgramVersion: 0
14591463
dirty: true
1464+
initialLoadPending: true
14601465
isClosed: true *changed*
14611466
noOpenRef: true
14621467
/user/username/projects/myproject/folder/tsconfig.json (Configured) *deleted*

tests/baselines/reference/tsserver/configuredProjects/add-and-then-remove-a-config-file-with-sibling-jsconfig-file.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@ Projects::
235235
projectStateVersion: 1
236236
projectProgramVersion: 0
237237
dirty: true
238+
initialLoadPending: true
238239
/user/username/projects/myproject/folder/tsconfig.json (Configured) *changed*
239240
projectStateVersion: 1
240241
projectProgramVersion: 1
@@ -392,6 +393,7 @@ Projects::
392393
projectStateVersion: 1
393394
projectProgramVersion: 1 *changed*
394395
dirty: false *changed*
396+
initialLoadPending: false *changed*
395397
/user/username/projects/myproject/folder/tsconfig.json (Configured)
396398
projectStateVersion: 1
397399
projectProgramVersion: 1
@@ -1324,6 +1326,7 @@ Projects::
13241326
projectStateVersion: 1
13251327
projectProgramVersion: 0
13261328
dirty: true
1329+
initialLoadPending: true
13271330
/user/username/projects/myproject/folder/tsconfig.json (Configured) *changed*
13281331
projectStateVersion: 1
13291332
projectProgramVersion: 1
@@ -1498,6 +1501,7 @@ Projects::
14981501
projectStateVersion: 1
14991502
projectProgramVersion: 1 *changed*
15001503
dirty: false *changed*
1504+
initialLoadPending: false *changed*
15011505
/user/username/projects/myproject/folder/tsconfig.json (Configured)
15021506
projectStateVersion: 1
15031507
projectProgramVersion: 1
@@ -2407,6 +2411,7 @@ Projects::
24072411
projectStateVersion: 1
24082412
projectProgramVersion: 0
24092413
dirty: true
2414+
initialLoadPending: true
24102415
/user/username/projects/myproject/folder/tsconfig.json (Configured) *changed*
24112416
projectStateVersion: 1
24122417
projectProgramVersion: 1
@@ -2517,6 +2522,7 @@ Projects::
25172522
projectStateVersion: 1
25182523
projectProgramVersion: 1 *changed*
25192524
dirty: false *changed*
2525+
initialLoadPending: false *changed*
25202526
/user/username/projects/myproject/folder/tsconfig.json (Configured)
25212527
projectStateVersion: 1
25222528
projectProgramVersion: 1
@@ -3062,6 +3068,7 @@ Projects::
30623068
projectStateVersion: 1
30633069
projectProgramVersion: 0
30643070
dirty: true
3071+
initialLoadPending: true
30653072
/user/username/projects/myproject/folder/tsconfig.json (Configured) *changed*
30663073
projectStateVersion: 1
30673074
projectProgramVersion: 1
@@ -3172,6 +3179,7 @@ Projects::
31723179
projectStateVersion: 1
31733180
projectProgramVersion: 1 *changed*
31743181
dirty: false *changed*
3182+
initialLoadPending: false *changed*
31753183
/user/username/projects/myproject/folder/tsconfig.json (Configured)
31763184
projectStateVersion: 1
31773185
projectProgramVersion: 1
@@ -3899,6 +3907,7 @@ Projects::
38993907
projectStateVersion: 1
39003908
projectProgramVersion: 0
39013909
dirty: true
3910+
initialLoadPending: true
39023911
/user/username/projects/myproject/folder/tsconfig.json (Configured) *changed*
39033912
projectStateVersion: 1
39043913
projectProgramVersion: 1
@@ -4009,6 +4018,7 @@ Projects::
40094018
projectStateVersion: 1
40104019
projectProgramVersion: 1 *changed*
40114020
dirty: false *changed*
4021+
initialLoadPending: false *changed*
40124022
/user/username/projects/myproject/folder/tsconfig.json (Configured)
40134023
projectStateVersion: 1
40144024
projectProgramVersion: 1

tests/baselines/reference/tsserver/configuredProjects/open-file-become-a-part-of-configured-project-if-it-is-referenced-from-root-file.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,7 @@ Projects::
284284
projectStateVersion: 1
285285
projectProgramVersion: 0
286286
dirty: true
287+
initialLoadPending: true
287288

288289
Info seq [hh:mm:ss:mss] Running: /user/username/projects/myproject/a/c/tsconfig.json
289290
Info seq [hh:mm:ss:mss] event:
@@ -565,6 +566,7 @@ Projects::
565566
projectStateVersion: 1
566567
projectProgramVersion: 1 *changed*
567568
dirty: false *changed*
569+
initialLoadPending: false *changed*
568570

569571
ScriptInfos::
570572
/user/username/projects/myproject/a/b/f1.ts (Open) *changed*

tests/baselines/reference/tsserver/events/projectLoading/lazyConfiguredProjectsFromExternalProject-is-disabled-when-using-default-event-handler.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ Projects::
8585
projectStateVersion: 1
8686
projectProgramVersion: 0
8787
dirty: true
88+
initialLoadPending: true
8889

8990
Before request
9091

@@ -236,6 +237,7 @@ Projects::
236237
projectStateVersion: 1
237238
projectProgramVersion: 1 *changed*
238239
dirty: false *changed*
240+
initialLoadPending: false *changed*
239241

240242
ScriptInfos::
241243
/a/lib/lib.d.ts *new*

tests/baselines/reference/tsserver/events/projectLoading/lazyConfiguredProjectsFromExternalProject-is-disabled-when-using-event-handler.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ Projects::
8585
projectStateVersion: 1
8686
projectProgramVersion: 0
8787
dirty: true
88+
initialLoadPending: true
8889

8990
Before request
9091

@@ -233,6 +234,7 @@ Projects::
233234
projectStateVersion: 1
234235
projectProgramVersion: 1 *changed*
235236
dirty: false *changed*
237+
initialLoadPending: false *changed*
236238

237239
ScriptInfos::
238240
/a/lib/lib.d.ts *new*

tests/baselines/reference/tsserver/events/projectLoading/lazyConfiguredProjectsFromExternalProject-is-true-and-file-is-opened-when-using-default-event-handler.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ Projects::
8585
projectStateVersion: 1
8686
projectProgramVersion: 0
8787
dirty: true
88+
initialLoadPending: true
8889

8990
Before request
9091

@@ -239,6 +240,7 @@ Projects::
239240
projectStateVersion: 1
240241
projectProgramVersion: 1 *changed*
241242
dirty: false *changed*
243+
initialLoadPending: false *changed*
242244

243245
ScriptInfos::
244246
/a/lib/lib.d.ts *new*

tests/baselines/reference/tsserver/events/projectLoading/lazyConfiguredProjectsFromExternalProject-is-true-and-file-is-opened-when-using-event-handler.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ Projects::
8585
projectStateVersion: 1
8686
projectProgramVersion: 0
8787
dirty: true
88+
initialLoadPending: true
8889

8990
Before request
9091

@@ -236,6 +237,7 @@ Projects::
236237
projectStateVersion: 1
237238
projectProgramVersion: 1 *changed*
238239
dirty: false *changed*
240+
initialLoadPending: false *changed*
239241

240242
ScriptInfos::
241243
/a/lib/lib.d.ts *new*

0 commit comments

Comments
 (0)