Update baselines

2026-04-17 13:48:46 -05:00 · 2026-01-15 19:47:17 +00:00
parent 4baf4e8120
commit 874031c5b9
7 changed files with 5 additions and 265 deletions
--- a/tests/baselines/reference/tsserver/documentRegistry/works-when-reusing-orphan-script-info-with-different-scriptKind.js
+++ b/tests/baselines/reference/tsserver/documentRegistry/works-when-reusing-orphan-script-info-with-different-scriptKind.js
@@ -35,15 +35,6 @@ Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: ^/inmemory/model/6 Pro
 Info seq  [hh:mm:ss:mss] Creating InferredProject: /dev/null/inferredProject1*, currentDirectory: /users/user/projects/san
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.d.ts 500 undefined WatchType: Closed Script info
-<<<<<<< HEAD
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /users/user/projects/san/^ 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /users/user/projects/san/^ 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /users/user/projects/san/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /users/user/projects/san/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /users/user/projects/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /users/user/projects/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-=======
->>>>>>> 4d94ccb06b (Handle resolution watching when its dynamic scriptInfo (#62894))
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /users/user/projects/san/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /users/user/projects/san/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /users/user/projects/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
@@ -82,19 +73,8 @@ Info seq  [hh:mm:ss:mss] response:
 After request

 PolledWatches::
-<<<<<<< HEAD
-/users/user/projects/node_modules: *new*
-  {"pollingInterval":500}
 /users/user/projects/node_modules/@types: *new*
  {"pollingInterval":500}
-/users/user/projects/san/^: *new*
-  {"pollingInterval":500}
-/users/user/projects/san/node_modules: *new*
-  {"pollingInterval":500}
-=======
-/users/user/projects/node_modules/@types: *new*
-  {"pollingInterval":500}
->>>>>>> 4d94ccb06b (Handle resolution watching when its dynamic scriptInfo (#62894))
 /users/user/projects/san/node_modules/@types: *new*
  {"pollingInterval":500}

--- a/tests/baselines/reference/tsserver/dynamicFiles/chat-block-with-imports.js
+++ b/tests/baselines/reference/tsserver/dynamicFiles/chat-block-with-imports.js
@@ -10,6 +10,7 @@ Before request
 {}

 //// [/home/src/tslibs/TS/Lib/lib.d.ts]
+/// <reference no-default-lib="true"/>
 interface Boolean {}
 interface Function {}
 interface CallableFunction {}
@@ -66,7 +67,7 @@ Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /us
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
 Info seq  [hh:mm:ss:mss] 	Files (2)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 "interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };"
+	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 "/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };"
 	/user/username/projects/myproject/a.ts SVC-1-0 ""


@@ -104,7 +105,7 @@ Info seq  [hh:mm:ss:mss] event:
            "tsx": 0,
            "tsxSize": 0,
            "dts": 1,
-            "dtsSize": 374,
+            "dtsSize": 413,
            "deferred": 0,
            "deferredSize": 0
          },
@@ -208,7 +209,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferred
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (2)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 "interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };"
+	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 "/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };"
 	^/chat-editing-snapshot-text-model/ts-nul-authority/c/temp/codeRepo/src/services/user.service.ts SVC-1-0 ""


@@ -289,7 +290,7 @@ Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferred
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject2* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/dev/null/inferredProject2*' (Inferred)
 Info seq  [hh:mm:ss:mss] 	Files (2)
-	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 "interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };"
+	/home/src/tslibs/TS/Lib/lib.d.ts Text-1 "/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };"
 	^/vscode-chat-code-block/dnnjb2rllwnoyxqtc2vzc2lvbjovl2xvy2fsl1peag1oelv6tkdvde9uvtvnuzawtxpbnuxxstrare10tvrobfpuvtbpvgmytudwaq/response_6b1244f1-9aca-4b8b-8f65-0ff7ed4e6b4e/2#{"references":[]} SVC-1-0 "import { UserService from './src/services/user.service';}"


--- a/tests/baselines/reference/tsserver/maxNodeModuleJsDepth/handles-resolutions-when-currentNodeModulesDepth-changes-when-referencing-file-from-another-file.js
+++ b/tests/baselines/reference/tsserver/maxNodeModuleJsDepth/handles-resolutions-when-currentNodeModulesDepth-changes-when-referencing-file-from-another-file.js
@@ -314,57 +314,6 @@ Info seq  [hh:mm:ss:mss] response:
    }
 After request

-<<<<<<< HEAD
-PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
-/user/username/projects/node_modules:
-  {"pollingInterval":500}
-/user/username/projects/package.json:
-  {"pollingInterval":2000}
-/user/username/projects/project1/jsconfig.json:
-  {"pollingInterval":2000}
-/user/username/projects/project1/node_modules:
-  {"pollingInterval":500}
-/user/username/projects/project1/package.json:
-  {"pollingInterval":2000}
-/user/username/projects/project1/src/bower_components: *new*
-  {"pollingInterval":500}
-/user/username/projects/project1/src/jsconfig.json:
-  {"pollingInterval":2000}
-/user/username/projects/project1/src/node_modules/glob/package.json:
-  {"pollingInterval":2000}
-/user/username/projects/project1/src/node_modules/minimatch/package.json:
-  {"pollingInterval":2000}
-/user/username/projects/project1/src/node_modules/package.json:
-  {"pollingInterval":2000}
-/user/username/projects/project1/src/node_modules/path/package.json:
-  {"pollingInterval":2000}
-/user/username/projects/project1/src/package.json:
-  {"pollingInterval":2000}
-/user/username/projects/project1/src/tsconfig.json:
-  {"pollingInterval":2000}
-/user/username/projects/project1/tsconfig.json:
-  {"pollingInterval":2000}
-
-FsWatches::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {}
-
-FsWatchesRecursive::
-/user/username/projects/project1/src/node_modules:
-  {}
-
-=======
->>>>>>> 4d94ccb06b (Handle resolution watching when its dynamic scriptInfo (#62894))
 Projects::
 /dev/null/inferredProject1* (Inferred) *changed*
    projectStateVersion: 1
--- a/tests/baselines/reference/tsserver/projects/file-with-name-constructor.js-doesnt-cause-issue-with-typeAcquisition-when-safe-type-list.js
+++ b/tests/baselines/reference/tsserver/projects/file-with-name-constructor.js-doesnt-cause-issue-with-typeAcquisition-when-safe-type-list.js
@@ -322,35 +322,6 @@ Info seq  [hh:mm:ss:mss] response:
    }
 After request

-<<<<<<< HEAD
-PolledWatches::
-/home/src/Vscode/Projects/bin/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
-/user/username/projects/node_modules:
-  {"pollingInterval":500}
-/user/username/projects/project/bower_components: *new*
-  {"pollingInterval":500}
-/user/username/projects/project/node_modules:
-  {"pollingInterval":500}
-
-FsWatches::
-/home/src/tslibs/TS/Lib/lib.d.ts:
-  {}
-/user/username/projects/project/constructor.js:
-  {}
-/user/username/projects/project/f1.js:
-  {}
-
-=======
->>>>>>> 4d94ccb06b (Handle resolution watching when its dynamic scriptInfo (#62894))
 Projects::
 project (External) *changed*
    projectStateVersion: 1
--- a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-failing.js
+++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-failing.js
@@ -168,17 +168,7 @@ PolledWatches::

 FsWatches::
 /home/src/Library/Caches/typescript/package.json: *new*
-<<<<<<< HEAD
  {"inode":116}
-/home/src/Vscode: *new*
-  {"inode":10}
-/home/src/Vscode/Projects: *new*
-  {"inode":11}
-/home/src/Vscode/Projects/bin: *new*
-  {"inode":12}
-=======
-  {"inode":117}
->>>>>>> 4d94ccb06b (Handle resolution watching when its dynamic scriptInfo (#62894))
 /home/src/tslibs/TS/Lib/lib.es2020.full.d.ts: *new*
  {"inode":22}

@@ -342,49 +332,6 @@ Info seq  [hh:mm:ss:mss] response:
    }
 After request

-<<<<<<< HEAD
-PolledWatches::
-/home/src/Library/Caches/typescript/node_modules/@types/node/package.json:
-  {"pollingInterval":2000}
-/home/src/Library/Caches/typescript/node_modules/@types/package.json:
-  {"pollingInterval":2000}
-/home/src/Library/Caches/typescript/node_modules/package.json:
-  {"pollingInterval":2000}
-/home/src/Vscode/Projects/bin/^:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
-
-FsWatches::
-/home/src/Library/Caches/typescript/package.json:
-  {"inode":116}
-/home/src/Vscode:
-  {"inode":10}
-/home/src/Vscode/Projects:
-  {"inode":11}
-/home/src/Vscode/Projects/bin:
-  {"inode":12}
-/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts:
-  {"inode":22}
-
-FsWatchesRecursive::
-/home/src/Library/Caches/typescript/node_modules:
-  {"inode":6}
-
-=======
->>>>>>> 4d94ccb06b (Handle resolution watching when its dynamic scriptInfo (#62894))
 Projects::
 /dev/null/inferredProject1* (Inferred) *changed*
    projectStateVersion: 1
--- a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file.js
+++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file.js
@@ -177,17 +177,7 @@ PolledWatches::

 FsWatches::
 /home/src/Library/Caches/typescript/package.json: *new*
-<<<<<<< HEAD
  {"inode":118}
-/home/src/Vscode: *new*
-  {"inode":12}
-/home/src/Vscode/Projects: *new*
-  {"inode":13}
-/home/src/Vscode/Projects/bin: *new*
-  {"inode":14}
-=======
-  {"inode":119}
->>>>>>> 4d94ccb06b (Handle resolution watching when its dynamic scriptInfo (#62894))
 /home/src/tslibs/TS/Lib/lib.es2020.full.d.ts: *new*
  {"inode":24}

@@ -345,51 +335,6 @@ Info seq  [hh:mm:ss:mss] response:
    }
 After request

-<<<<<<< HEAD
-PolledWatches::
-/home/src/Library/Caches/typescript/node_modules/@types/node/package.json:
-  {"pollingInterval":2000}
-/home/src/Library/Caches/typescript/node_modules/@types/package.json:
-  {"pollingInterval":2000}
-/home/src/Library/Caches/typescript/node_modules/@types/undici-types/package.json:
-  {"pollingInterval":2000}
-/home/src/Library/Caches/typescript/node_modules/package.json:
-  {"pollingInterval":2000}
-/home/src/Vscode/Projects/bin/^:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
-
-FsWatches::
-/home/src/Library/Caches/typescript/package.json:
-  {"inode":118}
-/home/src/Vscode:
-  {"inode":12}
-/home/src/Vscode/Projects:
-  {"inode":13}
-/home/src/Vscode/Projects/bin:
-  {"inode":14}
-/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts:
-  {"inode":24}
-
-FsWatchesRecursive::
-/home/src/Library/Caches/typescript/node_modules:
-  {"inode":6}
-
-=======
->>>>>>> 4d94ccb06b (Handle resolution watching when its dynamic scriptInfo (#62894))
 Projects::
 /dev/null/inferredProject1* (Inferred) *changed*
    projectStateVersion: 1
--- a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-relative-import-from-the-cache-file.js
+++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-relative-import-from-the-cache-file.js
@@ -164,17 +164,7 @@ PolledWatches::

 FsWatches::
 /home/src/Library/Caches/typescript/package.json: *new*
-<<<<<<< HEAD
  {"inode":117}
-/home/src/Vscode: *new*
-  {"inode":11}
-/home/src/Vscode/Projects: *new*
-  {"inode":12}
-/home/src/Vscode/Projects/bin: *new*
-  {"inode":13}
-=======
-  {"inode":118}
->>>>>>> 4d94ccb06b (Handle resolution watching when its dynamic scriptInfo (#62894))
 /home/src/tslibs/TS/Lib/lib.es2020.full.d.ts: *new*
  {"inode":23}

@@ -332,49 +322,6 @@ Info seq  [hh:mm:ss:mss] response:
    }
 After request

-<<<<<<< HEAD
-PolledWatches::
-/home/src/Library/Caches/typescript/node_modules/@types/node/package.json:
-  {"pollingInterval":2000}
-/home/src/Library/Caches/typescript/node_modules/@types/package.json:
-  {"pollingInterval":2000}
-/home/src/Library/Caches/typescript/node_modules/package.json:
-  {"pollingInterval":2000}
-/home/src/Vscode/Projects/bin/^:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/bower_components: *new*
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/bin/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/Projects/node_modules/@types:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules:
-  {"pollingInterval":500}
-/home/src/Vscode/node_modules/@types:
-  {"pollingInterval":500}
-
-FsWatches::
-/home/src/Library/Caches/typescript/package.json:
-  {"inode":117}
-/home/src/Vscode:
-  {"inode":11}
-/home/src/Vscode/Projects:
-  {"inode":12}
-/home/src/Vscode/Projects/bin:
-  {"inode":13}
-/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts:
-  {"inode":23}
-
-FsWatchesRecursive::
-/home/src/Library/Caches/typescript/node_modules:
-  {"inode":6}
-
-=======
->>>>>>> 4d94ccb06b (Handle resolution watching when its dynamic scriptInfo (#62894))
 Projects::
 /dev/null/inferredProject1* (Inferred) *changed*
    projectStateVersion: 1