Skip to content

Commit 2f8b822

Browse files
sheetalkamatsheetalkamat
authored
Some of the fixes picked out from my work for file updates (#57401)
1 parent 04fa4b5 commit 2f8b822

File tree

65 files changed

+273
-915
lines changed

Some content is hidden

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

65 files changed

+273
-915
lines changed

‎src/server/editorServices.ts

Lines changed: 107 additions & 135 deletions
Large diffs are not rendered by default.

‎src/server/scriptInfo.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ import {
2525
IScriptSnapshot,
2626
isString,
2727
LineInfo,
28+
orderedRemoveItem,
2829
Path,
2930
ScriptKind,
3031
ScriptSnapshot,
3132
some,
3233
SourceFile,
3334
SourceFileLike,
3435
TextSpan,
35-
unorderedRemoveItem,
3636
} from "./_namespaces/ts";
3737
import {
3838
AbsolutePositionAndLineText,
@@ -536,7 +536,8 @@ export class ScriptInfo {
536536
}
537537
break;
538538
default:
539-
if (unorderedRemoveItem(this.containingProjects, project)) {
539+
// We use first configured project as default so we shouldnt change the order of the containing projects
540+
if (orderedRemoveItem(this.containingProjects, project)) {
540541
project.onFileAddedOrRemoved(this.isSymlink());
541542
}
542543
break;

‎tests/baselines/reference/api/typescript.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3906,6 +3906,7 @@ declare namespace ts {
39063906
private static escapeFilenameForRegex;
39073907
resetSafeList(): void;
39083908
applySafeList(proj: protocol.ExternalProject): NormalizedPath[];
3909+
private applySafeListWorker;
39093910
openExternalProject(proj: protocol.ExternalProject): void;
39103911
hasDeferredExtension(): boolean;
39113912
private enableRequestedPluginsAsync;

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -541,19 +541,11 @@ Info seq [hh:mm:ss:mss] event:
541541
}
542542
}
543543
Info seq [hh:mm:ss:mss] Finding references to /packages/b/index.ts position 13 in project /tsconfig.json
544-
Info seq [hh:mm:ss:mss] Search path: /packages/b
545-
Info seq [hh:mm:ss:mss] For info: /packages/b/index.ts :: Config file name: /packages/b/tsconfig.json
546-
Info seq [hh:mm:ss:mss] Search path: /packages/b
547-
Info seq [hh:mm:ss:mss] For info: /packages/b/index.ts :: Config file name: /packages/b/tsconfig.json
548544
Info seq [hh:mm:ss:mss] Search path: /packages/a
549545
Info seq [hh:mm:ss:mss] For info: /packages/a/index.ts :: Config file name: /packages/a/tsconfig.json
550546
Info seq [hh:mm:ss:mss] Search path: /packages/a
551547
Info seq [hh:mm:ss:mss] For info: /packages/a/index.ts :: Config file name: /packages/a/tsconfig.json
552548
Info seq [hh:mm:ss:mss] Finding references to /packages/b/index.ts position 13 in project /packages/a/tsconfig.json
553-
Info seq [hh:mm:ss:mss] Search path: /packages/b
554-
Info seq [hh:mm:ss:mss] For info: /packages/b/index.ts :: Config file name: /packages/b/tsconfig.json
555-
Info seq [hh:mm:ss:mss] Search path: /packages/b
556-
Info seq [hh:mm:ss:mss] For info: /packages/b/index.ts :: Config file name: /packages/b/tsconfig.json
557549
Info seq [hh:mm:ss:mss] response:
558550
{
559551
"response": {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,8 +404,8 @@ ScriptInfos::
404404
/a/lib/lib.d.ts *changed*
405405
version: Text-1
406406
containingProjects: 2 *changed*
407-
/user/username/projects/myproject/tsconfig.json *new*
408407
/dev/null/inferredProject2*
408+
/user/username/projects/myproject/tsconfig.json *new*
409409
/dev/null/inferredProject1* *deleted*
410410
/user/username/projects/myproject/commonFile1.ts (Open) *changed*
411411
version: SVC-1-0

‎tests/baselines/reference/tsserver/declarationFileMaps/findAllReferences-starting-at-definition.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -978,10 +978,6 @@ Info seq [hh:mm:ss:mss] request:
978978
Info seq [hh:mm:ss:mss] Finding references to /a/a.ts position 16 in project /a/tsconfig.json
979979
Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/bin/a.d.ts.map 500 undefined WatchType: Closed Script info
980980
Info seq [hh:mm:ss:mss] Finding references to /a/bin/a.d.ts position 24 in project /dev/null/inferredProject1*
981-
Info seq [hh:mm:ss:mss] Search path: /a
982-
Info seq [hh:mm:ss:mss] For info: /a/a.ts :: Config file name: /a/tsconfig.json
983-
Info seq [hh:mm:ss:mss] Search path: /a
984-
Info seq [hh:mm:ss:mss] For info: /a/a.ts :: Config file name: /a/tsconfig.json
985981
Info seq [hh:mm:ss:mss] response:
986982
{
987983
"response": {

‎tests/baselines/reference/tsserver/declarationFileMaps/renameLocations-starting-at-definition.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -976,8 +976,6 @@ Info seq [hh:mm:ss:mss] request:
976976
"type": "request"
977977
}
978978
Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/bin/a.d.ts.map 500 undefined WatchType: Closed Script info
979-
Info seq [hh:mm:ss:mss] Search path: /a
980-
Info seq [hh:mm:ss:mss] For info: /a/a.ts :: Config file name: /a/tsconfig.json
981979
Info seq [hh:mm:ss:mss] response:
982980
{
983981
"response": {

‎tests/baselines/reference/tsserver/externalProjects/correctly-handling-add-or-remove-tsconfig---1-with-lazyConfiguredProjectsFromExternalProject.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,8 @@ Info seq [hh:mm:ss:mss] request:
249249
"seq": 4,
250250
"type": "request"
251251
}
252+
Info seq [hh:mm:ss:mss] Creating configuration project /a/b/tsconfig.json
253+
Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/b/tsconfig.json 2000 undefined Project: /a/b/tsconfig.json WatchType: Config file
252254
Info seq [hh:mm:ss:mss] `remove Project::
253255
Info seq [hh:mm:ss:mss] Project '/a/b/proj1' (External)
254256
Info seq [hh:mm:ss:mss] Files (2)
@@ -263,8 +265,6 @@ Info seq [hh:mm:ss:mss] Files (2)
263265
264266
Info seq [hh:mm:ss:mss] -----------------------------------------------
265267
Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/b/proj1 WatchType: Missing file
266-
Info seq [hh:mm:ss:mss] Creating configuration project /a/b/tsconfig.json
267-
Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/b/tsconfig.json 2000 undefined Project: /a/b/tsconfig.json WatchType: Config file
268268
Info seq [hh:mm:ss:mss] Project '/a/b/tsconfig.json' (Configured)
269269
Info seq [hh:mm:ss:mss] Files (0) InitialLoadPending
270270

‎tests/baselines/reference/tsserver/externalProjects/correctly-handling-add-or-remove-tsconfig---1.js

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -249,20 +249,6 @@ Info seq [hh:mm:ss:mss] request:
249249
"seq": 4,
250250
"type": "request"
251251
}
252-
Info seq [hh:mm:ss:mss] `remove Project::
253-
Info seq [hh:mm:ss:mss] Project '/a/b/proj1' (External)
254-
Info seq [hh:mm:ss:mss] Files (2)
255-
/a/b/app.ts
256-
/a/b/lib.ts
257-
258-
259-
app.ts
260-
Root file specified for compilation
261-
lib.ts
262-
Root file specified for compilation
263-
264-
Info seq [hh:mm:ss:mss] -----------------------------------------------
265-
Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/b/proj1 WatchType: Missing file
266252
Info seq [hh:mm:ss:mss] Creating configuration project /a/b/tsconfig.json
267253
Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/b/tsconfig.json 2000 undefined Project: /a/b/tsconfig.json WatchType: Config file
268254
Info seq [hh:mm:ss:mss] event:
@@ -347,6 +333,20 @@ Info seq [hh:mm:ss:mss] event:
347333
}
348334
}
349335
}
336+
Info seq [hh:mm:ss:mss] `remove Project::
337+
Info seq [hh:mm:ss:mss] Project '/a/b/proj1' (External)
338+
Info seq [hh:mm:ss:mss] Files (2)
339+
/a/b/app.ts
340+
/a/b/lib.ts
341+
342+
343+
app.ts
344+
Root file specified for compilation
345+
lib.ts
346+
Root file specified for compilation
347+
348+
Info seq [hh:mm:ss:mss] -----------------------------------------------
349+
Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/b/proj1 WatchType: Missing file
350350
Info seq [hh:mm:ss:mss] Project '/a/b/tsconfig.json' (Configured)
351351
Info seq [hh:mm:ss:mss] Files (1)
352352
@@ -362,10 +362,6 @@ Info seq [hh:mm:ss:mss] response:
362362
After request
363363
364364
PolledWatches::
365-
/a/lib/lib.d.ts:
366-
{"pollingInterval":500} *new*
367-
368-
PolledWatches *deleted*::
369365
/a/lib/lib.d.ts:
370366
{"pollingInterval":500}
371367

‎tests/baselines/reference/tsserver/externalProjects/correctly-handling-add-or-remove-tsconfig---2-with-lazyConfiguredProjectsFromExternalProject.js

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,10 @@ Info seq [hh:mm:ss:mss] request:
163163
"seq": 3,
164164
"type": "request"
165165
}
166+
Info seq [hh:mm:ss:mss] Creating configuration project /a/b/c/tsconfig.json
167+
Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/b/c/tsconfig.json 2000 undefined Project: /a/b/c/tsconfig.json WatchType: Config file
168+
Info seq [hh:mm:ss:mss] Creating configuration project /a/b/d/tsconfig.json
169+
Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/b/d/tsconfig.json 2000 undefined Project: /a/b/d/tsconfig.json WatchType: Config file
166170
Info seq [hh:mm:ss:mss] `remove Project::
167171
Info seq [hh:mm:ss:mss] Project '/a/b/proj1' (External)
168172
Info seq [hh:mm:ss:mss] Files (1)
@@ -174,10 +178,6 @@ Info seq [hh:mm:ss:mss] Files (1)
174178
175179
Info seq [hh:mm:ss:mss] -----------------------------------------------
176180
Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/b/proj1 WatchType: Missing file
177-
Info seq [hh:mm:ss:mss] Creating configuration project /a/b/c/tsconfig.json
178-
Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/b/c/tsconfig.json 2000 undefined Project: /a/b/c/tsconfig.json WatchType: Config file
179-
Info seq [hh:mm:ss:mss] Creating configuration project /a/b/d/tsconfig.json
180-
Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/b/d/tsconfig.json 2000 undefined Project: /a/b/d/tsconfig.json WatchType: Config file
181181
Info seq [hh:mm:ss:mss] Project '/a/b/c/tsconfig.json' (Configured)
182182
Info seq [hh:mm:ss:mss] Files (0) InitialLoadPending
183183
@@ -701,6 +701,18 @@ Info seq [hh:mm:ss:mss] request:
701701
"seq": 5,
702702
"type": "request"
703703
}
704+
Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /a/b/proj1
705+
Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/b/proj1 WatchType: Missing file
706+
Info seq [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /a/b/proj1 projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
707+
Info seq [hh:mm:ss:mss] Project '/a/b/proj1' (External)
708+
Info seq [hh:mm:ss:mss] Files (1)
709+
/a/b/app.ts Text-1 "let x = 1;"
710+
711+
712+
app.ts
713+
Root file specified for compilation
714+
715+
Info seq [hh:mm:ss:mss] -----------------------------------------------
704716
Info seq [hh:mm:ss:mss] `remove Project::
705717
Info seq [hh:mm:ss:mss] Project '/a/b/d/tsconfig.json' (Configured)
706718
Info seq [hh:mm:ss:mss] Files (1)
@@ -717,18 +729,6 @@ Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /a/b/d/tsconfig.json 2
717729
Info seq [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /a/b/d/node_modules/@types 1 undefined Project: /a/b/d/tsconfig.json WatchType: Type roots
718730
Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /a/b/d/node_modules/@types 1 undefined Project: /a/b/d/tsconfig.json WatchType: Type roots
719731
Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/b/d/tsconfig.json WatchType: Missing file
720-
Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /a/b/proj1
721-
Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/b/proj1 WatchType: Missing file
722-
Info seq [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /a/b/proj1 projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
723-
Info seq [hh:mm:ss:mss] Project '/a/b/proj1' (External)
724-
Info seq [hh:mm:ss:mss] Files (1)
725-
/a/b/app.ts Text-1 "let x = 1;"
726-
727-
728-
app.ts
729-
Root file specified for compilation
730-
731-
Info seq [hh:mm:ss:mss] -----------------------------------------------
732732
Info seq [hh:mm:ss:mss] Project '/a/b/proj1' (External)
733733
Info seq [hh:mm:ss:mss] Files (1)
734734

@@ -743,13 +743,11 @@ After request
743743

744744
PolledWatches::
745745
/a/lib/lib.d.ts:
746-
{"pollingInterval":500} *new*
746+
{"pollingInterval":500}
747747

748748
PolledWatches *deleted*::
749749
/a/b/d/node_modules/@types:
750750
{"pollingInterval":500}
751-
/a/lib/lib.d.ts:
752-
{"pollingInterval":500}
753751

754752
FsWatches::
755753
/a/b/app.ts:
@@ -813,6 +811,10 @@ Info seq [hh:mm:ss:mss] request:
813811
"seq": 6,
814812
"type": "request"
815813
}
814+
Info seq [hh:mm:ss:mss] Creating configuration project /a/b/c/tsconfig.json
815+
Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/b/c/tsconfig.json 2000 undefined Project: /a/b/c/tsconfig.json WatchType: Config file
816+
Info seq [hh:mm:ss:mss] Creating configuration project /a/b/d/tsconfig.json
817+
Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/b/d/tsconfig.json 2000 undefined Project: /a/b/d/tsconfig.json WatchType: Config file
816818
Info seq [hh:mm:ss:mss] `remove Project::
817819
Info seq [hh:mm:ss:mss] Project '/a/b/proj1' (External)
818820
Info seq [hh:mm:ss:mss] Files (1)
@@ -824,10 +826,6 @@ Info seq [hh:mm:ss:mss] Files (1)
824826
825827
Info seq [hh:mm:ss:mss] -----------------------------------------------
826828
Info seq [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/b/proj1 WatchType: Missing file
827-
Info seq [hh:mm:ss:mss] Creating configuration project /a/b/c/tsconfig.json
828-
Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/b/c/tsconfig.json 2000 undefined Project: /a/b/c/tsconfig.json WatchType: Config file
829-
Info seq [hh:mm:ss:mss] Creating configuration project /a/b/d/tsconfig.json
830-
Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/b/d/tsconfig.json 2000 undefined Project: /a/b/d/tsconfig.json WatchType: Config file
831829
Info seq [hh:mm:ss:mss] Project '/a/b/c/tsconfig.json' (Configured)
832830
Info seq [hh:mm:ss:mss] Files (0) InitialLoadPending
833831

0 commit comments

Comments
 (0)