From 521d3fb2d19d0b2787a49920d4f743aa12c2ebfd Mon Sep 17 00:00:00 2001
From: TypeScript Bot <ts_bot@rcavanaugh.com>
Date: Wed, 27 Mar 2024 14:22:58 -0700
Subject: [PATCH 1/8] =?UTF-8?q?=F0=9F=A4=96=20Pick=20PR=20#57950=20(Watch?=
 =?UTF-8?q?=20events=20enhancements)=20into=20release-5.4=20(#57967)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Sheetal Nandi <shkamat@microsoft.com>
---
 src/server/editorServices.ts                  |  56 +-
 src/server/protocol.ts                        |   9 +-
 .../unittests/tsserver/events/watchEvents.ts  | 172 +++-
 tests/baselines/reference/api/typescript.d.ts |   8 +-
 .../canUseWatchEvents-without-canUseEvents.js | 264 +++++-
 .../events/watchEvents/canUseWatchEvents.js   | 814 ++++++++++++++++--
 6 files changed, 1190 insertions(+), 133 deletions(-)

diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
index a1480723b8b93..d8ee13561b397 100644
--- a/src/server/editorServices.ts
+++ b/src/server/editorServices.ts
@@ -933,7 +933,16 @@ function createWatchFactoryHostUsingWatchEvents(service: ProjectService, canUseW
             recursive ? watchedDirectoriesRecursive : watchedDirectories,
             path,
             callback,
-            id => ({ eventName: CreateDirectoryWatcherEvent, data: { id, path, recursive: !!recursive } }),
+            id => ({
+                eventName: CreateDirectoryWatcherEvent,
+                data: {
+                    id,
+                    path,
+                    recursive: !!recursive,
+                    // Special case node_modules as we watch it for changes to closed script infos as well
+                    ignoreUpdate: !path.endsWith("/node_modules") ? true : undefined,
+                },
+            }),
         );
     }
     function getOrCreateFileWatcher<T>(
@@ -963,37 +972,32 @@ function createWatchFactoryHostUsingWatchEvents(service: ProjectService, canUseW
             },
         };
     }
-    function onWatchChange({ id, path, eventType }: protocol.WatchChangeRequestArgs) {
-        // console.log(`typescript-vscode-watcher:: Invoke:: ${id}:: ${path}:: ${eventType}`);
-        onFileWatcherCallback(id, path, eventType);
-        onDirectoryWatcherCallback(watchedDirectories, id, path, eventType);
-        onDirectoryWatcherCallback(watchedDirectoriesRecursive, id, path, eventType);
+    function onWatchChange(args: protocol.WatchChangeRequestArgs | readonly protocol.WatchChangeRequestArgs[]) {
+        if (isArray(args)) args.forEach(onWatchChangeRequestArgs);
+        else onWatchChangeRequestArgs(args);
     }
 
-    function onFileWatcherCallback(
-        id: number,
-        eventPath: string,
-        eventType: "create" | "delete" | "update",
-    ) {
-        watchedFiles.idToCallbacks.get(id)?.forEach(callback => {
-            const eventKind = eventType === "create" ?
-                FileWatcherEventKind.Created :
-                eventType === "delete" ?
-                FileWatcherEventKind.Deleted :
-                FileWatcherEventKind.Changed;
-            callback(eventPath, eventKind);
-        });
+    function onWatchChangeRequestArgs({ id, created, deleted, updated }: protocol.WatchChangeRequestArgs) {
+        onWatchEventType(id, created, FileWatcherEventKind.Created);
+        onWatchEventType(id, deleted, FileWatcherEventKind.Deleted);
+        onWatchEventType(id, updated, FileWatcherEventKind.Changed);
+    }
+
+    function onWatchEventType(id: number, paths: readonly string[] | undefined, eventKind: FileWatcherEventKind) {
+        if (!paths?.length) return;
+        forEachCallback(watchedFiles, id, paths, (callback, eventPath) => callback(eventPath, eventKind));
+        forEachCallback(watchedDirectories, id, paths, (callback, eventPath) => callback(eventPath));
+        forEachCallback(watchedDirectoriesRecursive, id, paths, (callback, eventPath) => callback(eventPath));
     }
 
-    function onDirectoryWatcherCallback(
-        { idToCallbacks }: HostWatcherMap<DirectoryWatcherCallback>,
+    function forEachCallback<T>(
+        hostWatcherMap: HostWatcherMap<T>,
         id: number,
-        eventPath: string,
-        eventType: "create" | "delete" | "update",
+        eventPaths: readonly string[],
+        cb: (callback: T, eventPath: string) => void,
     ) {
-        if (eventType === "update") return;
-        idToCallbacks.get(id)?.forEach(callback => {
-            callback(eventPath);
+        hostWatcherMap.idToCallbacks.get(id)?.forEach(callback => {
+            eventPaths.forEach(eventPath => cb(callback, eventPath));
         });
     }
 }
diff --git a/src/server/protocol.ts b/src/server/protocol.ts
index e61c2393f1d14..25910e021990a 100644
--- a/src/server/protocol.ts
+++ b/src/server/protocol.ts
@@ -1960,13 +1960,13 @@ export interface CloseRequest extends FileRequest {
 
 export interface WatchChangeRequest extends Request {
     command: CommandTypes.WatchChange;
-    arguments: WatchChangeRequestArgs;
+    arguments: WatchChangeRequestArgs | readonly WatchChangeRequestArgs[];
 }
-
 export interface WatchChangeRequestArgs {
     id: number;
-    path: string;
-    eventType: "create" | "delete" | "update";
+    created?: string[];
+    deleted?: string[];
+    updated?: string[];
 }
 
 /**
@@ -3052,6 +3052,7 @@ export interface CreateDirectoryWatcherEventBody {
     readonly id: number;
     readonly path: string;
     readonly recursive: boolean;
+    readonly ignoreUpdate?: boolean;
 }
 
 export type CloseFileWatcherEventName = "closeFileWatcher";
diff --git a/src/testRunner/unittests/tsserver/events/watchEvents.ts b/src/testRunner/unittests/tsserver/events/watchEvents.ts
index 0a6028dcda33d..88c6450a7ae52 100644
--- a/src/testRunner/unittests/tsserver/events/watchEvents.ts
+++ b/src/testRunner/unittests/tsserver/events/watchEvents.ts
@@ -4,6 +4,7 @@ import {
 } from "../../../../harness/tsserverLogger";
 import {
     createWatchUtils,
+    Watches,
     WatchUtils,
 } from "../../../../harness/watchUtils";
 import * as ts from "../../../_namespaces/ts";
@@ -60,11 +61,11 @@ describe("unittests:: tsserver:: events:: watchEvents", () => {
         }
 
         function watchDirectory(data: ts.server.protocol.CreateDirectoryWatcherEventBody) {
-            logger.log(`Custom watchDirectory: ${data.id}: ${data.path} ${data.recursive}`);
+            logger.log(`Custom watchDirectory: ${data.id}: ${data.path} ${data.recursive} ${data.ignoreUpdate}`);
             ts.Debug.assert(!idToClose.has(data.id));
             const result = host.factoryData.watchUtils.fsWatch(data.path, data.recursive, data);
             idToClose.set(data.id, () => {
-                logger.log(`Custom watchDirectory:: Close:: ${data.id}: ${data.path} ${data.recursive}`);
+                logger.log(`Custom watchDirectory:: Close:: ${data.id}: ${data.path} ${data.recursive} ${data.ignoreUpdate}`);
                 result.close();
             });
         }
@@ -89,37 +90,132 @@ describe("unittests:: tsserver:: events:: watchEvents", () => {
         }
     }
 
-    function updateFileOnHost(session: TestSession, file: string, log: string) {
+    function updateFileOnHost(session: TestSession, file: string, log: string, content?: string) {
         // Change b.ts
-        session.logger.log(log);
-        session.host.writeFile(file, session.host.readFile("/user/username/projects/myproject/a.ts")!);
+        session.logger.log(`${log}: ${file}`);
+        if (content) session.host.appendFile(file, content);
+        else session.host.writeFile(file, session.host.readFile("/user/username/projects/myproject/a.ts")!);
         session.host.runQueuedTimeoutCallbacks();
     }
 
+    function collectWatchChanges<T extends ts.server.protocol.CreateFileWatcherEventBody | ts.server.protocol.CreateDirectoryWatcherEventBody>(
+        session: TestSession,
+        watches: Watches<T>,
+        path: string,
+        eventPath: string,
+        eventType: "created" | "deleted" | "updated",
+        ignoreUpdate?: (data: T) => boolean,
+    ) {
+        session.logger.log(`Custom watch:: ${path} ${eventPath} ${eventType}`);
+        let result: ts.server.protocol.WatchChangeRequestArgs[] | undefined;
+        watches.forEach(
+            path,
+            data => {
+                if (ignoreUpdate?.(data)) return;
+                switch (eventType) {
+                    case "created":
+                        (result ??= []).push({ id: data.id, created: [eventPath] });
+                        break;
+                    case "deleted":
+                        (result ??= []).push({ id: data.id, deleted: [eventPath] });
+                        break;
+                    case "updated":
+                        (result ??= []).push({ id: data.id, updated: [eventPath] });
+                        break;
+                    default:
+                        ts.Debug.assertNever(eventType);
+                }
+            },
+        );
+        return result;
+    }
+
+    function collectDirectoryWatcherChanges(
+        session: TestSession,
+        dir: string,
+        eventPath: string,
+        eventType: "created" | "deleted" | "updated",
+    ) {
+        return collectWatchChanges(
+            session,
+            (session.logger.host as TestServerHostWithCustomWatch).factoryData.watchUtils.fsWatchesRecursive,
+            dir,
+            eventPath,
+            eventType,
+            data => !!data.ignoreUpdate && eventType === "updated",
+        );
+    }
+
+    function collectFileWatcherChanges(
+        session: TestSession,
+        file: string,
+        eventType: "created" | "deleted" | "updated",
+    ) {
+        return collectWatchChanges(
+            session,
+            (session.logger.host as TestServerHostWithCustomWatch).factoryData.watchUtils.pollingWatches,
+            file,
+            file,
+            eventType,
+        );
+    }
+
+    function invokeWatchChange(
+        session: TestSession,
+        ...args: (ts.server.protocol.WatchChangeRequestArgs[] | undefined)[]
+    ) {
+        let result: Map<number, ts.server.protocol.WatchChangeRequestArgs> | undefined;
+        args.forEach(arg =>
+            arg?.forEach(value => {
+                result ??= new Map();
+                const valueInResult = result.get(value.id);
+                if (!valueInResult) result.set(value.id, value);
+                else {
+                    valueInResult.created = ts.combine(valueInResult.created, value.created);
+                    valueInResult.deleted = ts.combine(valueInResult.deleted, value.deleted);
+                    valueInResult.updated = ts.combine(valueInResult.updated, value.updated);
+                }
+            })
+        );
+        if (result) {
+            session.executeCommandSeq<ts.server.protocol.WatchChangeRequest>({
+                command: ts.server.protocol.CommandTypes.WatchChange,
+                arguments: ts.singleOrMany(ts.arrayFrom(result.values())),
+            });
+        }
+    }
+
     function addFile(session: TestSession, path: string) {
         updateFileOnHost(session, path, "Add file");
-        session.logger.log("Custom watch");
-        (session.logger.host as TestServerHostWithCustomWatch).factoryData.watchUtils.fsWatchesRecursive.forEach(
-            "/user/username/projects/myproject",
-            data =>
-                session.executeCommandSeq<ts.server.protocol.WatchChangeRequest>({
-                    command: ts.server.protocol.CommandTypes.WatchChange,
-                    arguments: { id: data.id, path, eventType: "create" },
-                }),
+        invokeWatchChange(
+            session,
+            collectDirectoryWatcherChanges(session, "/user/username/projects/myproject", path, "created"),
         );
         session.host.runQueuedTimeoutCallbacks();
     }
 
-    function changeFile(session: TestSession, path: string) {
-        updateFileOnHost(session, path, "Change File");
-        session.logger.log("Custom watch");
-        (session.logger.host as TestServerHostWithCustomWatch).factoryData.watchUtils.pollingWatches.forEach(
-            path,
-            data =>
-                session.executeCommandSeq<ts.server.protocol.WatchChangeRequest>({
-                    command: ts.server.protocol.CommandTypes.WatchChange,
-                    arguments: { id: data.id, path, eventType: "update" },
-                }),
+    function changeFile(session: TestSession, path: string, content?: string) {
+        updateFileOnHost(session, path, "Change File", content);
+        invokeWatchChange(
+            session,
+            collectFileWatcherChanges(session, path, "updated"),
+            collectDirectoryWatcherChanges(session, ts.getDirectoryPath(path), path, "updated"),
+        );
+        session.host.runQueuedTimeoutCallbacks();
+    }
+
+    function npmInstall(session: TestSession) {
+        session.logger.log("update with npm install");
+        session.host.appendFile("/user/username/projects/myproject/node_modules/something/index.d.ts", `export const y = 20;`);
+        session.host.runQueuedTimeoutCallbacks();
+        invokeWatchChange(
+            session,
+            collectDirectoryWatcherChanges(
+                session,
+                "/user/username/projects/myproject/node_modules",
+                "/user/username/projects/myproject/node_modules/something/index.d.ts",
+                "updated",
+            ),
         );
         session.host.runQueuedTimeoutCallbacks();
     }
@@ -129,6 +225,8 @@ describe("unittests:: tsserver:: events:: watchEvents", () => {
             "/user/username/projects/myproject/tsconfig.json": "{}",
             "/user/username/projects/myproject/a.ts": `export class a { prop = "hello"; foo() { return this.prop; } }`,
             "/user/username/projects/myproject/b.ts": `export class b { prop = "hello"; foo() { return this.prop; } }`,
+            "/user/username/projects/myproject/m.ts": `import { x } from "something"`,
+            "/user/username/projects/myproject/node_modules/something/index.d.ts": `export const x = 10;`,
             [libFile.path]: libFile.content,
         });
         const logger = createLoggerWithInMemoryLogs(inputHost);
@@ -153,6 +251,26 @@ describe("unittests:: tsserver:: events:: watchEvents", () => {
         // Re watch
         closeFilesForSession(["/user/username/projects/myproject/b.ts"], session);
 
+        // Update c.ts
+        changeFile(session, "/user/username/projects/myproject/c.ts", `export const y = 20;`);
+
+        // Update with npm install
+        npmInstall(session);
+        host.runQueuedTimeoutCallbacks();
+
+        // Add and change multiple files - combine and send multiple requests together
+        updateFileOnHost(session, "/user/username/projects/myproject/d.ts", "Add file");
+        updateFileOnHost(session, "/user/username/projects/myproject/c.ts", "Change File", `export const z = 30;`);
+        updateFileOnHost(session, "/user/username/projects/myproject/e.ts", "Add File");
+        invokeWatchChange(
+            session,
+            collectDirectoryWatcherChanges(session, "/user/username/projects/myproject", "/user/username/projects/myproject/d.ts", "created"),
+            collectFileWatcherChanges(session, "/user/username/projects/myproject/c.ts", "updated"),
+            collectDirectoryWatcherChanges(session, "/user/username/projects/myproject", "/user/username/projects/myproject/c.ts", "updated"),
+            collectDirectoryWatcherChanges(session, "/user/username/projects/myproject", "/user/username/projects/myproject/e.ts", "created"),
+        );
+        session.host.runQueuedTimeoutCallbacks();
+
         baselineTsserverLogs("events/watchEvents", `canUseWatchEvents`, session);
         function handleWatchEvents(event: ts.server.ProjectServiceEvent) {
             switch (event.eventName) {
@@ -192,9 +310,15 @@ describe("unittests:: tsserver:: events:: watchEvents", () => {
         logger.msg = (s, type) => logger.info(`${type}:: ${s}`);
         session.executeCommandSeq<ts.server.protocol.WatchChangeRequest>({
             command: ts.server.protocol.CommandTypes.WatchChange,
-            arguments: { id: 1, path: "/user/username/projects/myproject/b.ts", eventType: "update" },
+            arguments: { id: 1, updated: ["/user/username/projects/myproject/b.ts"] },
         });
 
+        // Update c.ts
+        changeFile(session, "/user/username/projects/myproject/c.ts", `export const y = 20;`);
+
+        // Update with npm install
+        npmInstall(session);
+
         baselineTsserverLogs("events/watchEvents", `canUseWatchEvents without canUseEvents`, session);
     });
 });
diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts
index a131733463740..ae8aa63c572e0 100644
--- a/tests/baselines/reference/api/typescript.d.ts
+++ b/tests/baselines/reference/api/typescript.d.ts
@@ -1510,12 +1510,13 @@ declare namespace ts {
             }
             interface WatchChangeRequest extends Request {
                 command: CommandTypes.WatchChange;
-                arguments: WatchChangeRequestArgs;
+                arguments: WatchChangeRequestArgs | readonly WatchChangeRequestArgs[];
             }
             interface WatchChangeRequestArgs {
                 id: number;
-                path: string;
-                eventType: "create" | "delete" | "update";
+                created?: string[];
+                deleted?: string[];
+                updated?: string[];
             }
             /**
              * Request to obtain the list of files that should be regenerated if target file is recompiled.
@@ -2452,6 +2453,7 @@ declare namespace ts {
                 readonly id: number;
                 readonly path: string;
                 readonly recursive: boolean;
+                readonly ignoreUpdate?: boolean;
             }
             type CloseFileWatcherEventName = "closeFileWatcher";
             interface CloseFileWatcherEvent extends Event {
diff --git a/tests/baselines/reference/tsserver/events/watchEvents/canUseWatchEvents-without-canUseEvents.js b/tests/baselines/reference/tsserver/events/watchEvents/canUseWatchEvents-without-canUseEvents.js
index f4967a6194cc0..103fa17f1687b 100644
--- a/tests/baselines/reference/tsserver/events/watchEvents/canUseWatchEvents-without-canUseEvents.js
+++ b/tests/baselines/reference/tsserver/events/watchEvents/canUseWatchEvents-without-canUseEvents.js
@@ -10,6 +10,12 @@ export class a { prop = "hello"; foo() { return this.prop; } }
 //// [/user/username/projects/myproject/b.ts]
 export class b { prop = "hello"; foo() { return this.prop; } }
 
+//// [/user/username/projects/myproject/m.ts]
+import { x } from "something"
+
+//// [/user/username/projects/myproject/node_modules/something/index.d.ts]
+export const x = 10;
+
 //// [/a/lib/lib.d.ts]
 /// <reference no-default-lib="true"/>
 interface Boolean {}
@@ -40,7 +46,8 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/project
 Info seq  [hh:mm:ss:mss] Config: /user/username/projects/myproject/tsconfig.json : {
  "rootNames": [
   "/user/username/projects/myproject/a.ts",
-  "/user/username/projects/myproject/b.ts"
+  "/user/username/projects/myproject/b.ts",
+  "/user/username/projects/myproject/m.ts"
  ],
  "options": {
   "configFilePath": "/user/username/projects/myproject/tsconfig.json"
@@ -49,18 +56,25 @@ Info seq  [hh:mm:ss:mss] Config: /user/username/projects/myproject/tsconfig.json
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/m.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: 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:: Added:: 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:: Added:: WatchInfo: /user/username/projects/node_modules/@types 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node_modules/@types 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Type roots
 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 (3)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 	/a/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; }"
 	/user/username/projects/myproject/a.ts SVC-1-0 "export class a { prop = \"hello\"; foo() { return this.prop; } }"
 	/user/username/projects/myproject/b.ts Text-1 "export class b { prop = \"hello\"; foo() { return this.prop; } }"
+	/user/username/projects/myproject/node_modules/something/index.d.ts Text-1 "export const x = 10;"
+	/user/username/projects/myproject/m.ts Text-1 "import { x } from \"something\""
 
 
 	../../../../a/lib/lib.d.ts
@@ -69,10 +83,14 @@ Info seq  [hh:mm:ss:mss] 	Files (3)
 	  Matched by default include pattern '**/*'
 	b.ts
 	  Matched by default include pattern '**/*'
+	node_modules/something/index.d.ts
+	  Imported via "something" from file 'm.ts'
+	m.ts
+	  Matched by default include pattern '**/*'
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (3)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Open files: 
@@ -95,12 +113,16 @@ FsWatches::
   {}
 /user/username/projects/myproject/b.ts: *new*
   {}
+/user/username/projects/myproject/m.ts: *new*
+  {}
 /user/username/projects/myproject/tsconfig.json: *new*
   {}
 
 FsWatchesRecursive::
 /user/username/projects/myproject: *new*
   {}
+/user/username/projects/myproject/node_modules: *new*
+  {}
 
 Projects::
 /user/username/projects/myproject/tsconfig.json (Configured) *new*
@@ -120,8 +142,16 @@ ScriptInfos::
     version: Text-1
     containingProjects: 1
         /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/m.ts *new*
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/node_modules/something/index.d.ts *new*
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
 
-Add file
+Add file: /user/username/projects/myproject/c.ts
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /user/username/projects/myproject/c.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
 Info seq  [hh:mm:ss:mss] Scheduled: /user/username/projects/myproject/tsconfig.json
 Info seq  [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*
@@ -148,10 +178,12 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/project
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 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 (4)
+Info seq  [hh:mm:ss:mss] 	Files (6)
 	/a/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; }"
 	/user/username/projects/myproject/a.ts SVC-1-0 "export class a { prop = \"hello\"; foo() { return this.prop; } }"
 	/user/username/projects/myproject/b.ts Text-1 "export class b { prop = \"hello\"; foo() { return this.prop; } }"
+	/user/username/projects/myproject/node_modules/something/index.d.ts Text-1 "export const x = 10;"
+	/user/username/projects/myproject/m.ts Text-1 "import { x } from \"something\""
 	/user/username/projects/myproject/c.ts Text-1 "export class a { prop = \"hello\"; foo() { return this.prop; } }"
 
 
@@ -161,6 +193,10 @@ Info seq  [hh:mm:ss:mss] 	Files (4)
 	  Matched by default include pattern '**/*'
 	b.ts
 	  Matched by default include pattern '**/*'
+	node_modules/something/index.d.ts
+	  Imported via "something" from file 'm.ts'
+	m.ts
+	  Matched by default include pattern '**/*'
 	c.ts
 	  Matched by default include pattern '**/*'
 
@@ -168,7 +204,7 @@ Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles*
 Info seq  [hh:mm:ss:mss] Before ensureProjectForOpenFiles:
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (4)
+Info seq  [hh:mm:ss:mss] 	Files (6)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Open files: 
@@ -176,7 +212,7 @@ Info seq  [hh:mm:ss:mss] 	FileName: /user/username/projects/myproject/a.ts Proje
 Info seq  [hh:mm:ss:mss] 		Projects: /user/username/projects/myproject/tsconfig.json
 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 (4)
+Info seq  [hh:mm:ss:mss] 	Files (6)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Open files: 
@@ -197,12 +233,16 @@ FsWatches::
   {}
 /user/username/projects/myproject/c.ts: *new*
   {}
+/user/username/projects/myproject/m.ts:
+  {}
 /user/username/projects/myproject/tsconfig.json:
   {}
 
 FsWatchesRecursive::
 /user/username/projects/myproject:
   {}
+/user/username/projects/myproject/node_modules:
+  {}
 
 Projects::
 /user/username/projects/myproject/tsconfig.json (Configured) *changed*
@@ -227,13 +267,21 @@ ScriptInfos::
     version: Text-1
     containingProjects: 1
         /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/m.ts
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/node_modules/something/index.d.ts
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
 
-Custom watch
+Custom watch:: /user/username/projects/myproject /user/username/projects/myproject/c.ts created
 Before running Timeout callback:: count: 0
 
 After running Timeout callback:: count: 0
 
-Change File
+Change File: /user/username/projects/myproject/b.ts
 Info seq  [hh:mm:ss:mss] FileWatcher:: Triggered with /user/username/projects/myproject/b.ts 1:: WatchInfo: /user/username/projects/myproject/b.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Scheduled: /user/username/projects/myproject/tsconfig.json
 Info seq  [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*
@@ -273,22 +321,32 @@ ScriptInfos::
     version: Text-1
     containingProjects: 1
         /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/m.ts
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/node_modules/something/index.d.ts
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
 
 Info seq  [hh:mm:ss:mss] Running: /user/username/projects/myproject/tsconfig.json
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json projectStateVersion: 3 projectProgramVersion: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (4)
+Info seq  [hh:mm:ss:mss] 	Files (6)
 	/a/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; }"
 	/user/username/projects/myproject/a.ts SVC-1-0 "export class a { prop = \"hello\"; foo() { return this.prop; } }"
 	/user/username/projects/myproject/b.ts Text-2 "export class a { prop = \"hello\"; foo() { return this.prop; } }"
+	/user/username/projects/myproject/node_modules/something/index.d.ts Text-1 "export const x = 10;"
+	/user/username/projects/myproject/m.ts Text-1 "import { x } from \"something\""
 	/user/username/projects/myproject/c.ts Text-1 "export class a { prop = \"hello\"; foo() { return this.prop; } }"
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles*
 Info seq  [hh:mm:ss:mss] Before ensureProjectForOpenFiles:
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (4)
+Info seq  [hh:mm:ss:mss] 	Files (6)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Open files: 
@@ -296,7 +354,7 @@ Info seq  [hh:mm:ss:mss] 	FileName: /user/username/projects/myproject/a.ts Proje
 Info seq  [hh:mm:ss:mss] 		Projects: /user/username/projects/myproject/tsconfig.json
 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 (4)
+Info seq  [hh:mm:ss:mss] 	Files (6)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Open files: 
@@ -328,8 +386,17 @@ ScriptInfos::
     version: Text-1
     containingProjects: 1
         /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/m.ts
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/node_modules/something/index.d.ts
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
 
-Custom watch
+Custom watch:: /user/username/projects/myproject/b.ts /user/username/projects/myproject/b.ts updated
+Custom watch:: /user/username/projects/myproject /user/username/projects/myproject/b.ts updated
 Before running Timeout callback:: count: 0
 
 After running Timeout callback:: count: 0
@@ -349,7 +416,7 @@ Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: /user/username/project
 Info seq  [hh:mm:ss:mss] Search path: /user/username/projects/myproject
 Info seq  [hh:mm:ss:mss] For info: /user/username/projects/myproject/b.ts :: Config file name: /user/username/projects/myproject/tsconfig.json
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (4)
+Info seq  [hh:mm:ss:mss] 	Files (6)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Open files: 
@@ -374,6 +441,8 @@ FsWatches::
   {}
 /user/username/projects/myproject/c.ts:
   {}
+/user/username/projects/myproject/m.ts:
+  {}
 /user/username/projects/myproject/tsconfig.json:
   {}
 
@@ -384,6 +453,8 @@ FsWatches *deleted*::
 FsWatchesRecursive::
 /user/username/projects/myproject:
   {}
+/user/username/projects/myproject/node_modules:
+  {}
 
 ScriptInfos::
 /a/lib/lib.d.ts
@@ -403,6 +474,14 @@ ScriptInfos::
     version: Text-1
     containingProjects: 1
         /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/m.ts
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/node_modules/something/index.d.ts
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
 
 Before request
 
@@ -417,7 +496,7 @@ Info seq  [hh:mm:ss:mss] request:
     }
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (4)
+Info seq  [hh:mm:ss:mss] 	Files (6)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Open files: 
@@ -442,12 +521,16 @@ FsWatches::
   {}
 /user/username/projects/myproject/c.ts:
   {}
+/user/username/projects/myproject/m.ts:
+  {}
 /user/username/projects/myproject/tsconfig.json:
   {}
 
 FsWatchesRecursive::
 /user/username/projects/myproject:
   {}
+/user/username/projects/myproject/node_modules:
+  {}
 
 ScriptInfos::
 /a/lib/lib.d.ts
@@ -467,6 +550,14 @@ ScriptInfos::
     version: Text-1
     containingProjects: 1
         /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/m.ts
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/node_modules/something/index.d.ts
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
 
 Before request
 
@@ -475,8 +566,9 @@ Info seq  [hh:mm:ss:mss] request:
       "command": "watchChange",
       "arguments": {
         "id": 1,
-        "path": "/user/username/projects/myproject/b.ts",
-        "eventType": "update"
+        "updated": [
+          "/user/username/projects/myproject/b.ts"
+        ]
       },
       "seq": 4,
       "type": "request"
@@ -486,8 +578,9 @@ Info seq  [hh:mm:ss:mss] Err:: Unrecognized JSON command:
       "command": "watchChange",
       "arguments": {
         "id": 1,
-        "path": "/user/username/projects/myproject/b.ts",
-        "eventType": "update"
+        "updated": [
+          "/user/username/projects/myproject/b.ts"
+        ]
       },
       "seq": 4,
       "type": "request"
@@ -509,3 +602,136 @@ Info seq  [hh:mm:ss:mss] response:
       "responseRequired": false
     }
 After request
+
+Change File: /user/username/projects/myproject/c.ts
+Info seq  [hh:mm:ss:mss] FileWatcher:: Triggered with /user/username/projects/myproject/c.ts 1:: WatchInfo: /user/username/projects/myproject/c.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] Scheduled: /user/username/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/c.ts 1:: WatchInfo: /user/username/projects/myproject/c.ts 500 undefined WatchType: Closed Script info
+Before running Timeout callback:: count: 2
+5: /user/username/projects/myproject/tsconfig.json
+6: *ensureProjectForOpenFiles*
+//// [/user/username/projects/myproject/c.ts]
+export class a { prop = "hello"; foo() { return this.prop; } }export const y = 20;
+
+
+Timeout callback:: count: 2
+5: /user/username/projects/myproject/tsconfig.json *new*
+6: *ensureProjectForOpenFiles* *new*
+
+Projects::
+/user/username/projects/myproject/tsconfig.json (Configured) *changed*
+    projectStateVersion: 4 *changed*
+    projectProgramVersion: 2
+    dirty: true *changed*
+
+ScriptInfos::
+/a/lib/lib.d.ts
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/a.ts (Open)
+    version: SVC-1-0
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json *default*
+/user/username/projects/myproject/b.ts
+    version: Text-2
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/c.ts *changed*
+    version: Text-1
+    pendingReloadFromDisk: true *changed*
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/m.ts
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/node_modules/something/index.d.ts
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+
+Info seq  [hh:mm:ss:mss] Running: /user/username/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json projectStateVersion: 4 projectProgramVersion: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
+Info seq  [hh:mm:ss:mss] 	Files (6)
+	/a/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; }"
+	/user/username/projects/myproject/a.ts SVC-1-0 "export class a { prop = \"hello\"; foo() { return this.prop; } }"
+	/user/username/projects/myproject/b.ts Text-2 "export class a { prop = \"hello\"; foo() { return this.prop; } }"
+	/user/username/projects/myproject/node_modules/something/index.d.ts Text-1 "export const x = 10;"
+	/user/username/projects/myproject/m.ts Text-1 "import { x } from \"something\""
+	/user/username/projects/myproject/c.ts Text-2 "export class a { prop = \"hello\"; foo() { return this.prop; } }export const y = 20;"
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles*
+Info seq  [hh:mm:ss:mss] Before ensureProjectForOpenFiles:
+Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
+Info seq  [hh:mm:ss:mss] 	Files (6)
+
+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.ts ProjectRootPath: undefined
+Info seq  [hh:mm:ss:mss] 		Projects: /user/username/projects/myproject/tsconfig.json
+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 (6)
+
+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.ts ProjectRootPath: undefined
+Info seq  [hh:mm:ss:mss] 		Projects: /user/username/projects/myproject/tsconfig.json
+After running Timeout callback:: count: 0
+
+Projects::
+/user/username/projects/myproject/tsconfig.json (Configured) *changed*
+    projectStateVersion: 4
+    projectProgramVersion: 2
+    dirty: false *changed*
+
+ScriptInfos::
+/a/lib/lib.d.ts
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/a.ts (Open)
+    version: SVC-1-0
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json *default*
+/user/username/projects/myproject/b.ts
+    version: Text-2
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/c.ts *changed*
+    version: Text-2 *changed*
+    pendingReloadFromDisk: false *changed*
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/m.ts
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/node_modules/something/index.d.ts
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+
+Custom watch:: /user/username/projects/myproject/c.ts /user/username/projects/myproject/c.ts updated
+Custom watch:: /user/username/projects/myproject /user/username/projects/myproject/c.ts updated
+Before running Timeout callback:: count: 0
+
+After running Timeout callback:: count: 0
+
+update with npm install
+Before running Timeout callback:: count: 0
+//// [/user/username/projects/myproject/node_modules/something/index.d.ts]
+export const x = 10;export const y = 20;
+
+
+After running Timeout callback:: count: 0
+
+Custom watch:: /user/username/projects/myproject/node_modules /user/username/projects/myproject/node_modules/something/index.d.ts updated
+Before running Timeout callback:: count: 0
+
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/events/watchEvents/canUseWatchEvents.js b/tests/baselines/reference/tsserver/events/watchEvents/canUseWatchEvents.js
index b7bc70a6bb148..a70a15d02f3e5 100644
--- a/tests/baselines/reference/tsserver/events/watchEvents/canUseWatchEvents.js
+++ b/tests/baselines/reference/tsserver/events/watchEvents/canUseWatchEvents.js
@@ -10,6 +10,12 @@ export class a { prop = "hello"; foo() { return this.prop; } }
 //// [/user/username/projects/myproject/b.ts]
 export class b { prop = "hello"; foo() { return this.prop; } }
 
+//// [/user/username/projects/myproject/m.ts]
+import { x } from "something"
+
+//// [/user/username/projects/myproject/node_modules/something/index.d.ts]
+export const x = 10;
+
 //// [/a/lib/lib.d.ts]
 /// <reference no-default-lib="true"/>
 interface Boolean {}
@@ -61,7 +67,8 @@ Info seq  [hh:mm:ss:mss] event:
 Info seq  [hh:mm:ss:mss] Config: /user/username/projects/myproject/tsconfig.json : {
  "rootNames": [
   "/user/username/projects/myproject/a.ts",
-  "/user/username/projects/myproject/b.ts"
+  "/user/username/projects/myproject/b.ts",
+  "/user/username/projects/myproject/m.ts"
  ],
  "options": {
   "configFilePath": "/user/username/projects/myproject/tsconfig.json"
@@ -76,10 +83,11 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "id": 2,
         "path": "/user/username/projects/myproject",
-        "recursive": true
+        "recursive": true,
+        "ignoreUpdate": true
       }
     }
-Custom watchDirectory: 2: /user/username/projects/myproject true
+Custom watchDirectory: 2: /user/username/projects/myproject true true
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] event:
@@ -93,7 +101,33 @@ Info seq  [hh:mm:ss:mss] event:
       }
     }
 Custom watchFile: 3: /user/username/projects/myproject/b.ts
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/m.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "CustomHandler::createFileWatcher",
+      "body": {
+        "id": 4,
+        "path": "/user/username/projects/myproject/m.ts"
+      }
+    }
+Custom watchFile: 4: /user/username/projects/myproject/m.ts
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "CustomHandler::createDirectoryWatcher",
+      "body": {
+        "id": 5,
+        "path": "/user/username/projects/myproject/node_modules",
+        "recursive": true
+      }
+    }
+Custom watchDirectory: 5: /user/username/projects/myproject/node_modules true undefined
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
 Info seq  [hh:mm:ss:mss] event:
     {
@@ -101,11 +135,13 @@ Info seq  [hh:mm:ss:mss] event:
       "type": "event",
       "event": "CustomHandler::createFileWatcher",
       "body": {
-        "id": 4,
+        "id": 6,
         "path": "/a/lib/lib.d.ts"
       }
     }
-Custom watchFile: 4: /a/lib/lib.d.ts
+Custom watchFile: 6: /a/lib/lib.d.ts
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: 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] event:
     {
@@ -113,12 +149,13 @@ Info seq  [hh:mm:ss:mss] event:
       "type": "event",
       "event": "CustomHandler::createDirectoryWatcher",
       "body": {
-        "id": 5,
+        "id": 7,
         "path": "/user/username/projects/myproject/node_modules/@types",
-        "recursive": true
+        "recursive": true,
+        "ignoreUpdate": true
       }
     }
-Custom watchDirectory: 5: /user/username/projects/myproject/node_modules/@types true
+Custom watchDirectory: 7: /user/username/projects/myproject/node_modules/@types true true
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: 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:: Added:: WatchInfo: /user/username/projects/node_modules/@types 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Type roots
 Info seq  [hh:mm:ss:mss] event:
@@ -127,19 +164,22 @@ Info seq  [hh:mm:ss:mss] event:
       "type": "event",
       "event": "CustomHandler::createDirectoryWatcher",
       "body": {
-        "id": 6,
+        "id": 8,
         "path": "/user/username/projects/node_modules/@types",
-        "recursive": true
+        "recursive": true,
+        "ignoreUpdate": true
       }
     }
-Custom watchDirectory: 6: /user/username/projects/node_modules/@types true
+Custom watchDirectory: 8: /user/username/projects/node_modules/@types true true
 Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node_modules/@types 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Type roots
 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 (3)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 	/a/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; }"
 	/user/username/projects/myproject/a.ts SVC-1-0 "export class a { prop = \"hello\"; foo() { return this.prop; } }"
 	/user/username/projects/myproject/b.ts Text-1 "export class b { prop = \"hello\"; foo() { return this.prop; } }"
+	/user/username/projects/myproject/node_modules/something/index.d.ts Text-1 "export const x = 10;"
+	/user/username/projects/myproject/m.ts Text-1 "import { x } from \"something\""
 
 
 	../../../../a/lib/lib.d.ts
@@ -148,6 +188,10 @@ Info seq  [hh:mm:ss:mss] 	Files (3)
 	  Matched by default include pattern '**/*'
 	b.ts
 	  Matched by default include pattern '**/*'
+	node_modules/something/index.d.ts
+	  Imported via "something" from file 'm.ts'
+	m.ts
+	  Matched by default include pattern '**/*'
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] event:
@@ -171,12 +215,12 @@ Info seq  [hh:mm:ss:mss] event:
           "jsSize": 0,
           "jsx": 0,
           "jsxSize": 0,
-          "ts": 2,
-          "tsSize": 124,
+          "ts": 3,
+          "tsSize": 153,
           "tsx": 0,
           "tsxSize": 0,
-          "dts": 1,
-          "dtsSize": 334,
+          "dts": 2,
+          "dtsSize": 354,
           "deferred": 0,
           "deferredSize": 0
         },
@@ -209,7 +253,7 @@ Info seq  [hh:mm:ss:mss] event:
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (3)
+Info seq  [hh:mm:ss:mss] 	Files (5)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Open files: 
@@ -223,19 +267,23 @@ After request
 
 Custom WatchedFiles::
 /a/lib/lib.d.ts: *new*
-  {"id":4,"path":"/a/lib/lib.d.ts"}
+  {"id":6,"path":"/a/lib/lib.d.ts"}
 /user/username/projects/myproject/b.ts: *new*
   {"id":3,"path":"/user/username/projects/myproject/b.ts"}
+/user/username/projects/myproject/m.ts: *new*
+  {"id":4,"path":"/user/username/projects/myproject/m.ts"}
 /user/username/projects/myproject/tsconfig.json: *new*
   {"id":1,"path":"/user/username/projects/myproject/tsconfig.json"}
 
 Custom WatchedDirectoriesRecursive::
 /user/username/projects/myproject: *new*
-  {"id":2,"path":"/user/username/projects/myproject","recursive":true}
+  {"id":2,"path":"/user/username/projects/myproject","recursive":true,"ignoreUpdate":true}
+/user/username/projects/myproject/node_modules: *new*
+  {"id":5,"path":"/user/username/projects/myproject/node_modules","recursive":true}
 /user/username/projects/myproject/node_modules/@types: *new*
-  {"id":5,"path":"/user/username/projects/myproject/node_modules/@types","recursive":true}
+  {"id":7,"path":"/user/username/projects/myproject/node_modules/@types","recursive":true,"ignoreUpdate":true}
 /user/username/projects/node_modules/@types: *new*
-  {"id":6,"path":"/user/username/projects/node_modules/@types","recursive":true}
+  {"id":8,"path":"/user/username/projects/node_modules/@types","recursive":true,"ignoreUpdate":true}
 
 Projects::
 /user/username/projects/myproject/tsconfig.json (Configured) *new*
@@ -255,8 +303,16 @@ ScriptInfos::
     version: Text-1
     containingProjects: 1
         /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/m.ts *new*
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/node_modules/something/index.d.ts *new*
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
 
-Add file
+Add file: /user/username/projects/myproject/c.ts
 Before running Timeout callback:: count: 0
 //// [/user/username/projects/myproject/c.ts]
 export class a { prop = "hello"; foo() { return this.prop; } }
@@ -264,7 +320,7 @@ export class a { prop = "hello"; foo() { return this.prop; } }
 
 After running Timeout callback:: count: 0
 
-Custom watch
+Custom watch:: /user/username/projects/myproject /user/username/projects/myproject/c.ts created
 Before request
 
 Info seq  [hh:mm:ss:mss] request:
@@ -272,8 +328,9 @@ Info seq  [hh:mm:ss:mss] request:
       "command": "watchChange",
       "arguments": {
         "id": 2,
-        "path": "/user/username/projects/myproject/c.ts",
-        "eventType": "create"
+        "created": [
+          "/user/username/projects/myproject/c.ts"
+        ]
       },
       "seq": 2,
       "type": "request"
@@ -310,18 +367,20 @@ Info seq  [hh:mm:ss:mss] event:
       "type": "event",
       "event": "CustomHandler::createFileWatcher",
       "body": {
-        "id": 7,
+        "id": 9,
         "path": "/user/username/projects/myproject/c.ts"
       }
     }
-Custom watchFile: 7: /user/username/projects/myproject/c.ts
+Custom watchFile: 9: /user/username/projects/myproject/c.ts
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 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 (4)
+Info seq  [hh:mm:ss:mss] 	Files (6)
 	/a/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; }"
 	/user/username/projects/myproject/a.ts SVC-1-0 "export class a { prop = \"hello\"; foo() { return this.prop; } }"
 	/user/username/projects/myproject/b.ts Text-1 "export class b { prop = \"hello\"; foo() { return this.prop; } }"
+	/user/username/projects/myproject/node_modules/something/index.d.ts Text-1 "export const x = 10;"
+	/user/username/projects/myproject/m.ts Text-1 "import { x } from \"something\""
 	/user/username/projects/myproject/c.ts Text-1 "export class a { prop = \"hello\"; foo() { return this.prop; } }"
 
 
@@ -331,6 +390,10 @@ Info seq  [hh:mm:ss:mss] 	Files (4)
 	  Matched by default include pattern '**/*'
 	b.ts
 	  Matched by default include pattern '**/*'
+	node_modules/something/index.d.ts
+	  Imported via "something" from file 'm.ts'
+	m.ts
+	  Matched by default include pattern '**/*'
 	c.ts
 	  Matched by default include pattern '**/*'
 
@@ -338,7 +401,7 @@ Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles*
 Info seq  [hh:mm:ss:mss] Before ensureProjectForOpenFiles:
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (4)
+Info seq  [hh:mm:ss:mss] 	Files (6)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Open files: 
@@ -346,7 +409,7 @@ Info seq  [hh:mm:ss:mss] 	FileName: /user/username/projects/myproject/a.ts Proje
 Info seq  [hh:mm:ss:mss] 		Projects: /user/username/projects/myproject/tsconfig.json
 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 (4)
+Info seq  [hh:mm:ss:mss] 	Files (6)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Open files: 
@@ -367,21 +430,25 @@ After running Timeout callback:: count: 0
 
 Custom WatchedFiles::
 /a/lib/lib.d.ts:
-  {"id":4,"path":"/a/lib/lib.d.ts"}
+  {"id":6,"path":"/a/lib/lib.d.ts"}
 /user/username/projects/myproject/b.ts:
   {"id":3,"path":"/user/username/projects/myproject/b.ts"}
 /user/username/projects/myproject/c.ts: *new*
-  {"id":7,"path":"/user/username/projects/myproject/c.ts"}
+  {"id":9,"path":"/user/username/projects/myproject/c.ts"}
+/user/username/projects/myproject/m.ts:
+  {"id":4,"path":"/user/username/projects/myproject/m.ts"}
 /user/username/projects/myproject/tsconfig.json:
   {"id":1,"path":"/user/username/projects/myproject/tsconfig.json"}
 
 Custom WatchedDirectoriesRecursive::
 /user/username/projects/myproject:
-  {"id":2,"path":"/user/username/projects/myproject","recursive":true}
+  {"id":2,"path":"/user/username/projects/myproject","recursive":true,"ignoreUpdate":true}
+/user/username/projects/myproject/node_modules:
+  {"id":5,"path":"/user/username/projects/myproject/node_modules","recursive":true}
 /user/username/projects/myproject/node_modules/@types:
-  {"id":5,"path":"/user/username/projects/myproject/node_modules/@types","recursive":true}
+  {"id":7,"path":"/user/username/projects/myproject/node_modules/@types","recursive":true,"ignoreUpdate":true}
 /user/username/projects/node_modules/@types:
-  {"id":6,"path":"/user/username/projects/node_modules/@types","recursive":true}
+  {"id":8,"path":"/user/username/projects/node_modules/@types","recursive":true,"ignoreUpdate":true}
 
 Projects::
 /user/username/projects/myproject/tsconfig.json (Configured) *changed*
@@ -406,8 +473,16 @@ ScriptInfos::
     version: Text-1
     containingProjects: 1
         /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/m.ts
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/node_modules/something/index.d.ts
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
 
-Change File
+Change File: /user/username/projects/myproject/b.ts
 Before running Timeout callback:: count: 0
 //// [/user/username/projects/myproject/b.ts]
 export class a { prop = "hello"; foo() { return this.prop; } }
@@ -415,7 +490,8 @@ export class a { prop = "hello"; foo() { return this.prop; } }
 
 After running Timeout callback:: count: 0
 
-Custom watch
+Custom watch:: /user/username/projects/myproject/b.ts /user/username/projects/myproject/b.ts updated
+Custom watch:: /user/username/projects/myproject /user/username/projects/myproject/b.ts updated
 Before request
 
 Info seq  [hh:mm:ss:mss] request:
@@ -423,8 +499,9 @@ Info seq  [hh:mm:ss:mss] request:
       "command": "watchChange",
       "arguments": {
         "id": 3,
-        "path": "/user/username/projects/myproject/b.ts",
-        "eventType": "update"
+        "updated": [
+          "/user/username/projects/myproject/b.ts"
+        ]
       },
       "seq": 3,
       "type": "request"
@@ -467,6 +544,14 @@ ScriptInfos::
     version: Text-1
     containingProjects: 1
         /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/m.ts
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/node_modules/something/index.d.ts
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
 
 Before running Timeout callback:: count: 2
 3: /user/username/projects/myproject/tsconfig.json
@@ -476,17 +561,19 @@ Info seq  [hh:mm:ss:mss] Running: /user/username/projects/myproject/tsconfig.jso
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json
 Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json projectStateVersion: 3 projectProgramVersion: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (4)
+Info seq  [hh:mm:ss:mss] 	Files (6)
 	/a/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; }"
 	/user/username/projects/myproject/a.ts SVC-1-0 "export class a { prop = \"hello\"; foo() { return this.prop; } }"
 	/user/username/projects/myproject/b.ts Text-2 "export class a { prop = \"hello\"; foo() { return this.prop; } }"
+	/user/username/projects/myproject/node_modules/something/index.d.ts Text-1 "export const x = 10;"
+	/user/username/projects/myproject/m.ts Text-1 "import { x } from \"something\""
 	/user/username/projects/myproject/c.ts Text-1 "export class a { prop = \"hello\"; foo() { return this.prop; } }"
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles*
 Info seq  [hh:mm:ss:mss] Before ensureProjectForOpenFiles:
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (4)
+Info seq  [hh:mm:ss:mss] 	Files (6)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Open files: 
@@ -494,7 +581,7 @@ Info seq  [hh:mm:ss:mss] 	FileName: /user/username/projects/myproject/a.ts Proje
 Info seq  [hh:mm:ss:mss] 		Projects: /user/username/projects/myproject/tsconfig.json
 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 (4)
+Info seq  [hh:mm:ss:mss] 	Files (6)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Open files: 
@@ -537,6 +624,14 @@ ScriptInfos::
     version: Text-1
     containingProjects: 1
         /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/m.ts
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/node_modules/something/index.d.ts
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
 
 Before request
 
@@ -563,7 +658,7 @@ Custom watchFile:: Close:: 3: /user/username/projects/myproject/b.ts
 Info seq  [hh:mm:ss:mss] Search path: /user/username/projects/myproject
 Info seq  [hh:mm:ss:mss] For info: /user/username/projects/myproject/b.ts :: Config file name: /user/username/projects/myproject/tsconfig.json
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (4)
+Info seq  [hh:mm:ss:mss] 	Files (6)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Open files: 
@@ -579,9 +674,11 @@ After request
 
 Custom WatchedFiles::
 /a/lib/lib.d.ts:
-  {"id":4,"path":"/a/lib/lib.d.ts"}
+  {"id":6,"path":"/a/lib/lib.d.ts"}
 /user/username/projects/myproject/c.ts:
-  {"id":7,"path":"/user/username/projects/myproject/c.ts"}
+  {"id":9,"path":"/user/username/projects/myproject/c.ts"}
+/user/username/projects/myproject/m.ts:
+  {"id":4,"path":"/user/username/projects/myproject/m.ts"}
 /user/username/projects/myproject/tsconfig.json:
   {"id":1,"path":"/user/username/projects/myproject/tsconfig.json"}
 
@@ -591,11 +688,13 @@ Custom WatchedFiles *deleted*::
 
 Custom WatchedDirectoriesRecursive::
 /user/username/projects/myproject:
-  {"id":2,"path":"/user/username/projects/myproject","recursive":true}
+  {"id":2,"path":"/user/username/projects/myproject","recursive":true,"ignoreUpdate":true}
+/user/username/projects/myproject/node_modules:
+  {"id":5,"path":"/user/username/projects/myproject/node_modules","recursive":true}
 /user/username/projects/myproject/node_modules/@types:
-  {"id":5,"path":"/user/username/projects/myproject/node_modules/@types","recursive":true}
+  {"id":7,"path":"/user/username/projects/myproject/node_modules/@types","recursive":true,"ignoreUpdate":true}
 /user/username/projects/node_modules/@types:
-  {"id":6,"path":"/user/username/projects/node_modules/@types","recursive":true}
+  {"id":8,"path":"/user/username/projects/node_modules/@types","recursive":true,"ignoreUpdate":true}
 
 ScriptInfos::
 /a/lib/lib.d.ts
@@ -615,6 +714,14 @@ ScriptInfos::
     version: Text-1
     containingProjects: 1
         /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/m.ts
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/node_modules/something/index.d.ts
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
 
 Before request
 
@@ -634,13 +741,13 @@ Info seq  [hh:mm:ss:mss] event:
       "type": "event",
       "event": "CustomHandler::createFileWatcher",
       "body": {
-        "id": 8,
+        "id": 10,
         "path": "/user/username/projects/myproject/b.ts"
       }
     }
-Custom watchFile: 8: /user/username/projects/myproject/b.ts
+Custom watchFile: 10: /user/username/projects/myproject/b.ts
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (4)
+Info seq  [hh:mm:ss:mss] 	Files (6)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 Info seq  [hh:mm:ss:mss] Open files: 
@@ -654,21 +761,25 @@ After request
 
 Custom WatchedFiles::
 /a/lib/lib.d.ts:
-  {"id":4,"path":"/a/lib/lib.d.ts"}
+  {"id":6,"path":"/a/lib/lib.d.ts"}
 /user/username/projects/myproject/b.ts: *new*
-  {"id":8,"path":"/user/username/projects/myproject/b.ts"}
+  {"id":10,"path":"/user/username/projects/myproject/b.ts"}
 /user/username/projects/myproject/c.ts:
-  {"id":7,"path":"/user/username/projects/myproject/c.ts"}
+  {"id":9,"path":"/user/username/projects/myproject/c.ts"}
+/user/username/projects/myproject/m.ts:
+  {"id":4,"path":"/user/username/projects/myproject/m.ts"}
 /user/username/projects/myproject/tsconfig.json:
   {"id":1,"path":"/user/username/projects/myproject/tsconfig.json"}
 
 Custom WatchedDirectoriesRecursive::
 /user/username/projects/myproject:
-  {"id":2,"path":"/user/username/projects/myproject","recursive":true}
+  {"id":2,"path":"/user/username/projects/myproject","recursive":true,"ignoreUpdate":true}
+/user/username/projects/myproject/node_modules:
+  {"id":5,"path":"/user/username/projects/myproject/node_modules","recursive":true}
 /user/username/projects/myproject/node_modules/@types:
-  {"id":5,"path":"/user/username/projects/myproject/node_modules/@types","recursive":true}
+  {"id":7,"path":"/user/username/projects/myproject/node_modules/@types","recursive":true,"ignoreUpdate":true}
 /user/username/projects/node_modules/@types:
-  {"id":6,"path":"/user/username/projects/node_modules/@types","recursive":true}
+  {"id":8,"path":"/user/username/projects/node_modules/@types","recursive":true,"ignoreUpdate":true}
 
 ScriptInfos::
 /a/lib/lib.d.ts
@@ -688,3 +799,592 @@ ScriptInfos::
     version: Text-1
     containingProjects: 1
         /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/m.ts
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/node_modules/something/index.d.ts
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+
+Change File: /user/username/projects/myproject/c.ts
+Before running Timeout callback:: count: 0
+//// [/user/username/projects/myproject/c.ts]
+export class a { prop = "hello"; foo() { return this.prop; } }export const y = 20;
+
+
+After running Timeout callback:: count: 0
+
+Custom watch:: /user/username/projects/myproject/c.ts /user/username/projects/myproject/c.ts updated
+Custom watch:: /user/username/projects/myproject /user/username/projects/myproject/c.ts updated
+Before request
+
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "command": "watchChange",
+      "arguments": {
+        "id": 9,
+        "updated": [
+          "/user/username/projects/myproject/c.ts"
+        ]
+      },
+      "seq": 6,
+      "type": "request"
+    }
+Info seq  [hh:mm:ss:mss] FileWatcher:: Triggered with /user/username/projects/myproject/c.ts 1:: WatchInfo: /user/username/projects/myproject/c.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] Scheduled: /user/username/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/c.ts 1:: WatchInfo: /user/username/projects/myproject/c.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "responseRequired": false
+    }
+After request
+
+Timeout callback:: count: 2
+5: /user/username/projects/myproject/tsconfig.json *new*
+6: *ensureProjectForOpenFiles* *new*
+
+Projects::
+/user/username/projects/myproject/tsconfig.json (Configured) *changed*
+    projectStateVersion: 4 *changed*
+    projectProgramVersion: 2
+    dirty: true *changed*
+
+ScriptInfos::
+/a/lib/lib.d.ts
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/a.ts (Open)
+    version: SVC-1-0
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json *default*
+/user/username/projects/myproject/b.ts
+    version: Text-2
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/c.ts *changed*
+    version: Text-1
+    pendingReloadFromDisk: true *changed*
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/m.ts
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/node_modules/something/index.d.ts
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+
+Before running Timeout callback:: count: 2
+5: /user/username/projects/myproject/tsconfig.json
+6: *ensureProjectForOpenFiles*
+
+Info seq  [hh:mm:ss:mss] Running: /user/username/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json projectStateVersion: 4 projectProgramVersion: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
+Info seq  [hh:mm:ss:mss] 	Files (6)
+	/a/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; }"
+	/user/username/projects/myproject/a.ts SVC-1-0 "export class a { prop = \"hello\"; foo() { return this.prop; } }"
+	/user/username/projects/myproject/b.ts Text-2 "export class a { prop = \"hello\"; foo() { return this.prop; } }"
+	/user/username/projects/myproject/node_modules/something/index.d.ts Text-1 "export const x = 10;"
+	/user/username/projects/myproject/m.ts Text-1 "import { x } from \"something\""
+	/user/username/projects/myproject/c.ts Text-2 "export class a { prop = \"hello\"; foo() { return this.prop; } }export const y = 20;"
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles*
+Info seq  [hh:mm:ss:mss] Before ensureProjectForOpenFiles:
+Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
+Info seq  [hh:mm:ss:mss] 	Files (6)
+
+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.ts ProjectRootPath: undefined
+Info seq  [hh:mm:ss:mss] 		Projects: /user/username/projects/myproject/tsconfig.json
+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 (6)
+
+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.ts ProjectRootPath: undefined
+Info seq  [hh:mm:ss:mss] 		Projects: /user/username/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "CustomHandler::projectsUpdatedInBackground",
+      "body": {
+        "openFiles": [
+          "/user/username/projects/myproject/a.ts"
+        ]
+      }
+    }
+After running Timeout callback:: count: 0
+
+Projects::
+/user/username/projects/myproject/tsconfig.json (Configured) *changed*
+    projectStateVersion: 4
+    projectProgramVersion: 2
+    dirty: false *changed*
+
+ScriptInfos::
+/a/lib/lib.d.ts
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/a.ts (Open)
+    version: SVC-1-0
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json *default*
+/user/username/projects/myproject/b.ts
+    version: Text-2
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/c.ts *changed*
+    version: Text-2 *changed*
+    pendingReloadFromDisk: false *changed*
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/m.ts
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/node_modules/something/index.d.ts
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+
+update with npm install
+Before running Timeout callback:: count: 0
+//// [/user/username/projects/myproject/node_modules/something/index.d.ts]
+export const x = 10;export const y = 20;
+
+
+After running Timeout callback:: count: 0
+
+Custom watch:: /user/username/projects/myproject/node_modules /user/username/projects/myproject/node_modules/something/index.d.ts updated
+Before request
+
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "command": "watchChange",
+      "arguments": {
+        "id": 5,
+        "updated": [
+          "/user/username/projects/myproject/node_modules/something/index.d.ts"
+        ]
+      },
+      "seq": 7,
+      "type": "request"
+    }
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/something/index.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+Info seq  [hh:mm:ss:mss] Scheduled: /user/username/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/something/index.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/something/index.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
+Info seq  [hh:mm:ss:mss] Scheduled: /user/username/projects/myproject/tsconfig.jsonFailedLookupInvalidation
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/something/index.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "responseRequired": false
+    }
+After request
+
+Timeout callback:: count: 3
+7: /user/username/projects/myproject/tsconfig.json *new*
+8: *ensureProjectForOpenFiles* *new*
+9: /user/username/projects/myproject/tsconfig.jsonFailedLookupInvalidation *new*
+
+Projects::
+/user/username/projects/myproject/tsconfig.json (Configured) *changed*
+    projectStateVersion: 5 *changed*
+    projectProgramVersion: 2
+    dirty: true *changed*
+
+ScriptInfos::
+/a/lib/lib.d.ts
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/a.ts (Open)
+    version: SVC-1-0
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json *default*
+/user/username/projects/myproject/b.ts
+    version: Text-2
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/c.ts
+    version: Text-2
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/m.ts
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/node_modules/something/index.d.ts *changed*
+    version: Text-1
+    pendingReloadFromDisk: true *changed*
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+
+Before running Timeout callback:: count: 3
+7: /user/username/projects/myproject/tsconfig.json
+8: *ensureProjectForOpenFiles*
+9: /user/username/projects/myproject/tsconfig.jsonFailedLookupInvalidation
+
+Info seq  [hh:mm:ss:mss] Running: /user/username/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json projectStateVersion: 5 projectProgramVersion: 2 structureChanged: true structureIsReused:: SafeModules Elapsed:: *ms
+Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
+Info seq  [hh:mm:ss:mss] 	Files (6)
+	/a/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; }"
+	/user/username/projects/myproject/a.ts SVC-1-0 "export class a { prop = \"hello\"; foo() { return this.prop; } }"
+	/user/username/projects/myproject/b.ts Text-2 "export class a { prop = \"hello\"; foo() { return this.prop; } }"
+	/user/username/projects/myproject/node_modules/something/index.d.ts Text-2 "export const x = 10;export const y = 20;"
+	/user/username/projects/myproject/m.ts Text-1 "import { x } from \"something\""
+	/user/username/projects/myproject/c.ts Text-2 "export class a { prop = \"hello\"; foo() { return this.prop; } }export const y = 20;"
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+After running Timeout callback:: count: 1
+
+Timeout callback:: count: 1
+8: *ensureProjectForOpenFiles* *deleted*
+9: /user/username/projects/myproject/tsconfig.jsonFailedLookupInvalidation *deleted*
+10: *ensureProjectForOpenFiles* *new*
+
+Projects::
+/user/username/projects/myproject/tsconfig.json (Configured) *changed*
+    projectStateVersion: 5
+    projectProgramVersion: 3 *changed*
+    dirty: false *changed*
+
+ScriptInfos::
+/a/lib/lib.d.ts
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/a.ts (Open)
+    version: SVC-1-0
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json *default*
+/user/username/projects/myproject/b.ts
+    version: Text-2
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/c.ts
+    version: Text-2
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/m.ts
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/node_modules/something/index.d.ts *changed*
+    version: Text-2 *changed*
+    pendingReloadFromDisk: false *changed*
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+
+Before running Timeout callback:: count: 1
+10: *ensureProjectForOpenFiles*
+
+Info seq  [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles*
+Info seq  [hh:mm:ss:mss] Before ensureProjectForOpenFiles:
+Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
+Info seq  [hh:mm:ss:mss] 	Files (6)
+
+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.ts ProjectRootPath: undefined
+Info seq  [hh:mm:ss:mss] 		Projects: /user/username/projects/myproject/tsconfig.json
+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 (6)
+
+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.ts ProjectRootPath: undefined
+Info seq  [hh:mm:ss:mss] 		Projects: /user/username/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "CustomHandler::projectsUpdatedInBackground",
+      "body": {
+        "openFiles": [
+          "/user/username/projects/myproject/a.ts"
+        ]
+      }
+    }
+After running Timeout callback:: count: 0
+
+Add file: /user/username/projects/myproject/d.ts
+Before running Timeout callback:: count: 0
+//// [/user/username/projects/myproject/d.ts]
+export class a { prop = "hello"; foo() { return this.prop; } }
+
+
+After running Timeout callback:: count: 0
+
+Change File: /user/username/projects/myproject/c.ts
+Before running Timeout callback:: count: 0
+//// [/user/username/projects/myproject/c.ts]
+export class a { prop = "hello"; foo() { return this.prop; } }export const y = 20;export const z = 30;
+
+
+After running Timeout callback:: count: 0
+
+Add File: /user/username/projects/myproject/e.ts
+Before running Timeout callback:: count: 0
+//// [/user/username/projects/myproject/e.ts]
+export class a { prop = "hello"; foo() { return this.prop; } }
+
+
+After running Timeout callback:: count: 0
+
+Custom watch:: /user/username/projects/myproject /user/username/projects/myproject/d.ts created
+Custom watch:: /user/username/projects/myproject/c.ts /user/username/projects/myproject/c.ts updated
+Custom watch:: /user/username/projects/myproject /user/username/projects/myproject/c.ts updated
+Custom watch:: /user/username/projects/myproject /user/username/projects/myproject/e.ts created
+Before request
+
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "command": "watchChange",
+      "arguments": [
+        {
+          "id": 2,
+          "created": [
+            "/user/username/projects/myproject/d.ts",
+            "/user/username/projects/myproject/e.ts"
+          ]
+        },
+        {
+          "id": 9,
+          "updated": [
+            "/user/username/projects/myproject/c.ts"
+          ]
+        }
+      ],
+      "seq": 8,
+      "type": "request"
+    }
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /user/username/projects/myproject/d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
+Info seq  [hh:mm:ss:mss] Scheduled: /user/username/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with /user/username/projects/myproject/e.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
+Info seq  [hh:mm:ss:mss] Scheduled: /user/username/projects/myproject/tsconfig.json, Cancelled earlier one
+Info seq  [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/e.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
+Info seq  [hh:mm:ss:mss] FileWatcher:: Triggered with /user/username/projects/myproject/c.ts 1:: WatchInfo: /user/username/projects/myproject/c.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] Scheduled: /user/username/projects/myproject/tsconfig.json, Cancelled earlier one
+Info seq  [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/c.ts 1:: WatchInfo: /user/username/projects/myproject/c.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "responseRequired": false
+    }
+After request
+
+Timeout callback:: count: 2
+15: /user/username/projects/myproject/tsconfig.json *new*
+16: *ensureProjectForOpenFiles* *new*
+
+Projects::
+/user/username/projects/myproject/tsconfig.json (Configured) *changed*
+    projectStateVersion: 6 *changed*
+    projectProgramVersion: 3
+    dirty: true *changed*
+
+ScriptInfos::
+/a/lib/lib.d.ts
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/a.ts (Open)
+    version: SVC-1-0
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json *default*
+/user/username/projects/myproject/b.ts
+    version: Text-2
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/c.ts *changed*
+    version: Text-2
+    pendingReloadFromDisk: true *changed*
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/m.ts
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/node_modules/something/index.d.ts
+    version: Text-2
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+
+Before running Timeout callback:: count: 2
+15: /user/username/projects/myproject/tsconfig.json
+16: *ensureProjectForOpenFiles*
+
+Info seq  [hh:mm:ss:mss] Running: /user/username/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "CustomHandler::createFileWatcher",
+      "body": {
+        "id": 11,
+        "path": "/user/username/projects/myproject/d.ts"
+      }
+    }
+Custom watchFile: 11: /user/username/projects/myproject/d.ts
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/e.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "CustomHandler::createFileWatcher",
+      "body": {
+        "id": 12,
+        "path": "/user/username/projects/myproject/e.ts"
+      }
+    }
+Custom watchFile: 12: /user/username/projects/myproject/e.ts
+Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json projectStateVersion: 6 projectProgramVersion: 3 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 (8)
+	/a/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; }"
+	/user/username/projects/myproject/a.ts SVC-1-0 "export class a { prop = \"hello\"; foo() { return this.prop; } }"
+	/user/username/projects/myproject/b.ts Text-2 "export class a { prop = \"hello\"; foo() { return this.prop; } }"
+	/user/username/projects/myproject/node_modules/something/index.d.ts Text-2 "export const x = 10;export const y = 20;"
+	/user/username/projects/myproject/m.ts Text-1 "import { x } from \"something\""
+	/user/username/projects/myproject/c.ts Text-3 "export class a { prop = \"hello\"; foo() { return this.prop; } }export const y = 20;export const z = 30;"
+	/user/username/projects/myproject/d.ts Text-1 "export class a { prop = \"hello\"; foo() { return this.prop; } }"
+	/user/username/projects/myproject/e.ts Text-1 "export class a { prop = \"hello\"; foo() { return this.prop; } }"
+
+
+	../../../../a/lib/lib.d.ts
+	  Default library for target 'es5'
+	a.ts
+	  Matched by default include pattern '**/*'
+	b.ts
+	  Matched by default include pattern '**/*'
+	node_modules/something/index.d.ts
+	  Imported via "something" from file 'm.ts'
+	m.ts
+	  Matched by default include pattern '**/*'
+	c.ts
+	  Matched by default include pattern '**/*'
+	d.ts
+	  Matched by default include pattern '**/*'
+	e.ts
+	  Matched by default include pattern '**/*'
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles*
+Info seq  [hh:mm:ss:mss] Before ensureProjectForOpenFiles:
+Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
+Info seq  [hh:mm:ss:mss] 	Files (8)
+
+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.ts ProjectRootPath: undefined
+Info seq  [hh:mm:ss:mss] 		Projects: /user/username/projects/myproject/tsconfig.json
+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 (8)
+
+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.ts ProjectRootPath: undefined
+Info seq  [hh:mm:ss:mss] 		Projects: /user/username/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "CustomHandler::projectsUpdatedInBackground",
+      "body": {
+        "openFiles": [
+          "/user/username/projects/myproject/a.ts"
+        ]
+      }
+    }
+After running Timeout callback:: count: 0
+
+Custom WatchedFiles::
+/a/lib/lib.d.ts:
+  {"id":6,"path":"/a/lib/lib.d.ts"}
+/user/username/projects/myproject/b.ts:
+  {"id":10,"path":"/user/username/projects/myproject/b.ts"}
+/user/username/projects/myproject/c.ts:
+  {"id":9,"path":"/user/username/projects/myproject/c.ts"}
+/user/username/projects/myproject/d.ts: *new*
+  {"id":11,"path":"/user/username/projects/myproject/d.ts"}
+/user/username/projects/myproject/e.ts: *new*
+  {"id":12,"path":"/user/username/projects/myproject/e.ts"}
+/user/username/projects/myproject/m.ts:
+  {"id":4,"path":"/user/username/projects/myproject/m.ts"}
+/user/username/projects/myproject/tsconfig.json:
+  {"id":1,"path":"/user/username/projects/myproject/tsconfig.json"}
+
+Custom WatchedDirectoriesRecursive::
+/user/username/projects/myproject:
+  {"id":2,"path":"/user/username/projects/myproject","recursive":true,"ignoreUpdate":true}
+/user/username/projects/myproject/node_modules:
+  {"id":5,"path":"/user/username/projects/myproject/node_modules","recursive":true}
+/user/username/projects/myproject/node_modules/@types:
+  {"id":7,"path":"/user/username/projects/myproject/node_modules/@types","recursive":true,"ignoreUpdate":true}
+/user/username/projects/node_modules/@types:
+  {"id":8,"path":"/user/username/projects/node_modules/@types","recursive":true,"ignoreUpdate":true}
+
+Projects::
+/user/username/projects/myproject/tsconfig.json (Configured) *changed*
+    projectStateVersion: 6
+    projectProgramVersion: 4 *changed*
+    dirty: false *changed*
+
+ScriptInfos::
+/a/lib/lib.d.ts
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/a.ts (Open)
+    version: SVC-1-0
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json *default*
+/user/username/projects/myproject/b.ts
+    version: Text-2
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/c.ts *changed*
+    version: Text-3 *changed*
+    pendingReloadFromDisk: false *changed*
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/d.ts *new*
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/e.ts *new*
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/m.ts
+    version: Text-1
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json
+/user/username/projects/myproject/node_modules/something/index.d.ts
+    version: Text-2
+    containingProjects: 1
+        /user/username/projects/myproject/tsconfig.json

From 896947e3937ec6384b9a07f7b73dfe64219d1397 Mon Sep 17 00:00:00 2001
From: TypeScript Bot <ts_bot@rcavanaugh.com>
Date: Thu, 28 Mar 2024 16:03:07 -0700
Subject: [PATCH 2/8] =?UTF-8?q?=F0=9F=A4=96=20Pick=20PR=20#57938=20(Direct?=
 =?UTF-8?q?ories=20dont=20check=20modified=20tim...)=20into=20release-5.4?=
 =?UTF-8?q?=20(#57958)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Sheetal Nandi <shkamat@microsoft.com>
Co-authored-by: Jake Bailey <5341706+jakebailey@users.noreply.github.com>
---
 src/compiler/sys.ts                           |  36 +-
 .../helpers/virtualFileSystemWithWatch.ts     |  14 +-
 .../unittests/tscWatch/watchEnvironment.ts    |   8 +-
 .../reports-syntax-errors-in-config-file.js   |  16 +-
 .../demo/updates-with-bad-reference.js        |  26 +-
 .../demo/updates-with-circular-reference.js   |  22 +-
 ...for-changes-to-package-json-main-fields.js |  16 +-
 ...t-correctly-with-cts-and-mts-extensions.js |  36 +-
 ...se-different-module-resolution-settings.js |   8 +-
 ...n-no-files-are-emitted-with-incremental.js |  14 +-
 ...when-watching-when-no-files-are-emitted.js |  16 +-
 ...mit-any-files-on-error-with-incremental.js |  48 +-
 .../does-not-emit-any-files-on-error.js       |  52 +-
 .../incremental-updates-in-verbose-mode.js    |  24 +-
 .../when-file-with-no-error-changes.js        |   8 +-
 ...ing-errors-only-changed-file-is-emitted.js |   8 +-
 .../when-file-with-no-error-changes.js        |   4 +-
 ...ixing-error-files-all-files-are-emitted.js |   4 +-
 .../when-preserveWatchOutput-is-not-used.js   |   8 +-
 ...veWatchOutput-is-passed-on-command-line.js |   8 +-
 ...e-of-program-emit-with-outDir-specified.js |   2 +-
 ...r-recompilation-because-of-program-emit.js |   2 +-
 .../programUpdates/tsbuildinfo-has-error.js   |   2 +-
 ...e-down-stream-project-and-then-fixes-it.js |   8 +-
 ...ncing-project-even-for-non-local-change.js |   8 +-
 ...le-is-added,-and-its-subsequent-updates.js |   6 +-
 ...hanges-and-reports-found-errors-message.js |  12 +-
 ...not-start-build-of-referencing-projects.js |   4 +-
 ...le-is-added,-and-its-subsequent-updates.js |   6 +-
 ...hanges-and-reports-found-errors-message.js |  12 +-
 ...not-start-build-of-referencing-projects.js |   4 +-
 ...project-with-extended-config-is-removed.js |   4 +-
 ...hen-noUnusedParameters-changes-to-false.js |   4 +-
 .../works-with-extended-source-files.js       |  66 +--
 ...hen-there-are-23-projects-in-a-solution.js | 518 +++++++++---------
 ...when-there-are-3-projects-in-a-solution.js |  36 +-
 ...when-there-are-5-projects-in-a-solution.js |  56 +-
 ...when-there-are-8-projects-in-a-solution.js | 162 +++---
 .../publicApi/with-custom-transformers.js     |  14 +-
 .../reexport/Reports-errors-correctly.js      |  26 +-
 ...e-projects-with-single-watcher-per-file.js |  58 +-
 .../createWatchOfConfigFile.js                |   4 +-
 ...Result-on-WatchCompilerHostOfConfigFile.js |   4 +-
 .../consoleClearing/with---diagnostics.js     |   4 +-
 .../with---extendedDiagnostics.js             |   4 +-
 .../with---preserveWatchOutput.js             |   4 +-
 ...---diagnostics-or---extendedDiagnostics.js |   4 +-
 ...ms-correctly-in-incremental-compilation.js |   4 +-
 ...s-deleted-and-created-as-part-of-change.js |   2 +-
 ...ndles-new-lines-carriageReturn-lineFeed.js |   4 +-
 .../handles-new-lines-lineFeed.js             |   4 +-
 .../should-emit-specified-file.js             |   8 +-
 ...elf-if-'--isolatedModules'-is-specified.js |   4 +-
 ...-if-'--out'-or-'--outFile'-is-specified.js |   4 +-
 ...should-be-up-to-date-with-deleted-files.js |   4 +-
 ...-be-up-to-date-with-newly-created-files.js |   4 +-
 ...-to-date-with-the-reference-map-changes.js |  20 +-
 ...les-referencing-it-if-its-shape-changed.js |   8 +-
 ...should-detect-changes-in-non-root-files.js |   8 +-
 .../should-detect-non-existing-code-file.js   |   8 +-
 .../should-detect-removed-code-file.js        |   2 +-
 ...ll-files-if-a-global-file-changed-shape.js |   4 +-
 ...ould-return-cascaded-affected-file-list.js |  12 +-
 ...fine-for-files-with-circular-references.js |   4 +-
 .../config-does-not-have-out-or-outFile.js    |   8 +-
 .../config-has-out.js                         |   8 +-
 .../config-has-outFile.js                     |   8 +-
 ...-recursive-directory-watcher-is-invoked.js |   2 +-
 ...rrors-for-.d.ts-change-with-incremental.js |  12 +-
 .../errors-for-.d.ts-change.js                |  12 +-
 .../errors-for-.ts-change-with-incremental.js |  12 +-
 .../errors-for-.ts-change.js                  |  12 +-
 ...el-import-that-changes-with-incremental.js |  12 +-
 ...g-a-deep-multilevel-import-that-changes.js |  12 +-
 .../export-with-incremental.js                |  12 +-
 .../no-circular-import/export.js              |  12 +-
 .../exports-with-incremental.js               |  12 +-
 .../yes-circular-import/exports.js            |  12 +-
 .../with-noEmitOnError-with-incremental.js    |  12 +-
 .../with-noEmitOnError.js                     |  12 +-
 ...rrors-for-.d.ts-change-with-incremental.js |  12 +-
 .../errors-for-.d.ts-change.js                |  12 +-
 .../errors-for-.ts-change-with-incremental.js |  12 +-
 .../errors-for-.ts-change.js                  |  12 +-
 ...el-import-that-changes-with-incremental.js |  12 +-
 ...g-a-deep-multilevel-import-that-changes.js |  12 +-
 .../export-with-incremental.js                |  12 +-
 .../no-circular-import/export.js              |  12 +-
 .../exports-with-incremental.js               |  12 +-
 .../yes-circular-import/exports.js            |  12 +-
 .../with-noEmitOnError-with-incremental.js    |  12 +-
 .../with-noEmitOnError.js                     |  12 +-
 ...rrors-for-.d.ts-change-with-incremental.js |  12 +-
 .../errors-for-.d.ts-change.js                |  12 +-
 .../errors-for-.ts-change-with-incremental.js |  12 +-
 .../errors-for-.ts-change.js                  |  12 +-
 ...el-import-that-changes-with-incremental.js |  12 +-
 ...g-a-deep-multilevel-import-that-changes.js |  12 +-
 .../export-with-incremental.js                |  12 +-
 .../no-circular-import/export.js              |  12 +-
 .../exports-with-incremental.js               |  12 +-
 .../yes-circular-import/exports.js            |  12 +-
 .../with-noEmitOnError-with-incremental.js    |  12 +-
 .../default/with-noEmitOnError.js             |  12 +-
 ...rrors-for-.d.ts-change-with-incremental.js |  12 +-
 .../errors-for-.d.ts-change.js                |  12 +-
 .../errors-for-.ts-change-with-incremental.js |  12 +-
 .../errors-for-.ts-change.js                  |  12 +-
 ...el-import-that-changes-with-incremental.js |  12 +-
 ...g-a-deep-multilevel-import-that-changes.js |  12 +-
 .../export-with-incremental.js                |  12 +-
 .../no-circular-import/export.js              |  12 +-
 .../exports-with-incremental.js               |  12 +-
 .../yes-circular-import/exports.js            |  12 +-
 .../with-noEmitOnError-with-incremental.js    |  12 +-
 .../defaultAndD/with-noEmitOnError.js         |  12 +-
 ...rrors-for-.d.ts-change-with-incremental.js |  12 +-
 .../errors-for-.d.ts-change.js                |  12 +-
 .../errors-for-.ts-change-with-incremental.js |  12 +-
 .../errors-for-.ts-change.js                  |  12 +-
 ...el-import-that-changes-with-incremental.js |  12 +-
 ...g-a-deep-multilevel-import-that-changes.js |  12 +-
 .../export-with-incremental.js                |  12 +-
 .../no-circular-import/export.js              |  12 +-
 .../exports-with-incremental.js               |  12 +-
 .../yes-circular-import/exports.js            |  12 +-
 .../with-noEmitOnError-with-incremental.js    |  12 +-
 .../isolatedModules/with-noEmitOnError.js     |  12 +-
 ...rrors-for-.d.ts-change-with-incremental.js |  12 +-
 .../errors-for-.d.ts-change.js                |  12 +-
 .../errors-for-.ts-change-with-incremental.js |  12 +-
 .../errors-for-.ts-change.js                  |  12 +-
 ...el-import-that-changes-with-incremental.js |  12 +-
 ...g-a-deep-multilevel-import-that-changes.js |  12 +-
 .../export-with-incremental.js                |  12 +-
 .../no-circular-import/export.js              |  12 +-
 .../exports-with-incremental.js               |  12 +-
 .../yes-circular-import/exports.js            |  12 +-
 .../with-noEmitOnError-with-incremental.js    |  12 +-
 .../isolatedModulesAndD/with-noEmitOnError.js |  12 +-
 ...n-Windows-style-drive-root-is-lowercase.js |   4 +-
 ...n-Windows-style-drive-root-is-uppercase.js |   4 +-
 ...ry-symlink-target-and-import-match-disk.js |   4 +-
 ...le-symlink-target-and-import-match-disk.js |   4 +-
 ...nging-module-name-with-different-casing.js |   4 +-
 ...target-matches-disk-but-import-does-not.js |   4 +-
 ...target-matches-disk-but-import-does-not.js |   4 +-
 ...link-target,-and-disk-are-all-different.js |   4 +-
 ...link-target,-and-disk-are-all-different.js |   4 +-
 ...link-target-agree-but-do-not-match-disk.js |   4 +-
 ...link-target-agree-but-do-not-match-disk.js |   4 +-
 ...k-but-directory-symlink-target-does-not.js |   4 +-
 ...s-disk-but-file-symlink-target-does-not.js |   4 +-
 ...ative-information-file-location-changes.js |   4 +-
 .../editing-module-augmentation-watch.js      |   4 +-
 ...portHelpers-backing-types-removed-watch.js |   2 +-
 ...remental-with-circular-references-watch.js |   4 +-
 ...xImportSource-backing-types-added-watch.js |   2 +-
 ...mportSource-backing-types-removed-watch.js |   2 +-
 .../jsxImportSource-option-changed-watch.js   |   4 +-
 .../own-file-emit-with-errors-watch.js        |   4 +-
 .../own-file-emit-without-errors-watch.js     |   4 +-
 .../own-file-emit-with-errors-watch.js        |   4 +-
 ...-parameters-that-are-not-relative-watch.js |   4 +-
 .../without-commandline-options-watch.js      |   4 +-
 .../incremental/tsbuildinfo-has-error.js      |   2 +-
 ...lobal-declaration-file-is-deleted-watch.js |   2 +-
 .../with-config-with-redirection.js           |  30 +-
 .../tscWatch/libraryResolution/with-config.js |  30 +-
 .../without-config-with-redirection.js        |  22 +-
 .../libraryResolution/without-config.js       |  22 +-
 .../moduleResolution/alternateResult.js       |  32 +-
 .../diagnostics-from-cache.js                 |   4 +-
 ...esolutions-from-file-are-partially-used.js |   4 +-
 ...s-with-partially-used-import-attributes.js |   4 +-
 ...en-package-json-with-type-module-exists.js |  20 +-
 .../package-json-file-is-edited.js            |  20 +-
 .../type-reference-resolutions-reuse.js       |   4 +-
 ...for-changes-to-package-json-main-fields.js |   8 +-
 .../esm-mode-file-is-edited.js                |   4 +-
 ...configFile-contents-when-options-change.js |   4 +-
 ...rts-errors-when-the-config-file-changes.js |   8 +-
 ...en-'--allowArbitraryExtensions'-changes.js |   8 +-
 ...nostics-when-'--noUnusedLabels'-changes.js |   8 +-
 ...-a-configured-program-without-file-list.js |   2 +-
 ...hould-remove-the-module-not-found-error.js |   2 +-
 ...has-changed-(new-file-in-list-of-files).js |   4 +-
 ...ot-files-has-changed-(new-file-on-disk).js |   2 +-
 ...-when-set-of-root-files-was-not-changed.js |   4 +-
 .../programUpdates/change-module-to-none.js   |   4 +-
 ...iles-are-reflected-in-project-structure.js |   4 +-
 ...s-changes-in-lib-section-of-config-file.js |   4 +-
 ...keys-differ-only-in-directory-seperator.js |   6 +-
 ...eleted-files-affect-project-structure-2.js |   2 +-
 .../deleted-files-affect-project-structure.js |   2 +-
 .../extended-source-files-are-watched.js      |  16 +-
 .../file-in-files-is-deleted.js               |   2 +-
 .../handle-recreated-files-correctly.js       |  12 +-
 ...se-they-were-added-with-tripleSlashRefs.js |   2 +-
 ...tore-the-states-for-configured-projects.js |   6 +-
 ...estore-the-states-for-inferred-projects.js |   6 +-
 ...rors-correctly-with-file-not-in-rootDir.js |   4 +-
 ...s-errors-correctly-with-isolatedModules.js |   4 +-
 .../with-outFile.js                           |   2 +-
 ...odule-resolution-changes-in-config-file.js |   4 +-
 .../should-reflect-change-in-config-file.js   |   8 +-
 ...when-file-changes-from-global-to-module.js |   4 +-
 ...programs-are-not-affected-by-each-other.js |   2 +-
 ...tes-diagnostics-and-emit-for-decorators.js |   8 +-
 ...it-when-useDefineForClassFields-changes.js |   4 +-
 .../updates-emit-on-jsx-option-add.js         |   4 +-
 .../updates-emit-on-jsx-option-change.js      |   4 +-
 ...mit-when-importsNotUsedAsValues-changes.js |  12 +-
 ...on-emit-is-disabled-in-compiler-options.js |  16 +-
 .../with-default-options.js                   |   8 +-
 .../with-skipDefaultLibCheck.js               |   8 +-
 .../with-skipLibCheck.js                      |   8 +-
 .../with-default-options.js                   |   8 +-
 .../with-skipDefaultLibCheck.js               |   8 +-
 .../with-skipLibCheck.js                      |   8 +-
 ...when-ambient-modules-of-program-changes.js |   6 +-
 ...orceConsistentCasingInFileNames-changes.js |   4 +-
 ...s-errors-when-noErrorTruncation-changes.js |   4 +-
 ...es-errors-when-strictNullChecks-changes.js |  12 +-
 ...solution-when-resolveJsonModule-changes.js |   4 +-
 ...owImportingTsExtensions`-of-config-file.js |   4 +-
 .../when-changing-checkJs-of-config-file.js   |   4 +-
 ...file-is-added-to-the-referenced-project.js |  10 +-
 ...ibCheck-and-skipDefaultLibCheck-changes.js |  24 +-
 ...-file-is-changed-but-its-content-havent.js |   4 +-
 .../on-sample-project.js                      |   8 +-
 ...-different-folders-with-no-files-clause.js |  38 +-
 ...nsitive-references-in-different-folders.js |  38 +-
 .../on-transitive-references.js               |  38 +-
 ...n-declarationMap-changes-for-dependency.js |   4 +-
 ...roject-uses-different-module-resolution.js |   2 +-
 .../tscWatch/resolutionCache/caching-works.js |  12 +-
 .../loads-missing-files-from-disk.js          |   4 +-
 .../reusing-type-ref-resolution.js            |   6 +-
 .../scoped-package-installation.js            |   2 +-
 ...module-goes-missing-and-then-comes-back.js |   6 +-
 ...are-global-and-installed-at-later-point.js |   2 +-
 ...cluded-file-with-ambient-module-changes.js |   4 +-
 ...-no-notification-from-fs-for-index-file.js |  14 +-
 ...le-resolution-changes-to-ambient-module.js |   2 +-
 ...der-that-already-contains-@types-folder.js |   2 +-
 ...rogram-with-files-from-external-library.js |   4 +-
 ...-prefers-declaration-file-over-document.js |   4 +-
 ...es-field-when-solution-is-already-built.js |   2 +-
 ...Symlinks-when-solution-is-already-built.js |   2 +-
 ...-package-when-solution-is-already-built.js |   2 +-
 ...Symlinks-when-solution-is-already-built.js |   2 +-
 ...ubFolder-when-solution-is-already-built.js |   2 +-
 ...Symlinks-when-solution-is-already-built.js |   2 +-
 ...-package-when-solution-is-already-built.js |   2 +-
 ...Symlinks-when-solution-is-already-built.js |   2 +-
 ...-project-when-solution-is-already-built.js |   2 +-
 ...not-implement-hasInvalidatedResolutions.js |  12 +-
 ...st-implements-hasInvalidatedResolutions.js |   8 +-
 ...noEmit-with-composite-with-emit-builder.js |  14 +-
 ...it-with-composite-with-semantic-builder.js |  14 +-
 ...nError-with-composite-with-emit-builder.js |   8 +-
 ...or-with-composite-with-semantic-builder.js |   8 +-
 .../watchApi/semantic-builder-emitOnlyDts.js  |   4 +-
 ...createSemanticDiagnosticsBuilderProgram.js |   4 +-
 ...ting-with-emitOnlyDtsFiles-with-outFile.js |   2 +-
 .../when-emitting-with-emitOnlyDtsFiles.js    |   2 +-
 ...ing-useSourceOfProjectReferenceRedirect.js |  10 +-
 ...-host-implementing-getParsedCommandLine.js |   2 +-
 ...oject-when-there-is-no-config-file-name.js |   4 +-
 ...tends-when-there-is-no-config-file-name.js |   8 +-
 ...-timesouts-on-host-program-gets-updated.js |   2 +-
 .../fsEvent-for-change-is-repeated.js         |   8 +-
 ...tamp-false-useFsEventsOnParentDirectory.js | 175 ++++++
 .../fsWatch/fsWatchWithTimestamp-false.js     |   4 +-
 ...stamp-true-useFsEventsOnParentDirectory.js | 161 ++++++
 .../fsWatch/fsWatchWithTimestamp-true.js      |   4 +-
 ...inode-when-rename-event-ends-with-tilde.js |   6 +-
 ...e-occurs-when-file-is-still-on-the-disk.js |   6 +-
 ...when-using-file-watching-thats-on-inode.js |   6 +-
 ...e-occurs-when-file-is-still-on-the-disk.js |   6 +-
 ...hronous-watch-directory-renaming-a-file.js |   6 +-
 .../with-non-synchronous-watch-directory.js   |  10 +-
 .../using-dynamic-priority-polling.js         |   4 +-
 .../using-fixed-chunk-size-polling.js         |   4 +-
 285 files changed, 2042 insertions(+), 1682 deletions(-)
 create mode 100644 tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/fsWatchWithTimestamp-false-useFsEventsOnParentDirectory.js
 create mode 100644 tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/fsWatchWithTimestamp-true-useFsEventsOnParentDirectory.js

diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
index 32d7af09c03e7..42bd65099ea81 100644
--- a/src/compiler/sys.ts
+++ b/src/compiler/sys.ts
@@ -378,16 +378,24 @@ function createDynamicPriorityPollingWatchFile(host: {
     }
 }
 
-function createUseFsEventsOnParentDirectoryWatchFile(fsWatch: FsWatch, useCaseSensitiveFileNames: boolean): HostWatchFile {
+function createUseFsEventsOnParentDirectoryWatchFile(
+    fsWatch: FsWatch,
+    useCaseSensitiveFileNames: boolean,
+    getModifiedTime: NonNullable<System["getModifiedTime"]>,
+    fsWatchWithTimestamp: boolean | undefined,
+): HostWatchFile {
     // One file can have multiple watchers
     const fileWatcherCallbacks = createMultiMap<string, FileWatcherCallback>();
+    const fileTimestamps = fsWatchWithTimestamp ? new Map<string, Date>() : undefined;
     const dirWatchers = new Map<string, DirectoryWatcher>();
     const toCanonicalName = createGetCanonicalFileName(useCaseSensitiveFileNames);
     return nonPollingWatchFile;
 
     function nonPollingWatchFile(fileName: string, callback: FileWatcherCallback, _pollingInterval: PollingInterval, fallbackOptions: WatchOptions | undefined): FileWatcher {
         const filePath = toCanonicalName(fileName);
-        fileWatcherCallbacks.add(filePath, callback);
+        if (fileWatcherCallbacks.add(filePath, callback).length === 1 && fileTimestamps) {
+            fileTimestamps.set(filePath, getModifiedTime(fileName) || missingFileModifiedTime);
+        }
         const dirPath = getDirectoryPath(filePath) || ".";
         const watcher = dirWatchers.get(dirPath) ||
             createDirectoryWatcher(getDirectoryPath(fileName) || ".", dirPath, fallbackOptions);
@@ -410,15 +418,29 @@ function createUseFsEventsOnParentDirectoryWatchFile(fsWatch: FsWatch, useCaseSe
         const watcher = fsWatch(
             dirName,
             FileSystemEntryKind.Directory,
-            (_eventName: string, relativeFileName, modifiedTime) => {
+            (eventName: string, relativeFileName) => {
                 // When files are deleted from disk, the triggered "rename" event would have a relativefileName of "undefined"
                 if (!isString(relativeFileName)) return;
                 const fileName = getNormalizedAbsolutePath(relativeFileName, dirName);
+                const filePath = toCanonicalName(fileName);
                 // Some applications save a working file via rename operations
-                const callbacks = fileName && fileWatcherCallbacks.get(toCanonicalName(fileName));
+                const callbacks = fileName && fileWatcherCallbacks.get(filePath);
                 if (callbacks) {
+                    let currentModifiedTime;
+                    let eventKind = FileWatcherEventKind.Changed;
+                    if (fileTimestamps) {
+                        const existingTime = fileTimestamps.get(filePath)!;
+                        if (eventName === "change") {
+                            currentModifiedTime = getModifiedTime(fileName) || missingFileModifiedTime;
+                            if (currentModifiedTime.getTime() === existingTime.getTime()) return;
+                        }
+                        currentModifiedTime ||= getModifiedTime(fileName) || missingFileModifiedTime;
+                        fileTimestamps.set(filePath, currentModifiedTime);
+                        if (existingTime === missingFileModifiedTime) eventKind = FileWatcherEventKind.Created;
+                        else if (currentModifiedTime === missingFileModifiedTime) eventKind = FileWatcherEventKind.Deleted;
+                    }
                     for (const fileCallback of callbacks) {
-                        fileCallback(fileName, FileWatcherEventKind.Changed, modifiedTime);
+                        fileCallback(fileName, eventKind, currentModifiedTime);
                     }
                 }
             },
@@ -974,7 +996,7 @@ export function createSystemWatchFunctions({
                 );
             case WatchFileKind.UseFsEventsOnParentDirectory:
                 if (!nonPollingWatchFile) {
-                    nonPollingWatchFile = createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames);
+                    nonPollingWatchFile = createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames, getModifiedTime, fsWatchWithTimestamp);
                 }
                 return nonPollingWatchFile(fileName, callback, pollingInterval, getFallbackOptions(options));
             default:
@@ -1191,7 +1213,7 @@ export function createSystemWatchFunctions({
                 return watchPresentFileSystemEntryWithFsWatchFile();
             }
             try {
-                const presentWatcher = (!fsWatchWithTimestamp ? fsWatchWorker : fsWatchWorkerHandlingTimestamp)(
+                const presentWatcher = (entryKind === FileSystemEntryKind.Directory || !fsWatchWithTimestamp ? fsWatchWorker : fsWatchWorkerHandlingTimestamp)(
                     fileOrDirectory,
                     recursive,
                     inodeWatching ?
diff --git a/src/testRunner/unittests/helpers/virtualFileSystemWithWatch.ts b/src/testRunner/unittests/helpers/virtualFileSystemWithWatch.ts
index 3a3790f99c3d1..d32febe1d5277 100644
--- a/src/testRunner/unittests/helpers/virtualFileSystemWithWatch.ts
+++ b/src/testRunner/unittests/helpers/virtualFileSystemWithWatch.ts
@@ -501,12 +501,12 @@ export class TestServerHost implements server.ServerHost, FormatDiagnosticsHost,
         else {
             currentEntry.content = content;
             currentEntry.modifiedTime = this.now();
-            this.fs.get(getDirectoryPath(currentEntry.path))!.modifiedTime = this.now();
             if (options && options.invokeDirectoryWatcherInsteadOfFileChanged) {
                 const directoryFullPath = getDirectoryPath(currentEntry.fullPath);
-                this.invokeFileWatcher(directoryFullPath, FileWatcherEventKind.Changed, currentEntry.modifiedTime);
-                this.invokeFsWatchesCallbacks(directoryFullPath, "rename", currentEntry.modifiedTime, currentEntry.fullPath, options.useTildeAsSuffixInRenameEventFileName);
-                this.invokeRecursiveFsWatches(directoryFullPath, "rename", currentEntry.modifiedTime, currentEntry.fullPath, options.useTildeAsSuffixInRenameEventFileName);
+                this.fs.get(getDirectoryPath(currentEntry.path))!.modifiedTime = this.now();
+                this.invokeFileWatcher(directoryFullPath, FileWatcherEventKind.Changed, /*modifiedTime*/ undefined);
+                this.invokeFsWatchesCallbacks(directoryFullPath, "rename", /*modifiedTime*/ undefined, currentEntry.fullPath, options.useTildeAsSuffixInRenameEventFileName);
+                this.invokeRecursiveFsWatches(directoryFullPath, "rename", /*modifiedTime*/ undefined, currentEntry.fullPath, options.useTildeAsSuffixInRenameEventFileName);
             }
             else {
                 this.invokeFileAndFsWatches(currentEntry.fullPath, FileWatcherEventKind.Changed, currentEntry.modifiedTime, options?.useTildeAsSuffixInRenameEventFileName);
@@ -634,7 +634,7 @@ export class TestServerHost implements server.ServerHost, FormatDiagnosticsHost,
         const inodeWatching = this.inodeWatching;
         if (options?.skipInodeCheckOnCreate) this.inodeWatching = false;
         this.invokeFileAndFsWatches(fileOrDirectory.fullPath, FileWatcherEventKind.Created, fileOrDirectory.modifiedTime, options?.useTildeAsSuffixInRenameEventFileName);
-        this.invokeFileAndFsWatches(folder.fullPath, FileWatcherEventKind.Changed, fileOrDirectory.modifiedTime, options?.useTildeAsSuffixInRenameEventFileName);
+        this.invokeFileAndFsWatches(folder.fullPath, FileWatcherEventKind.Changed, folder.modifiedTime, options?.useTildeAsSuffixInRenameEventFileName);
         this.inodeWatching = inodeWatching;
     }
 
@@ -741,13 +741,13 @@ export class TestServerHost implements server.ServerHost, FormatDiagnosticsHost,
         this.invokeFsWatchesRecursiveCallbacks(fullPath, eventName, modifiedTime, entryFullPath, useTildeSuffix);
         const basePath = getDirectoryPath(fullPath);
         if (this.getCanonicalFileName(fullPath) !== this.getCanonicalFileName(basePath)) {
-            this.invokeRecursiveFsWatches(basePath, eventName, modifiedTime, entryFullPath || fullPath, useTildeSuffix);
+            this.invokeRecursiveFsWatches(basePath, eventName, /*modifiedTime*/ undefined, entryFullPath || fullPath, useTildeSuffix);
         }
     }
 
     invokeFsWatches(fullPath: string, eventName: "rename" | "change", modifiedTime: Date | undefined, useTildeSuffix: boolean | undefined) {
         this.invokeFsWatchesCallbacks(fullPath, eventName, modifiedTime, fullPath, useTildeSuffix);
-        this.invokeFsWatchesCallbacks(getDirectoryPath(fullPath), eventName, modifiedTime, fullPath, useTildeSuffix);
+        this.invokeFsWatchesCallbacks(getDirectoryPath(fullPath), eventName, /*modifiedTime*/ undefined, fullPath, useTildeSuffix);
         this.invokeRecursiveFsWatches(fullPath, eventName, modifiedTime, /*entryFullPath*/ undefined, useTildeSuffix);
     }
 
diff --git a/src/testRunner/unittests/tscWatch/watchEnvironment.ts b/src/testRunner/unittests/tscWatch/watchEnvironment.ts
index c8278c047b0f5..e936d62ee469a 100644
--- a/src/testRunner/unittests/tscWatch/watchEnvironment.ts
+++ b/src/testRunner/unittests/tscWatch/watchEnvironment.ts
@@ -690,11 +690,11 @@ describe("unittests:: tsc-watch:: watchEnvironment:: tsc-watch with different po
     });
 
     describe("with fsWatch with fsWatchWithTimestamp", () => {
-        function verify(fsWatchWithTimestamp: boolean) {
+        function verify(fsWatchWithTimestamp: boolean, watchFile?: "useFsEventsOnParentDirectory") {
             verifyTscWatch({
                 scenario,
-                subScenario: `fsWatch/fsWatchWithTimestamp ${fsWatchWithTimestamp}`,
-                commandLineArgs: ["-w", "--extendedDiagnostics"],
+                subScenario: `fsWatch/fsWatchWithTimestamp ${fsWatchWithTimestamp}${watchFile ? ` ${watchFile}` : ""}`,
+                commandLineArgs: ["-w", "--extendedDiagnostics", ...(watchFile ? ["--watchFile", watchFile] : [])],
                 sys: () =>
                     createWatchedSystem(
                         {
@@ -723,6 +723,8 @@ describe("unittests:: tsc-watch:: watchEnvironment:: tsc-watch with different po
         }
         verify(/*fsWatchWithTimestamp*/ true);
         verify(/*fsWatchWithTimestamp*/ false);
+        verify(/*fsWatchWithTimestamp*/ true, "useFsEventsOnParentDirectory");
+        verify(/*fsWatchWithTimestamp*/ false, "useFsEventsOnParentDirectory");
     });
 
     verifyTscWatch({
diff --git a/tests/baselines/reference/tsbuildWatch/configFileErrors/reports-syntax-errors-in-config-file.js b/tests/baselines/reference/tsbuildWatch/configFileErrors/reports-syntax-errors-in-config-file.js
index 6449ef37aa87a..55154b8311786 100644
--- a/tests/baselines/reference/tsbuildWatch/configFileErrors/reports-syntax-errors-in-config-file.js
+++ b/tests/baselines/reference/tsbuildWatch/configFileErrors/reports-syntax-errors-in-config-file.js
@@ -161,14 +161,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:33 AM] File change detected. Starting incremental compilation...
+[12:00:32 AM] File change detected. Starting incremental compilation...
 
 tsconfig.json:8:9 - error TS1005: ',' expected.
 
 8         "b.ts"
           ~~~~~~
 
-[12:00:34 AM] Found 1 error. Watching for file changes.
+[12:00:33 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -212,14 +212,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:38 AM] File change detected. Starting incremental compilation...
+[12:00:36 AM] File change detected. Starting incremental compilation...
 
 tsconfig.json:8:9 - error TS1005: ',' expected.
 
 8         "b.ts"
           ~~~~~~
 
-[12:00:46 AM] Found 1 error. Watching for file changes.
+[12:00:42 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -323,14 +323,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:50 AM] File change detected. Starting incremental compilation...
+[12:00:45 AM] File change detected. Starting incremental compilation...
 
 tsconfig.json:8:9 - error TS1005: ',' expected.
 
 8         "b.ts"
           ~~~~~~
 
-[12:00:51 AM] Found 1 error. Watching for file changes.
+[12:00:46 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -383,9 +383,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:56 AM] File change detected. Starting incremental compilation...
+[12:00:50 AM] File change detected. Starting incremental compilation...
 
-[12:01:12 AM] Found 0 errors. Watching for file changes.
+[12:01:04 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/demo/updates-with-bad-reference.js b/tests/baselines/reference/tsbuildWatch/demo/updates-with-bad-reference.js
index aac33e9234ffc..3e75bce702976 100644
--- a/tests/baselines/reference/tsbuildWatch/demo/updates-with-bad-reference.js
+++ b/tests/baselines/reference/tsbuildWatch/demo/updates-with-bad-reference.js
@@ -144,17 +144,17 @@ declare const console: { log(msg: any): void; };
 /a/lib/tsc.js -b -w -verbose
 Output::
 >> Screen clear
-[12:00:45 AM] Starting compilation in watch mode...
+[12:00:44 AM] Starting compilation in watch mode...
 
-[12:00:46 AM] Projects in this build: 
+[12:00:45 AM] Projects in this build: 
     * core/tsconfig.json
     * animals/tsconfig.json
     * zoo/tsconfig.json
     * tsconfig.json
 
-[12:00:47 AM] Project 'core/tsconfig.json' is out of date because output file 'lib/core/tsconfig.tsbuildinfo' does not exist
+[12:00:46 AM] Project 'core/tsconfig.json' is out of date because output file 'lib/core/tsconfig.tsbuildinfo' does not exist
 
-[12:00:48 AM] Building project '/user/username/projects/demo/core/tsconfig.json'...
+[12:00:47 AM] Building project '/user/username/projects/demo/core/tsconfig.json'...
 
 animals/index.ts:1:20 - error TS6059: File '/user/username/projects/demo/animals/animal.ts' is not under 'rootDir' '/user/username/projects/demo/core'. 'rootDir' is expected to contain all source files.
 
@@ -207,15 +207,15 @@ Output::
                          ~~~
     File is included via import here.
 
-[12:00:59 AM] Project 'animals/tsconfig.json' can't be built because its dependency 'core' has errors
+[12:00:58 AM] Project 'animals/tsconfig.json' can't be built because its dependency 'core' has errors
 
-[12:01:00 AM] Skipping build of project '/user/username/projects/demo/animals/tsconfig.json' because its dependency '/user/username/projects/demo/core' has errors
+[12:00:59 AM] Skipping build of project '/user/username/projects/demo/animals/tsconfig.json' because its dependency '/user/username/projects/demo/core' has errors
 
-[12:01:01 AM] Project 'zoo/tsconfig.json' can't be built because its dependency 'animals' was not built
+[12:01:00 AM] Project 'zoo/tsconfig.json' can't be built because its dependency 'animals' was not built
 
-[12:01:02 AM] Skipping build of project '/user/username/projects/demo/zoo/tsconfig.json' because its dependency '/user/username/projects/demo/animals' was not built
+[12:01:01 AM] Skipping build of project '/user/username/projects/demo/zoo/tsconfig.json' because its dependency '/user/username/projects/demo/animals' was not built
 
-[12:01:03 AM] Found 7 errors. Watching for file changes.
+[12:01:02 AM] Found 7 errors. Watching for file changes.
 
 
 
@@ -469,11 +469,11 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:06 AM] File change detected. Starting incremental compilation...
+[12:01:04 AM] File change detected. Starting incremental compilation...
 
-[12:01:07 AM] Project 'core/tsconfig.json' is out of date because buildinfo file 'lib/core/tsconfig.tsbuildinfo' indicates that some of the changes were not emitted
+[12:01:05 AM] Project 'core/tsconfig.json' is out of date because buildinfo file 'lib/core/tsconfig.tsbuildinfo' indicates that some of the changes were not emitted
 
-[12:01:08 AM] Building project '/user/username/projects/demo/core/tsconfig.json'...
+[12:01:06 AM] Building project '/user/username/projects/demo/core/tsconfig.json'...
 
 animals/index.ts:1:20 - error TS6059: File '/user/username/projects/demo/animals/animal.ts' is not under 'rootDir' '/user/username/projects/demo/core'. 'rootDir' is expected to contain all source files.
 
@@ -526,7 +526,7 @@ Output::
                          ~~~
     File is included via import here.
 
-[12:01:16 AM] Found 7 errors. Watching for file changes.
+[12:01:12 AM] Found 7 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/demo/updates-with-circular-reference.js b/tests/baselines/reference/tsbuildWatch/demo/updates-with-circular-reference.js
index d481aa7817dc4..13040d6d88481 100644
--- a/tests/baselines/reference/tsbuildWatch/demo/updates-with-circular-reference.js
+++ b/tests/baselines/reference/tsbuildWatch/demo/updates-with-circular-reference.js
@@ -148,9 +148,9 @@ declare const console: { log(msg: any): void; };
 /a/lib/tsc.js -b -w -verbose
 Output::
 >> Screen clear
-[12:00:46 AM] Starting compilation in watch mode...
+[12:00:45 AM] Starting compilation in watch mode...
 
-[12:00:47 AM] Projects in this build: 
+[12:00:46 AM] Projects in this build: 
     * animals/tsconfig.json
     * zoo/tsconfig.json
     * core/tsconfig.json
@@ -161,7 +161,7 @@ Output::
 /user/username/projects/demo/zoo/tsconfig.json
 /user/username/projects/demo/animals/tsconfig.json
 
-[12:00:48 AM] Found 1 error. Watching for file changes.
+[12:00:47 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -220,11 +220,11 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 1
 Output::
 >> Screen clear
-[12:00:52 AM] File change detected. Starting incremental compilation...
+[12:00:50 AM] File change detected. Starting incremental compilation...
 
-[12:00:53 AM] Project 'core/tsconfig.json' is out of date because output file 'lib/core/tsconfig.tsbuildinfo' does not exist
+[12:00:51 AM] Project 'core/tsconfig.json' is out of date because output file 'lib/core/tsconfig.tsbuildinfo' does not exist
 
-[12:00:54 AM] Building project '/user/username/projects/demo/core/tsconfig.json'...
+[12:00:52 AM] Building project '/user/username/projects/demo/core/tsconfig.json'...
 
 
 
@@ -318,15 +318,15 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 0
 Output::
-[12:01:09 AM] Project 'animals/tsconfig.json' is out of date because output file 'lib/animals/tsconfig.tsbuildinfo' does not exist
+[12:01:07 AM] Project 'animals/tsconfig.json' is out of date because output file 'lib/animals/tsconfig.tsbuildinfo' does not exist
 
-[12:01:10 AM] Building project '/user/username/projects/demo/animals/tsconfig.json'...
+[12:01:08 AM] Building project '/user/username/projects/demo/animals/tsconfig.json'...
 
-[12:01:31 AM] Project 'zoo/tsconfig.json' is out of date because output file 'lib/zoo/tsconfig.tsbuildinfo' does not exist
+[12:01:29 AM] Project 'zoo/tsconfig.json' is out of date because output file 'lib/zoo/tsconfig.tsbuildinfo' does not exist
 
-[12:01:32 AM] Building project '/user/username/projects/demo/zoo/tsconfig.json'...
+[12:01:30 AM] Building project '/user/username/projects/demo/zoo/tsconfig.json'...
 
-[12:01:45 AM] Found 0 errors. Watching for file changes.
+[12:01:43 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/moduleResolution/build-mode-watches-for-changes-to-package-json-main-fields.js b/tests/baselines/reference/tsbuildWatch/moduleResolution/build-mode-watches-for-changes-to-package-json-main-fields.js
index 206787e7d386d..f979c68b4c226 100644
--- a/tests/baselines/reference/tsbuildWatch/moduleResolution/build-mode-watches-for-changes-to-package-json-main-fields.js
+++ b/tests/baselines/reference/tsbuildWatch/moduleResolution/build-mode-watches-for-changes-to-package-json-main-fields.js
@@ -349,11 +349,11 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:19 AM] File change detected. Starting incremental compilation...
+[12:01:18 AM] File change detected. Starting incremental compilation...
 
-[12:01:20 AM] Project 'packages/pkg1/tsconfig.json' is out of date because output 'packages/pkg1/build/index.js' is older than input 'packages/pkg2/package.json'
+[12:01:19 AM] Project 'packages/pkg1/tsconfig.json' is out of date because output 'packages/pkg1/build/index.js' is older than input 'packages/pkg2/package.json'
 
-[12:01:21 AM] Building project '/user/username/projects/myproject/packages/pkg1/tsconfig.json'...
+[12:01:20 AM] Building project '/user/username/projects/myproject/packages/pkg1/tsconfig.json'...
 
 ======== Resolving module 'pkg2' from '/user/username/projects/myproject/packages/pkg1/index.ts'. ========
 Module resolution kind is not specified, using 'Node10'.
@@ -380,7 +380,7 @@ Resolving real path for '/user/username/projects/myproject/node_modules/pkg2/bui
 1 import type { TheNum } from 'pkg2'
                 ~~~~~~
 
-[12:01:22 AM] Found 1 error. Watching for file changes.
+[12:01:21 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -431,11 +431,11 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:26 AM] File change detected. Starting incremental compilation...
+[12:01:24 AM] File change detected. Starting incremental compilation...
 
-[12:01:27 AM] Project 'packages/pkg1/tsconfig.json' is out of date because output 'packages/pkg1/build/index.js' is older than input 'packages/pkg2/package.json'
+[12:01:25 AM] Project 'packages/pkg1/tsconfig.json' is out of date because output 'packages/pkg1/build/index.js' is older than input 'packages/pkg2/package.json'
 
-[12:01:28 AM] Building project '/user/username/projects/myproject/packages/pkg1/tsconfig.json'...
+[12:01:26 AM] Building project '/user/username/projects/myproject/packages/pkg1/tsconfig.json'...
 
 ======== Resolving module 'pkg2' from '/user/username/projects/myproject/packages/pkg1/index.ts'. ========
 Module resolution kind is not specified, using 'Node10'.
@@ -466,7 +466,7 @@ File '/user/username/projects/myproject/packages/pkg2/build/const.ts' does not e
 File '/user/username/projects/myproject/packages/pkg2/build/const.tsx' does not exist.
 File '/user/username/projects/myproject/packages/pkg2/build/const.d.ts' exists - use it as a name resolution result.
 ======== Module name './const.js' was successfully resolved to '/user/username/projects/myproject/packages/pkg2/build/const.d.ts'. ========
-[12:01:33 AM] Found 0 errors. Watching for file changes.
+[12:01:30 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly-with-cts-and-mts-extensions.js b/tests/baselines/reference/tsbuildWatch/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly-with-cts-and-mts-extensions.js
index 346657af30594..97d14bf567b4b 100644
--- a/tests/baselines/reference/tsbuildWatch/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly-with-cts-and-mts-extensions.js
+++ b/tests/baselines/reference/tsbuildWatch/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly-with-cts-and-mts-extensions.js
@@ -348,11 +348,11 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:13 AM] File change detected. Starting incremental compilation...
+[12:01:12 AM] File change detected. Starting incremental compilation...
 
-[12:01:14 AM] Project 'packages/pkg1/tsconfig.json' is out of date because output 'packages/pkg1/build/index.js' is older than input 'packages/pkg1/package.json'
+[12:01:13 AM] Project 'packages/pkg1/tsconfig.json' is out of date because output 'packages/pkg1/build/index.js' is older than input 'packages/pkg1/package.json'
 
-[12:01:15 AM] Building project '/user/username/projects/myproject/packages/pkg1/tsconfig.json'...
+[12:01:14 AM] Building project '/user/username/projects/myproject/packages/pkg1/tsconfig.json'...
 
 Found 'package.json' at '/user/username/projects/myproject/packages/pkg1/package.json'.
 ======== Resolving module 'pkg2' from '/user/username/projects/myproject/packages/pkg1/index.ts'. ========
@@ -397,7 +397,7 @@ File '/package.json' does not exist.
 1 import type { TheNum } from 'pkg2'
                               ~~~~~~
 
-[12:01:16 AM] Found 1 error. Watching for file changes.
+[12:01:15 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -449,11 +449,11 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:20 AM] File change detected. Starting incremental compilation...
+[12:01:18 AM] File change detected. Starting incremental compilation...
 
-[12:01:21 AM] Project 'packages/pkg1/tsconfig.json' is out of date because output 'packages/pkg1/build/index.js' is older than input 'packages/pkg1/package.json'
+[12:01:19 AM] Project 'packages/pkg1/tsconfig.json' is out of date because output 'packages/pkg1/build/index.js' is older than input 'packages/pkg1/package.json'
 
-[12:01:22 AM] Building project '/user/username/projects/myproject/packages/pkg1/tsconfig.json'...
+[12:01:20 AM] Building project '/user/username/projects/myproject/packages/pkg1/tsconfig.json'...
 
 Found 'package.json' at '/user/username/projects/myproject/packages/pkg1/package.json'.
 ======== Resolving module 'pkg2' from '/user/username/projects/myproject/packages/pkg1/index.ts'. ========
@@ -489,7 +489,7 @@ File '/user/username/projects/myproject/packages/pkg2/build/const.d.cts' exists
 File '/a/lib/package.json' does not exist.
 File '/a/package.json' does not exist.
 File '/package.json' does not exist.
-[12:01:27 AM] Found 0 errors. Watching for file changes.
+[12:01:24 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -542,11 +542,11 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:31 AM] File change detected. Starting incremental compilation...
+[12:01:27 AM] File change detected. Starting incremental compilation...
 
-[12:01:32 AM] Project 'packages/pkg1/tsconfig.json' is out of date because output 'packages/pkg1/build/index.js' is older than input 'packages/pkg1/package.json'
+[12:01:28 AM] Project 'packages/pkg1/tsconfig.json' is out of date because output 'packages/pkg1/build/index.js' is older than input 'packages/pkg1/package.json'
 
-[12:01:33 AM] Building project '/user/username/projects/myproject/packages/pkg1/tsconfig.json'...
+[12:01:29 AM] Building project '/user/username/projects/myproject/packages/pkg1/tsconfig.json'...
 
 Found 'package.json' at '/user/username/projects/myproject/packages/pkg1/package.json'.
 ======== Resolving module 'pkg2' from '/user/username/projects/myproject/packages/pkg1/index.ts'. ========
@@ -591,7 +591,7 @@ File '/package.json' does not exist.
 1 import type { TheNum } from 'pkg2'
                               ~~~~~~
 
-[12:01:34 AM] Found 1 error. Watching for file changes.
+[12:01:30 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -647,11 +647,11 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 1
 Output::
 >> Screen clear
-[12:01:42 AM] File change detected. Starting incremental compilation...
+[12:01:37 AM] File change detected. Starting incremental compilation...
 
-[12:01:43 AM] Project 'packages/pkg2/tsconfig.json' is out of date because output 'packages/pkg2/build/tsconfig.tsbuildinfo' is older than input 'packages/pkg2/index.cts'
+[12:01:38 AM] Project 'packages/pkg2/tsconfig.json' is out of date because output 'packages/pkg2/build/tsconfig.tsbuildinfo' is older than input 'packages/pkg2/index.cts'
 
-[12:01:44 AM] Building project '/user/username/projects/myproject/packages/pkg2/tsconfig.json'...
+[12:01:39 AM] Building project '/user/username/projects/myproject/packages/pkg2/tsconfig.json'...
 
 ======== Resolving module './const.cjs' from '/user/username/projects/myproject/packages/pkg2/index.cts'. ========
 Module resolution kind is not specified, using 'Node16'.
@@ -804,9 +804,9 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 0
 Output::
-[12:01:56 AM] Project 'packages/pkg1/tsconfig.json' is out of date because output 'packages/pkg1/build/index.js' is older than input 'packages/pkg2'
+[12:01:49 AM] Project 'packages/pkg1/tsconfig.json' is out of date because output 'packages/pkg1/build/index.js' is older than input 'packages/pkg2'
 
-[12:01:57 AM] Building project '/user/username/projects/myproject/packages/pkg1/tsconfig.json'...
+[12:01:50 AM] Building project '/user/username/projects/myproject/packages/pkg1/tsconfig.json'...
 
 Found 'package.json' at '/user/username/projects/myproject/packages/pkg1/package.json'.
 ======== Resolving module 'pkg2' from '/user/username/projects/myproject/packages/pkg1/index.ts'. ========
@@ -842,7 +842,7 @@ File '/user/username/projects/myproject/packages/pkg2/build/const.d.cts' exists
 File '/a/lib/package.json' does not exist according to earlier cached lookups.
 File '/a/package.json' does not exist according to earlier cached lookups.
 File '/package.json' does not exist according to earlier cached lookups.
-[12:02:02 AM] Found 0 errors. Watching for file changes.
+[12:01:54 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/moduleResolutionCache/handles-the-cache-correctly-when-two-projects-use-different-module-resolution-settings.js b/tests/baselines/reference/tsbuildWatch/moduleResolutionCache/handles-the-cache-correctly-when-two-projects-use-different-module-resolution-settings.js
index 82cd40d9385d5..66a14f062960b 100644
--- a/tests/baselines/reference/tsbuildWatch/moduleResolutionCache/handles-the-cache-correctly-when-two-projects-use-different-module-resolution-settings.js
+++ b/tests/baselines/reference/tsbuildWatch/moduleResolutionCache/handles-the-cache-correctly-when-two-projects-use-different-module-resolution-settings.js
@@ -365,13 +365,13 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:18 AM] File change detected. Starting incremental compilation...
+[12:01:17 AM] File change detected. Starting incremental compilation...
 
-[12:01:19 AM] Project 'project1/tsconfig.json' is out of date because output 'project1/tsconfig.tsbuildinfo' is older than input 'project1/index.ts'
+[12:01:18 AM] Project 'project1/tsconfig.json' is out of date because output 'project1/tsconfig.tsbuildinfo' is older than input 'project1/index.ts'
 
-[12:01:20 AM] Building project '/user/username/projects/myproject/project1/tsconfig.json'...
+[12:01:19 AM] Building project '/user/username/projects/myproject/project1/tsconfig.json'...
 
-[12:01:31 AM] Found 0 errors. Watching for file changes.
+[12:01:27 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted-with-incremental.js b/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted-with-incremental.js
index 46a118917ba77..93695fd9a052d 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted-with-incremental.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted-with-incremental.js
@@ -167,11 +167,11 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:36 AM] File change detected. Starting incremental compilation...
+[12:00:35 AM] File change detected. Starting incremental compilation...
 
-[12:00:37 AM] Project 'tsconfig.json' is up to date but needs to update timestamps of output files that are older than input files
+[12:00:36 AM] Project 'tsconfig.json' is up to date but needs to update timestamps of output files that are older than input files
 
-[12:00:38 AM] Found 0 errors. Watching for file changes.
+[12:00:37 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -195,13 +195,13 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:42 AM] File change detected. Starting incremental compilation...
+[12:00:40 AM] File change detected. Starting incremental compilation...
 
-[12:00:43 AM] Project 'tsconfig.json' is out of date because output 'tsconfig.tsbuildinfo' is older than input 'a.js'
+[12:00:41 AM] Project 'tsconfig.json' is out of date because output 'tsconfig.tsbuildinfo' is older than input 'a.js'
 
-[12:00:44 AM] Building project '/user/username/projects/myproject/tsconfig.json'...
+[12:00:42 AM] Building project '/user/username/projects/myproject/tsconfig.json'...
 
-[12:00:52 AM] Found 0 errors. Watching for file changes.
+[12:00:48 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted.js b/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted.js
index 48b0f3a712f97..950265cb6e968 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted.js
@@ -101,13 +101,13 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:31 AM] File change detected. Starting incremental compilation...
+[12:00:30 AM] File change detected. Starting incremental compilation...
 
-[12:00:32 AM] Project 'tsconfig.json' is out of date because output 'a.js' is older than input 'a.js'
+[12:00:31 AM] Project 'tsconfig.json' is out of date because output 'a.js' is older than input 'a.js'
 
-[12:00:33 AM] Building project '/user/username/projects/myproject/tsconfig.json'...
+[12:00:32 AM] Building project '/user/username/projects/myproject/tsconfig.json'...
 
-[12:00:34 AM] Found 0 errors. Watching for file changes.
+[12:00:33 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -151,13 +151,13 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:38 AM] File change detected. Starting incremental compilation...
+[12:00:36 AM] File change detected. Starting incremental compilation...
 
-[12:00:39 AM] Project 'tsconfig.json' is out of date because output 'a.js' is older than input 'a.js'
+[12:00:37 AM] Project 'tsconfig.json' is out of date because output 'a.js' is older than input 'a.js'
 
-[12:00:40 AM] Building project '/user/username/projects/myproject/tsconfig.json'...
+[12:00:38 AM] Building project '/user/username/projects/myproject/tsconfig.json'...
 
-[12:00:41 AM] Found 0 errors. Watching for file changes.
+[12:00:39 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error-with-incremental.js b/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error-with-incremental.js
index 8a8101d75eaa7..82f022ac073db 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error-with-incremental.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error-with-incremental.js
@@ -200,18 +200,18 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:47 AM] File change detected. Starting incremental compilation...
+[12:00:46 AM] File change detected. Starting incremental compilation...
 
-[12:00:48 AM] Project 'tsconfig.json' is out of date because buildinfo file 'dev-build/tsconfig.tsbuildinfo' indicates that some of the changes were not emitted
+[12:00:47 AM] Project 'tsconfig.json' is out of date because buildinfo file 'dev-build/tsconfig.tsbuildinfo' indicates that some of the changes were not emitted
 
-[12:00:49 AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
+[12:00:48 AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
 src/main.ts:4:1 - error TS1005: ',' expected.
 
 4 ;
   ~
 
-[12:00:50 AM] Found 1 error. Watching for file changes.
+[12:00:49 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -261,13 +261,13 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:54 AM] File change detected. Starting incremental compilation...
+[12:00:52 AM] File change detected. Starting incremental compilation...
 
-[12:00:55 AM] Project 'tsconfig.json' is out of date because buildinfo file 'dev-build/tsconfig.tsbuildinfo' indicates that some of the changes were not emitted
+[12:00:53 AM] Project 'tsconfig.json' is out of date because buildinfo file 'dev-build/tsconfig.tsbuildinfo' indicates that some of the changes were not emitted
 
-[12:00:56 AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
+[12:00:54 AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-[12:01:18 AM] Found 0 errors. Watching for file changes.
+[12:01:14 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -424,18 +424,18 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:22 AM] File change detected. Starting incremental compilation...
+[12:01:17 AM] File change detected. Starting incremental compilation...
 
-[12:01:23 AM] Project 'tsconfig.json' is out of date because output 'dev-build/tsconfig.tsbuildinfo' is older than input 'src/main.ts'
+[12:01:18 AM] Project 'tsconfig.json' is out of date because output 'dev-build/tsconfig.tsbuildinfo' is older than input 'src/main.ts'
 
-[12:01:24 AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
+[12:01:19 AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
         ~
 
-[12:01:32 AM] Found 1 error. Watching for file changes.
+[12:01:25 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -582,18 +582,18 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:37 AM] File change detected. Starting incremental compilation...
+[12:01:29 AM] File change detected. Starting incremental compilation...
 
-[12:01:38 AM] Project 'tsconfig.json' is out of date because buildinfo file 'dev-build/tsconfig.tsbuildinfo' indicates that some of the changes were not emitted
+[12:01:30 AM] Project 'tsconfig.json' is out of date because buildinfo file 'dev-build/tsconfig.tsbuildinfo' indicates that some of the changes were not emitted
 
-[12:01:39 AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
+[12:01:31 AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
         ~
 
-[12:01:40 AM] Found 1 error. Watching for file changes.
+[12:01:32 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -641,13 +641,13 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:44 AM] File change detected. Starting incremental compilation...
+[12:01:35 AM] File change detected. Starting incremental compilation...
 
-[12:01:45 AM] Project 'tsconfig.json' is out of date because buildinfo file 'dev-build/tsconfig.tsbuildinfo' indicates that some of the changes were not emitted
+[12:01:36 AM] Project 'tsconfig.json' is out of date because buildinfo file 'dev-build/tsconfig.tsbuildinfo' indicates that some of the changes were not emitted
 
-[12:01:46 AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
+[12:01:37 AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-[12:01:57 AM] Found 0 errors. Watching for file changes.
+[12:01:45 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -782,13 +782,13 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:02:01 AM] File change detected. Starting incremental compilation...
+[12:01:48 AM] File change detected. Starting incremental compilation...
 
-[12:02:02 AM] Project 'tsconfig.json' is up to date but needs to update timestamps of output files that are older than input files
+[12:01:49 AM] Project 'tsconfig.json' is up to date but needs to update timestamps of output files that are older than input files
 
-[12:02:03 AM] Updating output timestamps of project '/user/username/projects/noEmitOnError/tsconfig.json'...
+[12:01:50 AM] Updating output timestamps of project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-[12:02:05 AM] Found 0 errors. Watching for file changes.
+[12:01:52 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error.js b/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error.js
index 0183c236dab27..7f82a5708f5c6 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error.js
@@ -116,18 +116,18 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:39 AM] File change detected. Starting incremental compilation...
+[12:00:38 AM] File change detected. Starting incremental compilation...
 
-[12:00:40 AM] Project 'tsconfig.json' is out of date because output file 'dev-build/shared/types/db.js' does not exist
+[12:00:39 AM] Project 'tsconfig.json' is out of date because output file 'dev-build/shared/types/db.js' does not exist
 
-[12:00:41 AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
+[12:00:40 AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
 src/main.ts:4:1 - error TS1005: ',' expected.
 
 4 ;
   ~
 
-[12:00:42 AM] Found 1 error. Watching for file changes.
+[12:00:41 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -176,13 +176,13 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:46 AM] File change detected. Starting incremental compilation...
+[12:00:44 AM] File change detected. Starting incremental compilation...
 
-[12:00:47 AM] Project 'tsconfig.json' is out of date because output file 'dev-build/shared/types/db.js' does not exist
+[12:00:45 AM] Project 'tsconfig.json' is out of date because output file 'dev-build/shared/types/db.js' does not exist
 
-[12:00:48 AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
+[12:00:46 AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-[12:01:06 AM] Found 0 errors. Watching for file changes.
+[12:01:04 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -256,18 +256,18 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:10 AM] File change detected. Starting incremental compilation...
+[12:01:07 AM] File change detected. Starting incremental compilation...
 
-[12:01:11 AM] Project 'tsconfig.json' is out of date because output 'dev-build/shared/types/db.js' is older than input 'src/main.ts'
+[12:01:08 AM] Project 'tsconfig.json' is out of date because output 'dev-build/shared/types/db.js' is older than input 'src/main.ts'
 
-[12:01:12 AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
+[12:01:09 AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
         ~
 
-[12:01:13 AM] Found 1 error. Watching for file changes.
+[12:01:10 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -313,18 +313,18 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:18 AM] File change detected. Starting incremental compilation...
+[12:01:14 AM] File change detected. Starting incremental compilation...
 
-[12:01:19 AM] Project 'tsconfig.json' is out of date because output 'dev-build/shared/types/db.js' is older than input 'src/main.ts'
+[12:01:15 AM] Project 'tsconfig.json' is out of date because output 'dev-build/shared/types/db.js' is older than input 'src/main.ts'
 
-[12:01:20 AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
+[12:01:16 AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
         ~
 
-[12:01:21 AM] Found 1 error. Watching for file changes.
+[12:01:17 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -371,15 +371,15 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:25 AM] File change detected. Starting incremental compilation...
+[12:01:20 AM] File change detected. Starting incremental compilation...
 
-[12:01:26 AM] Project 'tsconfig.json' is out of date because output 'dev-build/shared/types/db.js' is older than input 'src/main.ts'
+[12:01:21 AM] Project 'tsconfig.json' is out of date because output 'dev-build/shared/types/db.js' is older than input 'src/main.ts'
 
-[12:01:27 AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
+[12:01:22 AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-[12:01:32 AM] Updating unchanged output timestamps of project '/user/username/projects/noEmitOnError/tsconfig.json'...
+[12:01:26 AM] Updating unchanged output timestamps of project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-[12:01:34 AM] Found 0 errors. Watching for file changes.
+[12:01:28 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -433,15 +433,15 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:38 AM] File change detected. Starting incremental compilation...
+[12:01:31 AM] File change detected. Starting incremental compilation...
 
-[12:01:39 AM] Project 'tsconfig.json' is out of date because output 'dev-build/shared/types/db.js' is older than input 'src/main.ts'
+[12:01:32 AM] Project 'tsconfig.json' is out of date because output 'dev-build/shared/types/db.js' is older than input 'src/main.ts'
 
-[12:01:40 AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
+[12:01:33 AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-[12:01:41 AM] Updating unchanged output timestamps of project '/user/username/projects/noEmitOnError/tsconfig.json'...
+[12:01:34 AM] Updating unchanged output timestamps of project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-[12:01:43 AM] Found 0 errors. Watching for file changes.
+[12:01:36 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/incremental-updates-in-verbose-mode.js b/tests/baselines/reference/tsbuildWatch/programUpdates/incremental-updates-in-verbose-mode.js
index 4064bd502842d..32558b39eb771 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/incremental-updates-in-verbose-mode.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/incremental-updates-in-verbose-mode.js
@@ -598,17 +598,17 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:27 AM] File change detected. Starting incremental compilation...
+[12:01:26 AM] File change detected. Starting incremental compilation...
 
-[12:01:28 AM] Project 'logic/tsconfig.json' is out of date because output 'logic/tsconfig.tsbuildinfo' is older than input 'logic/index.ts'
+[12:01:27 AM] Project 'logic/tsconfig.json' is out of date because output 'logic/tsconfig.tsbuildinfo' is older than input 'logic/index.ts'
 
-[12:01:29 AM] Building project '/user/username/projects/sample1/logic/tsconfig.json'...
+[12:01:28 AM] Building project '/user/username/projects/sample1/logic/tsconfig.json'...
 
-[12:01:43 AM] Project 'tests/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:01:38 AM] Project 'tests/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:01:44 AM] Updating output timestamps of project '/user/username/projects/sample1/tests/tsconfig.json'...
+[12:01:39 AM] Updating output timestamps of project '/user/username/projects/sample1/tests/tsconfig.json'...
 
-[12:01:46 AM] Found 0 errors. Watching for file changes.
+[12:01:41 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -765,11 +765,11 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 1
 Output::
 >> Screen clear
-[12:01:50 AM] File change detected. Starting incremental compilation...
+[12:01:44 AM] File change detected. Starting incremental compilation...
 
-[12:01:51 AM] Project 'logic/tsconfig.json' is out of date because output 'logic/tsconfig.tsbuildinfo' is older than input 'logic/index.ts'
+[12:01:45 AM] Project 'logic/tsconfig.json' is out of date because output 'logic/tsconfig.tsbuildinfo' is older than input 'logic/index.ts'
 
-[12:01:52 AM] Building project '/user/username/projects/sample1/logic/tsconfig.json'...
+[12:01:46 AM] Building project '/user/username/projects/sample1/logic/tsconfig.json'...
 
 
 
@@ -890,11 +890,11 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 0
 Output::
-[12:02:09 AM] Project 'tests/tsconfig.json' is out of date because output 'tests/index.js' is older than input 'logic/tsconfig.json'
+[12:01:58 AM] Project 'tests/tsconfig.json' is out of date because output 'tests/index.js' is older than input 'logic/tsconfig.json'
 
-[12:02:10 AM] Building project '/user/username/projects/sample1/tests/tsconfig.json'...
+[12:01:59 AM] Building project '/user/username/projects/sample1/tests/tsconfig.json'...
 
-[12:02:21 AM] Found 0 errors. Watching for file changes.
+[12:02:07 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-file-with-no-error-changes.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-file-with-no-error-changes.js
index 8daaf13948757..705fd725c47fb 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-file-with-no-error-changes.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-file-with-no-error-changes.js
@@ -199,14 +199,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:43 AM] File change detected. Starting incremental compilation...
+[12:00:42 AM] File change detected. Starting incremental compilation...
 
 app/fileWithError.ts:1:12 - error TS4094: Property 'p' of exported class expression may not be private or protected.
 
 1 export var myClassWithError = class {
              ~~~~~~~~~~~~~~~~
 
-[12:00:51 AM] Found 1 error. Watching for file changes.
+[12:00:48 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -327,14 +327,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:55 AM] File change detected. Starting incremental compilation...
+[12:00:51 AM] File change detected. Starting incremental compilation...
 
 app/fileWithError.ts:1:12 - error TS4094: Property 'p' of exported class expression may not be private or protected.
 
 1 export var myClassWithError = class {
              ~~~~~~~~~~~~~~~~
 
-[12:01:03 AM] Found 1 error. Watching for file changes.
+[12:00:57 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-fixing-errors-only-changed-file-is-emitted.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-fixing-errors-only-changed-file-is-emitted.js
index 4396b2d9f7caf..83e65f2959bc4 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-fixing-errors-only-changed-file-is-emitted.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-fixing-errors-only-changed-file-is-emitted.js
@@ -199,14 +199,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:43 AM] File change detected. Starting incremental compilation...
+[12:00:42 AM] File change detected. Starting incremental compilation...
 
 app/fileWithError.ts:1:12 - error TS4094: Property 'p' of exported class expression may not be private or protected.
 
 1 export var myClassWithError = class {
              ~~~~~~~~~~~~~~~~
 
-[12:00:51 AM] Found 1 error. Watching for file changes.
+[12:00:48 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -330,9 +330,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:55 AM] File change detected. Starting incremental compilation...
+[12:00:51 AM] File change detected. Starting incremental compilation...
 
-[12:01:06 AM] Found 0 errors. Watching for file changes.
+[12:00:59 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-file-with-no-error-changes.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-file-with-no-error-changes.js
index c775784f26109..7be2f16a2a94b 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-file-with-no-error-changes.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-file-with-no-error-changes.js
@@ -173,14 +173,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:35 AM] File change detected. Starting incremental compilation...
+[12:00:34 AM] File change detected. Starting incremental compilation...
 
 app/fileWithError.ts:1:12 - error TS4094: Property 'p' of exported class expression may not be private or protected.
 
 1 export var myClassWithError = class {
              ~~~~~~~~~~~~~~~~
 
-[12:00:43 AM] Found 1 error. Watching for file changes.
+[12:00:40 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-fixing-error-files-all-files-are-emitted.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-fixing-error-files-all-files-are-emitted.js
index 87cf3b60afa21..e6a04f8acabd7 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-fixing-error-files-all-files-are-emitted.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-fixing-error-files-all-files-are-emitted.js
@@ -176,9 +176,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:35 AM] File change detected. Starting incremental compilation...
+[12:00:34 AM] File change detected. Starting incremental compilation...
 
-[12:00:51 AM] Found 0 errors. Watching for file changes.
+[12:00:48 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-not-used.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-not-used.js
index d449e8280af5d..3a59cf5f35bf1 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-not-used.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-not-used.js
@@ -581,14 +581,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:20 AM] File change detected. Starting incremental compilation...
+[12:01:19 AM] File change detected. Starting incremental compilation...
 
 logic/index.ts:8:5 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 8 let y: string = 10;
       ~
 
-[12:01:28 AM] Found 1 error. Watching for file changes.
+[12:01:25 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -742,7 +742,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:31 AM] File change detected. Starting incremental compilation...
+[12:01:27 AM] File change detected. Starting incremental compilation...
 
 core/index.ts:5:5 - error TS2322: Type 'number' is not assignable to type 'string'.
 
@@ -754,7 +754,7 @@ Output::
 8 let y: string = 10;
       ~
 
-[12:01:39 AM] Found 2 errors. Watching for file changes.
+[12:01:33 AM] Found 2 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-passed-on-command-line.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-passed-on-command-line.js
index 44dc8881c84c5..60913f24c4ed4 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-passed-on-command-line.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-passed-on-command-line.js
@@ -582,14 +582,14 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 0
 Output::
-[12:01:20 AM] File change detected. Starting incremental compilation...
+[12:01:19 AM] File change detected. Starting incremental compilation...
 
 logic/index.ts:8:5 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 8 let y: string = 10;
       ~
 
-[12:01:28 AM] Found 1 error. Watching for file changes.
+[12:01:25 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -743,7 +743,7 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 0
 Output::
-[12:01:31 AM] File change detected. Starting incremental compilation...
+[12:01:27 AM] File change detected. Starting incremental compilation...
 
 core/index.ts:5:5 - error TS2322: Type 'number' is not assignable to type 'string'.
 
@@ -755,7 +755,7 @@ Output::
 8 let y: string = 10;
       ~
 
-[12:01:39 AM] Found 2 errors. Watching for file changes.
+[12:01:33 AM] Found 2 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit-with-outDir-specified.js b/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit-with-outDir-specified.js
index d0ce02cd974c2..d7b60f726d51f 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit-with-outDir-specified.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit-with-outDir-specified.js
@@ -290,7 +290,7 @@ Output::
 
 [12:01:04 AM] Building project '/user/username/projects/sample1/core/tsconfig.json'...
 
-[12:01:16 AM] Found 0 errors. Watching for file changes.
+[12:01:14 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit.js b/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit.js
index ce572d8da22a1..14b3bb0be9dc3 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit.js
@@ -302,7 +302,7 @@ Output::
 
 [12:01:05 AM] Building project '/user/username/projects/sample1/core/tsconfig.json'...
 
-[12:01:19 AM] Found 0 errors. Watching for file changes.
+[12:01:17 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/tsbuildinfo-has-error.js b/tests/baselines/reference/tsbuildWatch/programUpdates/tsbuildinfo-has-error.js
index 6bab84cf14c7e..891fb1d06a0d7 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/tsbuildinfo-has-error.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/tsbuildinfo-has-error.js
@@ -28,7 +28,7 @@ Output::
 >> Screen clear
 [12:00:19 AM] Starting compilation in watch mode...
 
-[12:00:28 AM] Found 0 errors. Watching for file changes.
+[12:00:27 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-project-change-introduces-error-in-the-down-stream-project-and-then-fixes-it.js b/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-project-change-introduces-error-in-the-down-stream-project-and-then-fixes-it.js
index cbf8812e11027..5cb6e8030d5d9 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-project-change-introduces-error-in-the-down-stream-project-and-then-fixes-it.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-project-change-introduces-error-in-the-down-stream-project-and-then-fixes-it.js
@@ -224,7 +224,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 1
 Output::
 >> Screen clear
-[12:00:46 AM] File change detected. Starting incremental compilation...
+[12:00:45 AM] File change detected. Starting incremental compilation...
 
 
 
@@ -317,7 +317,7 @@ Output::
           ~~~~~~~~
     'message2' is declared here.
 
-[12:01:00 AM] Found 1 error. Watching for file changes.
+[12:00:55 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -392,7 +392,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 1
 Output::
 >> Screen clear
-[12:01:04 AM] File change detected. Starting incremental compilation...
+[12:00:58 AM] File change detected. Starting incremental compilation...
 
 
 
@@ -475,7 +475,7 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 0
 Output::
-[12:01:22 AM] Found 0 errors. Watching for file changes.
+[12:01:11 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-using-prepend-builds-referencing-project-even-for-non-local-change.js b/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-using-prepend-builds-referencing-project-even-for-non-local-change.js
index 8218c63b43d7b..f536d5180fefc 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-using-prepend-builds-referencing-project-even-for-non-local-change.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-using-prepend-builds-referencing-project-even-for-non-local-change.js
@@ -338,7 +338,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 1
 Output::
 >> Screen clear
-[12:00:55 AM] File change detected. Starting incremental compilation...
+[12:00:54 AM] File change detected. Starting incremental compilation...
 
 
 
@@ -463,7 +463,7 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 0
 Output::
-[12:01:28 AM] Found 0 errors. Watching for file changes.
+[12:01:17 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -639,7 +639,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 1
 Output::
 >> Screen clear
-[12:01:32 AM] File change detected. Starting incremental compilation...
+[12:01:20 AM] File change detected. Starting incremental compilation...
 
 
 
@@ -759,7 +759,7 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 0
 Output::
-[12:01:59 AM] Found 0 errors. Watching for file changes.
+[12:01:39 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/builds-when-new-file-is-added,-and-its-subsequent-updates.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/builds-when-new-file-is-added,-and-its-subsequent-updates.js
index ef49267e49419..c1cb439996f80 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/builds-when-new-file-is-added,-and-its-subsequent-updates.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/builds-when-new-file-is-added,-and-its-subsequent-updates.js
@@ -741,7 +741,7 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 0
 Output::
-[12:01:30 AM] Found 0 errors. Watching for file changes.
+[12:01:28 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -814,7 +814,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 1
 Output::
 >> Screen clear
-[12:01:33 AM] File change detected. Starting incremental compilation...
+[12:01:30 AM] File change detected. Starting incremental compilation...
 
 
 
@@ -969,7 +969,7 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 0
 Output::
-[12:01:49 AM] Found 0 errors. Watching for file changes.
+[12:01:42 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/change-builds-changes-and-reports-found-errors-message.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/change-builds-changes-and-reports-found-errors-message.js
index 1ce191e18bbe7..d564ce74d5cb6 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/change-builds-changes-and-reports-found-errors-message.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/change-builds-changes-and-reports-found-errors-message.js
@@ -572,7 +572,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 1
 Output::
 >> Screen clear
-[12:01:16 AM] File change detected. Starting incremental compilation...
+[12:01:15 AM] File change detected. Starting incremental compilation...
 
 
 
@@ -720,7 +720,7 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 0
 Output::
-[12:01:53 AM] Found 0 errors. Watching for file changes.
+[12:01:41 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -983,7 +983,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 1
 Output::
 >> Screen clear
-[12:01:57 AM] File change detected. Starting incremental compilation...
+[12:01:44 AM] File change detected. Starting incremental compilation...
 
 
 
@@ -1123,7 +1123,7 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 0
 Output::
-[12:02:34 AM] Found 0 errors. Watching for file changes.
+[12:02:10 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -1388,7 +1388,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 1
 Output::
 >> Screen clear
-[12:02:39 AM] File change detected. Starting incremental compilation...
+[12:02:13 AM] File change detected. Starting incremental compilation...
 
 
 
@@ -1544,7 +1544,7 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 0
 Output::
-[12:03:17 AM] Found 0 errors. Watching for file changes.
+[12:02:40 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/non-local-change-does-not-start-build-of-referencing-projects.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/non-local-change-does-not-start-build-of-referencing-projects.js
index 31d5baed76ae2..92f33080e1d68 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/non-local-change-does-not-start-build-of-referencing-projects.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/non-local-change-does-not-start-build-of-referencing-projects.js
@@ -572,9 +572,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:16 AM] File change detected. Starting incremental compilation...
+[12:01:15 AM] File change detected. Starting incremental compilation...
 
-[12:01:29 AM] Found 0 errors. Watching for file changes.
+[12:01:25 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/builds-when-new-file-is-added,-and-its-subsequent-updates.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/builds-when-new-file-is-added,-and-its-subsequent-updates.js
index 47c4a0dd7ff50..7ac96bf5ae69a 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/builds-when-new-file-is-added,-and-its-subsequent-updates.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/builds-when-new-file-is-added,-and-its-subsequent-updates.js
@@ -754,7 +754,7 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 0
 Output::
-[12:01:36 AM] Found 0 errors. Watching for file changes.
+[12:01:34 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -827,7 +827,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 1
 Output::
 >> Screen clear
-[12:01:39 AM] File change detected. Starting incremental compilation...
+[12:01:36 AM] File change detected. Starting incremental compilation...
 
 
 
@@ -989,7 +989,7 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 0
 Output::
-[12:01:58 AM] Found 0 errors. Watching for file changes.
+[12:01:50 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/change-builds-changes-and-reports-found-errors-message.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/change-builds-changes-and-reports-found-errors-message.js
index 4bf5aafe68ed7..78c414f80daed 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/change-builds-changes-and-reports-found-errors-message.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/change-builds-changes-and-reports-found-errors-message.js
@@ -578,7 +578,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 1
 Output::
 >> Screen clear
-[12:01:20 AM] File change detected. Starting incremental compilation...
+[12:01:19 AM] File change detected. Starting incremental compilation...
 
 
 
@@ -733,7 +733,7 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 0
 Output::
-[12:02:00 AM] Found 0 errors. Watching for file changes.
+[12:01:47 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -996,7 +996,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 1
 Output::
 >> Screen clear
-[12:02:04 AM] File change detected. Starting incremental compilation...
+[12:01:50 AM] File change detected. Starting incremental compilation...
 
 
 
@@ -1143,7 +1143,7 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 0
 Output::
-[12:02:44 AM] Found 0 errors. Watching for file changes.
+[12:02:18 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -1408,7 +1408,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 1
 Output::
 >> Screen clear
-[12:02:49 AM] File change detected. Starting incremental compilation...
+[12:02:21 AM] File change detected. Starting incremental compilation...
 
 
 
@@ -1571,7 +1571,7 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 0
 Output::
-[12:03:30 AM] Found 0 errors. Watching for file changes.
+[12:02:50 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/non-local-change-does-not-start-build-of-referencing-projects.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/non-local-change-does-not-start-build-of-referencing-projects.js
index 37e5e01b361eb..5db746b7fda54 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/non-local-change-does-not-start-build-of-referencing-projects.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/non-local-change-does-not-start-build-of-referencing-projects.js
@@ -578,9 +578,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:20 AM] File change detected. Starting incremental compilation...
+[12:01:19 AM] File change detected. Starting incremental compilation...
 
-[12:01:36 AM] Found 0 errors. Watching for file changes.
+[12:01:31 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/works-correctly-when-project-with-extended-config-is-removed.js b/tests/baselines/reference/tsbuildWatch/programUpdates/works-correctly-when-project-with-extended-config-is-removed.js
index b78178060f039..48bde36a4dfa4 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/works-correctly-when-project-with-extended-config-is-removed.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/works-correctly-when-project-with-extended-config-is-removed.js
@@ -336,9 +336,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:58 AM] File change detected. Starting incremental compilation...
+[12:00:57 AM] File change detected. Starting incremental compilation...
 
-[12:00:59 AM] Found 0 errors. Watching for file changes.
+[12:00:58 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/works-when-noUnusedParameters-changes-to-false.js b/tests/baselines/reference/tsbuildWatch/programUpdates/works-when-noUnusedParameters-changes-to-false.js
index ab984f72ab9c6..858504db1a091 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/works-when-noUnusedParameters-changes-to-false.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/works-when-noUnusedParameters-changes-to-false.js
@@ -92,9 +92,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:26 AM] File change detected. Starting incremental compilation...
+[12:00:25 AM] File change detected. Starting incremental compilation...
 
-[12:00:30 AM] Found 0 errors. Watching for file changes.
+[12:00:29 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/works-with-extended-source-files.js b/tests/baselines/reference/tsbuildWatch/programUpdates/works-with-extended-source-files.js
index d9402e71a9859..38e89bf568e3a 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/works-with-extended-source-files.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/works-with-extended-source-files.js
@@ -385,11 +385,11 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 1
 Output::
 >> Screen clear
-[12:01:12 AM] File change detected. Starting incremental compilation...
+[12:01:11 AM] File change detected. Starting incremental compilation...
 
-[12:01:13 AM] Project 'project1.tsconfig.json' is out of date because output 'project1.tsconfig.tsbuildinfo' is older than input 'alpha.tsconfig.json'
+[12:01:12 AM] Project 'project1.tsconfig.json' is out of date because output 'project1.tsconfig.tsbuildinfo' is older than input 'alpha.tsconfig.json'
 
-[12:01:14 AM] Building project '/a/b/project1.tsconfig.json'...
+[12:01:13 AM] Building project '/a/b/project1.tsconfig.json'...
 
 
 
@@ -511,11 +511,11 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 0
 Output::
-[12:01:28 AM] Project 'project2.tsconfig.json' is out of date because output 'project2.tsconfig.tsbuildinfo' is older than input 'alpha.tsconfig.json'
+[12:01:23 AM] Project 'project2.tsconfig.json' is out of date because output 'project2.tsconfig.tsbuildinfo' is older than input 'alpha.tsconfig.json'
 
-[12:01:29 AM] Building project '/a/b/project2.tsconfig.json'...
+[12:01:24 AM] Building project '/a/b/project2.tsconfig.json'...
 
-[12:01:40 AM] Found 0 errors. Watching for file changes.
+[12:01:32 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -622,13 +622,13 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:44 AM] File change detected. Starting incremental compilation...
+[12:01:35 AM] File change detected. Starting incremental compilation...
 
-[12:01:45 AM] Project 'project2.tsconfig.json' is out of date because output 'project2.tsconfig.tsbuildinfo' is older than input 'bravo.tsconfig.json'
+[12:01:36 AM] Project 'project2.tsconfig.json' is out of date because output 'project2.tsconfig.tsbuildinfo' is older than input 'bravo.tsconfig.json'
 
-[12:01:46 AM] Building project '/a/b/project2.tsconfig.json'...
+[12:01:37 AM] Building project '/a/b/project2.tsconfig.json'...
 
-[12:01:57 AM] Found 0 errors. Watching for file changes.
+[12:01:45 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -731,13 +731,13 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:02:01 AM] File change detected. Starting incremental compilation...
+[12:01:48 AM] File change detected. Starting incremental compilation...
 
-[12:02:02 AM] Project 'project2.tsconfig.json' is out of date because output 'other2.js' is older than input 'project2.tsconfig.json'
+[12:01:49 AM] Project 'project2.tsconfig.json' is out of date because output 'other2.js' is older than input 'project2.tsconfig.json'
 
-[12:02:03 AM] Building project '/a/b/project2.tsconfig.json'...
+[12:01:50 AM] Building project '/a/b/project2.tsconfig.json'...
 
-[12:02:17 AM] Found 0 errors. Watching for file changes.
+[12:02:00 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -837,11 +837,11 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 1
 Output::
 >> Screen clear
-[12:02:22 AM] File change detected. Starting incremental compilation...
+[12:02:04 AM] File change detected. Starting incremental compilation...
 
-[12:02:23 AM] Project 'project1.tsconfig.json' is out of date because output 'project1.tsconfig.tsbuildinfo' is older than input 'alpha.tsconfig.json'
+[12:02:05 AM] Project 'project1.tsconfig.json' is out of date because output 'project1.tsconfig.tsbuildinfo' is older than input 'alpha.tsconfig.json'
 
-[12:02:24 AM] Building project '/a/b/project1.tsconfig.json'...
+[12:02:06 AM] Building project '/a/b/project1.tsconfig.json'...
 
 
 
@@ -959,11 +959,11 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 0
 Output::
-[12:02:38 AM] Project 'project2.tsconfig.json' is out of date because output 'commonFile1.js' is older than input 'alpha.tsconfig.json'
+[12:02:16 AM] Project 'project2.tsconfig.json' is out of date because output 'commonFile1.js' is older than input 'alpha.tsconfig.json'
 
-[12:02:39 AM] Building project '/a/b/project2.tsconfig.json'...
+[12:02:17 AM] Building project '/a/b/project2.tsconfig.json'...
 
-[12:02:53 AM] Found 0 errors. Watching for file changes.
+[12:02:27 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -1028,15 +1028,15 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:02:57 AM] File change detected. Starting incremental compilation...
+[12:02:30 AM] File change detected. Starting incremental compilation...
 
-[12:02:58 AM] Project 'project3.tsconfig.json' is out of date because output 'other2.js' is older than input 'extendsConfig2.tsconfig.json'
+[12:02:31 AM] Project 'project3.tsconfig.json' is out of date because output 'other2.js' is older than input 'extendsConfig2.tsconfig.json'
 
-[12:02:59 AM] Building project '/a/b/project3.tsconfig.json'...
+[12:02:32 AM] Building project '/a/b/project3.tsconfig.json'...
 
-[12:03:00 AM] Updating unchanged output timestamps of project '/a/b/project3.tsconfig.json'...
+[12:02:33 AM] Updating unchanged output timestamps of project '/a/b/project3.tsconfig.json'...
 
-[12:03:02 AM] Found 0 errors. Watching for file changes.
+[12:02:35 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -1093,15 +1093,15 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:03:06 AM] File change detected. Starting incremental compilation...
+[12:02:38 AM] File change detected. Starting incremental compilation...
 
-[12:03:07 AM] Project 'project3.tsconfig.json' is out of date because output 'other2.js' is older than input 'project3.tsconfig.json'
+[12:02:39 AM] Project 'project3.tsconfig.json' is out of date because output 'other2.js' is older than input 'project3.tsconfig.json'
 
-[12:03:08 AM] Building project '/a/b/project3.tsconfig.json'...
+[12:02:40 AM] Building project '/a/b/project3.tsconfig.json'...
 
-[12:03:09 AM] Updating unchanged output timestamps of project '/a/b/project3.tsconfig.json'...
+[12:02:41 AM] Updating unchanged output timestamps of project '/a/b/project3.tsconfig.json'...
 
-[12:03:11 AM] Found 0 errors. Watching for file changes.
+[12:02:43 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -1174,13 +1174,13 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:03:13 AM] File change detected. Starting incremental compilation...
+[12:02:45 AM] File change detected. Starting incremental compilation...
 
-[12:03:14 AM] Project 'project3.tsconfig.json' is up to date because newest input 'other2.ts' is older than output 'other2.js'
+[12:02:46 AM] Project 'project3.tsconfig.json' is up to date because newest input 'other2.ts' is older than output 'other2.js'
 
 error TS5083: Cannot read file '/a/b/extendsConfig2.tsconfig.json'.
 
-[12:03:15 AM] Found 1 error. Watching for file changes.
+[12:02:47 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-23-projects-in-a-solution.js b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-23-projects-in-a-solution.js
index 2d3e1d4e36847..19656aa547cf2 100644
--- a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-23-projects-in-a-solution.js
+++ b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-23-projects-in-a-solution.js
@@ -2606,101 +2606,101 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:06:55 AM] File change detected. Starting incremental compilation...
+[12:06:54 AM] File change detected. Starting incremental compilation...
 
-[12:06:56 AM] Project 'pkg0/tsconfig.json' is out of date because output 'pkg0/tsconfig.tsbuildinfo' is older than input 'pkg0/index.ts'
+[12:06:55 AM] Project 'pkg0/tsconfig.json' is out of date because output 'pkg0/tsconfig.tsbuildinfo' is older than input 'pkg0/index.ts'
 
-[12:06:57 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
+[12:06:56 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
-[12:07:08 AM] Project 'pkg1/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:07:04 AM] Project 'pkg1/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:07:09 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
+[12:07:05 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-[12:07:11 AM] Project 'pkg2/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:07:07 AM] Project 'pkg2/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:07:12 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
+[12:07:08 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-[12:07:14 AM] Project 'pkg3/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:07:10 AM] Project 'pkg3/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:07:15 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
+[12:07:11 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-[12:07:17 AM] Project 'pkg4/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:07:13 AM] Project 'pkg4/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:07:18 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
+[12:07:14 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
-[12:07:20 AM] Project 'pkg5/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:07:16 AM] Project 'pkg5/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:07:21 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
+[12:07:17 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
-[12:07:23 AM] Project 'pkg6/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:07:19 AM] Project 'pkg6/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:07:24 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
+[12:07:20 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
-[12:07:26 AM] Project 'pkg7/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:07:22 AM] Project 'pkg7/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:07:27 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
+[12:07:23 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
-[12:07:29 AM] Project 'pkg8/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:07:25 AM] Project 'pkg8/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:07:30 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg8/tsconfig.json'...
+[12:07:26 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg8/tsconfig.json'...
 
-[12:07:32 AM] Project 'pkg9/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:07:28 AM] Project 'pkg9/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:07:33 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg9/tsconfig.json'...
+[12:07:29 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg9/tsconfig.json'...
 
-[12:07:35 AM] Project 'pkg10/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:07:31 AM] Project 'pkg10/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:07:36 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg10/tsconfig.json'...
+[12:07:32 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg10/tsconfig.json'...
 
-[12:07:38 AM] Project 'pkg11/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:07:34 AM] Project 'pkg11/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:07:39 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg11/tsconfig.json'...
+[12:07:35 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg11/tsconfig.json'...
 
-[12:07:41 AM] Project 'pkg12/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:07:37 AM] Project 'pkg12/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:07:42 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg12/tsconfig.json'...
+[12:07:38 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg12/tsconfig.json'...
 
-[12:07:44 AM] Project 'pkg13/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:07:40 AM] Project 'pkg13/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:07:45 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg13/tsconfig.json'...
+[12:07:41 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg13/tsconfig.json'...
 
-[12:07:47 AM] Project 'pkg14/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:07:43 AM] Project 'pkg14/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:07:48 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg14/tsconfig.json'...
+[12:07:44 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg14/tsconfig.json'...
 
-[12:07:50 AM] Project 'pkg15/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:07:46 AM] Project 'pkg15/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:07:51 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg15/tsconfig.json'...
+[12:07:47 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg15/tsconfig.json'...
 
-[12:07:53 AM] Project 'pkg16/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:07:49 AM] Project 'pkg16/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:07:54 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg16/tsconfig.json'...
+[12:07:50 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg16/tsconfig.json'...
 
-[12:07:56 AM] Project 'pkg17/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:07:52 AM] Project 'pkg17/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:07:57 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg17/tsconfig.json'...
+[12:07:53 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg17/tsconfig.json'...
 
-[12:07:59 AM] Project 'pkg18/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:07:55 AM] Project 'pkg18/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:08:00 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg18/tsconfig.json'...
+[12:07:56 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg18/tsconfig.json'...
 
-[12:08:02 AM] Project 'pkg19/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:07:58 AM] Project 'pkg19/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:08:03 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg19/tsconfig.json'...
+[12:07:59 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg19/tsconfig.json'...
 
-[12:08:05 AM] Project 'pkg20/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:08:01 AM] Project 'pkg20/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:08:06 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg20/tsconfig.json'...
+[12:08:02 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg20/tsconfig.json'...
 
-[12:08:08 AM] Project 'pkg21/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:08:04 AM] Project 'pkg21/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:08:09 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg21/tsconfig.json'...
+[12:08:05 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg21/tsconfig.json'...
 
-[12:08:11 AM] Project 'pkg22/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:08:07 AM] Project 'pkg22/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:08:12 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg22/tsconfig.json'...
+[12:08:08 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg22/tsconfig.json'...
 
-[12:08:14 AM] Found 0 errors. Watching for file changes.
+[12:08:10 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -2830,11 +2830,11 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 1
 Output::
 >> Screen clear
-[12:08:17 AM] File change detected. Starting incremental compilation...
+[12:08:12 AM] File change detected. Starting incremental compilation...
 
-[12:08:18 AM] Project 'pkg0/tsconfig.json' is out of date because output 'pkg0/tsconfig.tsbuildinfo' is older than input 'pkg0/index.ts'
+[12:08:13 AM] Project 'pkg0/tsconfig.json' is out of date because output 'pkg0/tsconfig.tsbuildinfo' is older than input 'pkg0/index.ts'
 
-[12:08:19 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
+[12:08:14 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
 
 
@@ -2937,35 +2937,35 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 1
 Output::
-[12:08:33 AM] Project 'pkg1/tsconfig.json' is out of date because output 'pkg1/index.js' is older than input 'pkg0/tsconfig.json'
+[12:08:24 AM] Project 'pkg1/tsconfig.json' is out of date because output 'pkg1/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:08:34 AM] Building project '/user/username/projects/myproject/pkg1/tsconfig.json'...
+[12:08:25 AM] Building project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-[12:08:35 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
+[12:08:26 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-[12:08:37 AM] Project 'pkg2/tsconfig.json' is out of date because output 'pkg2/index.js' is older than input 'pkg0/tsconfig.json'
+[12:08:28 AM] Project 'pkg2/tsconfig.json' is out of date because output 'pkg2/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:08:38 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
+[12:08:29 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-[12:08:39 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
+[12:08:30 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-[12:08:41 AM] Project 'pkg3/tsconfig.json' is out of date because output 'pkg3/index.js' is older than input 'pkg0/tsconfig.json'
+[12:08:32 AM] Project 'pkg3/tsconfig.json' is out of date because output 'pkg3/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:08:42 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
+[12:08:33 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-[12:08:43 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
+[12:08:34 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-[12:08:45 AM] Project 'pkg4/tsconfig.json' is out of date because output 'pkg4/index.js' is older than input 'pkg0/tsconfig.json'
+[12:08:36 AM] Project 'pkg4/tsconfig.json' is out of date because output 'pkg4/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:08:46 AM] Building project '/user/username/projects/myproject/pkg4/tsconfig.json'...
+[12:08:37 AM] Building project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
-[12:08:47 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
+[12:08:38 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
-[12:08:49 AM] Project 'pkg5/tsconfig.json' is out of date because output 'pkg5/index.js' is older than input 'pkg0/tsconfig.json'
+[12:08:40 AM] Project 'pkg5/tsconfig.json' is out of date because output 'pkg5/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:08:50 AM] Building project '/user/username/projects/myproject/pkg5/tsconfig.json'...
+[12:08:41 AM] Building project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
-[12:08:51 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
+[12:08:42 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
 
 
@@ -3075,35 +3075,35 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 1
 Output::
-[12:08:53 AM] Project 'pkg6/tsconfig.json' is out of date because output 'pkg6/index.js' is older than input 'pkg0/tsconfig.json'
+[12:08:44 AM] Project 'pkg6/tsconfig.json' is out of date because output 'pkg6/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:08:54 AM] Building project '/user/username/projects/myproject/pkg6/tsconfig.json'...
+[12:08:45 AM] Building project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
-[12:08:55 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
+[12:08:46 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
-[12:08:57 AM] Project 'pkg7/tsconfig.json' is out of date because output 'pkg7/index.js' is older than input 'pkg0/tsconfig.json'
+[12:08:48 AM] Project 'pkg7/tsconfig.json' is out of date because output 'pkg7/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:08:58 AM] Building project '/user/username/projects/myproject/pkg7/tsconfig.json'...
+[12:08:49 AM] Building project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
-[12:08:59 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
+[12:08:50 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
-[12:09:01 AM] Project 'pkg8/tsconfig.json' is out of date because output 'pkg8/index.js' is older than input 'pkg0/tsconfig.json'
+[12:08:52 AM] Project 'pkg8/tsconfig.json' is out of date because output 'pkg8/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:09:02 AM] Building project '/user/username/projects/myproject/pkg8/tsconfig.json'...
+[12:08:53 AM] Building project '/user/username/projects/myproject/pkg8/tsconfig.json'...
 
-[12:09:03 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg8/tsconfig.json'...
+[12:08:54 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg8/tsconfig.json'...
 
-[12:09:05 AM] Project 'pkg9/tsconfig.json' is out of date because output 'pkg9/index.js' is older than input 'pkg0/tsconfig.json'
+[12:08:56 AM] Project 'pkg9/tsconfig.json' is out of date because output 'pkg9/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:09:06 AM] Building project '/user/username/projects/myproject/pkg9/tsconfig.json'...
+[12:08:57 AM] Building project '/user/username/projects/myproject/pkg9/tsconfig.json'...
 
-[12:09:07 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg9/tsconfig.json'...
+[12:08:58 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg9/tsconfig.json'...
 
-[12:09:09 AM] Project 'pkg10/tsconfig.json' is out of date because output 'pkg10/index.js' is older than input 'pkg0/tsconfig.json'
+[12:09:00 AM] Project 'pkg10/tsconfig.json' is out of date because output 'pkg10/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:09:10 AM] Building project '/user/username/projects/myproject/pkg10/tsconfig.json'...
+[12:09:01 AM] Building project '/user/username/projects/myproject/pkg10/tsconfig.json'...
 
-[12:09:11 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg10/tsconfig.json'...
+[12:09:02 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg10/tsconfig.json'...
 
 
 
@@ -3213,35 +3213,35 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 1
 Output::
-[12:09:13 AM] Project 'pkg11/tsconfig.json' is out of date because output 'pkg11/index.js' is older than input 'pkg0/tsconfig.json'
+[12:09:04 AM] Project 'pkg11/tsconfig.json' is out of date because output 'pkg11/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:09:14 AM] Building project '/user/username/projects/myproject/pkg11/tsconfig.json'...
+[12:09:05 AM] Building project '/user/username/projects/myproject/pkg11/tsconfig.json'...
 
-[12:09:15 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg11/tsconfig.json'...
+[12:09:06 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg11/tsconfig.json'...
 
-[12:09:17 AM] Project 'pkg12/tsconfig.json' is out of date because output 'pkg12/index.js' is older than input 'pkg0/tsconfig.json'
+[12:09:08 AM] Project 'pkg12/tsconfig.json' is out of date because output 'pkg12/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:09:18 AM] Building project '/user/username/projects/myproject/pkg12/tsconfig.json'...
+[12:09:09 AM] Building project '/user/username/projects/myproject/pkg12/tsconfig.json'...
 
-[12:09:19 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg12/tsconfig.json'...
+[12:09:10 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg12/tsconfig.json'...
 
-[12:09:21 AM] Project 'pkg13/tsconfig.json' is out of date because output 'pkg13/index.js' is older than input 'pkg0/tsconfig.json'
+[12:09:12 AM] Project 'pkg13/tsconfig.json' is out of date because output 'pkg13/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:09:22 AM] Building project '/user/username/projects/myproject/pkg13/tsconfig.json'...
+[12:09:13 AM] Building project '/user/username/projects/myproject/pkg13/tsconfig.json'...
 
-[12:09:23 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg13/tsconfig.json'...
+[12:09:14 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg13/tsconfig.json'...
 
-[12:09:25 AM] Project 'pkg14/tsconfig.json' is out of date because output 'pkg14/index.js' is older than input 'pkg0/tsconfig.json'
+[12:09:16 AM] Project 'pkg14/tsconfig.json' is out of date because output 'pkg14/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:09:26 AM] Building project '/user/username/projects/myproject/pkg14/tsconfig.json'...
+[12:09:17 AM] Building project '/user/username/projects/myproject/pkg14/tsconfig.json'...
 
-[12:09:27 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg14/tsconfig.json'...
+[12:09:18 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg14/tsconfig.json'...
 
-[12:09:29 AM] Project 'pkg15/tsconfig.json' is out of date because output 'pkg15/index.js' is older than input 'pkg0/tsconfig.json'
+[12:09:20 AM] Project 'pkg15/tsconfig.json' is out of date because output 'pkg15/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:09:30 AM] Building project '/user/username/projects/myproject/pkg15/tsconfig.json'...
+[12:09:21 AM] Building project '/user/username/projects/myproject/pkg15/tsconfig.json'...
 
-[12:09:31 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg15/tsconfig.json'...
+[12:09:22 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg15/tsconfig.json'...
 
 
 
@@ -3351,35 +3351,35 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 1
 Output::
-[12:09:33 AM] Project 'pkg16/tsconfig.json' is out of date because output 'pkg16/index.js' is older than input 'pkg0/tsconfig.json'
+[12:09:24 AM] Project 'pkg16/tsconfig.json' is out of date because output 'pkg16/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:09:34 AM] Building project '/user/username/projects/myproject/pkg16/tsconfig.json'...
+[12:09:25 AM] Building project '/user/username/projects/myproject/pkg16/tsconfig.json'...
 
-[12:09:35 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg16/tsconfig.json'...
+[12:09:26 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg16/tsconfig.json'...
 
-[12:09:37 AM] Project 'pkg17/tsconfig.json' is out of date because output 'pkg17/index.js' is older than input 'pkg0/tsconfig.json'
+[12:09:28 AM] Project 'pkg17/tsconfig.json' is out of date because output 'pkg17/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:09:38 AM] Building project '/user/username/projects/myproject/pkg17/tsconfig.json'...
+[12:09:29 AM] Building project '/user/username/projects/myproject/pkg17/tsconfig.json'...
 
-[12:09:39 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg17/tsconfig.json'...
+[12:09:30 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg17/tsconfig.json'...
 
-[12:09:41 AM] Project 'pkg18/tsconfig.json' is out of date because output 'pkg18/index.js' is older than input 'pkg0/tsconfig.json'
+[12:09:32 AM] Project 'pkg18/tsconfig.json' is out of date because output 'pkg18/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:09:42 AM] Building project '/user/username/projects/myproject/pkg18/tsconfig.json'...
+[12:09:33 AM] Building project '/user/username/projects/myproject/pkg18/tsconfig.json'...
 
-[12:09:43 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg18/tsconfig.json'...
+[12:09:34 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg18/tsconfig.json'...
 
-[12:09:45 AM] Project 'pkg19/tsconfig.json' is out of date because output 'pkg19/index.js' is older than input 'pkg0/tsconfig.json'
+[12:09:36 AM] Project 'pkg19/tsconfig.json' is out of date because output 'pkg19/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:09:46 AM] Building project '/user/username/projects/myproject/pkg19/tsconfig.json'...
+[12:09:37 AM] Building project '/user/username/projects/myproject/pkg19/tsconfig.json'...
 
-[12:09:47 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg19/tsconfig.json'...
+[12:09:38 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg19/tsconfig.json'...
 
-[12:09:49 AM] Project 'pkg20/tsconfig.json' is out of date because output 'pkg20/index.js' is older than input 'pkg0/tsconfig.json'
+[12:09:40 AM] Project 'pkg20/tsconfig.json' is out of date because output 'pkg20/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:09:50 AM] Building project '/user/username/projects/myproject/pkg20/tsconfig.json'...
+[12:09:41 AM] Building project '/user/username/projects/myproject/pkg20/tsconfig.json'...
 
-[12:09:51 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg20/tsconfig.json'...
+[12:09:42 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg20/tsconfig.json'...
 
 
 
@@ -3489,19 +3489,19 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 0
 Output::
-[12:09:54 AM] Project 'pkg21/tsconfig.json' is out of date because output 'pkg21/index.js' is older than input 'pkg0/tsconfig.json'
+[12:09:45 AM] Project 'pkg21/tsconfig.json' is out of date because output 'pkg21/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:09:55 AM] Building project '/user/username/projects/myproject/pkg21/tsconfig.json'...
+[12:09:46 AM] Building project '/user/username/projects/myproject/pkg21/tsconfig.json'...
 
-[12:09:56 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg21/tsconfig.json'...
+[12:09:47 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg21/tsconfig.json'...
 
-[12:09:58 AM] Project 'pkg22/tsconfig.json' is out of date because output 'pkg22/index.js' is older than input 'pkg0/tsconfig.json'
+[12:09:49 AM] Project 'pkg22/tsconfig.json' is out of date because output 'pkg22/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:09:59 AM] Building project '/user/username/projects/myproject/pkg22/tsconfig.json'...
+[12:09:50 AM] Building project '/user/username/projects/myproject/pkg22/tsconfig.json'...
 
-[12:10:00 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg22/tsconfig.json'...
+[12:09:51 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg22/tsconfig.json'...
 
-[12:10:02 AM] Found 0 errors. Watching for file changes.
+[12:09:53 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -3568,11 +3568,11 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 1
 Output::
 >> Screen clear
-[12:10:05 AM] File change detected. Starting incremental compilation...
+[12:09:55 AM] File change detected. Starting incremental compilation...
 
-[12:10:06 AM] Project 'pkg0/tsconfig.json' is out of date because output 'pkg0/tsconfig.tsbuildinfo' is older than input 'pkg0/index.ts'
+[12:09:56 AM] Project 'pkg0/tsconfig.json' is out of date because output 'pkg0/tsconfig.tsbuildinfo' is older than input 'pkg0/index.ts'
 
-[12:10:07 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
+[12:09:57 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
 
 
@@ -3677,35 +3677,35 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 1
 Output::
-[12:10:21 AM] Project 'pkg1/tsconfig.json' is out of date because output 'pkg1/index.js' is older than input 'pkg0/tsconfig.json'
+[12:10:07 AM] Project 'pkg1/tsconfig.json' is out of date because output 'pkg1/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:10:22 AM] Building project '/user/username/projects/myproject/pkg1/tsconfig.json'...
+[12:10:08 AM] Building project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-[12:10:23 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
+[12:10:09 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-[12:10:25 AM] Project 'pkg2/tsconfig.json' is out of date because output 'pkg2/index.js' is older than input 'pkg0/tsconfig.json'
+[12:10:11 AM] Project 'pkg2/tsconfig.json' is out of date because output 'pkg2/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:10:26 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
+[12:10:12 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-[12:10:27 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
+[12:10:13 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-[12:10:29 AM] Project 'pkg3/tsconfig.json' is out of date because output 'pkg3/index.js' is older than input 'pkg0/tsconfig.json'
+[12:10:15 AM] Project 'pkg3/tsconfig.json' is out of date because output 'pkg3/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:10:30 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
+[12:10:16 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-[12:10:31 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
+[12:10:17 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-[12:10:33 AM] Project 'pkg4/tsconfig.json' is out of date because output 'pkg4/index.js' is older than input 'pkg0/tsconfig.json'
+[12:10:19 AM] Project 'pkg4/tsconfig.json' is out of date because output 'pkg4/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:10:34 AM] Building project '/user/username/projects/myproject/pkg4/tsconfig.json'...
+[12:10:20 AM] Building project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
-[12:10:35 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
+[12:10:21 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
-[12:10:37 AM] Project 'pkg5/tsconfig.json' is out of date because output 'pkg5/index.js' is older than input 'pkg0/tsconfig.json'
+[12:10:23 AM] Project 'pkg5/tsconfig.json' is out of date because output 'pkg5/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:10:38 AM] Building project '/user/username/projects/myproject/pkg5/tsconfig.json'...
+[12:10:24 AM] Building project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
-[12:10:39 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
+[12:10:25 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
 
 
@@ -3815,35 +3815,35 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 1
 Output::
-[12:10:41 AM] Project 'pkg6/tsconfig.json' is out of date because output 'pkg6/index.js' is older than input 'pkg0/tsconfig.json'
+[12:10:27 AM] Project 'pkg6/tsconfig.json' is out of date because output 'pkg6/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:10:42 AM] Building project '/user/username/projects/myproject/pkg6/tsconfig.json'...
+[12:10:28 AM] Building project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
-[12:10:43 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
+[12:10:29 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
-[12:10:45 AM] Project 'pkg7/tsconfig.json' is out of date because output 'pkg7/index.js' is older than input 'pkg0/tsconfig.json'
+[12:10:31 AM] Project 'pkg7/tsconfig.json' is out of date because output 'pkg7/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:10:46 AM] Building project '/user/username/projects/myproject/pkg7/tsconfig.json'...
+[12:10:32 AM] Building project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
-[12:10:47 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
+[12:10:33 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
-[12:10:49 AM] Project 'pkg8/tsconfig.json' is out of date because output 'pkg8/index.js' is older than input 'pkg0/tsconfig.json'
+[12:10:35 AM] Project 'pkg8/tsconfig.json' is out of date because output 'pkg8/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:10:50 AM] Building project '/user/username/projects/myproject/pkg8/tsconfig.json'...
+[12:10:36 AM] Building project '/user/username/projects/myproject/pkg8/tsconfig.json'...
 
-[12:10:51 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg8/tsconfig.json'...
+[12:10:37 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg8/tsconfig.json'...
 
-[12:10:53 AM] Project 'pkg9/tsconfig.json' is out of date because output 'pkg9/index.js' is older than input 'pkg0/tsconfig.json'
+[12:10:39 AM] Project 'pkg9/tsconfig.json' is out of date because output 'pkg9/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:10:54 AM] Building project '/user/username/projects/myproject/pkg9/tsconfig.json'...
+[12:10:40 AM] Building project '/user/username/projects/myproject/pkg9/tsconfig.json'...
 
-[12:10:55 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg9/tsconfig.json'...
+[12:10:41 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg9/tsconfig.json'...
 
-[12:10:57 AM] Project 'pkg10/tsconfig.json' is out of date because output 'pkg10/index.js' is older than input 'pkg0/tsconfig.json'
+[12:10:43 AM] Project 'pkg10/tsconfig.json' is out of date because output 'pkg10/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:10:58 AM] Building project '/user/username/projects/myproject/pkg10/tsconfig.json'...
+[12:10:44 AM] Building project '/user/username/projects/myproject/pkg10/tsconfig.json'...
 
-[12:10:59 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg10/tsconfig.json'...
+[12:10:45 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg10/tsconfig.json'...
 
 
 
@@ -3961,51 +3961,51 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 1
 Output::
 >> Screen clear
-[12:11:03 AM] File change detected. Starting incremental compilation...
+[12:10:48 AM] File change detected. Starting incremental compilation...
 
-[12:11:04 AM] Project 'pkg0/tsconfig.json' is out of date because output 'pkg0/tsconfig.tsbuildinfo' is older than input 'pkg0/index.ts'
+[12:10:49 AM] Project 'pkg0/tsconfig.json' is out of date because output 'pkg0/tsconfig.tsbuildinfo' is older than input 'pkg0/index.ts'
 
-[12:11:05 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
+[12:10:50 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
-[12:11:16 AM] Project 'pkg1/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:10:58 AM] Project 'pkg1/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:11:17 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
+[12:10:59 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-[12:11:19 AM] Project 'pkg2/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:11:01 AM] Project 'pkg2/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:11:20 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
+[12:11:02 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-[12:11:22 AM] Project 'pkg3/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:11:04 AM] Project 'pkg3/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:11:23 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
+[12:11:05 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-[12:11:25 AM] Project 'pkg4/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:11:07 AM] Project 'pkg4/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:11:26 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
+[12:11:08 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
-[12:11:28 AM] Project 'pkg5/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:11:10 AM] Project 'pkg5/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:11:29 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
+[12:11:11 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
-[12:11:31 AM] Project 'pkg6/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:11:13 AM] Project 'pkg6/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:11:32 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
+[12:11:14 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
-[12:11:34 AM] Project 'pkg7/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:11:16 AM] Project 'pkg7/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:11:35 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
+[12:11:17 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
-[12:11:37 AM] Project 'pkg8/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:11:19 AM] Project 'pkg8/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:11:38 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg8/tsconfig.json'...
+[12:11:20 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg8/tsconfig.json'...
 
-[12:11:40 AM] Project 'pkg9/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:11:22 AM] Project 'pkg9/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:11:41 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg9/tsconfig.json'...
+[12:11:23 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg9/tsconfig.json'...
 
-[12:11:43 AM] Project 'pkg10/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:11:25 AM] Project 'pkg10/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:11:44 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg10/tsconfig.json'...
+[12:11:26 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg10/tsconfig.json'...
 
 
 
@@ -4115,35 +4115,35 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 1
 Output::
-[12:11:46 AM] Project 'pkg11/tsconfig.json' is out of date because output 'pkg11/index.js' is older than input 'pkg0/tsconfig.json'
+[12:11:28 AM] Project 'pkg11/tsconfig.json' is out of date because output 'pkg11/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:11:47 AM] Building project '/user/username/projects/myproject/pkg11/tsconfig.json'...
+[12:11:29 AM] Building project '/user/username/projects/myproject/pkg11/tsconfig.json'...
 
-[12:11:48 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg11/tsconfig.json'...
+[12:11:30 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg11/tsconfig.json'...
 
-[12:11:50 AM] Project 'pkg12/tsconfig.json' is out of date because output 'pkg12/index.js' is older than input 'pkg0/tsconfig.json'
+[12:11:32 AM] Project 'pkg12/tsconfig.json' is out of date because output 'pkg12/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:11:51 AM] Building project '/user/username/projects/myproject/pkg12/tsconfig.json'...
+[12:11:33 AM] Building project '/user/username/projects/myproject/pkg12/tsconfig.json'...
 
-[12:11:52 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg12/tsconfig.json'...
+[12:11:34 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg12/tsconfig.json'...
 
-[12:11:54 AM] Project 'pkg13/tsconfig.json' is out of date because output 'pkg13/index.js' is older than input 'pkg0/tsconfig.json'
+[12:11:36 AM] Project 'pkg13/tsconfig.json' is out of date because output 'pkg13/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:11:55 AM] Building project '/user/username/projects/myproject/pkg13/tsconfig.json'...
+[12:11:37 AM] Building project '/user/username/projects/myproject/pkg13/tsconfig.json'...
 
-[12:11:56 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg13/tsconfig.json'...
+[12:11:38 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg13/tsconfig.json'...
 
-[12:11:58 AM] Project 'pkg14/tsconfig.json' is out of date because output 'pkg14/index.js' is older than input 'pkg0/tsconfig.json'
+[12:11:40 AM] Project 'pkg14/tsconfig.json' is out of date because output 'pkg14/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:11:59 AM] Building project '/user/username/projects/myproject/pkg14/tsconfig.json'...
+[12:11:41 AM] Building project '/user/username/projects/myproject/pkg14/tsconfig.json'...
 
-[12:12:00 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg14/tsconfig.json'...
+[12:11:42 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg14/tsconfig.json'...
 
-[12:12:02 AM] Project 'pkg15/tsconfig.json' is out of date because output 'pkg15/index.js' is older than input 'pkg0/tsconfig.json'
+[12:11:44 AM] Project 'pkg15/tsconfig.json' is out of date because output 'pkg15/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:12:03 AM] Building project '/user/username/projects/myproject/pkg15/tsconfig.json'...
+[12:11:45 AM] Building project '/user/username/projects/myproject/pkg15/tsconfig.json'...
 
-[12:12:04 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg15/tsconfig.json'...
+[12:11:46 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg15/tsconfig.json'...
 
 
 
@@ -4261,11 +4261,11 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 1
 Output::
 >> Screen clear
-[12:12:09 AM] File change detected. Starting incremental compilation...
+[12:11:50 AM] File change detected. Starting incremental compilation...
 
-[12:12:10 AM] Project 'pkg0/tsconfig.json' is out of date because output 'pkg0/tsconfig.tsbuildinfo' is older than input 'pkg0/index.ts'
+[12:11:51 AM] Project 'pkg0/tsconfig.json' is out of date because output 'pkg0/tsconfig.tsbuildinfo' is older than input 'pkg0/index.ts'
 
-[12:12:11 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
+[12:11:52 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
 
 
@@ -4373,35 +4373,35 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 1
 Output::
-[12:12:25 AM] Project 'pkg1/tsconfig.json' is out of date because output 'pkg1/index.js' is older than input 'pkg0/tsconfig.json'
+[12:12:02 AM] Project 'pkg1/tsconfig.json' is out of date because output 'pkg1/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:12:26 AM] Building project '/user/username/projects/myproject/pkg1/tsconfig.json'...
+[12:12:03 AM] Building project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-[12:12:27 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
+[12:12:04 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-[12:12:29 AM] Project 'pkg2/tsconfig.json' is out of date because output 'pkg2/index.js' is older than input 'pkg0/tsconfig.json'
+[12:12:06 AM] Project 'pkg2/tsconfig.json' is out of date because output 'pkg2/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:12:30 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
+[12:12:07 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-[12:12:31 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
+[12:12:08 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-[12:12:33 AM] Project 'pkg3/tsconfig.json' is out of date because output 'pkg3/index.js' is older than input 'pkg0/tsconfig.json'
+[12:12:10 AM] Project 'pkg3/tsconfig.json' is out of date because output 'pkg3/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:12:34 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
+[12:12:11 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-[12:12:35 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
+[12:12:12 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-[12:12:37 AM] Project 'pkg4/tsconfig.json' is out of date because output 'pkg4/index.js' is older than input 'pkg0/tsconfig.json'
+[12:12:14 AM] Project 'pkg4/tsconfig.json' is out of date because output 'pkg4/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:12:38 AM] Building project '/user/username/projects/myproject/pkg4/tsconfig.json'...
+[12:12:15 AM] Building project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
-[12:12:39 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
+[12:12:16 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
-[12:12:41 AM] Project 'pkg5/tsconfig.json' is out of date because output 'pkg5/index.js' is older than input 'pkg0/tsconfig.json'
+[12:12:18 AM] Project 'pkg5/tsconfig.json' is out of date because output 'pkg5/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:12:42 AM] Building project '/user/username/projects/myproject/pkg5/tsconfig.json'...
+[12:12:19 AM] Building project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
-[12:12:43 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
+[12:12:20 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
 
 
@@ -4511,35 +4511,35 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 1
 Output::
-[12:12:45 AM] Project 'pkg6/tsconfig.json' is out of date because output 'pkg6/index.js' is older than input 'pkg0/tsconfig.json'
+[12:12:22 AM] Project 'pkg6/tsconfig.json' is out of date because output 'pkg6/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:12:46 AM] Building project '/user/username/projects/myproject/pkg6/tsconfig.json'...
+[12:12:23 AM] Building project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
-[12:12:47 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
+[12:12:24 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
-[12:12:49 AM] Project 'pkg7/tsconfig.json' is out of date because output 'pkg7/index.js' is older than input 'pkg0/tsconfig.json'
+[12:12:26 AM] Project 'pkg7/tsconfig.json' is out of date because output 'pkg7/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:12:50 AM] Building project '/user/username/projects/myproject/pkg7/tsconfig.json'...
+[12:12:27 AM] Building project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
-[12:12:51 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
+[12:12:28 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
-[12:12:53 AM] Project 'pkg8/tsconfig.json' is out of date because output 'pkg8/index.js' is older than input 'pkg0/tsconfig.json'
+[12:12:30 AM] Project 'pkg8/tsconfig.json' is out of date because output 'pkg8/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:12:54 AM] Building project '/user/username/projects/myproject/pkg8/tsconfig.json'...
+[12:12:31 AM] Building project '/user/username/projects/myproject/pkg8/tsconfig.json'...
 
-[12:12:55 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg8/tsconfig.json'...
+[12:12:32 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg8/tsconfig.json'...
 
-[12:12:57 AM] Project 'pkg9/tsconfig.json' is out of date because output 'pkg9/index.js' is older than input 'pkg0/tsconfig.json'
+[12:12:34 AM] Project 'pkg9/tsconfig.json' is out of date because output 'pkg9/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:12:58 AM] Building project '/user/username/projects/myproject/pkg9/tsconfig.json'...
+[12:12:35 AM] Building project '/user/username/projects/myproject/pkg9/tsconfig.json'...
 
-[12:12:59 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg9/tsconfig.json'...
+[12:12:36 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg9/tsconfig.json'...
 
-[12:13:01 AM] Project 'pkg10/tsconfig.json' is out of date because output 'pkg10/index.js' is older than input 'pkg0/tsconfig.json'
+[12:12:38 AM] Project 'pkg10/tsconfig.json' is out of date because output 'pkg10/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:13:02 AM] Building project '/user/username/projects/myproject/pkg10/tsconfig.json'...
+[12:12:39 AM] Building project '/user/username/projects/myproject/pkg10/tsconfig.json'...
 
-[12:13:03 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg10/tsconfig.json'...
+[12:12:40 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg10/tsconfig.json'...
 
 
 
@@ -4649,35 +4649,35 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 1
 Output::
-[12:13:05 AM] Project 'pkg11/tsconfig.json' is out of date because output 'pkg11/index.js' is older than input 'pkg0/tsconfig.json'
+[12:12:42 AM] Project 'pkg11/tsconfig.json' is out of date because output 'pkg11/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:13:06 AM] Building project '/user/username/projects/myproject/pkg11/tsconfig.json'...
+[12:12:43 AM] Building project '/user/username/projects/myproject/pkg11/tsconfig.json'...
 
-[12:13:07 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg11/tsconfig.json'...
+[12:12:44 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg11/tsconfig.json'...
 
-[12:13:09 AM] Project 'pkg12/tsconfig.json' is out of date because output 'pkg12/index.js' is older than input 'pkg0/tsconfig.json'
+[12:12:46 AM] Project 'pkg12/tsconfig.json' is out of date because output 'pkg12/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:13:10 AM] Building project '/user/username/projects/myproject/pkg12/tsconfig.json'...
+[12:12:47 AM] Building project '/user/username/projects/myproject/pkg12/tsconfig.json'...
 
-[12:13:11 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg12/tsconfig.json'...
+[12:12:48 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg12/tsconfig.json'...
 
-[12:13:13 AM] Project 'pkg13/tsconfig.json' is out of date because output 'pkg13/index.js' is older than input 'pkg0/tsconfig.json'
+[12:12:50 AM] Project 'pkg13/tsconfig.json' is out of date because output 'pkg13/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:13:14 AM] Building project '/user/username/projects/myproject/pkg13/tsconfig.json'...
+[12:12:51 AM] Building project '/user/username/projects/myproject/pkg13/tsconfig.json'...
 
-[12:13:15 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg13/tsconfig.json'...
+[12:12:52 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg13/tsconfig.json'...
 
-[12:13:17 AM] Project 'pkg14/tsconfig.json' is out of date because output 'pkg14/index.js' is older than input 'pkg0/tsconfig.json'
+[12:12:54 AM] Project 'pkg14/tsconfig.json' is out of date because output 'pkg14/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:13:18 AM] Building project '/user/username/projects/myproject/pkg14/tsconfig.json'...
+[12:12:55 AM] Building project '/user/username/projects/myproject/pkg14/tsconfig.json'...
 
-[12:13:19 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg14/tsconfig.json'...
+[12:12:56 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg14/tsconfig.json'...
 
-[12:13:21 AM] Project 'pkg15/tsconfig.json' is out of date because output 'pkg15/index.js' is older than input 'pkg0/tsconfig.json'
+[12:12:58 AM] Project 'pkg15/tsconfig.json' is out of date because output 'pkg15/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:13:22 AM] Building project '/user/username/projects/myproject/pkg15/tsconfig.json'...
+[12:12:59 AM] Building project '/user/username/projects/myproject/pkg15/tsconfig.json'...
 
-[12:13:23 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg15/tsconfig.json'...
+[12:13:00 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg15/tsconfig.json'...
 
 
 
@@ -4787,35 +4787,35 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 1
 Output::
-[12:13:25 AM] Project 'pkg16/tsconfig.json' is out of date because output 'pkg16/index.js' is older than input 'pkg0/tsconfig.json'
+[12:13:02 AM] Project 'pkg16/tsconfig.json' is out of date because output 'pkg16/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:13:26 AM] Building project '/user/username/projects/myproject/pkg16/tsconfig.json'...
+[12:13:03 AM] Building project '/user/username/projects/myproject/pkg16/tsconfig.json'...
 
-[12:13:27 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg16/tsconfig.json'...
+[12:13:04 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg16/tsconfig.json'...
 
-[12:13:29 AM] Project 'pkg17/tsconfig.json' is out of date because output 'pkg17/index.js' is older than input 'pkg0/tsconfig.json'
+[12:13:06 AM] Project 'pkg17/tsconfig.json' is out of date because output 'pkg17/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:13:30 AM] Building project '/user/username/projects/myproject/pkg17/tsconfig.json'...
+[12:13:07 AM] Building project '/user/username/projects/myproject/pkg17/tsconfig.json'...
 
-[12:13:31 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg17/tsconfig.json'...
+[12:13:08 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg17/tsconfig.json'...
 
-[12:13:33 AM] Project 'pkg18/tsconfig.json' is out of date because output 'pkg18/index.js' is older than input 'pkg0/tsconfig.json'
+[12:13:10 AM] Project 'pkg18/tsconfig.json' is out of date because output 'pkg18/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:13:34 AM] Building project '/user/username/projects/myproject/pkg18/tsconfig.json'...
+[12:13:11 AM] Building project '/user/username/projects/myproject/pkg18/tsconfig.json'...
 
-[12:13:35 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg18/tsconfig.json'...
+[12:13:12 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg18/tsconfig.json'...
 
-[12:13:37 AM] Project 'pkg19/tsconfig.json' is out of date because output 'pkg19/index.js' is older than input 'pkg0/tsconfig.json'
+[12:13:14 AM] Project 'pkg19/tsconfig.json' is out of date because output 'pkg19/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:13:38 AM] Building project '/user/username/projects/myproject/pkg19/tsconfig.json'...
+[12:13:15 AM] Building project '/user/username/projects/myproject/pkg19/tsconfig.json'...
 
-[12:13:39 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg19/tsconfig.json'...
+[12:13:16 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg19/tsconfig.json'...
 
-[12:13:41 AM] Project 'pkg20/tsconfig.json' is out of date because output 'pkg20/index.js' is older than input 'pkg0/tsconfig.json'
+[12:13:18 AM] Project 'pkg20/tsconfig.json' is out of date because output 'pkg20/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:13:42 AM] Building project '/user/username/projects/myproject/pkg20/tsconfig.json'...
+[12:13:19 AM] Building project '/user/username/projects/myproject/pkg20/tsconfig.json'...
 
-[12:13:43 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg20/tsconfig.json'...
+[12:13:20 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg20/tsconfig.json'...
 
 
 
@@ -4925,19 +4925,19 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 0
 Output::
-[12:13:45 AM] Project 'pkg21/tsconfig.json' is out of date because output 'pkg21/index.js' is older than input 'pkg0/tsconfig.json'
+[12:13:22 AM] Project 'pkg21/tsconfig.json' is out of date because output 'pkg21/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:13:46 AM] Building project '/user/username/projects/myproject/pkg21/tsconfig.json'...
+[12:13:23 AM] Building project '/user/username/projects/myproject/pkg21/tsconfig.json'...
 
-[12:13:47 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg21/tsconfig.json'...
+[12:13:24 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg21/tsconfig.json'...
 
-[12:13:49 AM] Project 'pkg22/tsconfig.json' is out of date because output 'pkg22/index.js' is older than input 'pkg0/tsconfig.json'
+[12:13:26 AM] Project 'pkg22/tsconfig.json' is out of date because output 'pkg22/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:13:50 AM] Building project '/user/username/projects/myproject/pkg22/tsconfig.json'...
+[12:13:27 AM] Building project '/user/username/projects/myproject/pkg22/tsconfig.json'...
 
-[12:13:51 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg22/tsconfig.json'...
+[12:13:28 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg22/tsconfig.json'...
 
-[12:13:53 AM] Found 0 errors. Watching for file changes.
+[12:13:30 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-3-projects-in-a-solution.js b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-3-projects-in-a-solution.js
index add1e60d23f6c..e4357e5afac23 100644
--- a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-3-projects-in-a-solution.js
+++ b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-3-projects-in-a-solution.js
@@ -386,21 +386,21 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:15 AM] File change detected. Starting incremental compilation...
+[12:01:14 AM] File change detected. Starting incremental compilation...
 
-[12:01:16 AM] Project 'pkg0/tsconfig.json' is out of date because output 'pkg0/tsconfig.tsbuildinfo' is older than input 'pkg0/index.ts'
+[12:01:15 AM] Project 'pkg0/tsconfig.json' is out of date because output 'pkg0/tsconfig.tsbuildinfo' is older than input 'pkg0/index.ts'
 
-[12:01:17 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
+[12:01:16 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
-[12:01:28 AM] Project 'pkg1/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:01:24 AM] Project 'pkg1/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:01:29 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
+[12:01:25 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-[12:01:31 AM] Project 'pkg2/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:01:27 AM] Project 'pkg2/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:01:32 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
+[12:01:28 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-[12:01:34 AM] Found 0 errors. Watching for file changes.
+[12:01:30 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -510,11 +510,11 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 1
 Output::
 >> Screen clear
-[12:01:37 AM] File change detected. Starting incremental compilation...
+[12:01:32 AM] File change detected. Starting incremental compilation...
 
-[12:01:38 AM] Project 'pkg0/tsconfig.json' is out of date because output 'pkg0/tsconfig.tsbuildinfo' is older than input 'pkg0/index.ts'
+[12:01:33 AM] Project 'pkg0/tsconfig.json' is out of date because output 'pkg0/tsconfig.tsbuildinfo' is older than input 'pkg0/index.ts'
 
-[12:01:39 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
+[12:01:34 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
 
 
@@ -617,19 +617,19 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 0
 Output::
-[12:01:53 AM] Project 'pkg1/tsconfig.json' is out of date because output 'pkg1/index.js' is older than input 'pkg0/tsconfig.json'
+[12:01:44 AM] Project 'pkg1/tsconfig.json' is out of date because output 'pkg1/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:01:54 AM] Building project '/user/username/projects/myproject/pkg1/tsconfig.json'...
+[12:01:45 AM] Building project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-[12:01:55 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
+[12:01:46 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-[12:01:57 AM] Project 'pkg2/tsconfig.json' is out of date because output 'pkg2/index.js' is older than input 'pkg0/tsconfig.json'
+[12:01:48 AM] Project 'pkg2/tsconfig.json' is out of date because output 'pkg2/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:01:58 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
+[12:01:49 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-[12:01:59 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
+[12:01:50 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-[12:02:01 AM] Found 0 errors. Watching for file changes.
+[12:01:52 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-5-projects-in-a-solution.js b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-5-projects-in-a-solution.js
index 6c5d5a11298e9..3649180fce541 100644
--- a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-5-projects-in-a-solution.js
+++ b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-5-projects-in-a-solution.js
@@ -608,29 +608,29 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:49 AM] File change detected. Starting incremental compilation...
+[12:01:48 AM] File change detected. Starting incremental compilation...
 
-[12:01:50 AM] Project 'pkg0/tsconfig.json' is out of date because output 'pkg0/tsconfig.tsbuildinfo' is older than input 'pkg0/index.ts'
+[12:01:49 AM] Project 'pkg0/tsconfig.json' is out of date because output 'pkg0/tsconfig.tsbuildinfo' is older than input 'pkg0/index.ts'
 
-[12:01:51 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
+[12:01:50 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
-[12:02:02 AM] Project 'pkg1/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:01:58 AM] Project 'pkg1/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:02:03 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
+[12:01:59 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-[12:02:05 AM] Project 'pkg2/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:02:01 AM] Project 'pkg2/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:02:06 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
+[12:02:02 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-[12:02:08 AM] Project 'pkg3/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:02:04 AM] Project 'pkg3/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:02:09 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
+[12:02:05 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-[12:02:11 AM] Project 'pkg4/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:02:07 AM] Project 'pkg4/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:02:12 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
+[12:02:08 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
-[12:02:14 AM] Found 0 errors. Watching for file changes.
+[12:02:10 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -742,11 +742,11 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 1
 Output::
 >> Screen clear
-[12:02:17 AM] File change detected. Starting incremental compilation...
+[12:02:12 AM] File change detected. Starting incremental compilation...
 
-[12:02:18 AM] Project 'pkg0/tsconfig.json' is out of date because output 'pkg0/tsconfig.tsbuildinfo' is older than input 'pkg0/index.ts'
+[12:02:13 AM] Project 'pkg0/tsconfig.json' is out of date because output 'pkg0/tsconfig.tsbuildinfo' is older than input 'pkg0/index.ts'
 
-[12:02:19 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
+[12:02:14 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
 
 
@@ -849,31 +849,31 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 0
 Output::
-[12:02:33 AM] Project 'pkg1/tsconfig.json' is out of date because output 'pkg1/index.js' is older than input 'pkg0/tsconfig.json'
+[12:02:24 AM] Project 'pkg1/tsconfig.json' is out of date because output 'pkg1/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:02:34 AM] Building project '/user/username/projects/myproject/pkg1/tsconfig.json'...
+[12:02:25 AM] Building project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-[12:02:35 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
+[12:02:26 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-[12:02:37 AM] Project 'pkg2/tsconfig.json' is out of date because output 'pkg2/index.js' is older than input 'pkg0/tsconfig.json'
+[12:02:28 AM] Project 'pkg2/tsconfig.json' is out of date because output 'pkg2/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:02:38 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
+[12:02:29 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-[12:02:39 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
+[12:02:30 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-[12:02:41 AM] Project 'pkg3/tsconfig.json' is out of date because output 'pkg3/index.js' is older than input 'pkg0/tsconfig.json'
+[12:02:32 AM] Project 'pkg3/tsconfig.json' is out of date because output 'pkg3/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:02:42 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
+[12:02:33 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-[12:02:43 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
+[12:02:34 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-[12:02:45 AM] Project 'pkg4/tsconfig.json' is out of date because output 'pkg4/index.js' is older than input 'pkg0/tsconfig.json'
+[12:02:36 AM] Project 'pkg4/tsconfig.json' is out of date because output 'pkg4/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:02:46 AM] Building project '/user/username/projects/myproject/pkg4/tsconfig.json'...
+[12:02:37 AM] Building project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
-[12:02:47 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
+[12:02:38 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
-[12:02:49 AM] Found 0 errors. Watching for file changes.
+[12:02:40 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-8-projects-in-a-solution.js b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-8-projects-in-a-solution.js
index 8d70635ca8929..1fe9bef4410cd 100644
--- a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-8-projects-in-a-solution.js
+++ b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-8-projects-in-a-solution.js
@@ -941,41 +941,41 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:02:40 AM] File change detected. Starting incremental compilation...
+[12:02:39 AM] File change detected. Starting incremental compilation...
 
-[12:02:41 AM] Project 'pkg0/tsconfig.json' is out of date because output 'pkg0/tsconfig.tsbuildinfo' is older than input 'pkg0/index.ts'
+[12:02:40 AM] Project 'pkg0/tsconfig.json' is out of date because output 'pkg0/tsconfig.tsbuildinfo' is older than input 'pkg0/index.ts'
 
-[12:02:42 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
+[12:02:41 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
-[12:02:53 AM] Project 'pkg1/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:02:49 AM] Project 'pkg1/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:02:54 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
+[12:02:50 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-[12:02:56 AM] Project 'pkg2/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:02:52 AM] Project 'pkg2/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:02:57 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
+[12:02:53 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-[12:02:59 AM] Project 'pkg3/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:02:55 AM] Project 'pkg3/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:03:00 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
+[12:02:56 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-[12:03:02 AM] Project 'pkg4/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:02:58 AM] Project 'pkg4/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:03:03 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
+[12:02:59 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
-[12:03:05 AM] Project 'pkg5/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:03:01 AM] Project 'pkg5/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:03:06 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
+[12:03:02 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
-[12:03:08 AM] Project 'pkg6/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:03:04 AM] Project 'pkg6/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:03:09 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
+[12:03:05 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
-[12:03:11 AM] Project 'pkg7/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:03:07 AM] Project 'pkg7/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:03:12 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
+[12:03:08 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
-[12:03:14 AM] Found 0 errors. Watching for file changes.
+[12:03:10 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -1090,11 +1090,11 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 1
 Output::
 >> Screen clear
-[12:03:17 AM] File change detected. Starting incremental compilation...
+[12:03:12 AM] File change detected. Starting incremental compilation...
 
-[12:03:18 AM] Project 'pkg0/tsconfig.json' is out of date because output 'pkg0/tsconfig.tsbuildinfo' is older than input 'pkg0/index.ts'
+[12:03:13 AM] Project 'pkg0/tsconfig.json' is out of date because output 'pkg0/tsconfig.tsbuildinfo' is older than input 'pkg0/index.ts'
 
-[12:03:19 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
+[12:03:14 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
 
 
@@ -1197,35 +1197,35 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 1
 Output::
-[12:03:33 AM] Project 'pkg1/tsconfig.json' is out of date because output 'pkg1/index.js' is older than input 'pkg0/tsconfig.json'
+[12:03:24 AM] Project 'pkg1/tsconfig.json' is out of date because output 'pkg1/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:03:34 AM] Building project '/user/username/projects/myproject/pkg1/tsconfig.json'...
+[12:03:25 AM] Building project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-[12:03:35 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
+[12:03:26 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-[12:03:37 AM] Project 'pkg2/tsconfig.json' is out of date because output 'pkg2/index.js' is older than input 'pkg0/tsconfig.json'
+[12:03:28 AM] Project 'pkg2/tsconfig.json' is out of date because output 'pkg2/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:03:38 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
+[12:03:29 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-[12:03:39 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
+[12:03:30 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-[12:03:41 AM] Project 'pkg3/tsconfig.json' is out of date because output 'pkg3/index.js' is older than input 'pkg0/tsconfig.json'
+[12:03:32 AM] Project 'pkg3/tsconfig.json' is out of date because output 'pkg3/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:03:42 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
+[12:03:33 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-[12:03:43 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
+[12:03:34 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-[12:03:45 AM] Project 'pkg4/tsconfig.json' is out of date because output 'pkg4/index.js' is older than input 'pkg0/tsconfig.json'
+[12:03:36 AM] Project 'pkg4/tsconfig.json' is out of date because output 'pkg4/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:03:46 AM] Building project '/user/username/projects/myproject/pkg4/tsconfig.json'...
+[12:03:37 AM] Building project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
-[12:03:47 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
+[12:03:38 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
-[12:03:49 AM] Project 'pkg5/tsconfig.json' is out of date because output 'pkg5/index.js' is older than input 'pkg0/tsconfig.json'
+[12:03:40 AM] Project 'pkg5/tsconfig.json' is out of date because output 'pkg5/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:03:50 AM] Building project '/user/username/projects/myproject/pkg5/tsconfig.json'...
+[12:03:41 AM] Building project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
-[12:03:51 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
+[12:03:42 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
 
 
@@ -1335,19 +1335,19 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 0
 Output::
-[12:03:53 AM] Project 'pkg6/tsconfig.json' is out of date because output 'pkg6/index.js' is older than input 'pkg0/tsconfig.json'
+[12:03:44 AM] Project 'pkg6/tsconfig.json' is out of date because output 'pkg6/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:03:54 AM] Building project '/user/username/projects/myproject/pkg6/tsconfig.json'...
+[12:03:45 AM] Building project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
-[12:03:55 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
+[12:03:46 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
-[12:03:57 AM] Project 'pkg7/tsconfig.json' is out of date because output 'pkg7/index.js' is older than input 'pkg0/tsconfig.json'
+[12:03:48 AM] Project 'pkg7/tsconfig.json' is out of date because output 'pkg7/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:03:58 AM] Building project '/user/username/projects/myproject/pkg7/tsconfig.json'...
+[12:03:49 AM] Building project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
-[12:03:59 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
+[12:03:50 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
-[12:04:01 AM] Found 0 errors. Watching for file changes.
+[12:03:52 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -1414,11 +1414,11 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 1
 Output::
 >> Screen clear
-[12:04:04 AM] File change detected. Starting incremental compilation...
+[12:03:54 AM] File change detected. Starting incremental compilation...
 
-[12:04:05 AM] Project 'pkg0/tsconfig.json' is out of date because output 'pkg0/tsconfig.tsbuildinfo' is older than input 'pkg0/index.ts'
+[12:03:55 AM] Project 'pkg0/tsconfig.json' is out of date because output 'pkg0/tsconfig.tsbuildinfo' is older than input 'pkg0/index.ts'
 
-[12:04:06 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
+[12:03:56 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
 
 
@@ -1523,35 +1523,35 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 1
 Output::
-[12:04:21 AM] Project 'pkg1/tsconfig.json' is out of date because output 'pkg1/index.js' is older than input 'pkg0/tsconfig.json'
+[12:04:07 AM] Project 'pkg1/tsconfig.json' is out of date because output 'pkg1/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:04:22 AM] Building project '/user/username/projects/myproject/pkg1/tsconfig.json'...
+[12:04:08 AM] Building project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-[12:04:23 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
+[12:04:09 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-[12:04:25 AM] Project 'pkg2/tsconfig.json' is out of date because output 'pkg2/index.js' is older than input 'pkg0/tsconfig.json'
+[12:04:11 AM] Project 'pkg2/tsconfig.json' is out of date because output 'pkg2/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:04:26 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
+[12:04:12 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-[12:04:27 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
+[12:04:13 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-[12:04:29 AM] Project 'pkg3/tsconfig.json' is out of date because output 'pkg3/index.js' is older than input 'pkg0/tsconfig.json'
+[12:04:15 AM] Project 'pkg3/tsconfig.json' is out of date because output 'pkg3/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:04:30 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
+[12:04:16 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-[12:04:31 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
+[12:04:17 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-[12:04:33 AM] Project 'pkg4/tsconfig.json' is out of date because output 'pkg4/index.js' is older than input 'pkg0/tsconfig.json'
+[12:04:19 AM] Project 'pkg4/tsconfig.json' is out of date because output 'pkg4/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:04:34 AM] Building project '/user/username/projects/myproject/pkg4/tsconfig.json'...
+[12:04:20 AM] Building project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
-[12:04:35 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
+[12:04:21 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
-[12:04:37 AM] Project 'pkg5/tsconfig.json' is out of date because output 'pkg5/index.js' is older than input 'pkg0/tsconfig.json'
+[12:04:23 AM] Project 'pkg5/tsconfig.json' is out of date because output 'pkg5/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:04:38 AM] Building project '/user/username/projects/myproject/pkg5/tsconfig.json'...
+[12:04:24 AM] Building project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
-[12:04:39 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
+[12:04:25 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
 
 
@@ -1669,31 +1669,31 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 1
 Output::
 >> Screen clear
-[12:04:43 AM] File change detected. Starting incremental compilation...
+[12:04:28 AM] File change detected. Starting incremental compilation...
 
-[12:04:44 AM] Project 'pkg0/tsconfig.json' is out of date because output 'pkg0/tsconfig.tsbuildinfo' is older than input 'pkg0/index.ts'
+[12:04:29 AM] Project 'pkg0/tsconfig.json' is out of date because output 'pkg0/tsconfig.tsbuildinfo' is older than input 'pkg0/index.ts'
 
-[12:04:45 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
+[12:04:30 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
-[12:04:56 AM] Project 'pkg1/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:04:38 AM] Project 'pkg1/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:04:57 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
+[12:04:39 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-[12:04:59 AM] Project 'pkg2/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:04:41 AM] Project 'pkg2/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:05:00 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
+[12:04:42 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-[12:05:02 AM] Project 'pkg3/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:04:44 AM] Project 'pkg3/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:05:03 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
+[12:04:45 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-[12:05:05 AM] Project 'pkg4/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:04:47 AM] Project 'pkg4/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:05:06 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
+[12:04:48 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
-[12:05:08 AM] Project 'pkg5/tsconfig.json' is up to date with .d.ts files from its dependencies
+[12:04:50 AM] Project 'pkg5/tsconfig.json' is up to date with .d.ts files from its dependencies
 
-[12:05:09 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
+[12:04:51 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
 
 
@@ -1798,19 +1798,19 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 0
 Output::
-[12:05:11 AM] Project 'pkg6/tsconfig.json' is out of date because output 'pkg6/index.js' is older than input 'pkg0/tsconfig.json'
+[12:04:53 AM] Project 'pkg6/tsconfig.json' is out of date because output 'pkg6/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:05:12 AM] Building project '/user/username/projects/myproject/pkg6/tsconfig.json'...
+[12:04:54 AM] Building project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
-[12:05:13 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
+[12:04:55 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
-[12:05:15 AM] Project 'pkg7/tsconfig.json' is out of date because output 'pkg7/index.js' is older than input 'pkg0/tsconfig.json'
+[12:04:57 AM] Project 'pkg7/tsconfig.json' is out of date because output 'pkg7/index.js' is older than input 'pkg0/tsconfig.json'
 
-[12:05:16 AM] Building project '/user/username/projects/myproject/pkg7/tsconfig.json'...
+[12:04:58 AM] Building project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
-[12:05:17 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
+[12:04:59 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
-[12:05:19 AM] Found 0 errors. Watching for file changes.
+[12:05:01 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/publicApi/with-custom-transformers.js b/tests/baselines/reference/tsbuildWatch/publicApi/with-custom-transformers.js
index c4bf0abf21386..36cfd3f9cac8a 100644
--- a/tests/baselines/reference/tsbuildWatch/publicApi/with-custom-transformers.js
+++ b/tests/baselines/reference/tsbuildWatch/publicApi/with-custom-transformers.js
@@ -330,11 +330,11 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 1
 Output::
 >> Screen clear
-[12:00:57 AM] File change detected. Starting incremental compilation...
+[12:00:56 AM] File change detected. Starting incremental compilation...
 
-[12:00:58 AM] Project 'shared/tsconfig.json' is out of date because output 'shared/tsconfig.tsbuildinfo' is older than input 'shared/index.ts'
+[12:00:57 AM] Project 'shared/tsconfig.json' is out of date because output 'shared/tsconfig.tsbuildinfo' is older than input 'shared/index.ts'
 
-[12:00:59 AM] Building project '/user/username/projects/myproject/shared/tsconfig.json'...
+[12:00:58 AM] Building project '/user/username/projects/myproject/shared/tsconfig.json'...
 
 
 
@@ -434,13 +434,13 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 0
 Output::
-[12:01:13 AM] Project 'webpack/tsconfig.json' is out of date because output 'webpack/index.js' is older than input 'shared/tsconfig.json'
+[12:01:08 AM] Project 'webpack/tsconfig.json' is out of date because output 'webpack/index.js' is older than input 'shared/tsconfig.json'
 
-[12:01:14 AM] Building project '/user/username/projects/myproject/webpack/tsconfig.json'...
+[12:01:09 AM] Building project '/user/username/projects/myproject/webpack/tsconfig.json'...
 
-[12:01:15 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/webpack/tsconfig.json'...
+[12:01:10 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/webpack/tsconfig.json'...
 
-[12:01:17 AM] Found 0 errors. Watching for file changes.
+[12:01:12 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/reexport/Reports-errors-correctly.js b/tests/baselines/reference/tsbuildWatch/reexport/Reports-errors-correctly.js
index 4b359bbed7939..242c0d9e997e6 100644
--- a/tests/baselines/reference/tsbuildWatch/reexport/Reports-errors-correctly.js
+++ b/tests/baselines/reference/tsbuildWatch/reexport/Reports-errors-correctly.js
@@ -320,11 +320,11 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 1
 Output::
 >> Screen clear
-[12:01:09 AM] File change detected. Starting incremental compilation...
+[12:01:08 AM] File change detected. Starting incremental compilation...
 
-[12:01:10 AM] Project 'src/pure/tsconfig.json' is out of date because output 'out/pure/tsconfig.tsbuildinfo' is older than input 'src/pure/session.ts'
+[12:01:09 AM] Project 'src/pure/tsconfig.json' is out of date because output 'out/pure/tsconfig.tsbuildinfo' is older than input 'src/pure/session.ts'
 
-[12:01:11 AM] Building project '/user/username/projects/reexport/src/pure/tsconfig.json'...
+[12:01:10 AM] Building project '/user/username/projects/reexport/src/pure/tsconfig.json'...
 
 
 
@@ -417,9 +417,9 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 0
 Output::
-[12:01:28 AM] Project 'src/main/tsconfig.json' is out of date because output 'out/main/index.js' is older than input 'src/pure/tsconfig.json'
+[12:01:22 AM] Project 'src/main/tsconfig.json' is out of date because output 'out/main/index.js' is older than input 'src/pure/tsconfig.json'
 
-[12:01:29 AM] Building project '/user/username/projects/reexport/src/main/tsconfig.json'...
+[12:01:23 AM] Building project '/user/username/projects/reexport/src/main/tsconfig.json'...
 
 src/main/index.ts:3:14 - error TS2741: Property 'bar' is missing in type '{ foo: number; }' but required in type 'Session'.
 
@@ -431,7 +431,7 @@ Output::
           ~~~
     'bar' is declared here.
 
-[12:01:30 AM] Found 1 error. Watching for file changes.
+[12:01:24 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -510,11 +510,11 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 1
 Output::
 >> Screen clear
-[12:01:34 AM] File change detected. Starting incremental compilation...
+[12:01:27 AM] File change detected. Starting incremental compilation...
 
-[12:01:35 AM] Project 'src/pure/tsconfig.json' is out of date because output 'out/pure/tsconfig.tsbuildinfo' is older than input 'src/pure/session.ts'
+[12:01:28 AM] Project 'src/pure/tsconfig.json' is out of date because output 'out/pure/tsconfig.tsbuildinfo' is older than input 'src/pure/session.ts'
 
-[12:01:36 AM] Building project '/user/username/projects/reexport/src/pure/tsconfig.json'...
+[12:01:29 AM] Building project '/user/username/projects/reexport/src/pure/tsconfig.json'...
 
 
 
@@ -610,13 +610,13 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 0
 Output::
-[12:01:53 AM] Failed to parse file 'src/main/tsconfig.json': Semantic errors.
+[12:01:41 AM] Failed to parse file 'src/main/tsconfig.json': Semantic errors.
 
-[12:01:54 AM] Building project '/user/username/projects/reexport/src/main/tsconfig.json'...
+[12:01:42 AM] Building project '/user/username/projects/reexport/src/main/tsconfig.json'...
 
-[12:01:55 AM] Updating unchanged output timestamps of project '/user/username/projects/reexport/src/main/tsconfig.json'...
+[12:01:43 AM] Updating unchanged output timestamps of project '/user/username/projects/reexport/src/main/tsconfig.json'...
 
-[12:01:57 AM] Found 0 errors. Watching for file changes.
+[12:01:45 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects-with-single-watcher-per-file.js b/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects-with-single-watcher-per-file.js
index d8adbeb93c4c7..e98aa7aeeca89 100644
--- a/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects-with-single-watcher-per-file.js
+++ b/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects-with-single-watcher-per-file.js
@@ -300,13 +300,13 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 1
 Output::
 >> Screen clear
-[12:01:13 AM] File change detected. Starting incremental compilation...
+[12:01:12 AM] File change detected. Starting incremental compilation...
 
-[12:01:14 AM] Project 'pkg0/tsconfig.json' is out of date because output 'pkg0/index.js' is older than input 'typings/xterm.d.ts'
+[12:01:13 AM] Project 'pkg0/tsconfig.json' is out of date because output 'pkg0/index.js' is older than input 'typings/xterm.d.ts'
 
-[12:01:15 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
+[12:01:14 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
-[12:01:16 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg0/tsconfig.json'...
+[12:01:15 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
 
 
@@ -320,25 +320,25 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 0
 Output::
-[12:01:18 AM] Project 'pkg1/tsconfig.json' is out of date because output 'pkg1/index.js' is older than input 'typings/xterm.d.ts'
+[12:01:17 AM] Project 'pkg1/tsconfig.json' is out of date because output 'pkg1/index.js' is older than input 'typings/xterm.d.ts'
 
-[12:01:19 AM] Building project '/user/username/projects/myproject/pkg1/tsconfig.json'...
+[12:01:18 AM] Building project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-[12:01:20 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
+[12:01:19 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-[12:01:22 AM] Project 'pkg2/tsconfig.json' is out of date because output 'pkg2/index.js' is older than input 'typings/xterm.d.ts'
+[12:01:21 AM] Project 'pkg2/tsconfig.json' is out of date because output 'pkg2/index.js' is older than input 'typings/xterm.d.ts'
 
-[12:01:23 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
+[12:01:22 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-[12:01:24 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
+[12:01:23 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-[12:01:26 AM] Project 'pkg3/tsconfig.json' is out of date because output 'pkg3/index.js' is older than input 'typings/xterm.d.ts'
+[12:01:25 AM] Project 'pkg3/tsconfig.json' is out of date because output 'pkg3/index.js' is older than input 'typings/xterm.d.ts'
 
-[12:01:27 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
+[12:01:26 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-[12:01:28 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
+[12:01:27 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-[12:01:30 AM] Found 0 errors. Watching for file changes.
+[12:01:29 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -459,9 +459,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:34 AM] File change detected. Starting incremental compilation...
+[12:01:32 AM] File change detected. Starting incremental compilation...
 
-[12:01:35 AM] Found 0 errors. Watching for file changes.
+[12:01:33 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -521,13 +521,13 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 1
 Output::
 >> Screen clear
-[12:01:39 AM] File change detected. Starting incremental compilation...
+[12:01:36 AM] File change detected. Starting incremental compilation...
 
-[12:01:40 AM] Project 'pkg0/tsconfig.json' is out of date because output 'pkg0/index.js' is older than input 'typings/xterm.d.ts'
+[12:01:37 AM] Project 'pkg0/tsconfig.json' is out of date because output 'pkg0/index.js' is older than input 'typings/xterm.d.ts'
 
-[12:01:41 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
+[12:01:38 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
-[12:01:42 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg0/tsconfig.json'...
+[12:01:39 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
 
 
@@ -541,19 +541,19 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 0
 Output::
-[12:01:44 AM] Project 'pkg1/tsconfig.json' is out of date because output 'pkg1/index.js' is older than input 'typings/xterm.d.ts'
+[12:01:41 AM] Project 'pkg1/tsconfig.json' is out of date because output 'pkg1/index.js' is older than input 'typings/xterm.d.ts'
 
-[12:01:45 AM] Building project '/user/username/projects/myproject/pkg1/tsconfig.json'...
+[12:01:42 AM] Building project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-[12:01:46 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
+[12:01:43 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-[12:01:48 AM] Project 'pkg2/tsconfig.json' is out of date because output 'pkg2/index.js' is older than input 'typings/xterm.d.ts'
+[12:01:45 AM] Project 'pkg2/tsconfig.json' is out of date because output 'pkg2/index.js' is older than input 'typings/xterm.d.ts'
 
-[12:01:49 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
+[12:01:46 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-[12:01:50 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
+[12:01:47 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-[12:01:52 AM] Found 0 errors. Watching for file changes.
+[12:01:49 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -643,14 +643,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:57 AM] File change detected. Starting incremental compilation...
+[12:01:53 AM] File change detected. Starting incremental compilation...
 
 tsconfig.json:2:12 - error TS18002: The 'files' list in config file '/user/username/projects/myproject/tsconfig.json' is empty.
 
 2   "files": [],
              ~~
 
-[12:01:58 AM] Found 1 error. Watching for file changes.
+[12:01:54 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/createWatchOfConfigFile.js b/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/createWatchOfConfigFile.js
index 0c8eb4f4bcf12..d108b12f7e14c 100644
--- a/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/createWatchOfConfigFile.js
+++ b/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/createWatchOfConfigFile.js
@@ -87,9 +87,9 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 0
 Output::
-[12:00:19 AM] File change detected. Starting incremental compilation...
+[12:00:18 AM] File change detected. Starting incremental compilation...
 
-[12:00:23 AM] Found 0 errors. Watching for file changes.
+[12:00:21 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/when-createWatchProgram-is-invoked-with-configFileParseResult-on-WatchCompilerHostOfConfigFile.js b/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/when-createWatchProgram-is-invoked-with-configFileParseResult-on-WatchCompilerHostOfConfigFile.js
index 62a3ba7ecf53c..dafb78c347306 100644
--- a/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/when-createWatchProgram-is-invoked-with-configFileParseResult-on-WatchCompilerHostOfConfigFile.js
+++ b/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/when-createWatchProgram-is-invoked-with-configFileParseResult-on-WatchCompilerHostOfConfigFile.js
@@ -88,9 +88,9 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 0
 Output::
-[12:00:19 AM] File change detected. Starting incremental compilation...
+[12:00:18 AM] File change detected. Starting incremental compilation...
 
-[12:00:23 AM] Found 0 errors. Watching for file changes.
+[12:00:21 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/consoleClearing/with---diagnostics.js b/tests/baselines/reference/tscWatch/consoleClearing/with---diagnostics.js
index 4fe4445427399..65b403dfb9d78 100644
--- a/tests/baselines/reference/tscWatch/consoleClearing/with---diagnostics.js
+++ b/tests/baselines/reference/tscWatch/consoleClearing/with---diagnostics.js
@@ -84,12 +84,12 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:00:17 AM] File change detected. Starting incremental compilation...
+[12:00:16 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/f.ts"]
   options: {"watch":true,"diagnostics":true}
-[12:00:21 AM] Found 0 errors. Watching for file changes.
+[12:00:19 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/consoleClearing/with---extendedDiagnostics.js b/tests/baselines/reference/tscWatch/consoleClearing/with---extendedDiagnostics.js
index c64c836f6048d..dd934f7424f19 100644
--- a/tests/baselines/reference/tscWatch/consoleClearing/with---extendedDiagnostics.js
+++ b/tests/baselines/reference/tscWatch/consoleClearing/with---extendedDiagnostics.js
@@ -86,12 +86,12 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:00:17 AM] File change detected. Starting incremental compilation...
+[12:00:16 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/f.ts"]
   options: {"watch":true,"extendedDiagnostics":true}
-[12:00:21 AM] Found 0 errors. Watching for file changes.
+[12:00:19 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/consoleClearing/with---preserveWatchOutput.js b/tests/baselines/reference/tscWatch/consoleClearing/with---preserveWatchOutput.js
index 05be37e595032..186bb432fccfd 100644
--- a/tests/baselines/reference/tscWatch/consoleClearing/with---preserveWatchOutput.js
+++ b/tests/baselines/reference/tscWatch/consoleClearing/with---preserveWatchOutput.js
@@ -72,9 +72,9 @@ Before running Timeout callback:: count: 1
 
 After running Timeout callback:: count: 0
 Output::
-[12:00:17 AM] File change detected. Starting incremental compilation...
+[12:00:16 AM] File change detected. Starting incremental compilation...
 
-[12:00:21 AM] Found 0 errors. Watching for file changes.
+[12:00:19 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/consoleClearing/without---diagnostics-or---extendedDiagnostics.js b/tests/baselines/reference/tscWatch/consoleClearing/without---diagnostics-or---extendedDiagnostics.js
index 1b7192afd675d..090e0f4d3e8c0 100644
--- a/tests/baselines/reference/tscWatch/consoleClearing/without---diagnostics-or---extendedDiagnostics.js
+++ b/tests/baselines/reference/tscWatch/consoleClearing/without---diagnostics-or---extendedDiagnostics.js
@@ -73,9 +73,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:17 AM] File change detected. Starting incremental compilation...
+[12:00:16 AM] File change detected. Starting incremental compilation...
 
-[12:00:21 AM] Found 0 errors. Watching for file changes.
+[12:00:19 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-file-content/elides-const-enums-correctly-in-incremental-compilation.js b/tests/baselines/reference/tscWatch/emit/emit-file-content/elides-const-enums-correctly-in-incremental-compilation.js
index c7e217e61f89a..facf876247081 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-file-content/elides-const-enums-correctly-in-incremental-compilation.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-file-content/elides-const-enums-correctly-in-incremental-compilation.js
@@ -102,9 +102,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:33 AM] File change detected. Starting incremental compilation...
+[12:00:32 AM] File change detected. Starting incremental compilation...
 
-[12:00:37 AM] Found 0 errors. Watching for file changes.
+[12:00:35 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-file-content/file-is-deleted-and-created-as-part-of-change.js b/tests/baselines/reference/tscWatch/emit/emit-file-content/file-is-deleted-and-created-as-part-of-change.js
index 1d2a9466fa997..77cf061bc89e4 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-file-content/file-is-deleted-and-created-as-part-of-change.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-file-content/file-is-deleted-and-created-as-part-of-change.js
@@ -95,7 +95,7 @@ Output::
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
 
-[12:00:32 AM] Found 0 errors. Watching for file changes.
+[12:00:31 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-file-content/handles-new-lines-carriageReturn-lineFeed.js b/tests/baselines/reference/tscWatch/emit/emit-file-content/handles-new-lines-carriageReturn-lineFeed.js
index 06dd77ab815c1..c401eda9b5d4e 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-file-content/handles-new-lines-carriageReturn-lineFeed.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-file-content/handles-new-lines-carriageReturn-lineFeed.js
@@ -78,9 +78,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:17 AM] File change detected. Starting incremental compilation...
+[12:00:16 AM] File change detected. Starting incremental compilation...
 
-[12:00:21 AM] Found 0 errors. Watching for file changes.
+[12:00:19 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-file-content/handles-new-lines-lineFeed.js b/tests/baselines/reference/tscWatch/emit/emit-file-content/handles-new-lines-lineFeed.js
index c54b1d613d5a8..fd184464fee25 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-file-content/handles-new-lines-lineFeed.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-file-content/handles-new-lines-lineFeed.js
@@ -78,9 +78,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:17 AM] File change detected. Starting incremental compilation...
+[12:00:16 AM] File change detected. Starting incremental compilation...
 
-[12:00:21 AM] Found 0 errors. Watching for file changes.
+[12:00:19 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-file-content/should-emit-specified-file.js b/tests/baselines/reference/tscWatch/emit/emit-file-content/should-emit-specified-file.js
index 0011a69abc4df..00811ed23290b 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-file-content/should-emit-specified-file.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-file-content/should-emit-specified-file.js
@@ -122,9 +122,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:29 AM] File change detected. Starting incremental compilation...
+[12:00:28 AM] File change detected. Starting incremental compilation...
 
-[12:00:39 AM] Found 0 errors. Watching for file changes.
+[12:00:35 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -187,9 +187,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:42 AM] File change detected. Starting incremental compilation...
+[12:00:37 AM] File change detected. Starting incremental compilation...
 
-[12:00:49 AM] Found 0 errors. Watching for file changes.
+[12:00:42 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--isolatedModules'-is-specified.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--isolatedModules'-is-specified.js
index 68bd4415160e3..1eafe130c7f25 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--isolatedModules'-is-specified.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--isolatedModules'-is-specified.js
@@ -154,9 +154,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:38 AM] File change detected. Starting incremental compilation...
+[12:00:37 AM] File change detected. Starting incremental compilation...
 
-[12:00:42 AM] Found 0 errors. Watching for file changes.
+[12:00:40 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--out'-or-'--outFile'-is-specified.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--out'-or-'--outFile'-is-specified.js
index 00cf09bc229d1..3085e496f256a 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--out'-or-'--outFile'-is-specified.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--out'-or-'--outFile'-is-specified.js
@@ -160,9 +160,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:30 AM] File change detected. Starting incremental compilation...
+[12:00:29 AM] File change detected. Starting incremental compilation...
 
-[12:00:34 AM] Found 0 errors. Watching for file changes.
+[12:00:32 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-deleted-files.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-deleted-files.js
index f03b07b805723..8b6adbadd0504 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-deleted-files.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-deleted-files.js
@@ -150,9 +150,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:39 AM] File change detected. Starting incremental compilation...
+[12:00:38 AM] File change detected. Starting incremental compilation...
 
-[12:00:46 AM] Found 0 errors. Watching for file changes.
+[12:00:43 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-newly-created-files.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-newly-created-files.js
index c7906ec124bb8..4b00ea8fe72d5 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-newly-created-files.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-newly-created-files.js
@@ -152,9 +152,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:40 AM] File change detected. Starting incremental compilation...
+[12:00:39 AM] File change detected. Starting incremental compilation...
 
-[12:00:52 AM] Found 0 errors. Watching for file changes.
+[12:00:48 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-the-reference-map-changes.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-the-reference-map-changes.js
index b214298174012..dbe22319bcca8 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-the-reference-map-changes.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-the-reference-map-changes.js
@@ -149,14 +149,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:38 AM] File change detected. Starting incremental compilation...
+[12:00:37 AM] File change detected. Starting incremental compilation...
 
 a/b/file1Consumer1.ts:1:16 - error TS2304: Cannot find name 'Foo'.
 
 1 export let y = Foo();
                  ~~~
 
-[12:00:42 AM] Found 1 error. Watching for file changes.
+[12:00:40 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -214,14 +214,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:46 AM] File change detected. Starting incremental compilation...
+[12:00:43 AM] File change detected. Starting incremental compilation...
 
 a/b/file1Consumer1.ts:1:16 - error TS2304: Cannot find name 'Foo'.
 
 1 export let y = Foo();
                  ~~~
 
-[12:00:53 AM] Found 1 error. Watching for file changes.
+[12:00:48 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -284,9 +284,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:57 AM] File change detected. Starting incremental compilation...
+[12:00:51 AM] File change detected. Starting incremental compilation...
 
-[12:01:01 AM] Found 0 errors. Watching for file changes.
+[12:00:54 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -344,7 +344,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:06 AM] File change detected. Starting incremental compilation...
+[12:00:58 AM] File change detected. Starting incremental compilation...
 
 a/b/file1Consumer1.ts:1:9 - error TS2305: Module '"./moduleFile1"' has no exported member 'Foo'.
 
@@ -361,7 +361,7 @@ Output::
 1 export let y = Foo();
                  ~~~
 
-[12:01:16 AM] Found 3 errors. Watching for file changes.
+[12:01:05 AM] Found 3 errors. Watching for file changes.
 
 
 
@@ -426,9 +426,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:23 AM] File change detected. Starting incremental compilation...
+[12:01:10 AM] File change detected. Starting incremental compilation...
 
-[12:01:33 AM] Found 0 errors. Watching for file changes.
+[12:01:17 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-contains-only-itself-if-a-module-file's-shape-didn't-change,-and-all-files-referencing-it-if-its-shape-changed.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-contains-only-itself-if-a-module-file's-shape-didn't-change,-and-all-files-referencing-it-if-its-shape-changed.js
index 5f75aa5777844..1054f63ce4b86 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-contains-only-itself-if-a-module-file's-shape-didn't-change,-and-all-files-referencing-it-if-its-shape-changed.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-contains-only-itself-if-a-module-file's-shape-didn't-change,-and-all-files-referencing-it-if-its-shape-changed.js
@@ -149,9 +149,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:38 AM] File change detected. Starting incremental compilation...
+[12:00:37 AM] File change detected. Starting incremental compilation...
 
-[12:00:48 AM] Found 0 errors. Watching for file changes.
+[12:00:44 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -217,14 +217,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:52 AM] File change detected. Starting incremental compilation...
+[12:00:47 AM] File change detected. Starting incremental compilation...
 
 a/b/moduleFile1.ts:1:46 - error TS2584: Cannot find name 'console'. Do you need to change your target library? Try changing the 'lib' compiler option to include 'dom'.
 
 1 export var T: number;export function Foo() { console.log('hi'); };
                                                ~~~~~~~
 
-[12:00:56 AM] Found 1 error. Watching for file changes.
+[12:00:50 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-changes-in-non-root-files.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-changes-in-non-root-files.js
index 6c325666bdf2d..764c5237f78c0 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-changes-in-non-root-files.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-changes-in-non-root-files.js
@@ -114,9 +114,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:32 AM] File change detected. Starting incremental compilation...
+[12:00:31 AM] File change detected. Starting incremental compilation...
 
-[12:00:39 AM] Found 0 errors. Watching for file changes.
+[12:00:36 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -172,9 +172,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:42 AM] File change detected. Starting incremental compilation...
+[12:00:38 AM] File change detected. Starting incremental compilation...
 
-[12:00:46 AM] Found 0 errors. Watching for file changes.
+[12:00:41 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-non-existing-code-file.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-non-existing-code-file.js
index be061427f0237..43647b1f3acf3 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-non-existing-code-file.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-non-existing-code-file.js
@@ -105,7 +105,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:21 AM] File change detected. Starting incremental compilation...
+[12:00:20 AM] File change detected. Starting incremental compilation...
 
 a/b/referenceFile1.ts:1:22 - error TS6053: File '/a/b/moduleFile2.ts' not found.
 
@@ -122,7 +122,7 @@ Output::
 2 export var x = Foo();export var yy = Foo();
                                        ~~~
 
-[12:00:25 AM] Found 3 errors. Watching for file changes.
+[12:00:23 AM] Found 3 errors. Watching for file changes.
 
 
 
@@ -190,7 +190,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:28 AM] File change detected. Starting incremental compilation...
+[12:00:26 AM] File change detected. Starting incremental compilation...
 
 a/b/referenceFile1.ts:2:16 - error TS2304: Cannot find name 'Foo'.
 
@@ -202,7 +202,7 @@ Output::
 2 export var x = Foo();export var yy = Foo();
                                        ~~~
 
-[12:00:34 AM] Found 2 errors. Watching for file changes.
+[12:00:31 AM] Found 2 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-removed-code-file.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-removed-code-file.js
index d3952dd7491c9..8494ca2f56274 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-removed-code-file.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-removed-code-file.js
@@ -123,7 +123,7 @@ Output::
 2 export var x = Foo();
                  ~~~
 
-[12:00:28 AM] Found 2 errors. Watching for file changes.
+[12:00:27 AM] Found 2 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-all-files-if-a-global-file-changed-shape.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-all-files-if-a-global-file-changed-shape.js
index e8e03ebd93721..eb10f479a681f 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-all-files-if-a-global-file-changed-shape.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-all-files-if-a-global-file-changed-shape.js
@@ -149,9 +149,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:37 AM] File change detected. Starting incremental compilation...
+[12:00:36 AM] File change detected. Starting incremental compilation...
 
-[12:00:53 AM] Found 0 errors. Watching for file changes.
+[12:00:47 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-cascaded-affected-file-list.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-cascaded-affected-file-list.js
index 8e1fb29a3bde3..b152713b43f62 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-cascaded-affected-file-list.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-cascaded-affected-file-list.js
@@ -163,9 +163,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:41 AM] File change detected. Starting incremental compilation...
+[12:00:40 AM] File change detected. Starting incremental compilation...
 
-[12:00:48 AM] Found 0 errors. Watching for file changes.
+[12:00:45 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -228,9 +228,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:52 AM] File change detected. Starting incremental compilation...
+[12:00:48 AM] File change detected. Starting incremental compilation...
 
-[12:01:02 AM] Found 0 errors. Watching for file changes.
+[12:00:55 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -301,9 +301,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:08 AM] File change detected. Starting incremental compilation...
+[12:00:59 AM] File change detected. Starting incremental compilation...
 
-[12:01:21 AM] Found 0 errors. Watching for file changes.
+[12:01:08 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-work-fine-for-files-with-circular-references.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-work-fine-for-files-with-circular-references.js
index 77ea101c50213..10719c710b451 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-work-fine-for-files-with-circular-references.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-work-fine-for-files-with-circular-references.js
@@ -109,9 +109,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:25 AM] File change detected. Starting incremental compilation...
+[12:00:24 AM] File change detected. Starting incremental compilation...
 
-[12:00:32 AM] Found 0 errors. Watching for file changes.
+[12:00:29 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-does-not-have-out-or-outFile.js b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-does-not-have-out-or-outFile.js
index 31234e6e47a32..b31e09cdac2ee 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-does-not-have-out-or-outFile.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-does-not-have-out-or-outFile.js
@@ -101,9 +101,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:24 AM] File change detected. Starting incremental compilation...
+[12:00:23 AM] File change detected. Starting incremental compilation...
 
-[12:00:31 AM] Found 0 errors. Watching for file changes.
+[12:00:28 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -157,9 +157,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:35 AM] File change detected. Starting incremental compilation...
+[12:00:31 AM] File change detected. Starting incremental compilation...
 
-[12:00:42 AM] Found 0 errors. Watching for file changes.
+[12:00:36 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-out.js b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-out.js
index 89c015141ab2f..f766977ca0114 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-out.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-out.js
@@ -101,7 +101,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:22 AM] File change detected. Starting incremental compilation...
+[12:00:21 AM] File change detected. Starting incremental compilation...
 
 a/tsconfig.json:3:5 - error TS5101: Option 'out' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
   Use 'outFile' instead.
@@ -109,7 +109,7 @@ Output::
 3     "out": "/a/out.js"
       ~~~~~
 
-[12:00:26 AM] Found 1 error. Watching for file changes.
+[12:00:24 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -159,7 +159,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:30 AM] File change detected. Starting incremental compilation...
+[12:00:27 AM] File change detected. Starting incremental compilation...
 
 a/tsconfig.json:3:5 - error TS5101: Option 'out' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
   Use 'outFile' instead.
@@ -167,7 +167,7 @@ Output::
 3     "out": "/a/out.js"
       ~~~~~
 
-[12:00:34 AM] Found 1 error. Watching for file changes.
+[12:00:30 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-outFile.js b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-outFile.js
index b3637e7ae0c16..f522c4a59f1c5 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-outFile.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-outFile.js
@@ -95,9 +95,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:22 AM] File change detected. Starting incremental compilation...
+[12:00:21 AM] File change detected. Starting incremental compilation...
 
-[12:00:26 AM] Found 0 errors. Watching for file changes.
+[12:00:24 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -147,9 +147,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:30 AM] File change detected. Starting incremental compilation...
+[12:00:27 AM] File change detected. Starting incremental compilation...
 
-[12:00:34 AM] Found 0 errors. Watching for file changes.
+[12:00:30 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js b/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js
index 28773029f85ce..f63962ebecde9 100644
--- a/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js
+++ b/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js
@@ -116,7 +116,7 @@ Output::
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
 
-[12:00:41 AM] Found 0 errors. Watching for file changes.
+[12:00:39 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change-with-incremental.js
index 14a9873424456..bee7c08ace308 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change-with-incremental.js
@@ -220,9 +220,9 @@ Before running Timeout callback:: count: 2
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:36 AM] File change detected. Starting incremental compilation...
+[12:00:35 AM] File change detected. Starting incremental compilation...
 
-[12:00:40 AM] Found 0 errors. Watching for file changes.
+[12:00:38 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -361,9 +361,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:47 AM] File change detected. Starting incremental compilation...
+[12:00:43 AM] File change detected. Starting incremental compilation...
 
-[12:00:51 AM] Found 0 errors. Watching for file changes.
+[12:00:46 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -502,9 +502,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:58 AM] File change detected. Starting incremental compilation...
+[12:00:51 AM] File change detected. Starting incremental compilation...
 
-[12:01:02 AM] Found 0 errors. Watching for file changes.
+[12:00:54 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js
index add448976c65a..21daf811520c9 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js
@@ -128,9 +128,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:32 AM] File change detected. Starting incremental compilation...
+[12:00:31 AM] File change detected. Starting incremental compilation...
 
-[12:00:33 AM] Found 0 errors. Watching for file changes.
+[12:00:32 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -182,9 +182,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:37 AM] File change detected. Starting incremental compilation...
+[12:00:35 AM] File change detected. Starting incremental compilation...
 
-[12:00:38 AM] Found 0 errors. Watching for file changes.
+[12:00:36 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -236,9 +236,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:42 AM] File change detected. Starting incremental compilation...
+[12:00:39 AM] File change detected. Starting incremental compilation...
 
-[12:00:43 AM] Found 0 errors. Watching for file changes.
+[12:00:40 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change-with-incremental.js
index 4fc9cea12e8e9..bbdce9b70f144 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change-with-incremental.js
@@ -240,14 +240,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:40 AM] File change detected. Starting incremental compilation...
+[12:00:39 AM] File change detected. Starting incremental compilation...
 
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
                   ~
 
-[12:00:53 AM] Found 1 error. Watching for file changes.
+[12:00:48 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -424,14 +424,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:00 AM] File change detected. Starting incremental compilation...
+[12:00:53 AM] File change detected. Starting incremental compilation...
 
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
                   ~
 
-[12:01:10 AM] Found 1 error. Watching for file changes.
+[12:01:00 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -605,14 +605,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:17 AM] File change detected. Starting incremental compilation...
+[12:01:05 AM] File change detected. Starting incremental compilation...
 
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
                   ~
 
-[12:01:27 AM] Found 1 error. Watching for file changes.
+[12:01:12 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js
index bdab0ae71b573..cc383c6ca0f69 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js
@@ -153,14 +153,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:36 AM] File change detected. Starting incremental compilation...
+[12:00:35 AM] File change detected. Starting incremental compilation...
 
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
                   ~
 
-[12:00:46 AM] Found 1 error. Watching for file changes.
+[12:00:42 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -229,14 +229,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:50 AM] File change detected. Starting incremental compilation...
+[12:00:45 AM] File change detected. Starting incremental compilation...
 
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
                   ~
 
-[12:00:57 AM] Found 1 error. Watching for file changes.
+[12:00:50 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -302,14 +302,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:01 AM] File change detected. Starting incremental compilation...
+[12:00:53 AM] File change detected. Starting incremental compilation...
 
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
                   ~
 
-[12:01:08 AM] Found 1 error. Watching for file changes.
+[12:00:58 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js
index bf43ce805ee09..85fea52e6d012 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js
@@ -357,9 +357,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:48 AM] File change detected. Starting incremental compilation...
+[12:00:47 AM] File change detected. Starting incremental compilation...
 
-[12:01:07 AM] Found 0 errors. Watching for file changes.
+[12:01:00 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -566,9 +566,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:14 AM] File change detected. Starting incremental compilation...
+[12:01:05 AM] File change detected. Starting incremental compilation...
 
-[12:01:24 AM] Found 0 errors. Watching for file changes.
+[12:01:12 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -766,9 +766,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:31 AM] File change detected. Starting incremental compilation...
+[12:01:17 AM] File change detected. Starting incremental compilation...
 
-[12:01:41 AM] Found 0 errors. Watching for file changes.
+[12:01:24 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js
index f64c41b167ed3..7bb2ecc8678dc 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -204,9 +204,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:44 AM] File change detected. Starting incremental compilation...
+[12:00:43 AM] File change detected. Starting incremental compilation...
 
-[12:01:00 AM] Found 0 errors. Watching for file changes.
+[12:00:54 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -277,9 +277,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:04 AM] File change detected. Starting incremental compilation...
+[12:00:57 AM] File change detected. Starting incremental compilation...
 
-[12:01:11 AM] Found 0 errors. Watching for file changes.
+[12:01:02 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -341,9 +341,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:15 AM] File change detected. Starting incremental compilation...
+[12:01:05 AM] File change detected. Starting incremental compilation...
 
-[12:01:22 AM] Found 0 errors. Watching for file changes.
+[12:01:10 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/no-circular-import/export-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/no-circular-import/export-with-incremental.js
index ba50accf01ce4..1dcf78bcf8a24 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/no-circular-import/export-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/no-circular-import/export-with-incremental.js
@@ -370,14 +370,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:58 AM] File change detected. Starting incremental compilation...
+[12:00:57 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:01:20 AM] Found 1 error. Watching for file changes.
+[12:01:12 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -602,14 +602,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:27 AM] File change detected. Starting incremental compilation...
+[12:01:17 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:01:37 AM] Found 1 error. Watching for file changes.
+[12:01:24 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -822,14 +822,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:44 AM] File change detected. Starting incremental compilation...
+[12:01:29 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:01:54 AM] Found 1 error. Watching for file changes.
+[12:01:36 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/no-circular-import/export.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/no-circular-import/export.js
index 67930ecf4ba52..24bc857b4e06e 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/no-circular-import/export.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/no-circular-import/export.js
@@ -245,14 +245,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:54 AM] File change detected. Starting incremental compilation...
+[12:00:53 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:01:13 AM] Found 1 error. Watching for file changes.
+[12:01:06 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -319,14 +319,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:17 AM] File change detected. Starting incremental compilation...
+[12:01:09 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:01:24 AM] Found 1 error. Watching for file changes.
+[12:01:14 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -381,14 +381,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:28 AM] File change detected. Starting incremental compilation...
+[12:01:17 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:01:35 AM] Found 1 error. Watching for file changes.
+[12:01:22 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/yes-circular-import/exports-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/yes-circular-import/exports-with-incremental.js
index 14fb6752908a8..16f3965af8fa3 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/yes-circular-import/exports-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/yes-circular-import/exports-with-incremental.js
@@ -408,14 +408,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:02 AM] File change detected. Starting incremental compilation...
+[12:01:01 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:01:27 AM] Found 1 error. Watching for file changes.
+[12:01:18 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -663,14 +663,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:34 AM] File change detected. Starting incremental compilation...
+[12:01:23 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:01:44 AM] Found 1 error. Watching for file changes.
+[12:01:30 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -903,14 +903,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:51 AM] File change detected. Starting incremental compilation...
+[12:01:35 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:02:01 AM] Found 1 error. Watching for file changes.
+[12:01:42 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/yes-circular-import/exports.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/yes-circular-import/exports.js
index 88cff851594ed..2abff337aa482 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/yes-circular-import/exports.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/yes-circular-import/exports.js
@@ -268,14 +268,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:58 AM] File change detected. Starting incremental compilation...
+[12:00:57 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:01:20 AM] Found 1 error. Watching for file changes.
+[12:01:12 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -346,14 +346,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:24 AM] File change detected. Starting incremental compilation...
+[12:01:15 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:01:31 AM] Found 1 error. Watching for file changes.
+[12:01:20 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -409,14 +409,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:35 AM] File change detected. Starting incremental compilation...
+[12:01:23 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:01:42 AM] Found 1 error. Watching for file changes.
+[12:01:28 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
index b83e758d17cc8..5d5aa3b187f43 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
@@ -241,9 +241,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:46 AM] File change detected. Starting incremental compilation...
+[12:00:44 AM] File change detected. Starting incremental compilation...
 
-[12:01:04 AM] Found 0 errors. Watching for file changes.
+[12:01:01 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -392,14 +392,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:11 AM] File change detected. Starting incremental compilation...
+[12:01:06 AM] File change detected. Starting incremental compilation...
 
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
         ~
 
-[12:01:15 AM] Found 1 error. Watching for file changes.
+[12:01:09 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -563,9 +563,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:26 AM] File change detected. Starting incremental compilation...
+[12:01:17 AM] File change detected. Starting incremental compilation...
 
-[12:01:33 AM] Found 0 errors. Watching for file changes.
+[12:01:22 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
index 458dd1f1a3238..97a0ecc9e0ae3 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
@@ -147,9 +147,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:39 AM] File change detected. Starting incremental compilation...
+[12:00:37 AM] File change detected. Starting incremental compilation...
 
-[12:00:56 AM] Found 0 errors. Watching for file changes.
+[12:00:54 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -218,14 +218,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:00 AM] File change detected. Starting incremental compilation...
+[12:00:57 AM] File change detected. Starting incremental compilation...
 
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
         ~
 
-[12:01:01 AM] Found 1 error. Watching for file changes.
+[12:00:58 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -291,9 +291,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:09 AM] File change detected. Starting incremental compilation...
+[12:01:04 AM] File change detected. Starting incremental compilation...
 
-[12:01:13 AM] Found 0 errors. Watching for file changes.
+[12:01:07 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change-with-incremental.js
index 7961ccb735ddb..cf4b453a29e7a 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change-with-incremental.js
@@ -227,9 +227,9 @@ Before running Timeout callback:: count: 2
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:38 AM] File change detected. Starting incremental compilation...
+[12:00:37 AM] File change detected. Starting incremental compilation...
 
-[12:00:42 AM] Found 0 errors. Watching for file changes.
+[12:00:40 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -371,9 +371,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:49 AM] File change detected. Starting incremental compilation...
+[12:00:45 AM] File change detected. Starting incremental compilation...
 
-[12:00:53 AM] Found 0 errors. Watching for file changes.
+[12:00:48 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -515,9 +515,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:00 AM] File change detected. Starting incremental compilation...
+[12:00:53 AM] File change detected. Starting incremental compilation...
 
-[12:01:04 AM] Found 0 errors. Watching for file changes.
+[12:00:56 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js
index ea34172360e18..41436b0c62344 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js
@@ -133,9 +133,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:34 AM] File change detected. Starting incremental compilation...
+[12:00:33 AM] File change detected. Starting incremental compilation...
 
-[12:00:35 AM] Found 0 errors. Watching for file changes.
+[12:00:34 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -188,9 +188,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:39 AM] File change detected. Starting incremental compilation...
+[12:00:37 AM] File change detected. Starting incremental compilation...
 
-[12:00:40 AM] Found 0 errors. Watching for file changes.
+[12:00:38 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -243,9 +243,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:44 AM] File change detected. Starting incremental compilation...
+[12:00:41 AM] File change detected. Starting incremental compilation...
 
-[12:00:45 AM] Found 0 errors. Watching for file changes.
+[12:00:42 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change-with-incremental.js
index ebace93e1bbda..ff4a57a781977 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change-with-incremental.js
@@ -268,9 +268,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:46 AM] File change detected. Starting incremental compilation...
+[12:00:45 AM] File change detected. Starting incremental compilation...
 
-[12:01:02 AM] Found 0 errors. Watching for file changes.
+[12:00:56 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -441,9 +441,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:09 AM] File change detected. Starting incremental compilation...
+[12:01:01 AM] File change detected. Starting incremental compilation...
 
-[12:01:25 AM] Found 0 errors. Watching for file changes.
+[12:01:12 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -614,9 +614,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:32 AM] File change detected. Starting incremental compilation...
+[12:01:17 AM] File change detected. Starting incremental compilation...
 
-[12:01:48 AM] Found 0 errors. Watching for file changes.
+[12:01:28 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js
index 1b8a305c50b8a..38d8afac7d1c6 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js
@@ -171,9 +171,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:42 AM] File change detected. Starting incremental compilation...
+[12:00:41 AM] File change detected. Starting incremental compilation...
 
-[12:00:55 AM] Found 0 errors. Watching for file changes.
+[12:00:50 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -247,9 +247,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:59 AM] File change detected. Starting incremental compilation...
+[12:00:53 AM] File change detected. Starting incremental compilation...
 
-[12:01:12 AM] Found 0 errors. Watching for file changes.
+[12:01:02 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -323,9 +323,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:16 AM] File change detected. Starting incremental compilation...
+[12:01:05 AM] File change detected. Starting incremental compilation...
 
-[12:01:29 AM] Found 0 errors. Watching for file changes.
+[12:01:14 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js
index 2d4ec10322c94..51e8022980747 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js
@@ -406,7 +406,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:58 AM] File change detected. Starting incremental compilation...
+[12:00:57 AM] File change detected. Starting incremental compilation...
 
 c.ts:6:13 - error TS2353: Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -423,7 +423,7 @@ Output::
 2 getPoint().c.x;
                ~
 
-[12:01:14 AM] Found 2 errors. Watching for file changes.
+[12:01:08 AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -669,7 +669,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:21 AM] File change detected. Starting incremental compilation...
+[12:01:13 AM] File change detected. Starting incremental compilation...
 
 c.ts:6:13 - error TS2353: Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -686,7 +686,7 @@ Output::
 2 getPoint().c.x;
                ~
 
-[12:01:37 AM] Found 2 errors. Watching for file changes.
+[12:01:24 AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -932,7 +932,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:44 AM] File change detected. Starting incremental compilation...
+[12:01:29 AM] File change detected. Starting incremental compilation...
 
 c.ts:6:13 - error TS2353: Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -949,7 +949,7 @@ Output::
 2 getPoint().c.x;
                ~
 
-[12:02:00 AM] Found 2 errors. Watching for file changes.
+[12:01:40 AM] Found 2 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 737f830375565..5625998113497 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -235,7 +235,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:54 AM] File change detected. Starting incremental compilation...
+[12:00:53 AM] File change detected. Starting incremental compilation...
 
 c.ts:6:13 - error TS2353: Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -252,7 +252,7 @@ Output::
 2 getPoint().c.x;
                ~
 
-[12:01:07 AM] Found 2 errors. Watching for file changes.
+[12:01:02 AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -327,7 +327,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:11 AM] File change detected. Starting incremental compilation...
+[12:01:05 AM] File change detected. Starting incremental compilation...
 
 c.ts:6:13 - error TS2353: Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -344,7 +344,7 @@ Output::
 2 getPoint().c.x;
                ~
 
-[12:01:24 AM] Found 2 errors. Watching for file changes.
+[12:01:14 AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -419,7 +419,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:28 AM] File change detected. Starting incremental compilation...
+[12:01:17 AM] File change detected. Starting incremental compilation...
 
 c.ts:6:13 - error TS2353: Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -436,7 +436,7 @@ Output::
 2 getPoint().c.x;
                ~
 
-[12:01:41 AM] Found 2 errors. Watching for file changes.
+[12:01:26 AM] Found 2 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/no-circular-import/export-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/no-circular-import/export-with-incremental.js
index 716b62f3a067c..8ee9ac0230dd7 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/no-circular-import/export-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/no-circular-import/export-with-incremental.js
@@ -424,9 +424,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:10 AM] File change detected. Starting incremental compilation...
+[12:01:09 AM] File change detected. Starting incremental compilation...
 
-[12:01:26 AM] Found 0 errors. Watching for file changes.
+[12:01:20 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -636,9 +636,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:33 AM] File change detected. Starting incremental compilation...
+[12:01:25 AM] File change detected. Starting incremental compilation...
 
-[12:01:49 AM] Found 0 errors. Watching for file changes.
+[12:01:36 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -848,9 +848,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:56 AM] File change detected. Starting incremental compilation...
+[12:01:41 AM] File change detected. Starting incremental compilation...
 
-[12:02:12 AM] Found 0 errors. Watching for file changes.
+[12:01:52 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/no-circular-import/export.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/no-circular-import/export.js
index c3cad2ad146bf..b534967209d67 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/no-circular-import/export.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/no-circular-import/export.js
@@ -277,9 +277,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:06 AM] File change detected. Starting incremental compilation...
+[12:01:05 AM] File change detected. Starting incremental compilation...
 
-[12:01:19 AM] Found 0 errors. Watching for file changes.
+[12:01:14 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -342,9 +342,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:23 AM] File change detected. Starting incremental compilation...
+[12:01:17 AM] File change detected. Starting incremental compilation...
 
-[12:01:36 AM] Found 0 errors. Watching for file changes.
+[12:01:26 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -407,9 +407,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:40 AM] File change detected. Starting incremental compilation...
+[12:01:29 AM] File change detected. Starting incremental compilation...
 
-[12:01:53 AM] Found 0 errors. Watching for file changes.
+[12:01:38 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/yes-circular-import/exports-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/yes-circular-import/exports-with-incremental.js
index 2c942c612cdfe..068d4fc18e69c 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/yes-circular-import/exports-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/yes-circular-import/exports-with-incremental.js
@@ -475,9 +475,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:16 AM] File change detected. Starting incremental compilation...
+[12:01:15 AM] File change detected. Starting incremental compilation...
 
-[12:01:32 AM] Found 0 errors. Watching for file changes.
+[12:01:26 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -707,9 +707,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:39 AM] File change detected. Starting incremental compilation...
+[12:01:31 AM] File change detected. Starting incremental compilation...
 
-[12:01:55 AM] Found 0 errors. Watching for file changes.
+[12:01:42 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -939,9 +939,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:02:02 AM] File change detected. Starting incremental compilation...
+[12:01:47 AM] File change detected. Starting incremental compilation...
 
-[12:02:18 AM] Found 0 errors. Watching for file changes.
+[12:01:58 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/yes-circular-import/exports.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/yes-circular-import/exports.js
index 2836be24007e9..361b84e68756b 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/yes-circular-import/exports.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/yes-circular-import/exports.js
@@ -309,9 +309,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:12 AM] File change detected. Starting incremental compilation...
+[12:01:11 AM] File change detected. Starting incremental compilation...
 
-[12:01:25 AM] Found 0 errors. Watching for file changes.
+[12:01:20 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -375,9 +375,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:29 AM] File change detected. Starting incremental compilation...
+[12:01:23 AM] File change detected. Starting incremental compilation...
 
-[12:01:42 AM] Found 0 errors. Watching for file changes.
+[12:01:32 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -441,9 +441,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:46 AM] File change detected. Starting incremental compilation...
+[12:01:35 AM] File change detected. Starting incremental compilation...
 
-[12:01:59 AM] Found 0 errors. Watching for file changes.
+[12:01:44 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
index 3fe0ba6223112..30ec0da052e3c 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
@@ -243,9 +243,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:46 AM] File change detected. Starting incremental compilation...
+[12:00:44 AM] File change detected. Starting incremental compilation...
 
-[12:01:10 AM] Found 0 errors. Watching for file changes.
+[12:01:07 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -414,14 +414,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:17 AM] File change detected. Starting incremental compilation...
+[12:01:12 AM] File change detected. Starting incremental compilation...
 
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
         ~
 
-[12:01:21 AM] Found 1 error. Watching for file changes.
+[12:01:15 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -591,9 +591,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:32 AM] File change detected. Starting incremental compilation...
+[12:01:23 AM] File change detected. Starting incremental compilation...
 
-[12:01:42 AM] Found 0 errors. Watching for file changes.
+[12:01:30 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
index e9bf6d12006c4..e628c9946623c 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
@@ -148,9 +148,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:39 AM] File change detected. Starting incremental compilation...
+[12:00:37 AM] File change detected. Starting incremental compilation...
 
-[12:01:02 AM] Found 0 errors. Watching for file changes.
+[12:01:00 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -234,14 +234,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:06 AM] File change detected. Starting incremental compilation...
+[12:01:03 AM] File change detected. Starting incremental compilation...
 
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
         ~
 
-[12:01:07 AM] Found 1 error. Watching for file changes.
+[12:01:04 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -308,9 +308,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:15 AM] File change detected. Starting incremental compilation...
+[12:01:10 AM] File change detected. Starting incremental compilation...
 
-[12:01:22 AM] Found 0 errors. Watching for file changes.
+[12:01:15 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.d.ts-change-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.d.ts-change-with-incremental.js
index eeae7bd5cf7b7..32539108b3da3 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.d.ts-change-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.d.ts-change-with-incremental.js
@@ -216,14 +216,14 @@ Before running Timeout callback:: count: 2
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:36 AM] File change detected. Starting incremental compilation...
+[12:00:35 AM] File change detected. Starting incremental compilation...
 
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
                   ~
 
-[12:00:40 AM] Found 1 error. Watching for file changes.
+[12:00:38 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -372,9 +372,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:47 AM] File change detected. Starting incremental compilation...
+[12:00:43 AM] File change detected. Starting incremental compilation...
 
-[12:00:51 AM] Found 0 errors. Watching for file changes.
+[12:00:46 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -511,14 +511,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:58 AM] File change detected. Starting incremental compilation...
+[12:00:51 AM] File change detected. Starting incremental compilation...
 
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
                   ~
 
-[12:01:02 AM] Found 1 error. Watching for file changes.
+[12:00:54 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.d.ts-change.js
index 09183c4f36b88..03ee71a89d3b2 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.d.ts-change.js
@@ -127,14 +127,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:32 AM] File change detected. Starting incremental compilation...
+[12:00:31 AM] File change detected. Starting incremental compilation...
 
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
                   ~
 
-[12:00:33 AM] Found 1 error. Watching for file changes.
+[12:00:32 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -187,9 +187,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:37 AM] File change detected. Starting incremental compilation...
+[12:00:35 AM] File change detected. Starting incremental compilation...
 
-[12:00:38 AM] Found 0 errors. Watching for file changes.
+[12:00:36 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -242,14 +242,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:42 AM] File change detected. Starting incremental compilation...
+[12:00:39 AM] File change detected. Starting incremental compilation...
 
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
                   ~
 
-[12:00:43 AM] Found 1 error. Watching for file changes.
+[12:00:40 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.ts-change-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.ts-change-with-incremental.js
index f0870856f5d0b..c493da37acbbf 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.ts-change-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.ts-change-with-incremental.js
@@ -236,14 +236,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:40 AM] File change detected. Starting incremental compilation...
+[12:00:39 AM] File change detected. Starting incremental compilation...
 
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
                   ~
 
-[12:00:53 AM] Found 1 error. Watching for file changes.
+[12:00:48 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -416,9 +416,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:00 AM] File change detected. Starting incremental compilation...
+[12:00:53 AM] File change detected. Starting incremental compilation...
 
-[12:01:10 AM] Found 0 errors. Watching for file changes.
+[12:01:00 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -577,14 +577,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:17 AM] File change detected. Starting incremental compilation...
+[12:01:05 AM] File change detected. Starting incremental compilation...
 
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
                   ~
 
-[12:01:27 AM] Found 1 error. Watching for file changes.
+[12:01:12 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.ts-change.js
index 2cde645e0c265..35c9509d7e41c 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.ts-change.js
@@ -152,14 +152,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:36 AM] File change detected. Starting incremental compilation...
+[12:00:35 AM] File change detected. Starting incremental compilation...
 
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
                   ~
 
-[12:00:46 AM] Found 1 error. Watching for file changes.
+[12:00:42 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -227,9 +227,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:50 AM] File change detected. Starting incremental compilation...
+[12:00:45 AM] File change detected. Starting incremental compilation...
 
-[12:00:57 AM] Found 0 errors. Watching for file changes.
+[12:00:50 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -296,14 +296,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:01 AM] File change detected. Starting incremental compilation...
+[12:00:53 AM] File change detected. Starting incremental compilation...
 
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
                   ~
 
-[12:01:08 AM] Found 1 error. Watching for file changes.
+[12:00:58 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js
index 71c268d14e9c8..defa3af3cc25a 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js
@@ -353,9 +353,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:48 AM] File change detected. Starting incremental compilation...
+[12:00:47 AM] File change detected. Starting incremental compilation...
 
-[12:01:07 AM] Found 0 errors. Watching for file changes.
+[12:01:00 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -558,7 +558,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:14 AM] File change detected. Starting incremental compilation...
+[12:01:05 AM] File change detected. Starting incremental compilation...
 
 c.ts:6:13 - error TS2353: Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -575,7 +575,7 @@ Output::
 2 getPoint().c.x;
                ~
 
-[12:01:24 AM] Found 2 errors. Watching for file changes.
+[12:01:12 AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -802,9 +802,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:31 AM] File change detected. Starting incremental compilation...
+[12:01:17 AM] File change detected. Starting incremental compilation...
 
-[12:01:41 AM] Found 0 errors. Watching for file changes.
+[12:01:24 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 429a7f2ad4a84..06f7c66923cf3 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -203,9 +203,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:44 AM] File change detected. Starting incremental compilation...
+[12:00:43 AM] File change detected. Starting incremental compilation...
 
-[12:01:00 AM] Found 0 errors. Watching for file changes.
+[12:00:54 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -275,7 +275,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:04 AM] File change detected. Starting incremental compilation...
+[12:00:57 AM] File change detected. Starting incremental compilation...
 
 c.ts:6:13 - error TS2353: Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -292,7 +292,7 @@ Output::
 2 getPoint().c.x;
                ~
 
-[12:01:11 AM] Found 2 errors. Watching for file changes.
+[12:01:02 AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -357,9 +357,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:15 AM] File change detected. Starting incremental compilation...
+[12:01:05 AM] File change detected. Starting incremental compilation...
 
-[12:01:22 AM] Found 0 errors. Watching for file changes.
+[12:01:10 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/no-circular-import/export-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/no-circular-import/export-with-incremental.js
index e195fb22d0cd9..db9471b1e0320 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/no-circular-import/export-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/no-circular-import/export-with-incremental.js
@@ -366,14 +366,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:58 AM] File change detected. Starting incremental compilation...
+[12:00:57 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:01:20 AM] Found 1 error. Watching for file changes.
+[12:01:12 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -594,9 +594,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:27 AM] File change detected. Starting incremental compilation...
+[12:01:17 AM] File change detected. Starting incremental compilation...
 
-[12:01:37 AM] Found 0 errors. Watching for file changes.
+[12:01:24 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -788,14 +788,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:44 AM] File change detected. Starting incremental compilation...
+[12:01:29 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:01:54 AM] Found 1 error. Watching for file changes.
+[12:01:36 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/no-circular-import/export.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/no-circular-import/export.js
index 938c2e16cddf9..d7ed15b7b4e53 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/no-circular-import/export.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/no-circular-import/export.js
@@ -244,14 +244,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:54 AM] File change detected. Starting incremental compilation...
+[12:00:53 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:01:13 AM] Found 1 error. Watching for file changes.
+[12:01:06 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -317,9 +317,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:17 AM] File change detected. Starting incremental compilation...
+[12:01:09 AM] File change detected. Starting incremental compilation...
 
-[12:01:24 AM] Found 0 errors. Watching for file changes.
+[12:01:14 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -381,14 +381,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:28 AM] File change detected. Starting incremental compilation...
+[12:01:17 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:01:35 AM] Found 1 error. Watching for file changes.
+[12:01:22 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/yes-circular-import/exports-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/yes-circular-import/exports-with-incremental.js
index cd09bbd711195..a9f7ae3f5905a 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/yes-circular-import/exports-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/yes-circular-import/exports-with-incremental.js
@@ -404,14 +404,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:02 AM] File change detected. Starting incremental compilation...
+[12:01:01 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:01:27 AM] Found 1 error. Watching for file changes.
+[12:01:18 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -655,9 +655,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:34 AM] File change detected. Starting incremental compilation...
+[12:01:23 AM] File change detected. Starting incremental compilation...
 
-[12:01:44 AM] Found 0 errors. Watching for file changes.
+[12:01:30 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -867,14 +867,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:51 AM] File change detected. Starting incremental compilation...
+[12:01:35 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:02:01 AM] Found 1 error. Watching for file changes.
+[12:01:42 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/yes-circular-import/exports.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/yes-circular-import/exports.js
index 1820fba2151b2..a63375f05f09a 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/yes-circular-import/exports.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/yes-circular-import/exports.js
@@ -267,14 +267,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:58 AM] File change detected. Starting incremental compilation...
+[12:00:57 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:01:20 AM] Found 1 error. Watching for file changes.
+[12:01:12 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -344,9 +344,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:24 AM] File change detected. Starting incremental compilation...
+[12:01:15 AM] File change detected. Starting incremental compilation...
 
-[12:01:31 AM] Found 0 errors. Watching for file changes.
+[12:01:20 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -411,14 +411,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:35 AM] File change detected. Starting incremental compilation...
+[12:01:23 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:01:42 AM] Found 1 error. Watching for file changes.
+[12:01:28 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError-with-incremental.js
index 419655701fdae..ccb535a9f9e3d 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError-with-incremental.js
@@ -239,9 +239,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:46 AM] File change detected. Starting incremental compilation...
+[12:00:44 AM] File change detected. Starting incremental compilation...
 
-[12:01:04 AM] Found 0 errors. Watching for file changes.
+[12:01:01 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -388,14 +388,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:11 AM] File change detected. Starting incremental compilation...
+[12:01:06 AM] File change detected. Starting incremental compilation...
 
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
         ~
 
-[12:01:15 AM] Found 1 error. Watching for file changes.
+[12:01:09 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -557,9 +557,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:26 AM] File change detected. Starting incremental compilation...
+[12:01:17 AM] File change detected. Starting incremental compilation...
 
-[12:01:33 AM] Found 0 errors. Watching for file changes.
+[12:01:22 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError.js
index 21592fc23bf95..772d508a4ac6c 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError.js
@@ -146,9 +146,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:39 AM] File change detected. Starting incremental compilation...
+[12:00:37 AM] File change detected. Starting incremental compilation...
 
-[12:00:56 AM] Found 0 errors. Watching for file changes.
+[12:00:54 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -216,14 +216,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:00 AM] File change detected. Starting incremental compilation...
+[12:00:57 AM] File change detected. Starting incremental compilation...
 
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
         ~
 
-[12:01:01 AM] Found 1 error. Watching for file changes.
+[12:00:58 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -288,9 +288,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:09 AM] File change detected. Starting incremental compilation...
+[12:01:04 AM] File change detected. Starting incremental compilation...
 
-[12:01:13 AM] Found 0 errors. Watching for file changes.
+[12:01:07 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.d.ts-change-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.d.ts-change-with-incremental.js
index 820da74b5a182..5d0dba2aaddd5 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.d.ts-change-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.d.ts-change-with-incremental.js
@@ -225,14 +225,14 @@ Before running Timeout callback:: count: 2
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:38 AM] File change detected. Starting incremental compilation...
+[12:00:37 AM] File change detected. Starting incremental compilation...
 
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
                   ~
 
-[12:00:45 AM] Found 1 error. Watching for file changes.
+[12:00:42 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -387,9 +387,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:52 AM] File change detected. Starting incremental compilation...
+[12:00:47 AM] File change detected. Starting incremental compilation...
 
-[12:00:59 AM] Found 0 errors. Watching for file changes.
+[12:00:52 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -532,14 +532,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:06 AM] File change detected. Starting incremental compilation...
+[12:00:57 AM] File change detected. Starting incremental compilation...
 
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
                   ~
 
-[12:01:13 AM] Found 1 error. Watching for file changes.
+[12:01:02 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js
index cae932000fb78..3d72064ceb7b2 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js
@@ -132,14 +132,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:34 AM] File change detected. Starting incremental compilation...
+[12:00:33 AM] File change detected. Starting incremental compilation...
 
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
                   ~
 
-[12:00:38 AM] Found 1 error. Watching for file changes.
+[12:00:36 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -194,9 +194,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:42 AM] File change detected. Starting incremental compilation...
+[12:00:39 AM] File change detected. Starting incremental compilation...
 
-[12:00:46 AM] Found 0 errors. Watching for file changes.
+[12:00:42 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -251,14 +251,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:50 AM] File change detected. Starting incremental compilation...
+[12:00:45 AM] File change detected. Starting incremental compilation...
 
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
                   ~
 
-[12:00:54 AM] Found 1 error. Watching for file changes.
+[12:00:48 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.ts-change-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.ts-change-with-incremental.js
index eb22f57f77993..60b6ff5d0f1cc 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.ts-change-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.ts-change-with-incremental.js
@@ -266,14 +266,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:46 AM] File change detected. Starting incremental compilation...
+[12:00:45 AM] File change detected. Starting incremental compilation...
 
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
                   ~
 
-[12:01:05 AM] Found 1 error. Watching for file changes.
+[12:00:58 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -457,9 +457,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:12 AM] File change detected. Starting incremental compilation...
+[12:01:03 AM] File change detected. Starting incremental compilation...
 
-[12:01:31 AM] Found 0 errors. Watching for file changes.
+[12:01:16 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -631,14 +631,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:38 AM] File change detected. Starting incremental compilation...
+[12:01:21 AM] File change detected. Starting incremental compilation...
 
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
                   ~
 
-[12:01:57 AM] Found 1 error. Watching for file changes.
+[12:01:34 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.ts-change.js
index d0913487c41ca..39820f7bbc3fa 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.ts-change.js
@@ -170,14 +170,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:42 AM] File change detected. Starting incremental compilation...
+[12:00:41 AM] File change detected. Starting incremental compilation...
 
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
                   ~
 
-[12:00:58 AM] Found 1 error. Watching for file changes.
+[12:00:52 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -253,9 +253,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:02 AM] File change detected. Starting incremental compilation...
+[12:00:55 AM] File change detected. Starting incremental compilation...
 
-[12:01:18 AM] Found 0 errors. Watching for file changes.
+[12:01:06 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -331,14 +331,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:22 AM] File change detected. Starting incremental compilation...
+[12:01:09 AM] File change detected. Starting incremental compilation...
 
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
                   ~
 
-[12:01:38 AM] Found 1 error. Watching for file changes.
+[12:01:20 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js
index 5bdedb7a731c3..124712fc44547 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js
@@ -404,9 +404,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:58 AM] File change detected. Starting incremental compilation...
+[12:00:57 AM] File change detected. Starting incremental compilation...
 
-[12:01:20 AM] Found 0 errors. Watching for file changes.
+[12:01:12 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -622,7 +622,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:27 AM] File change detected. Starting incremental compilation...
+[12:01:17 AM] File change detected. Starting incremental compilation...
 
 c.ts:6:13 - error TS2353: Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -639,7 +639,7 @@ Output::
 2 getPoint().c.x;
                ~
 
-[12:01:49 AM] Found 2 errors. Watching for file changes.
+[12:01:32 AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -889,9 +889,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:56 AM] File change detected. Starting incremental compilation...
+[12:01:37 AM] File change detected. Starting incremental compilation...
 
-[12:02:18 AM] Found 0 errors. Watching for file changes.
+[12:01:52 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 245f6ada8d167..4f3851e8caeeb 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -234,9 +234,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:54 AM] File change detected. Starting incremental compilation...
+[12:00:53 AM] File change detected. Starting incremental compilation...
 
-[12:01:13 AM] Found 0 errors. Watching for file changes.
+[12:01:06 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -316,7 +316,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:17 AM] File change detected. Starting incremental compilation...
+[12:01:09 AM] File change detected. Starting incremental compilation...
 
 c.ts:6:13 - error TS2353: Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -333,7 +333,7 @@ Output::
 2 getPoint().c.x;
                ~
 
-[12:01:36 AM] Found 2 errors. Watching for file changes.
+[12:01:22 AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -413,9 +413,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:40 AM] File change detected. Starting incremental compilation...
+[12:01:25 AM] File change detected. Starting incremental compilation...
 
-[12:01:59 AM] Found 0 errors. Watching for file changes.
+[12:01:38 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/no-circular-import/export-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/no-circular-import/export-with-incremental.js
index 86cd19246cf68..5fcb42dd0efbb 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/no-circular-import/export-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/no-circular-import/export-with-incremental.js
@@ -422,14 +422,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:10 AM] File change detected. Starting incremental compilation...
+[12:01:09 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:01:38 AM] Found 1 error. Watching for file changes.
+[12:01:28 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -661,9 +661,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:45 AM] File change detected. Starting incremental compilation...
+[12:01:33 AM] File change detected. Starting incremental compilation...
 
-[12:02:13 AM] Found 0 errors. Watching for file changes.
+[12:01:52 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -883,14 +883,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:02:20 AM] File change detected. Starting incremental compilation...
+[12:01:57 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:02:48 AM] Found 1 error. Watching for file changes.
+[12:02:16 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/no-circular-import/export.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/no-circular-import/export.js
index d53dd7d98a9c7..7cfb5883b8814 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/no-circular-import/export.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/no-circular-import/export.js
@@ -276,14 +276,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:06 AM] File change detected. Starting incremental compilation...
+[12:01:05 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:01:31 AM] Found 1 error. Watching for file changes.
+[12:01:22 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -357,9 +357,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:35 AM] File change detected. Starting incremental compilation...
+[12:01:25 AM] File change detected. Starting incremental compilation...
 
-[12:02:00 AM] Found 0 errors. Watching for file changes.
+[12:01:42 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -433,14 +433,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:02:04 AM] File change detected. Starting incremental compilation...
+[12:01:45 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:02:29 AM] Found 1 error. Watching for file changes.
+[12:02:02 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/yes-circular-import/exports-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/yes-circular-import/exports-with-incremental.js
index 60e9c70dd549a..157c156c594a3 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/yes-circular-import/exports-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/yes-circular-import/exports-with-incremental.js
@@ -473,14 +473,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:16 AM] File change detected. Starting incremental compilation...
+[12:01:15 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:01:47 AM] Found 1 error. Watching for file changes.
+[12:01:36 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -735,9 +735,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:54 AM] File change detected. Starting incremental compilation...
+[12:01:41 AM] File change detected. Starting incremental compilation...
 
-[12:02:25 AM] Found 0 errors. Watching for file changes.
+[12:02:02 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -980,14 +980,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:02:32 AM] File change detected. Starting incremental compilation...
+[12:02:07 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:03:03 AM] Found 1 error. Watching for file changes.
+[12:02:28 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/yes-circular-import/exports.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/yes-circular-import/exports.js
index d8295c5ccc6ce..90254f4b4a5f2 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/yes-circular-import/exports.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/yes-circular-import/exports.js
@@ -308,14 +308,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:12 AM] File change detected. Starting incremental compilation...
+[12:01:11 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:01:40 AM] Found 1 error. Watching for file changes.
+[12:01:30 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -393,9 +393,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:44 AM] File change detected. Starting incremental compilation...
+[12:01:33 AM] File change detected. Starting incremental compilation...
 
-[12:02:12 AM] Found 0 errors. Watching for file changes.
+[12:01:52 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -473,14 +473,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:02:16 AM] File change detected. Starting incremental compilation...
+[12:01:55 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:02:44 AM] Found 1 error. Watching for file changes.
+[12:02:14 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError-with-incremental.js
index bcecb0947641d..7e2f52d68e595 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError-with-incremental.js
@@ -241,9 +241,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:46 AM] File change detected. Starting incremental compilation...
+[12:00:44 AM] File change detected. Starting incremental compilation...
 
-[12:01:10 AM] Found 0 errors. Watching for file changes.
+[12:01:07 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -410,14 +410,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:17 AM] File change detected. Starting incremental compilation...
+[12:01:12 AM] File change detected. Starting incremental compilation...
 
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
         ~
 
-[12:01:21 AM] Found 1 error. Watching for file changes.
+[12:01:15 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -585,9 +585,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:32 AM] File change detected. Starting incremental compilation...
+[12:01:23 AM] File change detected. Starting incremental compilation...
 
-[12:01:42 AM] Found 0 errors. Watching for file changes.
+[12:01:30 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError.js
index 1e150b6d7108f..611cfa0825855 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError.js
@@ -147,9 +147,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:39 AM] File change detected. Starting incremental compilation...
+[12:00:37 AM] File change detected. Starting incremental compilation...
 
-[12:01:02 AM] Found 0 errors. Watching for file changes.
+[12:01:00 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -232,14 +232,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:06 AM] File change detected. Starting incremental compilation...
+[12:01:03 AM] File change detected. Starting incremental compilation...
 
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
         ~
 
-[12:01:07 AM] Found 1 error. Watching for file changes.
+[12:01:04 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -305,9 +305,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:15 AM] File change detected. Starting incremental compilation...
+[12:01:10 AM] File change detected. Starting incremental compilation...
 
-[12:01:22 AM] Found 0 errors. Watching for file changes.
+[12:01:15 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.d.ts-change-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.d.ts-change-with-incremental.js
index 72b36290e03bb..60c102cae5732 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.d.ts-change-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.d.ts-change-with-incremental.js
@@ -217,14 +217,14 @@ Before running Timeout callback:: count: 2
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:36 AM] File change detected. Starting incremental compilation...
+[12:00:35 AM] File change detected. Starting incremental compilation...
 
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
                   ~
 
-[12:00:40 AM] Found 1 error. Watching for file changes.
+[12:00:38 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -374,9 +374,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:47 AM] File change detected. Starting incremental compilation...
+[12:00:43 AM] File change detected. Starting incremental compilation...
 
-[12:00:51 AM] Found 0 errors. Watching for file changes.
+[12:00:46 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -514,14 +514,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:58 AM] File change detected. Starting incremental compilation...
+[12:00:51 AM] File change detected. Starting incremental compilation...
 
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
                   ~
 
-[12:01:02 AM] Found 1 error. Watching for file changes.
+[12:00:54 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js
index 4daeb3e4aeec0..b43fcd6ce2175 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js
@@ -128,14 +128,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:32 AM] File change detected. Starting incremental compilation...
+[12:00:31 AM] File change detected. Starting incremental compilation...
 
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
                   ~
 
-[12:00:33 AM] Found 1 error. Watching for file changes.
+[12:00:32 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -189,9 +189,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:37 AM] File change detected. Starting incremental compilation...
+[12:00:35 AM] File change detected. Starting incremental compilation...
 
-[12:00:38 AM] Found 0 errors. Watching for file changes.
+[12:00:36 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -245,14 +245,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:42 AM] File change detected. Starting incremental compilation...
+[12:00:39 AM] File change detected. Starting incremental compilation...
 
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
                   ~
 
-[12:00:43 AM] Found 1 error. Watching for file changes.
+[12:00:40 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.ts-change-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.ts-change-with-incremental.js
index 298f87dd9377c..a22fcea99089a 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.ts-change-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.ts-change-with-incremental.js
@@ -237,14 +237,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:40 AM] File change detected. Starting incremental compilation...
+[12:00:39 AM] File change detected. Starting incremental compilation...
 
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
                   ~
 
-[12:00:47 AM] Found 1 error. Watching for file changes.
+[12:00:44 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -411,9 +411,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:54 AM] File change detected. Starting incremental compilation...
+[12:00:49 AM] File change detected. Starting incremental compilation...
 
-[12:01:01 AM] Found 0 errors. Watching for file changes.
+[12:00:54 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -568,14 +568,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:08 AM] File change detected. Starting incremental compilation...
+[12:00:59 AM] File change detected. Starting incremental compilation...
 
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
                   ~
 
-[12:01:15 AM] Found 1 error. Watching for file changes.
+[12:01:04 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.ts-change.js
index 1f8bce1b8e7b9..b963399a114e4 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.ts-change.js
@@ -153,14 +153,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:36 AM] File change detected. Starting incremental compilation...
+[12:00:35 AM] File change detected. Starting incremental compilation...
 
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
                   ~
 
-[12:00:40 AM] Found 1 error. Watching for file changes.
+[12:00:38 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -227,9 +227,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:44 AM] File change detected. Starting incremental compilation...
+[12:00:41 AM] File change detected. Starting incremental compilation...
 
-[12:00:48 AM] Found 0 errors. Watching for file changes.
+[12:00:44 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -296,14 +296,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:52 AM] File change detected. Starting incremental compilation...
+[12:00:47 AM] File change detected. Starting incremental compilation...
 
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
                   ~
 
-[12:00:56 AM] Found 1 error. Watching for file changes.
+[12:00:50 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js
index ee1dc36d532fa..8db862419a992 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js
@@ -354,9 +354,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:48 AM] File change detected. Starting incremental compilation...
+[12:00:47 AM] File change detected. Starting incremental compilation...
 
-[12:00:55 AM] Found 0 errors. Watching for file changes.
+[12:00:52 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -543,7 +543,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:02 AM] File change detected. Starting incremental compilation...
+[12:00:57 AM] File change detected. Starting incremental compilation...
 
 c.ts:6:13 - error TS2353: Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -560,7 +560,7 @@ Output::
 2 getPoint().c.x;
                ~
 
-[12:01:09 AM] Found 2 errors. Watching for file changes.
+[12:01:02 AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -781,9 +781,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:16 AM] File change detected. Starting incremental compilation...
+[12:01:07 AM] File change detected. Starting incremental compilation...
 
-[12:01:23 AM] Found 0 errors. Watching for file changes.
+[12:01:12 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 9131d87703309..73d8cca2a06f1 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -204,9 +204,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:44 AM] File change detected. Starting incremental compilation...
+[12:00:43 AM] File change detected. Starting incremental compilation...
 
-[12:00:48 AM] Found 0 errors. Watching for file changes.
+[12:00:46 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -273,7 +273,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:52 AM] File change detected. Starting incremental compilation...
+[12:00:49 AM] File change detected. Starting incremental compilation...
 
 c.ts:6:13 - error TS2353: Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -290,7 +290,7 @@ Output::
 2 getPoint().c.x;
                ~
 
-[12:00:56 AM] Found 2 errors. Watching for file changes.
+[12:00:52 AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -357,9 +357,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:00 AM] File change detected. Starting incremental compilation...
+[12:00:55 AM] File change detected. Starting incremental compilation...
 
-[12:01:04 AM] Found 0 errors. Watching for file changes.
+[12:00:58 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/no-circular-import/export-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/no-circular-import/export-with-incremental.js
index 719cc4f59ec4f..223e824b801eb 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/no-circular-import/export-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/no-circular-import/export-with-incremental.js
@@ -367,14 +367,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:58 AM] File change detected. Starting incremental compilation...
+[12:00:57 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:01:05 AM] Found 1 error. Watching for file changes.
+[12:01:02 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -574,9 +574,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:12 AM] File change detected. Starting incremental compilation...
+[12:01:07 AM] File change detected. Starting incremental compilation...
 
-[12:01:19 AM] Found 0 errors. Watching for file changes.
+[12:01:12 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -764,14 +764,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:26 AM] File change detected. Starting incremental compilation...
+[12:01:17 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:01:33 AM] Found 1 error. Watching for file changes.
+[12:01:22 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/no-circular-import/export.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/no-circular-import/export.js
index 21f95a50a1a7c..85afa3cc9e4f8 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/no-circular-import/export.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/no-circular-import/export.js
@@ -245,14 +245,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:54 AM] File change detected. Starting incremental compilation...
+[12:00:53 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:00:58 AM] Found 1 error. Watching for file changes.
+[12:00:56 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -314,9 +314,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:02 AM] File change detected. Starting incremental compilation...
+[12:00:59 AM] File change detected. Starting incremental compilation...
 
-[12:01:06 AM] Found 0 errors. Watching for file changes.
+[12:01:02 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -378,14 +378,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:10 AM] File change detected. Starting incremental compilation...
+[12:01:05 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:01:14 AM] Found 1 error. Watching for file changes.
+[12:01:08 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/yes-circular-import/exports-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/yes-circular-import/exports-with-incremental.js
index c9e11c6bcc1bf..d12069429d282 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/yes-circular-import/exports-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/yes-circular-import/exports-with-incremental.js
@@ -405,14 +405,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:02 AM] File change detected. Starting incremental compilation...
+[12:01:01 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:01:09 AM] Found 1 error. Watching for file changes.
+[12:01:06 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -630,9 +630,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:16 AM] File change detected. Starting incremental compilation...
+[12:01:11 AM] File change detected. Starting incremental compilation...
 
-[12:01:23 AM] Found 0 errors. Watching for file changes.
+[12:01:16 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -838,14 +838,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:30 AM] File change detected. Starting incremental compilation...
+[12:01:21 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:01:37 AM] Found 1 error. Watching for file changes.
+[12:01:26 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/yes-circular-import/exports.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/yes-circular-import/exports.js
index 0944a7ab8a97f..c7bab9d08c734 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/yes-circular-import/exports.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/yes-circular-import/exports.js
@@ -268,14 +268,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:58 AM] File change detected. Starting incremental compilation...
+[12:00:57 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:01:02 AM] Found 1 error. Watching for file changes.
+[12:01:00 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -340,9 +340,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:06 AM] File change detected. Starting incremental compilation...
+[12:01:03 AM] File change detected. Starting incremental compilation...
 
-[12:01:10 AM] Found 0 errors. Watching for file changes.
+[12:01:06 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -407,14 +407,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:14 AM] File change detected. Starting incremental compilation...
+[12:01:09 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:01:18 AM] Found 1 error. Watching for file changes.
+[12:01:12 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError-with-incremental.js
index 0c8fddf759e18..751e9d0d7bad1 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError-with-incremental.js
@@ -240,9 +240,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:46 AM] File change detected. Starting incremental compilation...
+[12:00:44 AM] File change detected. Starting incremental compilation...
 
-[12:01:04 AM] Found 0 errors. Watching for file changes.
+[12:01:01 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -390,14 +390,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:11 AM] File change detected. Starting incremental compilation...
+[12:01:06 AM] File change detected. Starting incremental compilation...
 
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
         ~
 
-[12:01:15 AM] Found 1 error. Watching for file changes.
+[12:01:09 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -560,9 +560,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:26 AM] File change detected. Starting incremental compilation...
+[12:01:17 AM] File change detected. Starting incremental compilation...
 
-[12:01:33 AM] Found 0 errors. Watching for file changes.
+[12:01:22 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError.js
index 9a1f5f81bbe05..51d0dd54f0d0a 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError.js
@@ -147,9 +147,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:39 AM] File change detected. Starting incremental compilation...
+[12:00:37 AM] File change detected. Starting incremental compilation...
 
-[12:00:56 AM] Found 0 errors. Watching for file changes.
+[12:00:54 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -218,14 +218,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:00 AM] File change detected. Starting incremental compilation...
+[12:00:57 AM] File change detected. Starting incremental compilation...
 
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
         ~
 
-[12:01:01 AM] Found 1 error. Watching for file changes.
+[12:00:58 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -291,9 +291,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:09 AM] File change detected. Starting incremental compilation...
+[12:01:04 AM] File change detected. Starting incremental compilation...
 
-[12:01:13 AM] Found 0 errors. Watching for file changes.
+[12:01:07 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change-with-incremental.js
index 54c1d92368c11..7edd49438556d 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change-with-incremental.js
@@ -226,14 +226,14 @@ Before running Timeout callback:: count: 2
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:38 AM] File change detected. Starting incremental compilation...
+[12:00:37 AM] File change detected. Starting incremental compilation...
 
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
                   ~
 
-[12:00:45 AM] Found 1 error. Watching for file changes.
+[12:00:42 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -389,9 +389,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:52 AM] File change detected. Starting incremental compilation...
+[12:00:47 AM] File change detected. Starting incremental compilation...
 
-[12:00:59 AM] Found 0 errors. Watching for file changes.
+[12:00:52 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -535,14 +535,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:06 AM] File change detected. Starting incremental compilation...
+[12:00:57 AM] File change detected. Starting incremental compilation...
 
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
                   ~
 
-[12:01:13 AM] Found 1 error. Watching for file changes.
+[12:01:02 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js
index b08a10f36439a..960e975a62b3c 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js
@@ -133,14 +133,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:34 AM] File change detected. Starting incremental compilation...
+[12:00:33 AM] File change detected. Starting incremental compilation...
 
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
                   ~
 
-[12:00:38 AM] Found 1 error. Watching for file changes.
+[12:00:36 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -196,9 +196,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:42 AM] File change detected. Starting incremental compilation...
+[12:00:39 AM] File change detected. Starting incremental compilation...
 
-[12:00:46 AM] Found 0 errors. Watching for file changes.
+[12:00:42 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -254,14 +254,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:50 AM] File change detected. Starting incremental compilation...
+[12:00:45 AM] File change detected. Starting incremental compilation...
 
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
                   ~
 
-[12:00:54 AM] Found 1 error. Watching for file changes.
+[12:00:48 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change-with-incremental.js
index 34fffa538857e..a0c02ed1ed7c6 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change-with-incremental.js
@@ -267,14 +267,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:46 AM] File change detected. Starting incremental compilation...
+[12:00:45 AM] File change detected. Starting incremental compilation...
 
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
                   ~
 
-[12:01:02 AM] Found 1 error. Watching for file changes.
+[12:00:56 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -458,9 +458,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:09 AM] File change detected. Starting incremental compilation...
+[12:01:01 AM] File change detected. Starting incremental compilation...
 
-[12:01:25 AM] Found 0 errors. Watching for file changes.
+[12:01:12 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -632,14 +632,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:32 AM] File change detected. Starting incremental compilation...
+[12:01:17 AM] File change detected. Starting incremental compilation...
 
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
                   ~
 
-[12:01:48 AM] Found 1 error. Watching for file changes.
+[12:01:28 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js
index 797f62be44cd9..171a0c58b1b76 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js
@@ -171,14 +171,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:42 AM] File change detected. Starting incremental compilation...
+[12:00:41 AM] File change detected. Starting incremental compilation...
 
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
                   ~
 
-[12:00:55 AM] Found 1 error. Watching for file changes.
+[12:00:50 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -254,9 +254,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:59 AM] File change detected. Starting incremental compilation...
+[12:00:53 AM] File change detected. Starting incremental compilation...
 
-[12:01:12 AM] Found 0 errors. Watching for file changes.
+[12:01:02 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -332,14 +332,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:16 AM] File change detected. Starting incremental compilation...
+[12:01:05 AM] File change detected. Starting incremental compilation...
 
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
                   ~
 
-[12:01:29 AM] Found 1 error. Watching for file changes.
+[12:01:14 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js
index 9903e264a83dc..94463f0775fc4 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js
@@ -405,9 +405,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:58 AM] File change detected. Starting incremental compilation...
+[12:00:57 AM] File change detected. Starting incremental compilation...
 
-[12:01:20 AM] Found 0 errors. Watching for file changes.
+[12:01:12 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -626,7 +626,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:27 AM] File change detected. Starting incremental compilation...
+[12:01:17 AM] File change detected. Starting incremental compilation...
 
 c.ts:6:13 - error TS2353: Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -643,7 +643,7 @@ Output::
 2 getPoint().c.x;
                ~
 
-[12:01:49 AM] Found 2 errors. Watching for file changes.
+[12:01:32 AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -896,9 +896,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:56 AM] File change detected. Starting incremental compilation...
+[12:01:37 AM] File change detected. Starting incremental compilation...
 
-[12:02:18 AM] Found 0 errors. Watching for file changes.
+[12:01:52 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 658d0fe3569c0..c010fdca13759 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -235,9 +235,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:54 AM] File change detected. Starting incremental compilation...
+[12:00:53 AM] File change detected. Starting incremental compilation...
 
-[12:01:13 AM] Found 0 errors. Watching for file changes.
+[12:01:06 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -320,7 +320,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:17 AM] File change detected. Starting incremental compilation...
+[12:01:09 AM] File change detected. Starting incremental compilation...
 
 c.ts:6:13 - error TS2353: Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -337,7 +337,7 @@ Output::
 2 getPoint().c.x;
                ~
 
-[12:01:36 AM] Found 2 errors. Watching for file changes.
+[12:01:22 AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -420,9 +420,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:40 AM] File change detected. Starting incremental compilation...
+[12:01:25 AM] File change detected. Starting incremental compilation...
 
-[12:01:59 AM] Found 0 errors. Watching for file changes.
+[12:01:38 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/no-circular-import/export-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/no-circular-import/export-with-incremental.js
index 478a5707f1d63..e2aabdc77da4e 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/no-circular-import/export-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/no-circular-import/export-with-incremental.js
@@ -423,14 +423,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:10 AM] File change detected. Starting incremental compilation...
+[12:01:09 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:01:35 AM] Found 1 error. Watching for file changes.
+[12:01:26 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -662,9 +662,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:42 AM] File change detected. Starting incremental compilation...
+[12:01:31 AM] File change detected. Starting incremental compilation...
 
-[12:02:07 AM] Found 0 errors. Watching for file changes.
+[12:01:48 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -884,14 +884,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:02:14 AM] File change detected. Starting incremental compilation...
+[12:01:53 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:02:39 AM] Found 1 error. Watching for file changes.
+[12:02:10 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/no-circular-import/export.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/no-circular-import/export.js
index 218a45aa6c754..a34ffc4a93a41 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/no-circular-import/export.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/no-circular-import/export.js
@@ -277,14 +277,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:06 AM] File change detected. Starting incremental compilation...
+[12:01:05 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:01:28 AM] Found 1 error. Watching for file changes.
+[12:01:20 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -358,9 +358,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:32 AM] File change detected. Starting incremental compilation...
+[12:01:23 AM] File change detected. Starting incremental compilation...
 
-[12:01:54 AM] Found 0 errors. Watching for file changes.
+[12:01:38 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -434,14 +434,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:58 AM] File change detected. Starting incremental compilation...
+[12:01:41 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:02:20 AM] Found 1 error. Watching for file changes.
+[12:01:56 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/yes-circular-import/exports-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/yes-circular-import/exports-with-incremental.js
index e422438a45dde..8feca09b3c83b 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/yes-circular-import/exports-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/yes-circular-import/exports-with-incremental.js
@@ -474,14 +474,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:16 AM] File change detected. Starting incremental compilation...
+[12:01:15 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:01:44 AM] Found 1 error. Watching for file changes.
+[12:01:34 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -736,9 +736,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:51 AM] File change detected. Starting incremental compilation...
+[12:01:39 AM] File change detected. Starting incremental compilation...
 
-[12:02:19 AM] Found 0 errors. Watching for file changes.
+[12:01:58 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -981,14 +981,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:02:26 AM] File change detected. Starting incremental compilation...
+[12:02:03 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:02:54 AM] Found 1 error. Watching for file changes.
+[12:02:22 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/yes-circular-import/exports.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/yes-circular-import/exports.js
index d53c22f1ba94b..2c2a7103e0ba6 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/yes-circular-import/exports.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/yes-circular-import/exports.js
@@ -309,14 +309,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:12 AM] File change detected. Starting incremental compilation...
+[12:01:11 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:01:37 AM] Found 1 error. Watching for file changes.
+[12:01:28 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -394,9 +394,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:41 AM] File change detected. Starting incremental compilation...
+[12:01:31 AM] File change detected. Starting incremental compilation...
 
-[12:02:06 AM] Found 0 errors. Watching for file changes.
+[12:01:48 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -474,14 +474,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:02:10 AM] File change detected. Starting incremental compilation...
+[12:01:51 AM] File change detected. Starting incremental compilation...
 
 lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
 
 5             title: "title"
               ~~~~~
 
-[12:02:35 AM] Found 1 error. Watching for file changes.
+[12:02:08 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
index 4c478973f567a..66828419661ac 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
@@ -242,9 +242,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:46 AM] File change detected. Starting incremental compilation...
+[12:00:44 AM] File change detected. Starting incremental compilation...
 
-[12:01:10 AM] Found 0 errors. Watching for file changes.
+[12:01:07 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -412,14 +412,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:17 AM] File change detected. Starting incremental compilation...
+[12:01:12 AM] File change detected. Starting incremental compilation...
 
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
         ~
 
-[12:01:21 AM] Found 1 error. Watching for file changes.
+[12:01:15 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -588,9 +588,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:32 AM] File change detected. Starting incremental compilation...
+[12:01:23 AM] File change detected. Starting incremental compilation...
 
-[12:01:42 AM] Found 0 errors. Watching for file changes.
+[12:01:30 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError.js
index 793ee02cf206d..173a0d61ed336 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError.js
@@ -148,9 +148,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:39 AM] File change detected. Starting incremental compilation...
+[12:00:37 AM] File change detected. Starting incremental compilation...
 
-[12:01:02 AM] Found 0 errors. Watching for file changes.
+[12:01:00 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -234,14 +234,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:06 AM] File change detected. Starting incremental compilation...
+[12:01:03 AM] File change detected. Starting incremental compilation...
 
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
         ~
 
-[12:01:07 AM] Found 1 error. Watching for file changes.
+[12:01:04 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -308,9 +308,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:15 AM] File change detected. Starting incremental compilation...
+[12:01:10 AM] File change detected. Starting incremental compilation...
 
-[12:01:22 AM] Found 0 errors. Watching for file changes.
+[12:01:15 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-lowercase.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-lowercase.js
index eb52134550134..acb8f581ee9c1 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-lowercase.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-lowercase.js
@@ -137,7 +137,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:25 AM] File change detected. Starting incremental compilation...
+[12:00:24 AM] File change detected. Starting incremental compilation...
 
 a/lib/lib.d.ts
   Default library for target 'es5'
@@ -147,7 +147,7 @@ project/a.ts
   Imported via "c://project/a" from file 'project/b.ts'
 project/b.ts
   Matched by default include pattern '**/*'
-[12:00:32 AM] Found 0 errors. Watching for file changes.
+[12:00:29 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-uppercase.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-uppercase.js
index a852b023bc257..23031b357732f 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-uppercase.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-uppercase.js
@@ -137,7 +137,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:25 AM] File change detected. Starting incremental compilation...
+[12:00:24 AM] File change detected. Starting incremental compilation...
 
 a/lib/lib.d.ts
   Default library for target 'es5'
@@ -147,7 +147,7 @@ project/a.ts
   Imported via "c://project/a" from file 'project/b.ts'
 project/b.ts
   Matched by default include pattern '**/*'
-[12:00:32 AM] Found 0 errors. Watching for file changes.
+[12:00:29 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js
index 492906d765662..085bb9a0c139d 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js
@@ -171,7 +171,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:33 AM] File change detected. Starting incremental compilation...
+[12:00:32 AM] File change detected. Starting incremental compilation...
 
 ../../../../a/lib/lib.d.ts
   Default library for target 'es5'
@@ -182,7 +182,7 @@ link/a.ts
   Imported via "./link/a" from file 'b.ts'
 b.ts
   Matched by default include pattern '**/*'
-[12:00:37 AM] Found 0 errors. Watching for file changes.
+[12:00:35 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-file-symlink-target-and-import-match-disk.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-file-symlink-target-and-import-match-disk.js
index c5b8e96b521a1..b39b7da8cb115 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-file-symlink-target-and-import-match-disk.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-file-symlink-target-and-import-match-disk.js
@@ -156,7 +156,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:35 AM] File change detected. Starting incremental compilation...
+[12:00:34 AM] File change detected. Starting incremental compilation...
 
 ../../../../a/lib/lib.d.ts
   Default library for target 'es5'
@@ -168,7 +168,7 @@ link.ts
   Matched by default include pattern '**/*'
 b.ts
   Matched by default include pattern '**/*'
-[12:00:42 AM] Found 0 errors. Watching for file changes.
+[12:00:39 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-changing-module-name-with-different-casing.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-changing-module-name-with-different-casing.js
index c330827ffde5b..fd8c4e54d8cb5 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-changing-module-name-with-different-casing.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-changing-module-name-with-different-casing.js
@@ -120,7 +120,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:32 AM] File change detected. Starting incremental compilation...
+[12:00:31 AM] File change detected. Starting incremental compilation...
 
 user/username/projects/myproject/another.ts:1:24 - error TS1261: Already included file name '/user/username/projects/myproject/Logger.ts' differs from file name '/user/username/projects/myproject/logger.ts' only in casing.
   The file is in the program because:
@@ -130,7 +130,7 @@ Output::
 1 import { logger } from "./Logger"; new logger();
                          ~~~~~~~~~~
 
-[12:00:36 AM] Found 1 error. Watching for file changes.
+[12:00:34 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js
index 6fbd761335476..1ec53eea49977 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js
@@ -171,7 +171,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:33 AM] File change detected. Starting incremental compilation...
+[12:00:32 AM] File change detected. Starting incremental compilation...
 
 ../../../../a/lib/lib.d.ts
   Default library for target 'es5'
@@ -182,7 +182,7 @@ link/a.ts
   Imported via "./link/a" from file 'b.ts'
 b.ts
   Matched by default include pattern '**/*'
-[12:00:37 AM] Found 0 errors. Watching for file changes.
+[12:00:35 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-file-symlink-target-matches-disk-but-import-does-not.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-file-symlink-target-matches-disk-but-import-does-not.js
index 0f3c728285294..3c545360d7150 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-file-symlink-target-matches-disk-but-import-does-not.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-file-symlink-target-matches-disk-but-import-does-not.js
@@ -156,7 +156,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:35 AM] File change detected. Starting incremental compilation...
+[12:00:34 AM] File change detected. Starting incremental compilation...
 
 ../../../../a/lib/lib.d.ts
   Default library for target 'es5'
@@ -168,7 +168,7 @@ link.ts
   Matched by default include pattern '**/*'
 b.ts
   Matched by default include pattern '**/*'
-[12:00:42 AM] Found 0 errors. Watching for file changes.
+[12:00:39 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js
index 9e9a72d01e597..ab507a18e0ba9 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js
@@ -177,7 +177,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:33 AM] File change detected. Starting incremental compilation...
+[12:00:32 AM] File change detected. Starting incremental compilation...
 
 b.ts:2:19 - error TS2792: Cannot find module './yX/a'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
@@ -192,7 +192,7 @@ b.ts
   Matched by default include pattern '**/*'
 XY/a.ts
   Matched by default include pattern '**/*'
-[12:00:37 AM] Found 1 error. Watching for file changes.
+[12:00:35 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-file-symlink-target,-and-disk-are-all-different.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-file-symlink-target,-and-disk-are-all-different.js
index 94a19d7a0f6db..8f8e7c569c416 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-file-symlink-target,-and-disk-are-all-different.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-file-symlink-target,-and-disk-are-all-different.js
@@ -164,7 +164,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:35 AM] File change detected. Starting incremental compilation...
+[12:00:34 AM] File change detected. Starting incremental compilation...
 
 b.ts:2:19 - error TS2307: Cannot find module './yX' or its corresponding type declarations.
 
@@ -180,7 +180,7 @@ link.ts
   Matched by default include pattern '**/*'
 b.ts
   Matched by default include pattern '**/*'
-[12:00:39 AM] Found 1 error. Watching for file changes.
+[12:00:37 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js
index 8e16059bf38ad..2c053b975cd8b 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js
@@ -179,7 +179,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:33 AM] File change detected. Starting incremental compilation...
+[12:00:32 AM] File change detected. Starting incremental compilation...
 
 b.ts:2:19 - error TS1261: Already included file name '/user/username/projects/myproject/Xy/a.ts' differs from file name '/user/username/projects/myproject/XY/a.ts' only in casing.
   The file is in the program because:
@@ -198,7 +198,7 @@ link/a.ts
   Imported via "./link/a" from file 'b.ts'
 b.ts
   Matched by default include pattern '**/*'
-[12:00:37 AM] Found 1 error. Watching for file changes.
+[12:00:35 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-file-symlink-target-agree-but-do-not-match-disk.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-file-symlink-target-agree-but-do-not-match-disk.js
index acbae92d6101d..38c2e853da3d0 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-file-symlink-target-agree-but-do-not-match-disk.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-file-symlink-target-agree-but-do-not-match-disk.js
@@ -164,7 +164,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:35 AM] File change detected. Starting incremental compilation...
+[12:00:34 AM] File change detected. Starting incremental compilation...
 
 b.ts:2:19 - error TS1149: File name '/user/username/projects/myproject/Xy.ts' differs from already included file name '/user/username/projects/myproject/XY.ts' only in casing.
   The file is in the program because:
@@ -184,7 +184,7 @@ link.ts
   Matched by default include pattern '**/*'
 b.ts
   Matched by default include pattern '**/*'
-[12:00:42 AM] Found 1 error. Watching for file changes.
+[12:00:39 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js
index 7807baa22a334..d3a23375452f7 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js
@@ -179,7 +179,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:33 AM] File change detected. Starting incremental compilation...
+[12:00:32 AM] File change detected. Starting incremental compilation...
 
 b.ts:2:19 - error TS1261: Already included file name '/user/username/projects/myproject/Xy/a.ts' differs from file name '/user/username/projects/myproject/XY/a.ts' only in casing.
   The file is in the program because:
@@ -198,7 +198,7 @@ link/a.ts
   Imported via "./link/a" from file 'b.ts'
 b.ts
   Matched by default include pattern '**/*'
-[12:00:37 AM] Found 1 error. Watching for file changes.
+[12:00:35 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-file-symlink-target-does-not.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-file-symlink-target-does-not.js
index 25f173f6f2868..9d1beff479131 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-file-symlink-target-does-not.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-file-symlink-target-does-not.js
@@ -164,7 +164,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:35 AM] File change detected. Starting incremental compilation...
+[12:00:34 AM] File change detected. Starting incremental compilation...
 
 b.ts:2:19 - error TS1149: File name '/user/username/projects/myproject/Xy.ts' differs from already included file name '/user/username/projects/myproject/XY.ts' only in casing.
   The file is in the program because:
@@ -184,7 +184,7 @@ link.ts
   Matched by default include pattern '**/*'
 b.ts
   Matched by default include pattern '**/*'
-[12:00:42 AM] Found 1 error. Watching for file changes.
+[12:00:39 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-relative-information-file-location-changes.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-relative-information-file-location-changes.js
index 7d52a608fab86..5e844246eeaab 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-relative-information-file-location-changes.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-relative-information-file-location-changes.js
@@ -167,7 +167,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:35 AM] File change detected. Starting incremental compilation...
+[12:00:34 AM] File change detected. Starting incremental compilation...
 
 moduleA.ts:2:40 - error TS1261: Already included file name '/user/username/projects/myproject/ModuleC.ts' differs from file name '/user/username/projects/myproject/moduleC.ts' only in casing.
   The file is in the program because:
@@ -207,7 +207,7 @@ moduleA.ts
   Matched by default include pattern '**/*'
 moduleB.ts
   Matched by default include pattern '**/*'
-[12:00:39 AM] Found 2 errors. Watching for file changes.
+[12:00:37 AM] Found 2 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/incremental/editing-module-augmentation-watch.js b/tests/baselines/reference/tscWatch/incremental/editing-module-augmentation-watch.js
index b79c7d40fadde..ff4db176cc08b 100644
--- a/tests/baselines/reference/tscWatch/incremental/editing-module-augmentation-watch.js
+++ b/tests/baselines/reference/tscWatch/incremental/editing-module-augmentation-watch.js
@@ -228,14 +228,14 @@ FsWatchesRecursive *deleted*::
 
 Output::
 >> Screen clear
-[12:00:44 AM] Starting compilation in watch mode...
+[12:00:43 AM] Starting compilation in watch mode...
 
 src/index.ts:1:51 - error TS2339: Property 'foo' does not exist on type 'Result'.
 
 1 import classNames from "classnames"; classNames().foo;
                                                     ~~~
 
-[12:00:51 AM] Found 1 error. Watching for file changes.
+[12:00:48 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/incremental/importHelpers-backing-types-removed-watch.js b/tests/baselines/reference/tscWatch/incremental/importHelpers-backing-types-removed-watch.js
index 24b2670fbed8d..56d12f9f394d1 100644
--- a/tests/baselines/reference/tscWatch/incremental/importHelpers-backing-types-removed-watch.js
+++ b/tests/baselines/reference/tscWatch/incremental/importHelpers-backing-types-removed-watch.js
@@ -142,7 +142,7 @@ Output::
 1 export const x = {...{}};
                     ~~~~~
 
-[12:00:39 AM] Found 1 error. Watching for file changes.
+[12:00:38 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/incremental/incremental-with-circular-references-watch.js b/tests/baselines/reference/tscWatch/incremental/incremental-with-circular-references-watch.js
index 8cbde307a1adb..2cb4544eb0402 100644
--- a/tests/baselines/reference/tscWatch/incremental/incremental-with-circular-references-watch.js
+++ b/tests/baselines/reference/tscWatch/incremental/incremental-with-circular-references-watch.js
@@ -310,9 +310,9 @@ FsWatchesRecursive *deleted*::
 
 Output::
 >> Screen clear
-[12:00:44 AM] Starting compilation in watch mode...
+[12:00:43 AM] Starting compilation in watch mode...
 
-[12:01:00 AM] Found 0 errors. Watching for file changes.
+[12:00:54 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/incremental/jsxImportSource-backing-types-added-watch.js b/tests/baselines/reference/tscWatch/incremental/jsxImportSource-backing-types-added-watch.js
index 0c1512187f0ae..ae64881a4cdc6 100644
--- a/tests/baselines/reference/tscWatch/incremental/jsxImportSource-backing-types-added-watch.js
+++ b/tests/baselines/reference/tscWatch/incremental/jsxImportSource-backing-types-added-watch.js
@@ -210,7 +210,7 @@ Output::
 >> Screen clear
 [12:00:39 AM] Starting compilation in watch mode...
 
-[12:00:46 AM] Found 0 errors. Watching for file changes.
+[12:00:44 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/incremental/jsxImportSource-backing-types-removed-watch.js b/tests/baselines/reference/tscWatch/incremental/jsxImportSource-backing-types-removed-watch.js
index 60a605e74c613..01f14f972c837 100644
--- a/tests/baselines/reference/tscWatch/incremental/jsxImportSource-backing-types-removed-watch.js
+++ b/tests/baselines/reference/tscWatch/incremental/jsxImportSource-backing-types-removed-watch.js
@@ -226,7 +226,7 @@ Output::
 1 export const App = () => <div propA={true}></div>;
                            ~~~~~~~~~~~~~~~~~~~~~~~~
 
-[12:00:48 AM] Found 1 error. Watching for file changes.
+[12:00:46 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/incremental/jsxImportSource-option-changed-watch.js b/tests/baselines/reference/tscWatch/incremental/jsxImportSource-option-changed-watch.js
index 14503b6521e89..bedc4cba5af00 100644
--- a/tests/baselines/reference/tscWatch/incremental/jsxImportSource-option-changed-watch.js
+++ b/tests/baselines/reference/tscWatch/incremental/jsxImportSource-option-changed-watch.js
@@ -254,7 +254,7 @@ FsWatchesRecursive *deleted*::
 
 Output::
 >> Screen clear
-[12:00:50 AM] Starting compilation in watch mode...
+[12:00:49 AM] Starting compilation in watch mode...
 
 index.tsx:1:31 - error TS2322: Type '{ propA: boolean; }' is not assignable to type '{ propB?: boolean; }'.
   Property 'propA' does not exist on type '{ propB?: boolean; }'. Did you mean 'propB'?
@@ -268,7 +268,7 @@ node_modules/preact/jsx-runtime/index.d.ts
   Imported via "preact/jsx-runtime" from file 'index.tsx' with packageId 'preact/jsx-runtime/index.d.ts@0.0.1' to import 'jsx' and 'jsxs' factory functions
 index.tsx
   Matched by default include pattern '**/*'
-[12:00:57 AM] Found 1 error. Watching for file changes.
+[12:00:54 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/incremental/module-compilation/own-file-emit-with-errors-watch.js b/tests/baselines/reference/tscWatch/incremental/module-compilation/own-file-emit-with-errors-watch.js
index 5ca558cdb67a0..255ad3ffa14de 100644
--- a/tests/baselines/reference/tscWatch/incremental/module-compilation/own-file-emit-with-errors-watch.js
+++ b/tests/baselines/reference/tscWatch/incremental/module-compilation/own-file-emit-with-errors-watch.js
@@ -205,14 +205,14 @@ FsWatchesRecursive *deleted*::
 
 Output::
 >> Screen clear
-[12:00:36 AM] Starting compilation in watch mode...
+[12:00:35 AM] Starting compilation in watch mode...
 
 file2.ts:1:14 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 1 export const y: string = 20;
                ~
 
-[12:00:43 AM] Found 1 error. Watching for file changes.
+[12:00:40 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/incremental/module-compilation/own-file-emit-without-errors-watch.js b/tests/baselines/reference/tscWatch/incremental/module-compilation/own-file-emit-without-errors-watch.js
index 729c6d322d3e7..ebf919bb891fb 100644
--- a/tests/baselines/reference/tscWatch/incremental/module-compilation/own-file-emit-without-errors-watch.js
+++ b/tests/baselines/reference/tscWatch/incremental/module-compilation/own-file-emit-without-errors-watch.js
@@ -188,9 +188,9 @@ FsWatchesRecursive *deleted*::
 
 Output::
 >> Screen clear
-[12:00:36 AM] Starting compilation in watch mode...
+[12:00:35 AM] Starting compilation in watch mode...
 
-[12:00:43 AM] Found 0 errors. Watching for file changes.
+[12:00:40 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/incremental/own-file-emit-with-errors-watch.js b/tests/baselines/reference/tscWatch/incremental/own-file-emit-with-errors-watch.js
index 3bbabadce8165..e3656b2ecafb7 100644
--- a/tests/baselines/reference/tscWatch/incremental/own-file-emit-with-errors-watch.js
+++ b/tests/baselines/reference/tscWatch/incremental/own-file-emit-with-errors-watch.js
@@ -200,14 +200,14 @@ FsWatchesRecursive *deleted*::
 
 Output::
 >> Screen clear
-[12:00:36 AM] Starting compilation in watch mode...
+[12:00:35 AM] Starting compilation in watch mode...
 
 file2.ts:1:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 1 const y: string = 20;
         ~
 
-[12:00:46 AM] Found 1 error. Watching for file changes.
+[12:00:42 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/incremental/own-file-emit-without-errors/with-commandline-parameters-that-are-not-relative-watch.js b/tests/baselines/reference/tscWatch/incremental/own-file-emit-without-errors/with-commandline-parameters-that-are-not-relative-watch.js
index 3ff0593175d84..c969c60f86296 100644
--- a/tests/baselines/reference/tscWatch/incremental/own-file-emit-without-errors/with-commandline-parameters-that-are-not-relative-watch.js
+++ b/tests/baselines/reference/tscWatch/incremental/own-file-emit-without-errors/with-commandline-parameters-that-are-not-relative-watch.js
@@ -184,9 +184,9 @@ FsWatchesRecursive *deleted*::
 
 Output::
 >> Screen clear
-[12:00:36 AM] Starting compilation in watch mode...
+[12:00:35 AM] Starting compilation in watch mode...
 
-[12:00:46 AM] Found 0 errors. Watching for file changes.
+[12:00:42 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/incremental/own-file-emit-without-errors/without-commandline-options-watch.js b/tests/baselines/reference/tscWatch/incremental/own-file-emit-without-errors/without-commandline-options-watch.js
index a6b01acecf719..d9c1e62e25c04 100644
--- a/tests/baselines/reference/tscWatch/incremental/own-file-emit-without-errors/without-commandline-options-watch.js
+++ b/tests/baselines/reference/tscWatch/incremental/own-file-emit-without-errors/without-commandline-options-watch.js
@@ -183,9 +183,9 @@ FsWatchesRecursive *deleted*::
 
 Output::
 >> Screen clear
-[12:00:36 AM] Starting compilation in watch mode...
+[12:00:35 AM] Starting compilation in watch mode...
 
-[12:00:46 AM] Found 0 errors. Watching for file changes.
+[12:00:42 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/incremental/tsbuildinfo-has-error.js b/tests/baselines/reference/tscWatch/incremental/tsbuildinfo-has-error.js
index 994207a54942c..48255ed4277f0 100644
--- a/tests/baselines/reference/tscWatch/incremental/tsbuildinfo-has-error.js
+++ b/tests/baselines/reference/tscWatch/incremental/tsbuildinfo-has-error.js
@@ -28,7 +28,7 @@ Output::
 >> Screen clear
 [12:00:19 AM] Starting compilation in watch mode...
 
-[12:00:25 AM] Found 0 errors. Watching for file changes.
+[12:00:24 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/incremental/when-file-with-ambient-global-declaration-file-is-deleted-watch.js b/tests/baselines/reference/tscWatch/incremental/when-file-with-ambient-global-declaration-file-is-deleted-watch.js
index f26553a64bd2f..f6b784dcb3512 100644
--- a/tests/baselines/reference/tscWatch/incremental/when-file-with-ambient-global-declaration-file-is-deleted-watch.js
+++ b/tests/baselines/reference/tscWatch/incremental/when-file-with-ambient-global-declaration-file-is-deleted-watch.js
@@ -186,7 +186,7 @@ Output::
 1 console.log(Config.value);
               ~~~~~~
 
-[12:00:39 AM] Found 1 error. Watching for file changes.
+[12:00:37 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/libraryResolution/with-config-with-redirection.js b/tests/baselines/reference/tscWatch/libraryResolution/with-config-with-redirection.js
index 6d039ea5ebc2a..8af40d8819a08 100644
--- a/tests/baselines/reference/tscWatch/libraryResolution/with-config-with-redirection.js
+++ b/tests/baselines/reference/tscWatch/libraryResolution/with-config-with-redirection.js
@@ -652,7 +652,7 @@ project1/utils.d.ts
 project1/typeroot1/sometype/index.d.ts
   Matched by default include pattern '**/*'
   Entry point for implicit type library 'sometype'
-[12:02:05 AM] Found 0 errors. Watching for file changes.
+[12:02:01 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -919,7 +919,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:02:11 AM] File change detected. Starting incremental compilation...
+[12:02:05 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/home/src/projects/project1/core.d.ts","/home/src/projects/project1/file.ts","/home/src/projects/project1/file2.ts","/home/src/projects/project1/index.ts","/home/src/projects/project1/utils.d.ts","/home/src/projects/project1/typeroot1/sometype/index.d.ts"]
@@ -950,7 +950,7 @@ project1/utils.d.ts
 project1/typeroot1/sometype/index.d.ts
   Matched by default include pattern '**/*'
   Entry point for implicit type library 'sometype'
-[12:02:21 AM] Found 0 errors. Watching for file changes.
+[12:02:12 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -1169,7 +1169,7 @@ After running Timeout callback:: count: 0
 Output::
 Reloading new file names and options
 Synchronizing program
-[12:02:26 AM] File change detected. Starting incremental compilation...
+[12:02:16 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/home/src/projects/project1/file.ts","/home/src/projects/project1/file2.ts","/home/src/projects/project1/index.ts","/home/src/projects/project1/utils.d.ts","/home/src/projects/project1/typeroot1/sometype/index.d.ts"]
@@ -1200,7 +1200,7 @@ project1/utils.d.ts
 project1/typeroot1/sometype/index.d.ts
   Matched by default include pattern '**/*'
   Entry point for implicit type library 'sometype'
-[12:02:30 AM] Found 0 errors. Watching for file changes.
+[12:02:19 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -1443,7 +1443,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:02:37 AM] File change detected. Starting incremental compilation...
+[12:02:25 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/home/src/projects/project1/file.ts","/home/src/projects/project1/file2.ts","/home/src/projects/project1/index.ts","/home/src/projects/project1/utils.d.ts","/home/src/projects/project1/typeroot1/sometype/index.d.ts"]
@@ -1489,7 +1489,7 @@ project1/utils.d.ts
 project1/typeroot1/sometype/index.d.ts
   Matched by default include pattern '**/*'
   Entry point for implicit type library 'sometype'
-[12:02:50 AM] Found 0 errors. Watching for file changes.
+[12:02:34 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -1754,7 +1754,7 @@ After running Timeout callback:: count: 0
 Output::
 Reloading config file: /home/src/projects/project1/tsconfig.json
 Synchronizing program
-[12:02:57 AM] File change detected. Starting incremental compilation...
+[12:02:39 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/home/src/projects/project1/file.ts","/home/src/projects/project1/file2.ts","/home/src/projects/project1/index.ts","/home/src/projects/project1/utils.d.ts","/home/src/projects/project1/typeroot1/sometype/index.d.ts"]
@@ -1792,7 +1792,7 @@ project1/utils.d.ts
 project1/typeroot1/sometype/index.d.ts
   Matched by default include pattern '**/*'
   Entry point for implicit type library 'sometype'
-[12:02:58 AM] Found 0 errors. Watching for file changes.
+[12:02:40 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -1920,7 +1920,7 @@ After running Timeout callback:: count: 0
 Output::
 Reloading config file: /home/src/projects/project1/tsconfig.json
 Synchronizing program
-[12:03:03 AM] File change detected. Starting incremental compilation...
+[12:02:44 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/home/src/projects/project1/file.ts","/home/src/projects/project1/file2.ts","/home/src/projects/project1/index.ts","/home/src/projects/project1/utils.d.ts","/home/src/projects/project1/typeroot1/sometype/index.d.ts"]
@@ -1992,7 +1992,7 @@ project1/utils.d.ts
 project1/typeroot1/sometype/index.d.ts
   Matched by default include pattern '**/*'
   Entry point for implicit type library 'sometype'
-[12:03:16 AM] Found 0 errors. Watching for file changes.
+[12:02:53 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -2253,7 +2253,7 @@ Before running Timeout callback:: count: 2
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:03:22 AM] File change detected. Starting incremental compilation...
+[12:02:58 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/home/src/projects/project1/file.ts","/home/src/projects/project1/file2.ts","/home/src/projects/project1/index.ts","/home/src/projects/project1/utils.d.ts","/home/src/projects/project1/typeroot1/sometype/index.d.ts"]
@@ -2317,7 +2317,7 @@ project1/utils.d.ts
 project1/typeroot1/sometype/index.d.ts
   Matched by default include pattern '**/*'
   Entry point for implicit type library 'sometype'
-[12:03:35 AM] Found 0 errors. Watching for file changes.
+[12:03:07 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -2583,7 +2583,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:03:41 AM] File change detected. Starting incremental compilation...
+[12:03:12 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/home/src/projects/project1/file.ts","/home/src/projects/project1/file2.ts","/home/src/projects/project1/index.ts","/home/src/projects/project1/utils.d.ts","/home/src/projects/project1/typeroot1/sometype/index.d.ts"]
@@ -2629,7 +2629,7 @@ project1/utils.d.ts
 project1/typeroot1/sometype/index.d.ts
   Matched by default include pattern '**/*'
   Entry point for implicit type library 'sometype'
-[12:03:54 AM] Found 0 errors. Watching for file changes.
+[12:03:21 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/libraryResolution/with-config.js b/tests/baselines/reference/tscWatch/libraryResolution/with-config.js
index 7039e7b710a71..d0ba7bde387e3 100644
--- a/tests/baselines/reference/tscWatch/libraryResolution/with-config.js
+++ b/tests/baselines/reference/tscWatch/libraryResolution/with-config.js
@@ -651,7 +651,7 @@ project1/utils.d.ts
 project1/typeroot1/sometype/index.d.ts
   Matched by default include pattern '**/*'
   Entry point for implicit type library 'sometype'
-[12:01:48 AM] Found 0 errors. Watching for file changes.
+[12:01:44 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -915,7 +915,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:01:54 AM] File change detected. Starting incremental compilation...
+[12:01:48 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/home/src/projects/project1/core.d.ts","/home/src/projects/project1/file.ts","/home/src/projects/project1/file2.ts","/home/src/projects/project1/index.ts","/home/src/projects/project1/utils.d.ts","/home/src/projects/project1/typeroot1/sometype/index.d.ts"]
@@ -946,7 +946,7 @@ project1/utils.d.ts
 project1/typeroot1/sometype/index.d.ts
   Matched by default include pattern '**/*'
   Entry point for implicit type library 'sometype'
-[12:02:04 AM] Found 0 errors. Watching for file changes.
+[12:01:55 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -1165,7 +1165,7 @@ After running Timeout callback:: count: 0
 Output::
 Reloading new file names and options
 Synchronizing program
-[12:02:10 AM] File change detected. Starting incremental compilation...
+[12:02:00 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/home/src/projects/project1/file.ts","/home/src/projects/project1/file2.ts","/home/src/projects/project1/index.ts","/home/src/projects/project1/utils.d.ts","/home/src/projects/project1/typeroot1/sometype/index.d.ts"]
@@ -1196,7 +1196,7 @@ project1/utils.d.ts
 project1/typeroot1/sometype/index.d.ts
   Matched by default include pattern '**/*'
   Entry point for implicit type library 'sometype'
-[12:02:14 AM] Found 0 errors. Watching for file changes.
+[12:02:03 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -1430,7 +1430,7 @@ Before running Timeout callback:: count: 2
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:02:19 AM] File change detected. Starting incremental compilation...
+[12:02:07 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/home/src/projects/project1/file.ts","/home/src/projects/project1/file2.ts","/home/src/projects/project1/index.ts","/home/src/projects/project1/utils.d.ts","/home/src/projects/project1/typeroot1/sometype/index.d.ts"]
@@ -1494,7 +1494,7 @@ project1/utils.d.ts
 project1/typeroot1/sometype/index.d.ts
   Matched by default include pattern '**/*'
   Entry point for implicit type library 'sometype'
-[12:02:32 AM] Found 0 errors. Watching for file changes.
+[12:02:16 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -1762,7 +1762,7 @@ After running Timeout callback:: count: 0
 Output::
 Reloading config file: /home/src/projects/project1/tsconfig.json
 Synchronizing program
-[12:02:39 AM] File change detected. Starting incremental compilation...
+[12:02:21 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/home/src/projects/project1/file.ts","/home/src/projects/project1/file2.ts","/home/src/projects/project1/index.ts","/home/src/projects/project1/utils.d.ts","/home/src/projects/project1/typeroot1/sometype/index.d.ts"]
@@ -1800,7 +1800,7 @@ project1/utils.d.ts
 project1/typeroot1/sometype/index.d.ts
   Matched by default include pattern '**/*'
   Entry point for implicit type library 'sometype'
-[12:02:40 AM] Found 0 errors. Watching for file changes.
+[12:02:22 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -1927,7 +1927,7 @@ After running Timeout callback:: count: 0
 Output::
 Reloading config file: /home/src/projects/project1/tsconfig.json
 Synchronizing program
-[12:02:46 AM] File change detected. Starting incremental compilation...
+[12:02:27 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/home/src/projects/project1/file.ts","/home/src/projects/project1/file2.ts","/home/src/projects/project1/index.ts","/home/src/projects/project1/utils.d.ts","/home/src/projects/project1/typeroot1/sometype/index.d.ts"]
@@ -1981,7 +1981,7 @@ project1/utils.d.ts
 project1/typeroot1/sometype/index.d.ts
   Matched by default include pattern '**/*'
   Entry point for implicit type library 'sometype'
-[12:02:59 AM] Found 0 errors. Watching for file changes.
+[12:02:36 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -2254,7 +2254,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:03:08 AM] File change detected. Starting incremental compilation...
+[12:02:44 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/home/src/projects/project1/file.ts","/home/src/projects/project1/file2.ts","/home/src/projects/project1/index.ts","/home/src/projects/project1/utils.d.ts","/home/src/projects/project1/typeroot1/sometype/index.d.ts"]
@@ -2300,7 +2300,7 @@ project1/utils.d.ts
 project1/typeroot1/sometype/index.d.ts
   Matched by default include pattern '**/*'
   Entry point for implicit type library 'sometype'
-[12:03:21 AM] Found 0 errors. Watching for file changes.
+[12:02:53 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -2554,7 +2554,7 @@ Before running Timeout callback:: count: 2
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:03:26 AM] File change detected. Starting incremental compilation...
+[12:02:57 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/home/src/projects/project1/file.ts","/home/src/projects/project1/file2.ts","/home/src/projects/project1/index.ts","/home/src/projects/project1/utils.d.ts","/home/src/projects/project1/typeroot1/sometype/index.d.ts"]
@@ -2618,7 +2618,7 @@ project1/utils.d.ts
 project1/typeroot1/sometype/index.d.ts
   Matched by default include pattern '**/*'
   Entry point for implicit type library 'sometype'
-[12:03:39 AM] Found 0 errors. Watching for file changes.
+[12:03:06 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/libraryResolution/without-config-with-redirection.js b/tests/baselines/reference/tscWatch/libraryResolution/without-config-with-redirection.js
index d32801e28bc3f..cb2f5b9672e72 100644
--- a/tests/baselines/reference/tscWatch/libraryResolution/without-config-with-redirection.js
+++ b/tests/baselines/reference/tscWatch/libraryResolution/without-config-with-redirection.js
@@ -456,7 +456,7 @@ project1/index.ts
   Root file specified for compilation
 project1/file2.ts
   Root file specified for compilation
-[12:01:52 AM] Found 0 errors. Watching for file changes.
+[12:01:49 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -574,7 +574,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:01:55 AM] File change detected. Starting incremental compilation...
+[12:01:51 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["project1/core.d.ts","project1/utils.d.ts","project1/file.ts","project1/index.ts","project1/file2.ts"]
@@ -602,7 +602,7 @@ project1/index.ts
   Root file specified for compilation
 project1/file2.ts
   Root file specified for compilation
-[12:01:59 AM] Found 0 errors. Watching for file changes.
+[12:01:54 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -673,7 +673,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:02:01 AM] File change detected. Starting incremental compilation...
+[12:01:56 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["project1/core.d.ts","project1/utils.d.ts","project1/file.ts","project1/index.ts","project1/file2.ts"]
@@ -705,7 +705,7 @@ project1/index.ts
   Root file specified for compilation
 project1/file2.ts
   Root file specified for compilation
-[12:02:02 AM] Found 1 error. Watching for file changes.
+[12:01:57 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -811,7 +811,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:02:06 AM] File change detected. Starting incremental compilation...
+[12:02:01 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["project1/core.d.ts","project1/utils.d.ts","project1/file.ts","project1/index.ts","project1/file2.ts"]
@@ -855,7 +855,7 @@ project1/index.ts
   Root file specified for compilation
 project1/file2.ts
   Root file specified for compilation
-[12:02:16 AM] Found 1 error. Watching for file changes.
+[12:02:08 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -962,7 +962,7 @@ Before running Timeout callback:: count: 2
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:02:18 AM] File change detected. Starting incremental compilation...
+[12:02:10 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["project1/core.d.ts","project1/utils.d.ts","project1/file.ts","project1/index.ts","project1/file2.ts"]
@@ -1023,7 +1023,7 @@ project1/index.ts
   Root file specified for compilation
 project1/file2.ts
   Root file specified for compilation
-[12:02:28 AM] Found 1 error. Watching for file changes.
+[12:02:17 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -1142,7 +1142,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:02:32 AM] File change detected. Starting incremental compilation...
+[12:02:21 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["project1/core.d.ts","project1/utils.d.ts","project1/file.ts","project1/index.ts","project1/file2.ts"]
@@ -1186,7 +1186,7 @@ project1/index.ts
   Root file specified for compilation
 project1/file2.ts
   Root file specified for compilation
-[12:02:42 AM] Found 1 error. Watching for file changes.
+[12:02:28 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/libraryResolution/without-config.js b/tests/baselines/reference/tscWatch/libraryResolution/without-config.js
index dfd9070afc35d..92bdd8475f521 100644
--- a/tests/baselines/reference/tscWatch/libraryResolution/without-config.js
+++ b/tests/baselines/reference/tscWatch/libraryResolution/without-config.js
@@ -452,7 +452,7 @@ project1/index.ts
   Root file specified for compilation
 project1/file2.ts
   Root file specified for compilation
-[12:01:35 AM] Found 0 errors. Watching for file changes.
+[12:01:32 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -567,7 +567,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:01:38 AM] File change detected. Starting incremental compilation...
+[12:01:34 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["project1/core.d.ts","project1/utils.d.ts","project1/file.ts","project1/index.ts","project1/file2.ts"]
@@ -595,7 +595,7 @@ project1/index.ts
   Root file specified for compilation
 project1/file2.ts
   Root file specified for compilation
-[12:01:42 AM] Found 0 errors. Watching for file changes.
+[12:01:37 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -666,7 +666,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:01:45 AM] File change detected. Starting incremental compilation...
+[12:01:40 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["project1/core.d.ts","project1/utils.d.ts","project1/file.ts","project1/index.ts","project1/file2.ts"]
@@ -698,7 +698,7 @@ project1/index.ts
   Root file specified for compilation
 project1/file2.ts
   Root file specified for compilation
-[12:01:46 AM] Found 1 error. Watching for file changes.
+[12:01:41 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -795,7 +795,7 @@ Before running Timeout callback:: count: 2
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:01:48 AM] File change detected. Starting incremental compilation...
+[12:01:43 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["project1/core.d.ts","project1/utils.d.ts","project1/file.ts","project1/index.ts","project1/file2.ts"]
@@ -856,7 +856,7 @@ project1/index.ts
   Root file specified for compilation
 project1/file2.ts
   Root file specified for compilation
-[12:01:58 AM] Found 1 error. Watching for file changes.
+[12:01:50 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -978,7 +978,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:02:03 AM] File change detected. Starting incremental compilation...
+[12:01:55 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["project1/core.d.ts","project1/utils.d.ts","project1/file.ts","project1/index.ts","project1/file2.ts"]
@@ -1022,7 +1022,7 @@ project1/index.ts
   Root file specified for compilation
 project1/file2.ts
   Root file specified for compilation
-[12:02:13 AM] Found 1 error. Watching for file changes.
+[12:02:02 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -1129,7 +1129,7 @@ Before running Timeout callback:: count: 2
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:02:16 AM] File change detected. Starting incremental compilation...
+[12:02:05 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["project1/core.d.ts","project1/utils.d.ts","project1/file.ts","project1/index.ts","project1/file2.ts"]
@@ -1190,7 +1190,7 @@ project1/index.ts
   Root file specified for compilation
 project1/file2.ts
   Root file specified for compilation
-[12:02:26 AM] Found 1 error. Watching for file changes.
+[12:02:12 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/moduleResolution/alternateResult.js b/tests/baselines/reference/tscWatch/moduleResolution/alternateResult.js
index 0ae3f12b5db49..ea460b1996070 100644
--- a/tests/baselines/reference/tscWatch/moduleResolution/alternateResult.js
+++ b/tests/baselines/reference/tscWatch/moduleResolution/alternateResult.js
@@ -1169,7 +1169,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:01:40 AM] File change detected. Starting incremental compilation...
+[12:01:39 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/home/src/projects/project/index.mts"]
@@ -1220,7 +1220,7 @@ File '/a/package.json' does not exist according to earlier cached lookups.
 File '/package.json' does not exist according to earlier cached lookups.
 error TS5110: Option 'module' must be set to 'Node16' when option 'moduleResolution' is set to 'Node16'.
 
-[12:01:47 AM] Found 1 error. Watching for file changes.
+[12:01:44 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -1432,7 +1432,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:01:55 AM] File change detected. Starting incremental compilation...
+[12:01:50 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/home/src/projects/project/index.mts"]
@@ -1477,7 +1477,7 @@ DirectoryWatcher:: Close:: WatchInfo: /home/src/projects/node_modules 1 undefine
 Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /home/src/projects/node_modules 1 undefined Failed Lookup Locations
 error TS5110: Option 'module' must be set to 'Node16' when option 'moduleResolution' is set to 'Node16'.
 
-[12:02:02 AM] Found 1 error. Watching for file changes.
+[12:01:55 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -1701,7 +1701,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:02:09 AM] File change detected. Starting incremental compilation...
+[12:02:00 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/home/src/projects/project/index.mts"]
@@ -1797,7 +1797,7 @@ DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/node_modules 1 undefine
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/node_modules 1 undefined Failed Lookup Locations
 error TS5110: Option 'module' must be set to 'Node16' when option 'moduleResolution' is set to 'Node16'.
 
-[12:02:16 AM] Found 1 error. Watching for file changes.
+[12:02:05 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -2011,7 +2011,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:02:24 AM] File change detected. Starting incremental compilation...
+[12:02:11 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/home/src/projects/project/index.mts"]
@@ -2081,7 +2081,7 @@ File '/package.json' does not exist according to earlier cached lookups.
 FileWatcher:: Close:: WatchInfo: /home/src/projects/project/node_modules/foo2/index.d.ts 250 undefined Source file
 error TS5110: Option 'module' must be set to 'Node16' when option 'moduleResolution' is set to 'Node16'.
 
-[12:02:31 AM] Found 1 error. Watching for file changes.
+[12:02:16 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -2267,7 +2267,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:02:36 AM] File change detected. Starting incremental compilation...
+[12:02:20 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/home/src/projects/project/index.mts"]
@@ -2369,7 +2369,7 @@ File '/a/package.json' does not exist according to earlier cached lookups.
 File '/package.json' does not exist according to earlier cached lookups.
 error TS5110: Option 'module' must be set to 'Node16' when option 'moduleResolution' is set to 'Node16'.
 
-[12:02:37 AM] Found 1 error. Watching for file changes.
+[12:02:21 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -2433,7 +2433,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:02:40 AM] File change detected. Starting incremental compilation...
+[12:02:24 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/home/src/projects/project/index.mts"]
@@ -2514,7 +2514,7 @@ File '/a/package.json' does not exist according to earlier cached lookups.
 File '/package.json' does not exist according to earlier cached lookups.
 error TS5110: Option 'module' must be set to 'Node16' when option 'moduleResolution' is set to 'Node16'.
 
-[12:02:41 AM] Found 1 error. Watching for file changes.
+[12:02:25 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -2580,7 +2580,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:02:44 AM] File change detected. Starting incremental compilation...
+[12:02:28 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/home/src/projects/project/index.mts"]
@@ -2669,7 +2669,7 @@ File '/a/package.json' does not exist according to earlier cached lookups.
 File '/package.json' does not exist according to earlier cached lookups.
 error TS5110: Option 'module' must be set to 'Node16' when option 'moduleResolution' is set to 'Node16'.
 
-[12:02:45 AM] Found 1 error. Watching for file changes.
+[12:02:29 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -2735,7 +2735,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:02:49 AM] File change detected. Starting incremental compilation...
+[12:02:33 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/home/src/projects/project/index.mts"]
@@ -2803,7 +2803,7 @@ File '/a/package.json' does not exist according to earlier cached lookups.
 File '/package.json' does not exist according to earlier cached lookups.
 error TS5110: Option 'module' must be set to 'Node16' when option 'moduleResolution' is set to 'Node16'.
 
-[12:02:50 AM] Found 1 error. Watching for file changes.
+[12:02:34 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/moduleResolution/diagnostics-from-cache.js b/tests/baselines/reference/tscWatch/moduleResolution/diagnostics-from-cache.js
index 2cb6b0ebed40e..c87dc4fb61cad 100644
--- a/tests/baselines/reference/tscWatch/moduleResolution/diagnostics-from-cache.js
+++ b/tests/baselines/reference/tscWatch/moduleResolution/diagnostics-from-cache.js
@@ -170,7 +170,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:43 AM] File change detected. Starting incremental compilation...
+[12:00:42 AM] File change detected. Starting incremental compilation...
 
 File '/a/lib/package.json' does not exist according to earlier cached lookups.
 File '/a/package.json' does not exist according to earlier cached lookups.
@@ -194,7 +194,7 @@ File '/package.json' does not exist according to earlier cached lookups.
 
 error TS5110: Option 'module' must be set to 'NodeNext' when option 'moduleResolution' is set to 'NodeNext'.
 
-[12:00:50 AM] Found 2 errors. Watching for file changes.
+[12:00:47 AM] Found 2 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/moduleResolution/module-resolutions-from-file-are-partially-used.js b/tests/baselines/reference/tscWatch/moduleResolution/module-resolutions-from-file-are-partially-used.js
index 255d5b70ba11e..100cf3d74c8c8 100644
--- a/tests/baselines/reference/tscWatch/moduleResolution/module-resolutions-from-file-are-partially-used.js
+++ b/tests/baselines/reference/tscWatch/moduleResolution/module-resolutions-from-file-are-partially-used.js
@@ -250,7 +250,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:47 AM] File change detected. Starting incremental compilation...
+[12:00:46 AM] File change detected. Starting incremental compilation...
 
 File '/a/lib/package.json' does not exist according to earlier cached lookups.
 File '/a/package.json' does not exist according to earlier cached lookups.
@@ -307,7 +307,7 @@ File '/a/package.json' does not exist according to earlier cached lookups.
 File '/package.json' does not exist according to earlier cached lookups.
 error TS5110: Option 'module' must be set to 'Node16' when option 'moduleResolution' is set to 'Node16'.
 
-[12:00:54 AM] Found 1 error. Watching for file changes.
+[12:00:51 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/moduleResolution/module-resolutions-from-files-with-partially-used-import-attributes.js b/tests/baselines/reference/tscWatch/moduleResolution/module-resolutions-from-files-with-partially-used-import-attributes.js
index 3089ff9dd4aca..e1998d13cce6e 100644
--- a/tests/baselines/reference/tscWatch/moduleResolution/module-resolutions-from-files-with-partially-used-import-attributes.js
+++ b/tests/baselines/reference/tscWatch/moduleResolution/module-resolutions-from-files-with-partially-used-import-attributes.js
@@ -250,7 +250,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:47 AM] File change detected. Starting incremental compilation...
+[12:00:46 AM] File change detected. Starting incremental compilation...
 
 File '/a/lib/package.json' does not exist according to earlier cached lookups.
 File '/a/package.json' does not exist according to earlier cached lookups.
@@ -307,7 +307,7 @@ File '/a/package.json' does not exist according to earlier cached lookups.
 File '/package.json' does not exist according to earlier cached lookups.
 error TS5110: Option 'module' must be set to 'Node16' when option 'moduleResolution' is set to 'Node16'.
 
-[12:00:54 AM] Found 1 error. Watching for file changes.
+[12:00:51 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/moduleResolution/package-json-file-is-edited-when-package-json-with-type-module-exists.js b/tests/baselines/reference/tscWatch/moduleResolution/package-json-file-is-edited-when-package-json-with-type-module-exists.js
index f8f64dc2a8384..d724b594821bb 100644
--- a/tests/baselines/reference/tscWatch/moduleResolution/package-json-file-is-edited-when-package-json-with-type-module-exists.js
+++ b/tests/baselines/reference/tscWatch/moduleResolution/package-json-file-is-edited-when-package-json-with-type-module-exists.js
@@ -191,7 +191,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:00:41 AM] File change detected. Starting incremental compilation...
+[12:00:40 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/src/fileA.ts"]
@@ -233,7 +233,7 @@ File '/package.json' does not exist according to earlier cached lookups.
 src/fileA.ts
   Matched by default include pattern '**/*'
   File is CommonJS module because 'package.json' does not have field "type"
-[12:00:45 AM] Found 1 error. Watching for file changes.
+[12:00:43 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -339,7 +339,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:00:50 AM] File change detected. Starting incremental compilation...
+[12:00:47 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/src/fileA.ts"]
@@ -376,7 +376,7 @@ Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/mypr
 src/fileA.ts
   Matched by default include pattern '**/*'
   File is ECMAScript module because 'package.json' has field "type" with value "module"
-[12:00:54 AM] Found 1 error. Watching for file changes.
+[12:00:50 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -476,7 +476,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:00:56 AM] File change detected. Starting incremental compilation...
+[12:00:52 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/src/fileA.ts"]
@@ -527,7 +527,7 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/package.json 2000 undef
 src/fileA.ts
   Matched by default include pattern '**/*'
   File is CommonJS module because 'package.json' was not found
-[12:01:00 AM] Found 1 error. Watching for file changes.
+[12:00:55 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -634,7 +634,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:01:04 AM] File change detected. Starting incremental compilation...
+[12:00:59 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/src/fileA.ts"]
@@ -661,7 +661,7 @@ FileWatcher:: Close:: WatchInfo: /user/username/projects/package.json 2000 undef
 src/fileA.ts
   Matched by default include pattern '**/*'
   File is CommonJS module because 'package.json' does not have field "type"
-[12:01:05 AM] Found 1 error. Watching for file changes.
+[12:01:00 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -756,7 +756,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:01:07 AM] File change detected. Starting incremental compilation...
+[12:01:02 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/src/fileA.ts"]
@@ -791,7 +791,7 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/package.json 2000 undef
 src/fileA.ts
   Matched by default include pattern '**/*'
   File is CommonJS module because 'package.json' was not found
-[12:01:08 AM] Found 1 error. Watching for file changes.
+[12:01:03 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/moduleResolution/package-json-file-is-edited.js b/tests/baselines/reference/tscWatch/moduleResolution/package-json-file-is-edited.js
index 0313b55f99cbf..2f83dff2a2ac8 100644
--- a/tests/baselines/reference/tscWatch/moduleResolution/package-json-file-is-edited.js
+++ b/tests/baselines/reference/tscWatch/moduleResolution/package-json-file-is-edited.js
@@ -202,7 +202,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:00:41 AM] File change detected. Starting incremental compilation...
+[12:00:40 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/src/fileA.ts"]
@@ -239,7 +239,7 @@ Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/mypr
 src/fileA.ts
   Matched by default include pattern '**/*'
   File is ECMAScript module because 'package.json' has field "type" with value "module"
-[12:00:45 AM] Found 1 error. Watching for file changes.
+[12:00:43 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -344,7 +344,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:00:50 AM] File change detected. Starting incremental compilation...
+[12:00:47 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/src/fileA.ts"]
@@ -386,7 +386,7 @@ File '/package.json' does not exist according to earlier cached lookups.
 src/fileA.ts
   Matched by default include pattern '**/*'
   File is CommonJS module because 'package.json' does not have field "type"
-[12:00:54 AM] Found 1 error. Watching for file changes.
+[12:00:50 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -486,7 +486,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:00:56 AM] File change detected. Starting incremental compilation...
+[12:00:52 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/src/fileA.ts"]
@@ -521,7 +521,7 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/package.json 2000 undef
 src/fileA.ts
   Matched by default include pattern '**/*'
   File is CommonJS module because 'package.json' was not found
-[12:00:57 AM] Found 1 error. Watching for file changes.
+[12:00:53 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -620,7 +620,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:01:01 AM] File change detected. Starting incremental compilation...
+[12:00:57 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/src/fileA.ts"]
@@ -658,7 +658,7 @@ FileWatcher:: Close:: WatchInfo: /user/username/projects/package.json 2000 undef
 src/fileA.ts
   Matched by default include pattern '**/*'
   File is ECMAScript module because 'package.json' has field "type" with value "module"
-[12:01:05 AM] Found 1 error. Watching for file changes.
+[12:01:00 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -760,7 +760,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:01:07 AM] File change detected. Starting incremental compilation...
+[12:01:02 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/src/fileA.ts"]
@@ -811,7 +811,7 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/package.json 2000 undef
 src/fileA.ts
   Matched by default include pattern '**/*'
   File is CommonJS module because 'package.json' was not found
-[12:01:11 AM] Found 1 error. Watching for file changes.
+[12:01:05 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/moduleResolution/type-reference-resolutions-reuse.js b/tests/baselines/reference/tscWatch/moduleResolution/type-reference-resolutions-reuse.js
index a2a7789a8c593..b155d82fc3dbe 100644
--- a/tests/baselines/reference/tscWatch/moduleResolution/type-reference-resolutions-reuse.js
+++ b/tests/baselines/reference/tscWatch/moduleResolution/type-reference-resolutions-reuse.js
@@ -259,7 +259,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:53 AM] File change detected. Starting incremental compilation...
+[12:00:52 AM] File change detected. Starting incremental compilation...
 
 File '/a/lib/package.json' does not exist according to earlier cached lookups.
 File '/a/package.json' does not exist according to earlier cached lookups.
@@ -328,7 +328,7 @@ File '/a/package.json' does not exist according to earlier cached lookups.
 File '/package.json' does not exist according to earlier cached lookups.
 error TS5110: Option 'module' must be set to 'Node16' when option 'moduleResolution' is set to 'Node16'.
 
-[12:00:57 AM] Found 1 error. Watching for file changes.
+[12:00:55 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/moduleResolution/watches-for-changes-to-package-json-main-fields.js b/tests/baselines/reference/tscWatch/moduleResolution/watches-for-changes-to-package-json-main-fields.js
index 055a34b24ed61..66e9d7e528731 100644
--- a/tests/baselines/reference/tscWatch/moduleResolution/watches-for-changes-to-package-json-main-fields.js
+++ b/tests/baselines/reference/tscWatch/moduleResolution/watches-for-changes-to-package-json-main-fields.js
@@ -189,7 +189,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:53 AM] File change detected. Starting incremental compilation...
+[12:00:52 AM] File change detected. Starting incremental compilation...
 
 ======== Resolving module 'pkg2' from '/user/username/projects/myproject/packages/pkg1/index.ts'. ========
 Module resolution kind is not specified, using 'Node10'.
@@ -216,7 +216,7 @@ Resolving real path for '/user/username/projects/myproject/node_modules/pkg2/bui
 1 import type { TheNum } from 'pkg2'
                 ~~~~~~
 
-[12:00:57 AM] Found 1 error. Watching for file changes.
+[12:00:55 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -319,7 +319,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:02 AM] File change detected. Starting incremental compilation...
+[12:00:59 AM] File change detected. Starting incremental compilation...
 
 ======== Resolving module 'pkg2' from '/user/username/projects/myproject/packages/pkg1/index.ts'. ========
 Module resolution kind is not specified, using 'Node10'.
@@ -349,7 +349,7 @@ File '/user/username/projects/myproject/packages/pkg2/build/const.ts' does not e
 File '/user/username/projects/myproject/packages/pkg2/build/const.tsx' does not exist.
 File '/user/username/projects/myproject/packages/pkg2/build/const.d.ts' exists - use it as a name resolution result.
 ======== Module name './const.js' was successfully resolved to '/user/username/projects/myproject/packages/pkg2/build/const.d.ts'. ========
-[12:01:06 AM] Found 0 errors. Watching for file changes.
+[12:01:02 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/nodenext watch emit/esm-mode-file-is-edited.js b/tests/baselines/reference/tscWatch/nodenext watch emit/esm-mode-file-is-edited.js
index dd9da818379a8..10d2b1d0a7007 100644
--- a/tests/baselines/reference/tscWatch/nodenext watch emit/esm-mode-file-is-edited.js	
+++ b/tests/baselines/reference/tscWatch/nodenext watch emit/esm-mode-file-is-edited.js	
@@ -120,9 +120,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:30 AM] File change detected. Starting incremental compilation...
+[12:00:29 AM] File change detected. Starting incremental compilation...
 
-[12:00:34 AM] Found 0 errors. Watching for file changes.
+[12:00:32 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/Options-Diagnostic-locations-reported-correctly-with-changes-in-configFile-contents-when-options-change.js b/tests/baselines/reference/tscWatch/programUpdates/Options-Diagnostic-locations-reported-correctly-with-changes-in-configFile-contents-when-options-change.js
index 1b490b69be59f..3c99d905575e8 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/Options-Diagnostic-locations-reported-correctly-with-changes-in-configFile-contents-when-options-change.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/Options-Diagnostic-locations-reported-correctly-with-changes-in-configFile-contents-when-options-change.js
@@ -114,7 +114,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:22 AM] File change detected. Starting incremental compilation...
+[12:00:21 AM] File change detected. Starting incremental compilation...
 
 a/b/tsconfig.json:4:9 - error TS5053: Option 'mapRoot' cannot be specified with option 'inlineSourceMap'.
 
@@ -131,7 +131,7 @@ Output::
 5         "mapRoot": "./"
           ~~~~~~~~~
 
-[12:00:23 AM] Found 3 errors. Watching for file changes.
+[12:00:22 AM] Found 3 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/Reports-errors-when-the-config-file-changes.js b/tests/baselines/reference/tscWatch/programUpdates/Reports-errors-when-the-config-file-changes.js
index 3bc51736d9455..377b6e756d7d6 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/Reports-errors-when-the-config-file-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/Reports-errors-when-the-config-file-changes.js
@@ -89,14 +89,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:22 AM] File change detected. Starting incremental compilation...
+[12:00:21 AM] File change detected. Starting incremental compilation...
 
 a/b/tsconfig.json:3:29 - error TS5023: Unknown compiler option 'haha'.
 
 3                             "haha": 123
                               ~~~~~~
 
-[12:00:23 AM] Found 1 error. Watching for file changes.
+[12:00:22 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -140,9 +140,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:27 AM] File change detected. Starting incremental compilation...
+[12:00:25 AM] File change detected. Starting incremental compilation...
 
-[12:00:28 AM] Found 0 errors. Watching for file changes.
+[12:00:26 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/Updates-diagnostics-when-'--allowArbitraryExtensions'-changes.js b/tests/baselines/reference/tscWatch/programUpdates/Updates-diagnostics-when-'--allowArbitraryExtensions'-changes.js
index 631e8dcf104eb..956642aa14588 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/Updates-diagnostics-when-'--allowArbitraryExtensions'-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/Updates-diagnostics-when-'--allowArbitraryExtensions'-changes.js
@@ -110,14 +110,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:21 AM] File change detected. Starting incremental compilation...
+[12:00:20 AM] File change detected. Starting incremental compilation...
 
 a.ts:1:16 - error TS6263: Module './b.css' was resolved to '/b.d.css.ts', but '--allowArbitraryExtensions' is not set.
 
 1 import {} from './b.css'
                  ~~~~~~~~~
 
-[12:00:25 AM] Found 1 error. Watching for file changes.
+[12:00:23 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -181,14 +181,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:28 AM] File change detected. Starting incremental compilation...
+[12:00:25 AM] File change detected. Starting incremental compilation...
 
 a.ts:1:16 - error TS2306: File '/b.d.css.ts' is not a module.
 
 1 import {} from './b.css'
                  ~~~~~~~~~
 
-[12:00:32 AM] Found 1 error. Watching for file changes.
+[12:00:28 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/Updates-diagnostics-when-'--noUnusedLabels'-changes.js b/tests/baselines/reference/tscWatch/programUpdates/Updates-diagnostics-when-'--noUnusedLabels'-changes.js
index 72bcc2a77f043..49bc4c0ce29cb 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/Updates-diagnostics-when-'--noUnusedLabels'-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/Updates-diagnostics-when-'--noUnusedLabels'-changes.js
@@ -95,14 +95,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:19 AM] File change detected. Starting incremental compilation...
+[12:00:18 AM] File change detected. Starting incremental compilation...
 
 a.ts:1:1 - error TS7028: Unused label.
 
 1 label: while (1) {}
   ~~~~~
 
-[12:00:20 AM] Found 1 error. Watching for file changes.
+[12:00:19 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -151,9 +151,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:23 AM] File change detected. Starting incremental compilation...
+[12:00:21 AM] File change detected. Starting incremental compilation...
 
-[12:00:24 AM] Found 0 errors. Watching for file changes.
+[12:00:22 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/add-new-files-to-a-configured-program-without-file-list.js b/tests/baselines/reference/tscWatch/programUpdates/add-new-files-to-a-configured-program-without-file-list.js
index 1f8c206429b75..d28ccad40c653 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/add-new-files-to-a-configured-program-without-file-list.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/add-new-files-to-a-configured-program-without-file-list.js
@@ -87,7 +87,7 @@ Output::
 >> Screen clear
 [12:00:21 AM] File change detected. Starting incremental compilation...
 
-[12:00:27 AM] Found 0 errors. Watching for file changes.
+[12:00:26 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/add-the-missing-module-file-for-inferred-project-should-remove-the-module-not-found-error.js b/tests/baselines/reference/tscWatch/programUpdates/add-the-missing-module-file-for-inferred-project-should-remove-the-module-not-found-error.js
index da628bc41f0d5..f0060a115ca99 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/add-the-missing-module-file-for-inferred-project-should-remove-the-module-not-found-error.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/add-the-missing-module-file-for-inferred-project-should-remove-the-module-not-found-error.js
@@ -96,7 +96,7 @@ Output::
 >> Screen clear
 [12:00:25 AM] File change detected. Starting incremental compilation...
 
-[12:00:31 AM] Found 0 errors. Watching for file changes.
+[12:00:30 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-in-list-of-files).js b/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-in-list-of-files).js
index 8aff2f6bc5760..43911ae4f7819 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-in-list-of-files).js
+++ b/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-in-list-of-files).js
@@ -95,9 +95,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:24 AM] File change detected. Starting incremental compilation...
+[12:00:23 AM] File change detected. Starting incremental compilation...
 
-[12:00:30 AM] Found 0 errors. Watching for file changes.
+[12:00:28 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-on-disk).js b/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-on-disk).js
index c56e1a27cdde6..a81f214caa325 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-on-disk).js
+++ b/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-on-disk).js
@@ -87,7 +87,7 @@ Output::
 >> Screen clear
 [12:00:21 AM] File change detected. Starting incremental compilation...
 
-[12:00:27 AM] Found 0 errors. Watching for file changes.
+[12:00:26 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/can-update-configured-project-when-set-of-root-files-was-not-changed.js b/tests/baselines/reference/tscWatch/programUpdates/can-update-configured-project-when-set-of-root-files-was-not-changed.js
index b8ed5a441a127..ea275f8c3a2d4 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/can-update-configured-project-when-set-of-root-files-was-not-changed.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/can-update-configured-project-when-set-of-root-files-was-not-changed.js
@@ -108,9 +108,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:26 AM] File change detected. Starting incremental compilation...
+[12:00:25 AM] File change detected. Starting incremental compilation...
 
-[12:00:29 AM] Found 0 errors. Watching for file changes.
+[12:00:28 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/change-module-to-none.js b/tests/baselines/reference/tscWatch/programUpdates/change-module-to-none.js
index a1987c6771001..09b7e8a5d9080 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/change-module-to-none.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/change-module-to-none.js
@@ -91,14 +91,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:22 AM] File change detected. Starting incremental compilation...
+[12:00:21 AM] File change detected. Starting incremental compilation...
 
 a/b/f1.ts:1:1 - error TS1148: Cannot use imports, exports, or module augmentations when '--module' is 'none'.
 
 1 export {}
   ~~~~~~~~~
 
-[12:00:26 AM] Found 1 error. Watching for file changes.
+[12:00:24 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/changes-in-files-are-reflected-in-project-structure.js b/tests/baselines/reference/tscWatch/programUpdates/changes-in-files-are-reflected-in-project-structure.js
index 7fa21db9eb0b6..648283e831cbe 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/changes-in-files-are-reflected-in-project-structure.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/changes-in-files-are-reflected-in-project-structure.js
@@ -115,7 +115,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:27 AM] File change detected. Starting incremental compilation...
+[12:00:26 AM] File change detected. Starting incremental compilation...
 
 a/lib/lib.d.ts
   Default library for target 'es5'
@@ -125,7 +125,7 @@ a/b/f2.ts
   Imported via "./f2" from file 'a/b/f1.ts'
 a/b/f1.ts
   Root file specified for compilation
-[12:00:36 AM] Found 0 errors. Watching for file changes.
+[12:00:33 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/correctly-handles-changes-in-lib-section-of-config-file.js b/tests/baselines/reference/tscWatch/programUpdates/correctly-handles-changes-in-lib-section-of-config-file.js
index 3d87d4e966220..ff737af519061 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/correctly-handles-changes-in-lib-section-of-config-file.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/correctly-handles-changes-in-lib-section-of-config-file.js
@@ -122,9 +122,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:22 AM] File change detected. Starting incremental compilation...
+[12:00:21 AM] File change detected. Starting incremental compilation...
 
-[12:00:26 AM] Found 0 errors. Watching for file changes.
+[12:00:24 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/correctly-parses-wild-card-directories-from-implicit-glob-when-two-keys-differ-only-in-directory-seperator.js b/tests/baselines/reference/tscWatch/programUpdates/correctly-parses-wild-card-directories-from-implicit-glob-when-two-keys-differ-only-in-directory-seperator.js
index 161d0e8f134f9..2ba8ad7066a22 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/correctly-parses-wild-card-directories-from-implicit-glob-when-two-keys-differ-only-in-directory-seperator.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/correctly-parses-wild-card-directories-from-implicit-glob-when-two-keys-differ-only-in-directory-seperator.js
@@ -224,7 +224,7 @@ Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myprojec
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/new-file.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Project: /user/username/projects/myproject/tsconfig.json Detected output file: /user/username/projects/myproject/new-file.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/new-file.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
-[12:00:47 AM] Found 0 errors. Watching for file changes.
+[12:00:46 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -388,12 +388,12 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:00:53 AM] File change detected. Starting incremental compilation...
+[12:00:50 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/f1.ts","/user/username/projects/myproject/f2.ts","/user/username/projects/myproject/new-file.ts"]
   options: {"composite":true,"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
-[12:01:00 AM] Found 0 errors. Watching for file changes.
+[12:00:55 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure-2.js b/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure-2.js
index ac551a6f77472..625f8b8f5cb38 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure-2.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure-2.js
@@ -140,7 +140,7 @@ Output::
 1 export * from "./f2"
                 ~~~~~~
 
-[12:00:32 AM] Found 1 error. Watching for file changes.
+[12:00:31 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure.js b/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure.js
index 8429625de17e4..43aeb7b1003ca 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure.js
@@ -139,7 +139,7 @@ Output::
 1 export * from "./f2"
                 ~~~~~~
 
-[12:00:32 AM] Found 1 error. Watching for file changes.
+[12:00:31 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/extended-source-files-are-watched.js b/tests/baselines/reference/tscWatch/programUpdates/extended-source-files-are-watched.js
index 56105ed340860..ed95b18706d47 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/extended-source-files-are-watched.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/extended-source-files-are-watched.js
@@ -119,9 +119,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:29 AM] File change detected. Starting incremental compilation...
+[12:00:28 AM] File change detected. Starting incremental compilation...
 
-[12:00:36 AM] Found 0 errors. Watching for file changes.
+[12:00:33 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -196,9 +196,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:39 AM] File change detected. Starting incremental compilation...
+[12:00:35 AM] File change detected. Starting incremental compilation...
 
-[12:00:46 AM] Found 0 errors. Watching for file changes.
+[12:00:40 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -258,9 +258,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:49 AM] File change detected. Starting incremental compilation...
+[12:00:42 AM] File change detected. Starting incremental compilation...
 
-[12:00:50 AM] Found 0 errors. Watching for file changes.
+[12:00:43 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -314,9 +314,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:54 AM] File change detected. Starting incremental compilation...
+[12:00:46 AM] File change detected. Starting incremental compilation...
 
-[12:00:55 AM] Found 0 errors. Watching for file changes.
+[12:00:47 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/file-in-files-is-deleted.js b/tests/baselines/reference/tscWatch/programUpdates/file-in-files-is-deleted.js
index 94b8f4bc5091f..658fe2a13975a 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/file-in-files-is-deleted.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/file-in-files-is-deleted.js
@@ -109,7 +109,7 @@ Output::
           ~~~~~~~
     File is matched by 'files' list specified here.
 
-[12:00:28 AM] Found 1 error. Watching for file changes.
+[12:00:27 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/handle-recreated-files-correctly.js b/tests/baselines/reference/tscWatch/programUpdates/handle-recreated-files-correctly.js
index 7084393e83f43..01dd0711f6ec8 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/handle-recreated-files-correctly.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/handle-recreated-files-correctly.js
@@ -105,7 +105,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:25 AM] File change detected. Starting incremental compilation...
+[12:00:24 AM] File change detected. Starting incremental compilation...
 
 a/lib/lib.d.ts
   Default library for target 'es5'
@@ -113,7 +113,7 @@ a/b/commonFile1.ts
   Matched by default include pattern '**/*'
 a/b/commonFile2.ts
   Matched by default include pattern '**/*'
-[12:00:32 AM] Found 0 errors. Watching for file changes.
+[12:00:29 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -166,13 +166,13 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:34 AM] File change detected. Starting incremental compilation...
+[12:00:31 AM] File change detected. Starting incremental compilation...
 
 a/lib/lib.d.ts
   Default library for target 'es5'
 a/b/commonFile1.ts
   Matched by default include pattern '**/*'
-[12:00:38 AM] Found 0 errors. Watching for file changes.
+[12:00:34 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -233,7 +233,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:41 AM] File change detected. Starting incremental compilation...
+[12:00:37 AM] File change detected. Starting incremental compilation...
 
 a/lib/lib.d.ts
   Default library for target 'es5'
@@ -241,7 +241,7 @@ a/b/commonFile1.ts
   Matched by default include pattern '**/*'
 a/b/commonFile2.ts
   Matched by default include pattern '**/*'
-[12:00:48 AM] Found 0 errors. Watching for file changes.
+[12:00:42 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/handles-the-missing-files---that-were-added-to-program-because-they-were-added-with-tripleSlashRefs.js b/tests/baselines/reference/tscWatch/programUpdates/handles-the-missing-files---that-were-added-to-program-because-they-were-added-with-tripleSlashRefs.js
index db75beba8089d..aba2e0f864343 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/handles-the-missing-files---that-were-added-to-program-because-they-were-added-with-tripleSlashRefs.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/handles-the-missing-files---that-were-added-to-program-because-they-were-added-with-tripleSlashRefs.js
@@ -102,7 +102,7 @@ Output::
 >> Screen clear
 [12:00:19 AM] File change detected. Starting incremental compilation...
 
-[12:00:25 AM] Found 0 errors. Watching for file changes.
+[12:00:24 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-configured-projects.js b/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-configured-projects.js
index 5399017134ab3..915108e1a50e0 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-configured-projects.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-configured-projects.js
@@ -121,7 +121,7 @@ Output::
 1 import * as T from "./moduleFile"; T.bar();
                      ~~~~~~~~~~~~~~
 
-[12:00:39 AM] Found 1 error. Watching for file changes.
+[12:00:38 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -222,9 +222,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:43 AM] File change detected. Starting incremental compilation...
+[12:00:42 AM] File change detected. Starting incremental compilation...
 
-[12:00:49 AM] Found 0 errors. Watching for file changes.
+[12:00:47 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-inferred-projects.js b/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-inferred-projects.js
index 575b00b41e7f4..0bc14a8108ef6 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-inferred-projects.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-inferred-projects.js
@@ -103,7 +103,7 @@ Output::
 1 import * as T from "./moduleFile"; T.bar();
                      ~~~~~~~~~~~~~~
 
-[12:00:35 AM] Found 1 error. Watching for file changes.
+[12:00:34 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -172,9 +172,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:39 AM] File change detected. Starting incremental compilation...
+[12:00:38 AM] File change detected. Starting incremental compilation...
 
-[12:00:45 AM] Found 0 errors. Watching for file changes.
+[12:00:43 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-file-not-in-rootDir.js b/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-file-not-in-rootDir.js
index d283faddfad04..2f667dca93a6c 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-file-not-in-rootDir.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-file-not-in-rootDir.js
@@ -120,14 +120,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:35 AM] File change detected. Starting incremental compilation...
+[12:00:34 AM] File change detected. Starting incremental compilation...
 
 a.ts:3:19 - error TS6059: File '/user/username/projects/b.ts' is not under 'rootDir' '/user/username/projects/myproject'. 'rootDir' is expected to contain all source files.
 
 3 import { x } from "../b";
                     ~~~~~~
 
-[12:00:39 AM] Found 1 error. Watching for file changes.
+[12:00:37 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-isolatedModules.js b/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-isolatedModules.js
index e364de522cef5..594d82aa106a5 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-isolatedModules.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-isolatedModules.js
@@ -115,14 +115,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:32 AM] File change detected. Starting incremental compilation...
+[12:00:31 AM] File change detected. Starting incremental compilation...
 
 b.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const b: string = a;
         ~
 
-[12:00:36 AM] Found 1 error. Watching for file changes.
+[12:00:34 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/with-outFile.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/with-outFile.js
index 95dbc5ff7bab8..2cef5891c8fa6 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/with-outFile.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/with-outFile.js
@@ -125,7 +125,7 @@ Output::
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
 
-[12:00:38 AM] Found 0 errors. Watching for file changes.
+[12:00:37 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-properly-handle-module-resolution-changes-in-config-file.js b/tests/baselines/reference/tscWatch/programUpdates/should-properly-handle-module-resolution-changes-in-config-file.js
index c6a37f4fba646..398c3593749b9 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-properly-handle-module-resolution-changes-in-config-file.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-properly-handle-module-resolution-changes-in-config-file.js
@@ -104,9 +104,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:28 AM] File change detected. Starting incremental compilation...
+[12:00:27 AM] File change detected. Starting incremental compilation...
 
-[12:00:34 AM] Found 0 errors. Watching for file changes.
+[12:00:32 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-reflect-change-in-config-file.js b/tests/baselines/reference/tscWatch/programUpdates/should-reflect-change-in-config-file.js
index 45c5e358d33f0..89c95fb2341b6 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-reflect-change-in-config-file.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-reflect-change-in-config-file.js
@@ -104,7 +104,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:25 AM] File change detected. Starting incremental compilation...
+[12:00:24 AM] File change detected. Starting incremental compilation...
 
 a/lib/lib.d.ts
   Default library for target 'es5'
@@ -112,7 +112,7 @@ a/b/commonFile1.ts
   Part of 'files' list in tsconfig.json
 a/b/commonFile2.ts
   Part of 'files' list in tsconfig.json
-[12:00:32 AM] Found 0 errors. Watching for file changes.
+[12:00:29 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -170,13 +170,13 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:36 AM] File change detected. Starting incremental compilation...
+[12:00:32 AM] File change detected. Starting incremental compilation...
 
 a/lib/lib.d.ts
   Default library for target 'es5'
 a/b/commonFile1.ts
   Part of 'files' list in tsconfig.json
-[12:00:40 AM] Found 0 errors. Watching for file changes.
+[12:00:35 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/shouldnt-report-error-about-unused-function-incorrectly-when-file-changes-from-global-to-module.js b/tests/baselines/reference/tscWatch/programUpdates/shouldnt-report-error-about-unused-function-incorrectly-when-file-changes-from-global-to-module.js
index c1a4765822a61..3db760ae66488 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/shouldnt-report-error-about-unused-function-incorrectly-when-file-changes-from-global-to-module.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/shouldnt-report-error-about-unused-function-incorrectly-when-file-changes-from-global-to-module.js
@@ -90,9 +90,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:20 AM] File change detected. Starting incremental compilation...
+[12:00:19 AM] File change detected. Starting incremental compilation...
 
-[12:00:24 AM] Found 0 errors. Watching for file changes.
+[12:00:22 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/two-watch-programs-are-not-affected-by-each-other.js b/tests/baselines/reference/tscWatch/programUpdates/two-watch-programs-are-not-affected-by-each-other.js
index 2bc0d096d9443..adabb76a83b51 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/two-watch-programs-are-not-affected-by-each-other.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/two-watch-programs-are-not-affected-by-each-other.js
@@ -87,7 +87,7 @@ Output::
 >> Screen clear
 [12:00:27 AM] Starting compilation in watch mode...
 
-[12:00:36 AM] Found 0 errors. Watching for file changes.
+[12:00:34 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-for-decorators.js b/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-for-decorators.js
index a4d3f9bf9a76c..cbbb9f04e2235 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-for-decorators.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-for-decorators.js
@@ -176,7 +176,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:23 AM] File change detected. Starting incremental compilation...
+[12:00:22 AM] File change detected. Starting incremental compilation...
 
 tsconfig.json:4:5 - error TS5101: Option 'importsNotUsedAsValues' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
   Use 'verbatimModuleSyntax' instead.
@@ -184,7 +184,7 @@ Output::
 4     "importsNotUsedAsValues": "error",
       ~~~~~~~~~~~~~~~~~~~~~~~~
 
-[12:00:30 AM] Found 1 error. Watching for file changes.
+[12:00:27 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -255,7 +255,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:33 AM] File change detected. Starting incremental compilation...
+[12:00:29 AM] File change detected. Starting incremental compilation...
 
 tsconfig.json:4:5 - error TS5101: Option 'importsNotUsedAsValues' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
   Use 'verbatimModuleSyntax' instead.
@@ -263,7 +263,7 @@ Output::
 4     "importsNotUsedAsValues": "error",
       ~~~~~~~~~~~~~~~~~~~~~~~~
 
-[12:00:40 AM] Found 1 error. Watching for file changes.
+[12:00:34 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-when-useDefineForClassFields-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-when-useDefineForClassFields-changes.js
index 4391d29d308e0..30db66a5f061c 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-when-useDefineForClassFields-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-when-useDefineForClassFields-changes.js
@@ -109,14 +109,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:20 AM] File change detected. Starting incremental compilation...
+[12:00:19 AM] File change detected. Starting incremental compilation...
 
 a.ts:2:21 - error TS2610: 'prop' is defined as an accessor in class 'C', but is overridden here in 'D' as an instance property.
 
 2 class D extends C { prop = 1; }
                       ~~~~
 
-[12:00:24 AM] Found 1 error. Watching for file changes.
+[12:00:22 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-emit-on-jsx-option-add.js b/tests/baselines/reference/tscWatch/programUpdates/updates-emit-on-jsx-option-add.js
index 112da47ea3ce6..20b155e53c203 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-emit-on-jsx-option-add.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-emit-on-jsx-option-add.js
@@ -98,9 +98,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:28 AM] File change detected. Starting incremental compilation...
+[12:00:27 AM] File change detected. Starting incremental compilation...
 
-[12:00:31 AM] Found 0 errors. Watching for file changes.
+[12:00:30 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-emit-on-jsx-option-change.js b/tests/baselines/reference/tscWatch/programUpdates/updates-emit-on-jsx-option-change.js
index 04dd757bb18aa..1b5eb4294c3b3 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-emit-on-jsx-option-change.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-emit-on-jsx-option-change.js
@@ -96,9 +96,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:28 AM] File change detected. Starting incremental compilation...
+[12:00:27 AM] File change detected. Starting incremental compilation...
 
-[12:00:31 AM] Found 0 errors. Watching for file changes.
+[12:00:30 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-and-emit-when-importsNotUsedAsValues-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-and-emit-when-importsNotUsedAsValues-changes.js
index b8aac3ecf0730..a95eed3bff6a6 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-and-emit-when-importsNotUsedAsValues-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-and-emit-when-importsNotUsedAsValues-changes.js
@@ -122,9 +122,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:32 AM] File change detected. Starting incremental compilation...
+[12:00:31 AM] File change detected. Starting incremental compilation...
 
-[12:00:39 AM] Found 0 errors. Watching for file changes.
+[12:00:36 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -176,7 +176,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:43 AM] File change detected. Starting incremental compilation...
+[12:00:39 AM] File change detected. Starting incremental compilation...
 
 tsconfig.json:3:5 - error TS5101: Option 'importsNotUsedAsValues' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
   Use 'verbatimModuleSyntax' instead.
@@ -184,7 +184,7 @@ Output::
 3     "importsNotUsedAsValues": "error"
       ~~~~~~~~~~~~~~~~~~~~~~~~
 
-[12:00:50 AM] Found 1 error. Watching for file changes.
+[12:00:44 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -241,7 +241,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:54 AM] File change detected. Starting incremental compilation...
+[12:00:47 AM] File change detected. Starting incremental compilation...
 
 tsconfig.json:3:5 - error TS5101: Option 'importsNotUsedAsValues' is deprecated and will stop functioning in TypeScript 5.5. Specify compilerOption '"ignoreDeprecations": "5.0"' to silence this error.
   Use 'verbatimModuleSyntax' instead.
@@ -249,7 +249,7 @@ Output::
 3     "importsNotUsedAsValues": "preserve"
       ~~~~~~~~~~~~~~~~~~~~~~~~
 
-[12:01:01 AM] Found 1 error. Watching for file changes.
+[12:00:52 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-correctly-when-declaration-emit-is-disabled-in-compiler-options.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-correctly-when-declaration-emit-is-disabled-in-compiler-options.js
index 8d5948ef61171..741cf1dc3e091 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-correctly-when-declaration-emit-is-disabled-in-compiler-options.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-correctly-when-declaration-emit-is-disabled-in-compiler-options.js
@@ -111,14 +111,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:28 AM] File change detected. Starting incremental compilation...
+[12:00:27 AM] File change detected. Starting incremental compilation...
 
 a.ts:2:6 - error TS2345: Argument of type 'number' is not assignable to parameter of type 'string'.
 
 2 test(4, 5);
        ~
 
-[12:00:29 AM] Found 1 error. Watching for file changes.
+[12:00:28 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -170,9 +170,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:33 AM] File change detected. Starting incremental compilation...
+[12:00:31 AM] File change detected. Starting incremental compilation...
 
-[12:00:34 AM] Found 0 errors. Watching for file changes.
+[12:00:32 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -224,7 +224,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:38 AM] File change detected. Starting incremental compilation...
+[12:00:35 AM] File change detected. Starting incremental compilation...
 
 a.ts:2:9 - error TS2345: Argument of type 'number' is not assignable to parameter of type 'string'.
 
@@ -236,7 +236,7 @@ Output::
 2     return x + y / 5;
                  ~
 
-[12:00:39 AM] Found 2 errors. Watching for file changes.
+[12:00:36 AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -288,9 +288,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:44 AM] File change detected. Starting incremental compilation...
+[12:00:40 AM] File change detected. Starting incremental compilation...
 
-[12:00:45 AM] Found 0 errors. Watching for file changes.
+[12:00:41 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-module-file-with-global-definitions-changes/with-default-options.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-module-file-with-global-definitions-changes/with-default-options.js
index 8763f49766f69..15c44ef272451 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-module-file-with-global-definitions-changes/with-default-options.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-module-file-with-global-definitions-changes/with-default-options.js
@@ -104,9 +104,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:26 AM] File change detected. Starting incremental compilation...
+[12:00:25 AM] File change detected. Starting incremental compilation...
 
-[12:00:30 AM] Found 0 errors. Watching for file changes.
+[12:00:28 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -155,7 +155,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:34 AM] File change detected. Starting incremental compilation...
+[12:00:31 AM] File change detected. Starting incremental compilation...
 
 ../../../../a/lib/lib.d.ts:13:14 - error TS2687: All declarations of 'fullscreen' must have identical modifiers.
 
@@ -167,7 +167,7 @@ Output::
 4     fullscreen: boolean;
       ~~~~~~~~~~
 
-[12:00:38 AM] Found 2 errors. Watching for file changes.
+[12:00:34 AM] Found 2 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-module-file-with-global-definitions-changes/with-skipDefaultLibCheck.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-module-file-with-global-definitions-changes/with-skipDefaultLibCheck.js
index 81f27897154bc..9f2aca9b60cb0 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-module-file-with-global-definitions-changes/with-skipDefaultLibCheck.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-module-file-with-global-definitions-changes/with-skipDefaultLibCheck.js
@@ -100,9 +100,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:26 AM] File change detected. Starting incremental compilation...
+[12:00:25 AM] File change detected. Starting incremental compilation...
 
-[12:00:30 AM] Found 0 errors. Watching for file changes.
+[12:00:28 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -151,14 +151,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:34 AM] File change detected. Starting incremental compilation...
+[12:00:31 AM] File change detected. Starting incremental compilation...
 
 a.ts:4:5 - error TS2687: All declarations of 'fullscreen' must have identical modifiers.
 
 4     fullscreen: boolean;
       ~~~~~~~~~~
 
-[12:00:38 AM] Found 1 error. Watching for file changes.
+[12:00:34 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-module-file-with-global-definitions-changes/with-skipLibCheck.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-module-file-with-global-definitions-changes/with-skipLibCheck.js
index 6e21d4cbb445a..af7196e2553b1 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-module-file-with-global-definitions-changes/with-skipLibCheck.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-module-file-with-global-definitions-changes/with-skipLibCheck.js
@@ -100,9 +100,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:26 AM] File change detected. Starting incremental compilation...
+[12:00:25 AM] File change detected. Starting incremental compilation...
 
-[12:00:30 AM] Found 0 errors. Watching for file changes.
+[12:00:28 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -151,14 +151,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:34 AM] File change detected. Starting incremental compilation...
+[12:00:31 AM] File change detected. Starting incremental compilation...
 
 a.ts:4:5 - error TS2687: All declarations of 'fullscreen' must have identical modifiers.
 
 4     fullscreen: boolean;
       ~~~~~~~~~~
 
-[12:00:38 AM] Found 1 error. Watching for file changes.
+[12:00:34 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-non-module-file-changes/with-default-options.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-non-module-file-changes/with-default-options.js
index 04eb353857f67..88c4f7e54afae 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-non-module-file-changes/with-default-options.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-non-module-file-changes/with-default-options.js
@@ -97,9 +97,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:26 AM] File change detected. Starting incremental compilation...
+[12:00:25 AM] File change detected. Starting incremental compilation...
 
-[12:00:30 AM] Found 0 errors. Watching for file changes.
+[12:00:28 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -149,7 +149,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:34 AM] File change detected. Starting incremental compilation...
+[12:00:31 AM] File change detected. Starting incremental compilation...
 
 ../../../../a/lib/lib.d.ts:13:14 - error TS2687: All declarations of 'fullscreen' must have identical modifiers.
 
@@ -161,7 +161,7 @@ Output::
 2     fullscreen: boolean;
       ~~~~~~~~~~
 
-[12:00:38 AM] Found 2 errors. Watching for file changes.
+[12:00:34 AM] Found 2 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-non-module-file-changes/with-skipDefaultLibCheck.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-non-module-file-changes/with-skipDefaultLibCheck.js
index 9a9f35874d3ea..5c049cfc5c59d 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-non-module-file-changes/with-skipDefaultLibCheck.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-non-module-file-changes/with-skipDefaultLibCheck.js
@@ -93,9 +93,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:26 AM] File change detected. Starting incremental compilation...
+[12:00:25 AM] File change detected. Starting incremental compilation...
 
-[12:00:30 AM] Found 0 errors. Watching for file changes.
+[12:00:28 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -145,14 +145,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:34 AM] File change detected. Starting incremental compilation...
+[12:00:31 AM] File change detected. Starting incremental compilation...
 
 a.ts:2:5 - error TS2687: All declarations of 'fullscreen' must have identical modifiers.
 
 2     fullscreen: boolean;
       ~~~~~~~~~~
 
-[12:00:38 AM] Found 1 error. Watching for file changes.
+[12:00:34 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-non-module-file-changes/with-skipLibCheck.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-non-module-file-changes/with-skipLibCheck.js
index 00e533f5bc5fb..0a9f5dd392b5e 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-non-module-file-changes/with-skipLibCheck.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-non-module-file-changes/with-skipLibCheck.js
@@ -93,9 +93,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:26 AM] File change detected. Starting incremental compilation...
+[12:00:25 AM] File change detected. Starting incremental compilation...
 
-[12:00:30 AM] Found 0 errors. Watching for file changes.
+[12:00:28 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -145,14 +145,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:34 AM] File change detected. Starting incremental compilation...
+[12:00:31 AM] File change detected. Starting incremental compilation...
 
 a.ts:2:5 - error TS2687: All declarations of 'fullscreen' must have identical modifiers.
 
 2     fullscreen: boolean;
       ~~~~~~~~~~
 
-[12:00:38 AM] Found 1 error. Watching for file changes.
+[12:00:34 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-ambient-modules-of-program-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-ambient-modules-of-program-changes.js
index d3e508fb3d24a..43a4d26d7f627 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-ambient-modules-of-program-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-ambient-modules-of-program-changes.js
@@ -115,7 +115,7 @@ Output::
              ~~~
     'foo' was also declared here.
 
-[12:00:33 AM] Found 2 errors. Watching for file changes.
+[12:00:32 AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -185,9 +185,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:35 AM] File change detected. Starting incremental compilation...
+[12:00:34 AM] File change detected. Starting incremental compilation...
 
-[12:00:39 AM] Found 0 errors. Watching for file changes.
+[12:00:37 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-forceConsistentCasingInFileNames-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-forceConsistentCasingInFileNames-changes.js
index 314142652cbb7..e347c55130911 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-forceConsistentCasingInFileNames-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-forceConsistentCasingInFileNames-changes.js
@@ -116,7 +116,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:24 AM] File change detected. Starting incremental compilation...
+[12:00:23 AM] File change detected. Starting incremental compilation...
 
 b.ts:1:43 - error TS1149: File name '/A.ts' differs from already included file name '/a.ts' only in casing.
   The file is in the program because:
@@ -132,7 +132,7 @@ Output::
                       ~~~~~
     File is included via import here.
 
-[12:00:25 AM] Found 1 error. Watching for file changes.
+[12:00:24 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-noErrorTruncation-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-noErrorTruncation-changes.js
index 7f2d1b5962997..59e25e0cf6565 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-noErrorTruncation-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-noErrorTruncation-changes.js
@@ -110,14 +110,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:28 AM] File change detected. Starting incremental compilation...
+[12:00:27 AM] File change detected. Starting incremental compilation...
 
 a.ts:10:1 - error TS2367: This comparison appears to be unintentional because the types '{ reallyLongPropertyName1: string | number | bigint | boolean | symbol | object; reallyLongPropertyName2: string | number | bigint | boolean | symbol | object; reallyLongPropertyName3: string | number | bigint | boolean | symbol | object; reallyLongPropertyName4: string | number | bigint | boolean | symbol | object; reallyLongPropertyName5: string | number | bigint | boolean | symbol | object; reallyLongPropertyName6: string | number | bigint | boolean | symbol | object; reallyLongPropertyName7: string | number | bigint | boolean | symbol | object; }' and 'string' have no overlap.
 
 10 v === 'foo';
    ~~~~~~~~~~~
 
-[12:00:29 AM] Found 1 error. Watching for file changes.
+[12:00:28 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-strictNullChecks-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-strictNullChecks-changes.js
index 378233eece71e..6f74c4397ea6c 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-strictNullChecks-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-strictNullChecks-changes.js
@@ -97,14 +97,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:28 AM] File change detected. Starting incremental compilation...
+[12:00:27 AM] File change detected. Starting incremental compilation...
 
 a.ts:2:1 - error TS2531: Object is possibly 'null'.
 
 2 foo().hello
   ~~~~~
 
-[12:00:29 AM] Found 1 error. Watching for file changes.
+[12:00:28 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -152,14 +152,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:33 AM] File change detected. Starting incremental compilation...
+[12:00:31 AM] File change detected. Starting incremental compilation...
 
 a.ts:2:1 - error TS2531: Object is possibly 'null'.
 
 2 foo().hello
   ~~~~~
 
-[12:00:34 AM] Found 1 error. Watching for file changes.
+[12:00:32 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -205,9 +205,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:38 AM] File change detected. Starting incremental compilation...
+[12:00:35 AM] File change detected. Starting incremental compilation...
 
-[12:00:39 AM] Found 0 errors. Watching for file changes.
+[12:00:36 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-moduleResolution-when-resolveJsonModule-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-moduleResolution-when-resolveJsonModule-changes.js
index 5c3ff2104166f..960f749f51c3e 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-moduleResolution-when-resolveJsonModule-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-moduleResolution-when-resolveJsonModule-changes.js
@@ -113,9 +113,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:30 AM] File change detected. Starting incremental compilation...
+[12:00:29 AM] File change detected. Starting incremental compilation...
 
-[12:00:34 AM] Found 0 errors. Watching for file changes.
+[12:00:32 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/when-changing-`allowImportingTsExtensions`-of-config-file.js b/tests/baselines/reference/tscWatch/programUpdates/when-changing-`allowImportingTsExtensions`-of-config-file.js
index 5371bd71ae3e1..74aed949b4938 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/when-changing-`allowImportingTsExtensions`-of-config-file.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/when-changing-`allowImportingTsExtensions`-of-config-file.js
@@ -135,12 +135,12 @@ After running Timeout callback:: count: 0
 Output::
 Reloading config file: /user/username/projects/myproject/tsconfig.json
 Synchronizing program
-[12:00:28 AM] File change detected. Starting incremental compilation...
+[12:00:27 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts"]
   options: {"noEmit":true,"allowImportingTsExtensions":true,"watch":true,"project":"/user/username/projects/myproject","extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
-[12:00:29 AM] Found 0 errors. Watching for file changes.
+[12:00:28 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/when-changing-checkJs-of-config-file.js b/tests/baselines/reference/tscWatch/programUpdates/when-changing-checkJs-of-config-file.js
index dd96e248eadea..0fa2ab08fe8b3 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/when-changing-checkJs-of-config-file.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/when-changing-checkJs-of-config-file.js
@@ -135,7 +135,7 @@ After running Timeout callback:: count: 0
 Output::
 Reloading config file: /user/username/projects/myproject/tsconfig.json
 Synchronizing program
-[12:00:30 AM] File change detected. Starting incremental compilation...
+[12:00:29 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/a.js","/user/username/projects/myproject/b.ts"]
@@ -146,7 +146,7 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a.js 250 unde
 1 export const aNumber: number = "string"
                         ~~~~~~
 
-[12:00:34 AM] Found 1 error. Watching for file changes.
+[12:00:32 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/when-new-file-is-added-to-the-referenced-project.js b/tests/baselines/reference/tscWatch/programUpdates/when-new-file-is-added-to-the-referenced-project.js
index d4eccc6dc5da9..8dd1677143c80 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/when-new-file-is-added-to-the-referenced-project.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/when-new-file-is-added-to-the-referenced-project.js
@@ -379,7 +379,7 @@ CreatingProgramWith::
   options: {"module":0,"composite":true,"watch":true,"project":"/user/username/projects/myproject/projects/project2/tsconfig.json","extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/projects/project2/tsconfig.json"}
   projectReferences: [{"path":"/user/username/projects/myproject/projects/project1","originalPath":"../project1"}]
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
-[12:00:56 AM] Found 0 errors. Watching for file changes.
+[12:00:54 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -562,7 +562,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:01:05 AM] File change detected. Starting incremental compilation...
+[12:01:02 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/projects/project2/class2.ts"]
@@ -583,7 +583,7 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
       ~~~~~
     File is output from referenced project specified here.
 
-[12:01:12 AM] Found 1 error. Watching for file changes.
+[12:01:07 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -769,14 +769,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:01:19 AM] File change detected. Starting incremental compilation...
+[12:01:13 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/projects/project2/class2.ts"]
   options: {"module":0,"composite":true,"watch":true,"project":"/user/username/projects/myproject/projects/project2/tsconfig.json","extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/projects/project2/tsconfig.json"}
   projectReferences: [{"path":"/user/username/projects/myproject/projects/project1","originalPath":"../project1"}]
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
-[12:01:26 AM] Found 0 errors. Watching for file changes.
+[12:01:18 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/when-skipLibCheck-and-skipDefaultLibCheck-changes.js b/tests/baselines/reference/tscWatch/programUpdates/when-skipLibCheck-and-skipDefaultLibCheck-changes.js
index 0b3e9ee9d5b98..0d22ce6119ea2 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/when-skipLibCheck-and-skipDefaultLibCheck-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/when-skipLibCheck-and-skipDefaultLibCheck-changes.js
@@ -128,14 +128,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:30 AM] File change detected. Starting incremental compilation...
+[12:00:29 AM] File change detected. Starting incremental compilation...
 
 a.ts:2:5 - error TS2687: All declarations of 'fullscreen' must have identical modifiers.
 
 2     fullscreen: boolean;
       ~~~~~~~~~~
 
-[12:00:31 AM] Found 1 error. Watching for file changes.
+[12:00:30 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -188,7 +188,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:35 AM] File change detected. Starting incremental compilation...
+[12:00:33 AM] File change detected. Starting incremental compilation...
 
 a.ts:2:5 - error TS2687: All declarations of 'fullscreen' must have identical modifiers.
 
@@ -200,7 +200,7 @@ Output::
 2     fullscreen: boolean;
       ~~~~~~~~~~
 
-[12:00:36 AM] Found 2 errors. Watching for file changes.
+[12:00:34 AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -249,7 +249,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:40 AM] File change detected. Starting incremental compilation...
+[12:00:37 AM] File change detected. Starting incremental compilation...
 
 ../../../../a/lib/lib.d.ts:13:14 - error TS2687: All declarations of 'fullscreen' must have identical modifiers.
 
@@ -266,7 +266,7 @@ Output::
 2     fullscreen: boolean;
       ~~~~~~~~~~
 
-[12:00:41 AM] Found 3 errors. Watching for file changes.
+[12:00:38 AM] Found 3 errors. Watching for file changes.
 
 
 
@@ -317,7 +317,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:46 AM] File change detected. Starting incremental compilation...
+[12:00:42 AM] File change detected. Starting incremental compilation...
 
 a.ts:2:5 - error TS2687: All declarations of 'fullscreen' must have identical modifiers.
 
@@ -329,7 +329,7 @@ Output::
 2     fullscreen: boolean;
       ~~~~~~~~~~
 
-[12:00:47 AM] Found 2 errors. Watching for file changes.
+[12:00:43 AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -381,14 +381,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:51 AM] File change detected. Starting incremental compilation...
+[12:00:46 AM] File change detected. Starting incremental compilation...
 
 a.ts:2:5 - error TS2687: All declarations of 'fullscreen' must have identical modifiers.
 
 2     fullscreen: boolean;
       ~~~~~~~~~~
 
-[12:00:52 AM] Found 1 error. Watching for file changes.
+[12:00:47 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -437,7 +437,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:56 AM] File change detected. Starting incremental compilation...
+[12:00:50 AM] File change detected. Starting incremental compilation...
 
 ../../../../a/lib/lib.d.ts:13:14 - error TS2687: All declarations of 'fullscreen' must have identical modifiers.
 
@@ -454,7 +454,7 @@ Output::
 2     fullscreen: boolean;
       ~~~~~~~~~~
 
-[12:00:57 AM] Found 3 errors. Watching for file changes.
+[12:00:51 AM] Found 3 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/works-correctly-when-config-file-is-changed-but-its-content-havent.js b/tests/baselines/reference/tscWatch/programUpdates/works-correctly-when-config-file-is-changed-but-its-content-havent.js
index 132a5801ad750..4ba0d958a8405 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/works-correctly-when-config-file-is-changed-but-its-content-havent.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/works-correctly-when-config-file-is-changed-but-its-content-havent.js
@@ -95,9 +95,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:25 AM] File change detected. Starting incremental compilation...
+[12:00:24 AM] File change detected. Starting incremental compilation...
 
-[12:00:26 AM] Found 0 errors. Watching for file changes.
+[12:00:25 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/on-sample-project.js b/tests/baselines/reference/tscWatch/projectsWithReferences/on-sample-project.js
index 1b739fe539133..7f2601ea76811 100644
--- a/tests/baselines/reference/tscWatch/projectsWithReferences/on-sample-project.js
+++ b/tests/baselines/reference/tscWatch/projectsWithReferences/on-sample-project.js
@@ -796,7 +796,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:51 AM] File change detected. Starting incremental compilation...
+[12:01:40 AM] File change detected. Starting incremental compilation...
 
 Reusing resolution of module '../core/anotherModule' from '/user/username/projects/sample1/logic/index.ts' of old program, it was successfully resolved to '/user/username/projects/sample1/core/anotherModule.ts'.
 ../../../../a/lib/lib.d.ts
@@ -813,7 +813,7 @@ logic/index.d.ts
   File is output of project reference source 'logic/index.ts'
 tests/index.ts
   Part of 'files' list in tsconfig.json
-[12:01:58 AM] Found 0 errors. Watching for file changes.
+[12:01:45 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -1100,7 +1100,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:02:20 AM] File change detected. Starting incremental compilation...
+[12:02:02 AM] File change detected. Starting incremental compilation...
 
 Reusing resolution of module '../core/index' from '/user/username/projects/sample1/tests/index.ts' of old program, it was successfully resolved to '/user/username/projects/sample1/core/index.ts'.
 Reusing resolution of module '../logic/index' from '/user/username/projects/sample1/tests/index.ts' of old program, it was successfully resolved to '/user/username/projects/sample1/logic/index.ts'.
@@ -1123,7 +1123,7 @@ logic/decls/index.d.ts
   File is output of project reference source 'logic/index.ts'
 tests/index.ts
   Part of 'files' list in tsconfig.json
-[12:02:27 AM] Found 0 errors. Watching for file changes.
+[12:02:07 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders-with-no-files-clause.js b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders-with-no-files-clause.js
index 5a7f98c04b784..b772a7830d21c 100644
--- a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders-with-no-files-clause.js
+++ b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders-with-no-files-clause.js
@@ -273,7 +273,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c/index.ts'
 c/index.ts
   Matched by default include pattern '**/*'
-[12:01:03 AM] Found 0 errors. Watching for file changes.
+[12:01:02 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -480,7 +480,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:19 AM] File change detected. Starting incremental compilation...
+[12:01:13 AM] File change detected. Starting incremental compilation...
 
 Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveReferences/b/index.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/a/index.ts'.
 ../../../../a/lib/lib.d.ts
@@ -495,7 +495,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c/index.ts'
 c/index.ts
   Matched by default include pattern '**/*'
-[12:01:23 AM] Found 0 errors. Watching for file changes.
+[12:01:16 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -594,7 +594,7 @@ Before running Timeout callback:: count: 2
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:31 AM] File change detected. Starting incremental compilation...
+[12:01:23 AM] File change detected. Starting incremental compilation...
 
 ======== Resolving module '../b' from '/user/username/projects/transitiveReferences/c/index.ts'. ========
 Module resolution kind is not specified, using 'Node10'.
@@ -632,7 +632,7 @@ nrefs/a.d.ts
   Imported via "@ref/a" from file 'c/index.ts'
 c/index.ts
   Matched by default include pattern '**/*'
-[12:01:35 AM] Found 0 errors. Watching for file changes.
+[12:01:26 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -770,7 +770,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:39 AM] File change detected. Starting incremental compilation...
+[12:01:29 AM] File change detected. Starting incremental compilation...
 
 ======== Resolving module '../b' from '/user/username/projects/transitiveReferences/c/index.ts'. ========
 Module resolution kind is not specified, using 'Node10'.
@@ -808,7 +808,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c/index.ts'
 c/index.ts
   Matched by default include pattern '**/*'
-[12:01:43 AM] Found 0 errors. Watching for file changes.
+[12:01:32 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -947,7 +947,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:47 AM] File change detected. Starting incremental compilation...
+[12:01:35 AM] File change detected. Starting incremental compilation...
 
 Reusing resolution of module '../b' from '/user/username/projects/transitiveReferences/c/index.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/b/index.ts'.
 Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveReferences/c/index.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/refs/a.d.ts'.
@@ -966,7 +966,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c/index.ts'
 c/index.ts
   Matched by default include pattern '**/*'
-[12:01:48 AM] Found 0 errors. Watching for file changes.
+[12:01:36 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -1102,7 +1102,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:53 AM] File change detected. Starting incremental compilation...
+[12:01:40 AM] File change detected. Starting incremental compilation...
 
 Reusing resolution of module '../b' from '/user/username/projects/transitiveReferences/c/index.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/b/index.ts'.
 Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveReferences/c/index.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/refs/a.d.ts'.
@@ -1120,7 +1120,7 @@ b/index.d.ts
   File is output of project reference source 'b/index.ts'
 c/index.ts
   Matched by default include pattern '**/*'
-[12:01:54 AM] Found 0 errors. Watching for file changes.
+[12:01:41 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -1234,7 +1234,7 @@ Before running Timeout callback:: count: 2
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:56 AM] File change detected. Starting incremental compilation...
+[12:01:43 AM] File change detected. Starting incremental compilation...
 
 Reusing resolution of module '../b' from '/user/username/projects/transitiveReferences/c/index.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/b/index.ts'.
 Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveReferences/c/index.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/refs/a.d.ts'.
@@ -1267,7 +1267,7 @@ b/index.ts
   Imported via '../b' from file 'c/index.ts'
 c/index.ts
   Matched by default include pattern '**/*'
-[12:02:03 AM] Found 1 error. Watching for file changes.
+[12:01:48 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -1403,7 +1403,7 @@ Before running Timeout callback:: count: 2
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:02:06 AM] File change detected. Starting incremental compilation...
+[12:01:51 AM] File change detected. Starting incremental compilation...
 
 Reusing resolution of module '../b' from '/user/username/projects/transitiveReferences/c/index.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/b/index.ts'.
 Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveReferences/c/index.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/refs/a.d.ts'.
@@ -1423,7 +1423,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c/index.ts'
 c/index.ts
   Matched by default include pattern '**/*'
-[12:02:10 AM] Found 0 errors. Watching for file changes.
+[12:01:54 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -1548,7 +1548,7 @@ Before running Timeout callback:: count: 2
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:02:12 AM] File change detected. Starting incremental compilation...
+[12:01:56 AM] File change detected. Starting incremental compilation...
 
 Reusing resolution of module '../b' from '/user/username/projects/transitiveReferences/c/index.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/b/index.ts'.
 Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveReferences/c/index.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/refs/a.d.ts'.
@@ -1573,7 +1573,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c/index.ts'
 c/index.ts
   Matched by default include pattern '**/*'
-[12:02:16 AM] Found 1 error. Watching for file changes.
+[12:01:59 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -1702,7 +1702,7 @@ Before running Timeout callback:: count: 2
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:02:20 AM] File change detected. Starting incremental compilation...
+[12:02:03 AM] File change detected. Starting incremental compilation...
 
 Reusing resolution of module '../b' from '/user/username/projects/transitiveReferences/c/index.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/b/index.ts'.
 Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveReferences/c/index.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/refs/a.d.ts'.
@@ -1719,7 +1719,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c/index.ts'
 c/index.ts
   Matched by default include pattern '**/*'
-[12:02:21 AM] Found 0 errors. Watching for file changes.
+[12:02:04 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders.js b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders.js
index cc4d4157dcb68..6836ee241769e 100644
--- a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders.js
+++ b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders.js
@@ -282,7 +282,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c/index.ts'
 c/index.ts
   Part of 'files' list in tsconfig.json
-[12:01:03 AM] Found 0 errors. Watching for file changes.
+[12:01:02 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -487,7 +487,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:19 AM] File change detected. Starting incremental compilation...
+[12:01:13 AM] File change detected. Starting incremental compilation...
 
 Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveReferences/b/index.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/a/index.ts'.
 ../../../../a/lib/lib.d.ts
@@ -502,7 +502,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c/index.ts'
 c/index.ts
   Part of 'files' list in tsconfig.json
-[12:01:23 AM] Found 0 errors. Watching for file changes.
+[12:01:16 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -604,7 +604,7 @@ Before running Timeout callback:: count: 2
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:31 AM] File change detected. Starting incremental compilation...
+[12:01:23 AM] File change detected. Starting incremental compilation...
 
 ======== Resolving module '../b' from '/user/username/projects/transitiveReferences/c/index.ts'. ========
 Module resolution kind is not specified, using 'Node10'.
@@ -642,7 +642,7 @@ nrefs/a.d.ts
   Imported via "@ref/a" from file 'c/index.ts'
 c/index.ts
   Part of 'files' list in tsconfig.json
-[12:01:35 AM] Found 0 errors. Watching for file changes.
+[12:01:26 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -781,7 +781,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:39 AM] File change detected. Starting incremental compilation...
+[12:01:29 AM] File change detected. Starting incremental compilation...
 
 ======== Resolving module '../b' from '/user/username/projects/transitiveReferences/c/index.ts'. ========
 Module resolution kind is not specified, using 'Node10'.
@@ -819,7 +819,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c/index.ts'
 c/index.ts
   Part of 'files' list in tsconfig.json
-[12:01:43 AM] Found 0 errors. Watching for file changes.
+[12:01:32 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -959,7 +959,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:47 AM] File change detected. Starting incremental compilation...
+[12:01:35 AM] File change detected. Starting incremental compilation...
 
 Reusing resolution of module '../b' from '/user/username/projects/transitiveReferences/c/index.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/b/index.ts'.
 Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveReferences/c/index.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/refs/a.d.ts'.
@@ -978,7 +978,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c/index.ts'
 c/index.ts
   Part of 'files' list in tsconfig.json
-[12:01:48 AM] Found 0 errors. Watching for file changes.
+[12:01:36 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -1117,7 +1117,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:53 AM] File change detected. Starting incremental compilation...
+[12:01:40 AM] File change detected. Starting incremental compilation...
 
 Reusing resolution of module '../b' from '/user/username/projects/transitiveReferences/c/index.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/b/index.ts'.
 Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveReferences/c/index.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/refs/a.d.ts'.
@@ -1135,7 +1135,7 @@ b/index.d.ts
   File is output of project reference source 'b/index.ts'
 c/index.ts
   Part of 'files' list in tsconfig.json
-[12:01:54 AM] Found 0 errors. Watching for file changes.
+[12:01:41 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -1245,7 +1245,7 @@ Before running Timeout callback:: count: 2
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:56 AM] File change detected. Starting incremental compilation...
+[12:01:43 AM] File change detected. Starting incremental compilation...
 
 Reusing resolution of module '../b' from '/user/username/projects/transitiveReferences/c/index.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/b/index.ts'.
 Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveReferences/c/index.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/refs/a.d.ts'.
@@ -1278,7 +1278,7 @@ b/index.ts
   Imported via '../b' from file 'c/index.ts'
 c/index.ts
   Part of 'files' list in tsconfig.json
-[12:02:03 AM] Found 1 error. Watching for file changes.
+[12:01:48 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -1411,7 +1411,7 @@ Before running Timeout callback:: count: 2
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:02:06 AM] File change detected. Starting incremental compilation...
+[12:01:51 AM] File change detected. Starting incremental compilation...
 
 Reusing resolution of module '../b' from '/user/username/projects/transitiveReferences/c/index.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/b/index.ts'.
 Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveReferences/c/index.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/refs/a.d.ts'.
@@ -1431,7 +1431,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c/index.ts'
 c/index.ts
   Part of 'files' list in tsconfig.json
-[12:02:10 AM] Found 0 errors. Watching for file changes.
+[12:01:54 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -1554,7 +1554,7 @@ Before running Timeout callback:: count: 2
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:02:12 AM] File change detected. Starting incremental compilation...
+[12:01:56 AM] File change detected. Starting incremental compilation...
 
 Reusing resolution of module '../b' from '/user/username/projects/transitiveReferences/c/index.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/b/index.ts'.
 Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveReferences/c/index.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/refs/a.d.ts'.
@@ -1579,7 +1579,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c/index.ts'
 c/index.ts
   Part of 'files' list in tsconfig.json
-[12:02:16 AM] Found 1 error. Watching for file changes.
+[12:01:59 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -1709,7 +1709,7 @@ Before running Timeout callback:: count: 2
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:02:20 AM] File change detected. Starting incremental compilation...
+[12:02:03 AM] File change detected. Starting incremental compilation...
 
 Reusing resolution of module '../b' from '/user/username/projects/transitiveReferences/c/index.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/b/index.ts'.
 Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveReferences/c/index.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/refs/a.d.ts'.
@@ -1726,7 +1726,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c/index.ts'
 c/index.ts
   Part of 'files' list in tsconfig.json
-[12:02:21 AM] Found 0 errors. Watching for file changes.
+[12:02:04 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references.js b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references.js
index 911332f3afab3..ad05802e6387b 100644
--- a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references.js
+++ b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references.js
@@ -283,7 +283,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c.ts'
 c.ts
   Part of 'files' list in tsconfig.json
-[12:00:57 AM] Found 0 errors. Watching for file changes.
+[12:00:56 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -481,7 +481,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:13 AM] File change detected. Starting incremental compilation...
+[12:01:07 AM] File change detected. Starting incremental compilation...
 
 Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveReferences/b.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/a.ts'.
 ../../../../a/lib/lib.d.ts
@@ -496,7 +496,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c.ts'
 c.ts
   Part of 'files' list in tsconfig.json
-[12:01:17 AM] Found 0 errors. Watching for file changes.
+[12:01:10 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -596,7 +596,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:25 AM] File change detected. Starting incremental compilation...
+[12:01:17 AM] File change detected. Starting incremental compilation...
 
 ======== Resolving module './b' from '/user/username/projects/transitiveReferences/c.ts'. ========
 Module resolution kind is not specified, using 'Node10'.
@@ -630,7 +630,7 @@ nrefs/a.d.ts
   Imported via "@ref/a" from file 'c.ts'
 c.ts
   Part of 'files' list in tsconfig.json
-[12:01:29 AM] Found 0 errors. Watching for file changes.
+[12:01:20 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -761,7 +761,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:33 AM] File change detected. Starting incremental compilation...
+[12:01:23 AM] File change detected. Starting incremental compilation...
 
 ======== Resolving module './b' from '/user/username/projects/transitiveReferences/c.ts'. ========
 Module resolution kind is not specified, using 'Node10'.
@@ -795,7 +795,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c.ts'
 c.ts
   Part of 'files' list in tsconfig.json
-[12:01:37 AM] Found 0 errors. Watching for file changes.
+[12:01:26 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -927,7 +927,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:41 AM] File change detected. Starting incremental compilation...
+[12:01:29 AM] File change detected. Starting incremental compilation...
 
 Reusing resolution of module './b' from '/user/username/projects/transitiveReferences/c.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/b.ts'.
 Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveReferences/c.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/refs/a.d.ts'.
@@ -946,7 +946,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c.ts'
 c.ts
   Part of 'files' list in tsconfig.json
-[12:01:42 AM] Found 0 errors. Watching for file changes.
+[12:01:30 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -1075,7 +1075,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:47 AM] File change detected. Starting incremental compilation...
+[12:01:34 AM] File change detected. Starting incremental compilation...
 
 Reusing resolution of module './b' from '/user/username/projects/transitiveReferences/c.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/b.ts'.
 Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveReferences/c.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/refs/a.d.ts'.
@@ -1093,7 +1093,7 @@ b.d.ts
   File is output of project reference source 'b.ts'
 c.ts
   Part of 'files' list in tsconfig.json
-[12:01:48 AM] Found 0 errors. Watching for file changes.
+[12:01:35 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -1195,7 +1195,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:50 AM] File change detected. Starting incremental compilation...
+[12:01:37 AM] File change detected. Starting incremental compilation...
 
 Reusing resolution of module './b' from '/user/username/projects/transitiveReferences/c.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/b.ts'.
 Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveReferences/c.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/refs/a.d.ts'.
@@ -1228,7 +1228,7 @@ b.ts
   Imported via './b' from file 'c.ts'
 c.ts
   Part of 'files' list in tsconfig.json
-[12:01:57 AM] Found 1 error. Watching for file changes.
+[12:01:42 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -1350,7 +1350,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:02:00 AM] File change detected. Starting incremental compilation...
+[12:01:45 AM] File change detected. Starting incremental compilation...
 
 Reusing resolution of module './b' from '/user/username/projects/transitiveReferences/c.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/b.ts'.
 Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveReferences/c.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/refs/a.d.ts'.
@@ -1370,7 +1370,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c.ts'
 c.ts
   Part of 'files' list in tsconfig.json
-[12:02:04 AM] Found 0 errors. Watching for file changes.
+[12:01:48 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -1480,7 +1480,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:02:06 AM] File change detected. Starting incremental compilation...
+[12:01:50 AM] File change detected. Starting incremental compilation...
 
 Reusing resolution of module './b' from '/user/username/projects/transitiveReferences/c.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/b.ts'.
 Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveReferences/c.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/refs/a.d.ts'.
@@ -1505,7 +1505,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c.ts'
 c.ts
   Part of 'files' list in tsconfig.json
-[12:02:10 AM] Found 1 error. Watching for file changes.
+[12:01:53 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -1622,7 +1622,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:02:14 AM] File change detected. Starting incremental compilation...
+[12:01:57 AM] File change detected. Starting incremental compilation...
 
 Reusing resolution of module './b' from '/user/username/projects/transitiveReferences/c.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/b.ts'.
 Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveReferences/c.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/refs/a.d.ts'.
@@ -1639,7 +1639,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c.ts'
 c.ts
   Part of 'files' list in tsconfig.json
-[12:02:15 AM] Found 0 errors. Watching for file changes.
+[12:01:58 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/when-declarationMap-changes-for-dependency.js b/tests/baselines/reference/tscWatch/projectsWithReferences/when-declarationMap-changes-for-dependency.js
index f66f60e7f764d..72957edaf3762 100644
--- a/tests/baselines/reference/tscWatch/projectsWithReferences/when-declarationMap-changes-for-dependency.js
+++ b/tests/baselines/reference/tscWatch/projectsWithReferences/when-declarationMap-changes-for-dependency.js
@@ -536,7 +536,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:01:24 AM] File change detected. Starting incremental compilation...
+[12:01:19 AM] File change detected. Starting incremental compilation...
 
 Reusing resolution of module '../core/index' from '/user/username/projects/sample1/logic/index.ts' of old program, it was successfully resolved to '/user/username/projects/sample1/core/index.ts'.
 Reusing resolution of module '../core/anotherModule' from '/user/username/projects/sample1/logic/index.ts' of old program, it was successfully resolved to '/user/username/projects/sample1/core/anotherModule.ts'.
@@ -550,7 +550,7 @@ core/anotherModule.d.ts
   File is output of project reference source 'core/anotherModule.ts'
 logic/index.ts
   Matched by default include pattern '**/*'
-[12:01:25 AM] Found 0 errors. Watching for file changes.
+[12:01:20 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/when-referenced-project-uses-different-module-resolution.js b/tests/baselines/reference/tscWatch/projectsWithReferences/when-referenced-project-uses-different-module-resolution.js
index e081291d93604..97874c88445fa 100644
--- a/tests/baselines/reference/tscWatch/projectsWithReferences/when-referenced-project-uses-different-module-resolution.js
+++ b/tests/baselines/reference/tscWatch/projectsWithReferences/when-referenced-project-uses-different-module-resolution.js
@@ -276,7 +276,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c.ts'
 c.ts
   Part of 'files' list in tsconfig.json
-[12:00:57 AM] Found 0 errors. Watching for file changes.
+[12:00:56 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/caching-works.js b/tests/baselines/reference/tscWatch/resolutionCache/caching-works.js
index 23b437452f68e..edec9faf3712d 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/caching-works.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/caching-works.js
@@ -104,7 +104,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:32 AM] File change detected. Starting incremental compilation...
+[12:00:31 AM] File change detected. Starting incremental compilation...
 
 users/username/projects/project/d/f0.ts:1:17 - error TS2306: File '/users/username/projects/project/f1.ts' is not a module.
 
@@ -121,7 +121,7 @@ Output::
 1 foo()
   ~~~
 
-[12:00:36 AM] Found 3 errors. Watching for file changes.
+[12:00:34 AM] Found 3 errors. Watching for file changes.
 
 
 
@@ -171,14 +171,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:40 AM] File change detected. Starting incremental compilation...
+[12:00:37 AM] File change detected. Starting incremental compilation...
 
 users/username/projects/project/d/f0.ts:1:17 - error TS2792: Cannot find module 'f2'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 1 import {x} from "f2"
                   ~~~~
 
-[12:00:44 AM] Found 1 error. Watching for file changes.
+[12:00:40 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -240,7 +240,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:48 AM] File change detected. Starting incremental compilation...
+[12:00:43 AM] File change detected. Starting incremental compilation...
 
 users/username/projects/project/d/f0.ts:1:17 - error TS2306: File '/users/username/projects/project/f1.ts' is not a module.
 
@@ -252,7 +252,7 @@ Output::
 1 foo()
   ~~~
 
-[12:00:55 AM] Found 2 errors. Watching for file changes.
+[12:00:48 AM] Found 2 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/loads-missing-files-from-disk.js b/tests/baselines/reference/tscWatch/resolutionCache/loads-missing-files-from-disk.js
index fb95cd5f7a975..39eb5270f61e4 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/loads-missing-files-from-disk.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/loads-missing-files-from-disk.js
@@ -91,9 +91,9 @@ Before running Timeout callback:: count: 2
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:28 AM] File change detected. Starting incremental compilation...
+[12:00:27 AM] File change detected. Starting incremental compilation...
 
-[12:00:32 AM] Found 0 errors. Watching for file changes.
+[12:00:30 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/reusing-type-ref-resolution.js b/tests/baselines/reference/tscWatch/resolutionCache/reusing-type-ref-resolution.js
index 8f15bbb35bf24..c51d75ca3714b 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/reusing-type-ref-resolution.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/reusing-type-ref-resolution.js
@@ -457,7 +457,7 @@ node_modules/pkg2/index.d.ts
   Type library referenced via 'pkg2' from file 'fileWithTypeRefs.ts'
 fileWithTypeRefs.ts
   Matched by default include pattern '**/*'
-[12:01:01 AM] Found 2 errors. Watching for file changes.
+[12:00:59 AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -690,7 +690,7 @@ After running Timeout callback:: count: 0
 Output::
 Reloading new file names and options
 Synchronizing program
-[12:01:10 AM] File change detected. Starting incremental compilation...
+[12:01:07 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/users/username/projects/project/fileWithImports.ts","/users/username/projects/project/fileWithTypeRefs.ts"]
@@ -732,7 +732,7 @@ node_modules/pkg3/index.d.ts
   Type library referenced via 'pkg3' from file 'fileWithTypeRefs.ts'
 fileWithTypeRefs.ts
   Matched by default include pattern '**/*'
-[12:01:17 AM] Found 1 error. Watching for file changes.
+[12:01:12 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/scoped-package-installation.js b/tests/baselines/reference/tscWatch/resolutionCache/scoped-package-installation.js
index aedf7d142e541..308907838057e 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/scoped-package-installation.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/scoped-package-installation.js
@@ -520,7 +520,7 @@ Resolving real path for '/user/username/projects/myproject/node_modules/@myapp/t
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@myapp/ts-types/index.d.ts 250 undefined Source file
 DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/node_modules 1 undefined Failed Lookup Locations
 Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/node_modules 1 undefined Failed Lookup Locations
-[12:00:56 AM] Found 0 errors. Watching for file changes.
+[12:00:55 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/should-compile-correctly-when-resolved-module-goes-missing-and-then-comes-back.js b/tests/baselines/reference/tscWatch/resolutionCache/should-compile-correctly-when-resolved-module-goes-missing-and-then-comes-back.js
index 1403239b79801..de04ab483e065 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/should-compile-correctly-when-resolved-module-goes-missing-and-then-comes-back.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/should-compile-correctly-when-resolved-module-goes-missing-and-then-comes-back.js
@@ -96,7 +96,7 @@ Output::
 1 import {x} from "bar"
                   ~~~~~
 
-[12:00:30 AM] Found 1 error. Watching for file changes.
+[12:00:29 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -163,9 +163,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:33 AM] File change detected. Starting incremental compilation...
+[12:00:32 AM] File change detected. Starting incremental compilation...
 
-[12:00:37 AM] Found 0 errors. Watching for file changes.
+[12:00:35 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/when-types-in-compiler-option-are-global-and-installed-at-later-point.js b/tests/baselines/reference/tscWatch/resolutionCache/when-types-in-compiler-option-are-global-and-installed-at-later-point.js
index 4da3bd570816e..eb30e8bf7e3d0 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/when-types-in-compiler-option-are-global-and-installed-at-later-point.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/when-types-in-compiler-option-are-global-and-installed-at-later-point.js
@@ -157,7 +157,7 @@ Output::
 >> Screen clear
 [12:00:39 AM] File change detected. Starting incremental compilation...
 
-[12:00:43 AM] Found 0 errors. Watching for file changes.
+[12:00:42 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/works-when-included-file-with-ambient-module-changes.js b/tests/baselines/reference/tscWatch/resolutionCache/works-when-included-file-with-ambient-module-changes.js
index 220bdc9a91feb..4c363557c5d90 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/works-when-included-file-with-ambient-module-changes.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/works-when-included-file-with-ambient-module-changes.js
@@ -120,9 +120,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:27 AM] File change detected. Starting incremental compilation...
+[12:00:26 AM] File change detected. Starting incremental compilation...
 
-[12:00:31 AM] Found 0 errors. Watching for file changes.
+[12:00:29 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/works-when-installing-something-in-node_modules-or-@types-when-there-is-no-notification-from-fs-for-index-file.js b/tests/baselines/reference/tscWatch/resolutionCache/works-when-installing-something-in-node_modules-or-@types-when-there-is-no-notification-from-fs-for-index-file.js
index dd63df4d22aa9..9787b67aa697a 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/works-when-installing-something-in-node_modules-or-@types-when-there-is-no-notification-from-fs-for-index-file.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/works-when-installing-something-in-node_modules-or-@types-when-there-is-no-notification-from-fs-for-index-file.js
@@ -253,7 +253,7 @@ FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/
 1 process.on("uncaughtException");
   ~~~~~~~
 
-[12:00:52 AM] Found 1 error. Watching for file changes.
+[12:00:51 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -364,7 +364,7 @@ After running Timeout callback:: count: 0
 Output::
 Reloading new file names and options
 Synchronizing program
-[12:00:59 AM] File change detected. Starting incremental compilation...
+[12:00:58 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/worker.ts"]
@@ -375,7 +375,7 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/
 1 process.on("uncaughtException");
   ~~~~~~~
 
-[12:01:00 AM] Found 1 error. Watching for file changes.
+[12:00:59 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -454,7 +454,7 @@ After running Timeout callback:: count: 0
 Output::
 Reloading new file names and options
 Synchronizing program
-[12:01:03 AM] File change detected. Starting incremental compilation...
+[12:01:02 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/worker.ts"]
@@ -465,7 +465,7 @@ Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node
   The file is in the program because:
     Entry point for implicit type library 'node'
 
-[12:01:04 AM] Found 1 error. Watching for file changes.
+[12:01:03 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -572,7 +572,7 @@ After running Timeout callback:: count: 0
 Output::
 Reloading new file names and options
 Synchronizing program
-[12:01:15 AM] File change detected. Starting incremental compilation...
+[12:01:14 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/worker.ts"]
@@ -583,7 +583,7 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/globals.d.ts 250 undefined Source file
 DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/node_modules 1 undefined Failed Lookup Locations
 Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/node_modules 1 undefined Failed Lookup Locations
-[12:01:19 AM] Found 0 errors. Watching for file changes.
+[12:01:17 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/works-when-module-resolution-changes-to-ambient-module.js b/tests/baselines/reference/tscWatch/resolutionCache/works-when-module-resolution-changes-to-ambient-module.js
index cbcd69cbb137a..6849bdee4d6f1 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/works-when-module-resolution-changes-to-ambient-module.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/works-when-module-resolution-changes-to-ambient-module.js
@@ -135,7 +135,7 @@ Output::
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
 
-[12:00:37 AM] Found 0 errors. Watching for file changes.
+[12:00:36 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/works-when-renaming-node_modules-folder-that-already-contains-@types-folder.js b/tests/baselines/reference/tscWatch/resolutionCache/works-when-renaming-node_modules-folder-that-already-contains-@types-folder.js
index e2c38427135fd..22b442c653f9f 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/works-when-renaming-node_modules-folder-that-already-contains-@types-folder.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/works-when-renaming-node_modules-folder-that-already-contains-@types-folder.js
@@ -127,7 +127,7 @@ Output::
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
 
-[12:00:38 AM] Found 0 errors. Watching for file changes.
+[12:00:37 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/works-when-reusing-program-with-files-from-external-library.js b/tests/baselines/reference/tscWatch/resolutionCache/works-when-reusing-program-with-files-from-external-library.js
index 081a97c44ef30..f757a879cea1c 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/works-when-reusing-program-with-files-from-external-library.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/works-when-reusing-program-with-files-from-external-library.js
@@ -143,9 +143,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:40 AM] File change detected. Starting incremental compilation...
+[12:00:39 AM] File change detected. Starting incremental compilation...
 
-[12:00:44 AM] Found 0 errors. Watching for file changes.
+[12:00:42 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/resolveJsonModule/incremental-always-prefers-declaration-file-over-document.js b/tests/baselines/reference/tscWatch/resolveJsonModule/incremental-always-prefers-declaration-file-over-document.js
index e2372d40c1ec8..505b353e7a69a 100644
--- a/tests/baselines/reference/tscWatch/resolveJsonModule/incremental-always-prefers-declaration-file-over-document.js
+++ b/tests/baselines/reference/tscWatch/resolveJsonModule/incremental-always-prefers-declaration-file-over-document.js
@@ -179,14 +179,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:32 AM] File change detected. Starting incremental compilation...
+[12:00:31 AM] File change detected. Starting incremental compilation...
 
 src/project/main.ts:1:18 - error TS6263: Module './data.json' was resolved to '/src/project/data.d.json.ts', but '--allowArbitraryExtensions' is not set.
 
 1 import data from "./data.json"; let x: string = data;
                    ~~~~~~~~~~~~~
 
-[12:00:33 AM] Found 1 error. Watching for file changes.
+[12:00:32 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-when-solution-is-already-built.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-when-solution-is-already-built.js
index 352267cf3bfa4..d5d8701ca1266 100644
--- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-when-solution-is-already-built.js
+++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-when-solution-is-already-built.js
@@ -246,7 +246,7 @@ Output::
 >> Screen clear
 [12:01:11 AM] Starting compilation in watch mode...
 
-[12:01:18 AM] Found 0 errors. Watching for file changes.
+[12:01:16 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-preserveSymlinks-when-solution-is-already-built.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-preserveSymlinks-when-solution-is-already-built.js
index 20c3fb38304ca..6de3efe08e3c4 100644
--- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-preserveSymlinks-when-solution-is-already-built.js
+++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-preserveSymlinks-when-solution-is-already-built.js
@@ -248,7 +248,7 @@ Output::
 >> Screen clear
 [12:01:11 AM] Starting compilation in watch mode...
 
-[12:01:18 AM] Found 0 errors. Watching for file changes.
+[12:01:16 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-scoped-package-when-solution-is-already-built.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-scoped-package-when-solution-is-already-built.js
index 15abedfd3b25d..87acceefec88b 100644
--- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-scoped-package-when-solution-is-already-built.js
+++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-scoped-package-when-solution-is-already-built.js
@@ -246,7 +246,7 @@ Output::
 >> Screen clear
 [12:01:13 AM] Starting compilation in watch mode...
 
-[12:01:20 AM] Found 0 errors. Watching for file changes.
+[12:01:18 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-scoped-package-with-preserveSymlinks-when-solution-is-already-built.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-scoped-package-with-preserveSymlinks-when-solution-is-already-built.js
index 9dbace85ccc24..e22fd43a5dd27 100644
--- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-scoped-package-with-preserveSymlinks-when-solution-is-already-built.js
+++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-scoped-package-with-preserveSymlinks-when-solution-is-already-built.js
@@ -248,7 +248,7 @@ Output::
 >> Screen clear
 [12:01:13 AM] Starting compilation in watch mode...
 
-[12:01:20 AM] Found 0 errors. Watching for file changes.
+[12:01:18 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-when-solution-is-already-built.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-when-solution-is-already-built.js
index 4d65001440f84..3ed1f2e643aef 100644
--- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-when-solution-is-already-built.js
+++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-when-solution-is-already-built.js
@@ -243,7 +243,7 @@ Output::
 >> Screen clear
 [12:01:16 AM] Starting compilation in watch mode...
 
-[12:01:23 AM] Found 0 errors. Watching for file changes.
+[12:01:21 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-preserveSymlinks-when-solution-is-already-built.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-preserveSymlinks-when-solution-is-already-built.js
index 034d10c239c00..280635ea9f4bd 100644
--- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-preserveSymlinks-when-solution-is-already-built.js
+++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-preserveSymlinks-when-solution-is-already-built.js
@@ -245,7 +245,7 @@ Output::
 >> Screen clear
 [12:01:16 AM] Starting compilation in watch mode...
 
-[12:01:23 AM] Found 0 errors. Watching for file changes.
+[12:01:21 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-scoped-package-when-solution-is-already-built.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-scoped-package-when-solution-is-already-built.js
index 549a1b8fdc549..b6c72372f85b0 100644
--- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-scoped-package-when-solution-is-already-built.js
+++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-scoped-package-when-solution-is-already-built.js
@@ -243,7 +243,7 @@ Output::
 >> Screen clear
 [12:01:18 AM] Starting compilation in watch mode...
 
-[12:01:25 AM] Found 0 errors. Watching for file changes.
+[12:01:23 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-scoped-package-with-preserveSymlinks-when-solution-is-already-built.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-scoped-package-with-preserveSymlinks-when-solution-is-already-built.js
index 0eaad029c6e80..e074ea00a17e4 100644
--- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-scoped-package-with-preserveSymlinks-when-solution-is-already-built.js
+++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-scoped-package-with-preserveSymlinks-when-solution-is-already-built.js
@@ -245,7 +245,7 @@ Output::
 >> Screen clear
 [12:01:18 AM] Starting compilation in watch mode...
 
-[12:01:25 AM] Found 0 errors. Watching for file changes.
+[12:01:23 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/with-simple-project-when-solution-is-already-built.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/with-simple-project-when-solution-is-already-built.js
index 5eca6eac48b74..332a3547ca677 100644
--- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/with-simple-project-when-solution-is-already-built.js
+++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/with-simple-project-when-solution-is-already-built.js
@@ -399,7 +399,7 @@ Output::
 >> Screen clear
 [12:01:17 AM] Starting compilation in watch mode...
 
-[12:01:24 AM] Found 0 errors. Watching for file changes.
+[12:01:22 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/host-implements-does-not-implement-hasInvalidatedResolutions.js b/tests/baselines/reference/tscWatch/watchApi/host-implements-does-not-implement-hasInvalidatedResolutions.js
index 147c73c2face9..c83705062f814 100644
--- a/tests/baselines/reference/tscWatch/watchApi/host-implements-does-not-implement-hasInvalidatedResolutions.js
+++ b/tests/baselines/reference/tscWatch/watchApi/host-implements-does-not-implement-hasInvalidatedResolutions.js
@@ -128,7 +128,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:00:29 AM] File change detected. Starting incremental compilation...
+[12:00:28 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/main.ts"]
@@ -140,7 +140,7 @@ File '/user/username/projects/myproject/other.ts' does not exist.
 File '/user/username/projects/myproject/other.tsx' does not exist.
 File '/user/username/projects/myproject/other.d.ts' exists - use it as a name resolution result.
 ======== Module name './other' was successfully resolved to '/user/username/projects/myproject/other.d.ts'. ========
-[12:00:30 AM] Found 0 errors. Watching for file changes.
+[12:00:29 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -188,7 +188,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:00:33 AM] File change detected. Starting incremental compilation...
+[12:00:31 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/main.ts"]
@@ -200,7 +200,7 @@ File '/user/username/projects/myproject/other.ts' does not exist.
 File '/user/username/projects/myproject/other.tsx' does not exist.
 File '/user/username/projects/myproject/other.d.ts' exists - use it as a name resolution result.
 ======== Module name './other' was successfully resolved to '/user/username/projects/myproject/other.d.ts'. ========
-[12:00:37 AM] Found 0 errors. Watching for file changes.
+[12:00:34 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -254,7 +254,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:00:42 AM] File change detected. Starting incremental compilation...
+[12:00:38 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/main.ts"]
@@ -265,7 +265,7 @@ Loading module as file / folder, candidate module location '/user/username/proje
 File '/user/username/projects/myproject/other.ts' exists - use it as a name resolution result.
 ======== Module name './other' was successfully resolved to '/user/username/projects/myproject/other.ts'. ========
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/other.ts 250 undefined Source file
-[12:00:48 AM] Found 0 errors. Watching for file changes.
+[12:00:43 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/host-implements-hasInvalidatedResolutions.js b/tests/baselines/reference/tscWatch/watchApi/host-implements-hasInvalidatedResolutions.js
index e3acd4b406517..8308c5aa831ac 100644
--- a/tests/baselines/reference/tscWatch/watchApi/host-implements-hasInvalidatedResolutions.js
+++ b/tests/baselines/reference/tscWatch/watchApi/host-implements-hasInvalidatedResolutions.js
@@ -156,12 +156,12 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:00:31 AM] File change detected. Starting incremental compilation...
+[12:00:29 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/main.ts"]
   options: {"traceResolution":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
-[12:00:35 AM] Found 0 errors. Watching for file changes.
+[12:00:32 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -215,7 +215,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:00:40 AM] File change detected. Starting incremental compilation...
+[12:00:36 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/main.ts"]
@@ -226,7 +226,7 @@ Loading module as file / folder, candidate module location '/user/username/proje
 File '/user/username/projects/myproject/other.ts' exists - use it as a name resolution result.
 ======== Module name './other' was successfully resolved to '/user/username/projects/myproject/other.ts'. ========
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/other.ts 250 undefined Source file
-[12:00:46 AM] Found 0 errors. Watching for file changes.
+[12:00:41 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/noEmit-with-composite-with-emit-builder.js b/tests/baselines/reference/tscWatch/watchApi/noEmit-with-composite-with-emit-builder.js
index 236aab4bb03fc..970da08865070 100644
--- a/tests/baselines/reference/tscWatch/watchApi/noEmit-with-composite-with-emit-builder.js
+++ b/tests/baselines/reference/tscWatch/watchApi/noEmit-with-composite-with-emit-builder.js
@@ -158,7 +158,7 @@ Output::
 >> Screen clear
 [12:00:29 AM] Starting compilation in watch mode...
 
-[12:00:41 AM] Found 0 errors. Watching for file changes.
+[12:00:40 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -340,9 +340,9 @@ FsWatchesRecursive *deleted*::
 tsc --w --noEmit
 Output::
 >> Screen clear
-[12:00:47 AM] Starting compilation in watch mode...
+[12:00:44 AM] Starting compilation in watch mode...
 
-[12:00:51 AM] Found 0 errors. Watching for file changes.
+[12:00:47 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -463,9 +463,9 @@ exitCode:: ExitStatus.undefined
 tsc --w
 Output::
 >> Screen clear
-[12:00:55 AM] Starting compilation in watch mode...
+[12:00:50 AM] Starting compilation in watch mode...
 
-[12:01:02 AM] Found 0 errors. Watching for file changes.
+[12:00:55 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -634,9 +634,9 @@ FsWatchesRecursive *deleted*::
 tsc --w
 Output::
 >> Screen clear
-[12:01:08 AM] Starting compilation in watch mode...
+[12:00:59 AM] Starting compilation in watch mode...
 
-[12:01:15 AM] Found 0 errors. Watching for file changes.
+[12:01:04 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/noEmit-with-composite-with-semantic-builder.js b/tests/baselines/reference/tscWatch/watchApi/noEmit-with-composite-with-semantic-builder.js
index 448e55b82ae4a..c1a1347fc74d6 100644
--- a/tests/baselines/reference/tscWatch/watchApi/noEmit-with-composite-with-semantic-builder.js
+++ b/tests/baselines/reference/tscWatch/watchApi/noEmit-with-composite-with-semantic-builder.js
@@ -165,7 +165,7 @@ Output::
 >> Screen clear
 [12:00:29 AM] Starting compilation in watch mode...
 
-[12:00:41 AM] Found 0 errors. Watching for file changes.
+[12:00:40 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -354,9 +354,9 @@ FsWatchesRecursive *deleted*::
 tsc --w --noEmit
 Output::
 >> Screen clear
-[12:00:47 AM] Starting compilation in watch mode...
+[12:00:44 AM] Starting compilation in watch mode...
 
-[12:00:51 AM] Found 0 errors. Watching for file changes.
+[12:00:47 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -484,9 +484,9 @@ Output file text for /user/username/projects/myproject/tsconfig.tsbuildinfo is s
 tsc --w
 Output::
 >> Screen clear
-[12:00:55 AM] Starting compilation in watch mode...
+[12:00:50 AM] Starting compilation in watch mode...
 
-[12:01:02 AM] Found 0 errors. Watching for file changes.
+[12:00:55 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -662,9 +662,9 @@ FsWatchesRecursive *deleted*::
 tsc --w
 Output::
 >> Screen clear
-[12:01:08 AM] Starting compilation in watch mode...
+[12:00:59 AM] Starting compilation in watch mode...
 
-[12:01:18 AM] Found 0 errors. Watching for file changes.
+[12:01:06 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/noEmitOnError-with-composite-with-emit-builder.js b/tests/baselines/reference/tscWatch/watchApi/noEmitOnError-with-composite-with-emit-builder.js
index b8e3c8b37a556..23bd5b5d7cc2e 100644
--- a/tests/baselines/reference/tscWatch/watchApi/noEmitOnError-with-composite-with-emit-builder.js
+++ b/tests/baselines/reference/tscWatch/watchApi/noEmitOnError-with-composite-with-emit-builder.js
@@ -203,14 +203,14 @@ FsWatchesRecursive *deleted*::
 tsc --w
 Output::
 >> Screen clear
-[12:00:31 AM] Starting compilation in watch mode...
+[12:00:30 AM] Starting compilation in watch mode...
 
 user/username/projects/myproject/main.ts:1:14 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 1 export const x: string = 10;
                ~
 
-[12:00:35 AM] Found 1 error. Watching for file changes.
+[12:00:33 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -374,9 +374,9 @@ FsWatchesRecursive *deleted*::
 tsc --w
 Output::
 >> Screen clear
-[12:00:42 AM] Starting compilation in watch mode...
+[12:00:38 AM] Starting compilation in watch mode...
 
-[12:00:54 AM] Found 0 errors. Watching for file changes.
+[12:00:49 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/noEmitOnError-with-composite-with-semantic-builder.js b/tests/baselines/reference/tscWatch/watchApi/noEmitOnError-with-composite-with-semantic-builder.js
index c6975bfff2927..ea98093107260 100644
--- a/tests/baselines/reference/tscWatch/watchApi/noEmitOnError-with-composite-with-semantic-builder.js
+++ b/tests/baselines/reference/tscWatch/watchApi/noEmitOnError-with-composite-with-semantic-builder.js
@@ -210,14 +210,14 @@ FsWatchesRecursive *deleted*::
 tsc --w
 Output::
 >> Screen clear
-[12:00:31 AM] Starting compilation in watch mode...
+[12:00:30 AM] Starting compilation in watch mode...
 
 user/username/projects/myproject/main.ts:1:14 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 1 export const x: string = 10;
                ~
 
-[12:00:35 AM] Found 1 error. Watching for file changes.
+[12:00:33 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -388,9 +388,9 @@ FsWatchesRecursive *deleted*::
 tsc --w
 Output::
 >> Screen clear
-[12:00:42 AM] Starting compilation in watch mode...
+[12:00:38 AM] Starting compilation in watch mode...
 
-[12:00:54 AM] Found 0 errors. Watching for file changes.
+[12:00:49 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/semantic-builder-emitOnlyDts.js b/tests/baselines/reference/tscWatch/watchApi/semantic-builder-emitOnlyDts.js
index 6f6f907655b23..eb3a3d51a01c2 100644
--- a/tests/baselines/reference/tscWatch/watchApi/semantic-builder-emitOnlyDts.js
+++ b/tests/baselines/reference/tscWatch/watchApi/semantic-builder-emitOnlyDts.js
@@ -201,9 +201,9 @@ FsWatchesRecursive *deleted*::
 
 Output::
 >> Screen clear
-[12:00:32 AM] Starting compilation in watch mode...
+[12:00:31 AM] Starting compilation in watch mode...
 
-[12:00:40 AM] Found 0 errors. Watching for file changes.
+[12:00:38 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/verifies-that-noEmit-is-handled-on-createSemanticDiagnosticsBuilderProgram.js b/tests/baselines/reference/tscWatch/watchApi/verifies-that-noEmit-is-handled-on-createSemanticDiagnosticsBuilderProgram.js
index d1565959d24aa..ea131d5776f26 100644
--- a/tests/baselines/reference/tscWatch/watchApi/verifies-that-noEmit-is-handled-on-createSemanticDiagnosticsBuilderProgram.js
+++ b/tests/baselines/reference/tscWatch/watchApi/verifies-that-noEmit-is-handled-on-createSemanticDiagnosticsBuilderProgram.js
@@ -96,9 +96,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:27 AM] File change detected. Starting incremental compilation...
+[12:00:26 AM] File change detected. Starting incremental compilation...
 
-[12:00:28 AM] Found 0 errors. Watching for file changes.
+[12:00:27 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/when-emitting-with-emitOnlyDtsFiles-with-outFile.js b/tests/baselines/reference/tscWatch/watchApi/when-emitting-with-emitOnlyDtsFiles-with-outFile.js
index e843e41e91741..2a31c8b7a778d 100644
--- a/tests/baselines/reference/tscWatch/watchApi/when-emitting-with-emitOnlyDtsFiles-with-outFile.js
+++ b/tests/baselines/reference/tscWatch/watchApi/when-emitting-with-emitOnlyDtsFiles-with-outFile.js
@@ -123,7 +123,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:00:28 AM] File change detected. Starting incremental compilation...
+[12:00:27 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts"]
diff --git a/tests/baselines/reference/tscWatch/watchApi/when-emitting-with-emitOnlyDtsFiles.js b/tests/baselines/reference/tscWatch/watchApi/when-emitting-with-emitOnlyDtsFiles.js
index bb0059caa837e..57d4db7a2d8c4 100644
--- a/tests/baselines/reference/tscWatch/watchApi/when-emitting-with-emitOnlyDtsFiles.js
+++ b/tests/baselines/reference/tscWatch/watchApi/when-emitting-with-emitOnlyDtsFiles.js
@@ -210,7 +210,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:00:32 AM] File change detected. Starting incremental compilation...
+[12:00:31 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts"]
diff --git a/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine-without-implementing-useSourceOfProjectReferenceRedirect.js b/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine-without-implementing-useSourceOfProjectReferenceRedirect.js
index e0b9a75feccda..bd1d7c72481c8 100644
--- a/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine-without-implementing-useSourceOfProjectReferenceRedirect.js
+++ b/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine-without-implementing-useSourceOfProjectReferenceRedirect.js
@@ -375,7 +375,7 @@ CreatingProgramWith::
   options: {"module":0,"composite":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/projects/project2/tsconfig.json"}
   projectReferences: [{"path":"/user/username/projects/myproject/projects/project1","originalPath":"../project1"}]
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
-[12:00:56 AM] Found 0 errors. Watching for file changes.
+[12:00:54 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -556,7 +556,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:01:05 AM] File change detected. Starting incremental compilation...
+[12:01:02 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/projects/project2/class2.ts"]
@@ -577,7 +577,7 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
       ~~~~~
     File is output from referenced project specified here.
 
-[12:01:12 AM] Found 1 error. Watching for file changes.
+[12:01:07 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -761,14 +761,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:01:19 AM] File change detected. Starting incremental compilation...
+[12:01:13 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/projects/project2/class2.ts"]
   options: {"module":0,"composite":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/projects/project2/tsconfig.json"}
   projectReferences: [{"path":"/user/username/projects/myproject/projects/project1","originalPath":"../project1"}]
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
-[12:01:26 AM] Found 0 errors. Watching for file changes.
+[12:01:18 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine.js b/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine.js
index df872382e3f42..955b4a8ac69dd 100644
--- a/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine.js
+++ b/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine.js
@@ -240,7 +240,7 @@ CreatingProgramWith::
   options: {"module":0,"composite":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/projects/project2/tsconfig.json"}
   projectReferences: [{"path":"/user/username/projects/myproject/projects/project1","originalPath":"../project1"}]
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.ts 250 undefined Source file
-[12:00:52 AM] Found 0 errors. Watching for file changes.
+[12:00:50 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/when-watching-referenced-project-when-there-is-no-config-file-name.js b/tests/baselines/reference/tscWatch/watchApi/when-watching-referenced-project-when-there-is-no-config-file-name.js
index 8ff79cb8b2c49..067d641ad2182 100644
--- a/tests/baselines/reference/tscWatch/watchApi/when-watching-referenced-project-when-there-is-no-config-file-name.js
+++ b/tests/baselines/reference/tscWatch/watchApi/when-watching-referenced-project-when-there-is-no-config-file-name.js
@@ -162,13 +162,13 @@ After running Timeout callback:: count: 0
 Output::
 Synchronizing program
 Loading config file: /user/username/projects/project/lib/tsconfig.json
-[12:00:38 AM] File change detected. Starting incremental compilation...
+[12:00:37 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/project/app.ts"]
   options: {"types":[],"extendedDiagnostics":true,"configFilePath":"/user/username/projects/project/tsconfig.json"}
   projectReferences: [{"path":"/user/username/projects/project/lib","originalPath":"./lib"}]
-[12:00:39 AM] Found 0 errors. Watching for file changes.
+[12:00:38 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/when-watching-referenced-project-with-extends-when-there-is-no-config-file-name.js b/tests/baselines/reference/tscWatch/watchApi/when-watching-referenced-project-with-extends-when-there-is-no-config-file-name.js
index e2da1988d9ae6..d992e91c0d802 100644
--- a/tests/baselines/reference/tscWatch/watchApi/when-watching-referenced-project-with-extends-when-there-is-no-config-file-name.js
+++ b/tests/baselines/reference/tscWatch/watchApi/when-watching-referenced-project-with-extends-when-there-is-no-config-file-name.js
@@ -163,13 +163,13 @@ After running Timeout callback:: count: 0
 Output::
 Synchronizing program
 Loading config file: /user/username/projects/project/lib/tsconfig.json
-[12:00:38 AM] File change detected. Starting incremental compilation...
+[12:00:37 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/project/app.ts"]
   options: {"types":[],"extendedDiagnostics":true,"configFilePath":"/user/username/projects/project/tsconfig.json"}
   projectReferences: [{"path":"/user/username/projects/project/lib","originalPath":"./lib"}]
-[12:00:39 AM] Found 0 errors. Watching for file changes.
+[12:00:38 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -222,13 +222,13 @@ After running Timeout callback:: count: 0
 Output::
 Synchronizing program
 Loading config file: /user/username/projects/project/lib/tsconfig.json
-[12:00:43 AM] File change detected. Starting incremental compilation...
+[12:00:41 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/project/app.ts"]
   options: {"types":[],"extendedDiagnostics":true,"configFilePath":"/user/username/projects/project/tsconfig.json"}
   projectReferences: [{"path":"/user/username/projects/project/lib","originalPath":"./lib"}]
-[12:00:44 AM] Found 0 errors. Watching for file changes.
+[12:00:42 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/without-timesouts-on-host-program-gets-updated.js b/tests/baselines/reference/tscWatch/watchApi/without-timesouts-on-host-program-gets-updated.js
index 8d60f68191b3f..4bc5493b28161 100644
--- a/tests/baselines/reference/tscWatch/watchApi/without-timesouts-on-host-program-gets-updated.js
+++ b/tests/baselines/reference/tscWatch/watchApi/without-timesouts-on-host-program-gets-updated.js
@@ -81,7 +81,7 @@ const y =10;
 
 
 Output::
-[12:00:32 AM] Found 0 errors. Watching for file changes.
+[12:00:31 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsEvent-for-change-is-repeated.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsEvent-for-change-is-repeated.js
index 940db1302a4e8..c7eee66fcc618 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/fsEvent-for-change-is-repeated.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsEvent-for-change-is-repeated.js
@@ -97,12 +97,12 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:00:26 AM] File change detected. Starting incremental compilation...
+[12:00:25 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["main.ts"]
   options: {"watch":true,"extendedDiagnostics":true}
-[12:00:30 AM] Found 0 errors. Watching for file changes.
+[12:00:28 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -180,12 +180,12 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:00:34 AM] File change detected. Starting incremental compilation...
+[12:00:31 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["main.ts"]
   options: {"watch":true,"extendedDiagnostics":true}
-[12:00:38 AM] Found 0 errors. Watching for file changes.
+[12:00:34 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/fsWatchWithTimestamp-false-useFsEventsOnParentDirectory.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/fsWatchWithTimestamp-false-useFsEventsOnParentDirectory.js
new file mode 100644
index 0000000000000..75def812226f6
--- /dev/null
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/fsWatchWithTimestamp-false-useFsEventsOnParentDirectory.js
@@ -0,0 +1,175 @@
+currentDirectory:: /user/username/projects/myproject useCaseSensitiveFileNames: false
+Input::
+//// [/a/lib/lib.d.ts]
+/// <reference no-default-lib="true"/>
+interface Boolean {}
+interface Function {}
+interface CallableFunction {}
+interface NewableFunction {}
+interface IArguments {}
+interface Number { toExponential: any; }
+interface Object {}
+interface RegExp {}
+interface String { charAt: any; }
+interface Array<T> { length: number; [n: number]: T; }
+
+//// [/user/username/projects/myproject/main.ts]
+export const x = 10;
+
+//// [/user/username/projects/myproject/tsconfig.json]
+{
+  "files": [
+    "main.ts"
+  ]
+}
+
+
+/a/lib/tsc.js -w --extendedDiagnostics --watchFile useFsEventsOnParentDirectory
+Output::
+[12:00:21 AM] Starting compilation in watch mode...
+
+Current directory: /user/username/projects/myproject CaseSensitiveFileNames: false
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/tsconfig.json 2000 {"watchFile":5} Config file
+Synchronizing program
+CreatingProgramWith::
+  roots: ["/user/username/projects/myproject/main.ts"]
+  options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main.ts 250 {"watchFile":5} Source file
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 250 {"watchFile":5} Source file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"watchFile":5} Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"watchFile":5} Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node_modules/@types 1 {"watchFile":5} Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node_modules/@types 1 {"watchFile":5} Type roots
+[12:00:24 AM] Found 0 errors. Watching for file changes.
+
+
+
+//// [/user/username/projects/myproject/main.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.x = void 0;
+exports.x = 10;
+
+
+
+PolledWatches::
+/user/username/projects/myproject/node_modules/@types: *new*
+  {"pollingInterval":500}
+/user/username/projects/node_modules/@types: *new*
+  {"pollingInterval":500}
+
+FsWatches::
+/a/lib: *new*
+  {}
+/user/username/projects/myproject: *new*
+  {}
+
+Program root files: [
+  "/user/username/projects/myproject/main.ts"
+]
+Program options: {
+  "watch": true,
+  "extendedDiagnostics": true,
+  "configFilePath": "/user/username/projects/myproject/tsconfig.json"
+}
+Program structureReused: Not
+Program files::
+/a/lib/lib.d.ts
+/user/username/projects/myproject/main.ts
+
+Semantic diagnostics in builder refreshed for::
+/a/lib/lib.d.ts
+/user/username/projects/myproject/main.ts
+
+Shape signatures in builder refreshed for::
+/a/lib/lib.d.ts (used version)
+/user/username/projects/myproject/main.ts (used version)
+
+exitCode:: ExitStatus.undefined
+
+Change:: emulate access
+
+Input::
+
+Output::
+FileWatcher:: Triggered with /user/username/projects/myproject/main.ts 1:: WatchInfo: /user/username/projects/myproject/main.ts 250 {"watchFile":5} Source file
+Scheduling update
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/main.ts 1:: WatchInfo: /user/username/projects/myproject/main.ts 250 {"watchFile":5} Source file
+
+
+Timeout callback:: count: 1
+1: timerToUpdateProgram *new*
+
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+
+After running Timeout callback:: count: 0
+Output::
+Synchronizing program
+
+
+
+
+exitCode:: ExitStatus.undefined
+
+Change:: modify file contents
+
+Input::
+//// [/user/username/projects/myproject/main.ts]
+export const x = 10;export const y = 10;
+
+
+Output::
+FileWatcher:: Triggered with /user/username/projects/myproject/main.ts 1:: WatchInfo: /user/username/projects/myproject/main.ts 250 {"watchFile":5} Source file
+Scheduling update
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/main.ts 1:: WatchInfo: /user/username/projects/myproject/main.ts 250 {"watchFile":5} Source file
+
+
+Timeout callback:: count: 1
+2: timerToUpdateProgram *new*
+
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+
+After running Timeout callback:: count: 0
+Output::
+Synchronizing program
+[12:00:26 AM] File change detected. Starting incremental compilation...
+
+CreatingProgramWith::
+  roots: ["/user/username/projects/myproject/main.ts"]
+  options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
+[12:00:29 AM] Found 0 errors. Watching for file changes.
+
+
+
+//// [/user/username/projects/myproject/main.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.y = exports.x = void 0;
+exports.x = 10;
+exports.y = 10;
+
+
+
+
+Program root files: [
+  "/user/username/projects/myproject/main.ts"
+]
+Program options: {
+  "watch": true,
+  "extendedDiagnostics": true,
+  "configFilePath": "/user/username/projects/myproject/tsconfig.json"
+}
+Program structureReused: Completely
+Program files::
+/a/lib/lib.d.ts
+/user/username/projects/myproject/main.ts
+
+Semantic diagnostics in builder refreshed for::
+/user/username/projects/myproject/main.ts
+
+Shape signatures in builder refreshed for::
+/user/username/projects/myproject/main.ts (computed .d.ts)
+
+exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/fsWatchWithTimestamp-false.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/fsWatchWithTimestamp-false.js
index e8cfa9431277a..82513aa3db08e 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/fsWatchWithTimestamp-false.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/fsWatchWithTimestamp-false.js
@@ -136,12 +136,12 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:00:27 AM] File change detected. Starting incremental compilation...
+[12:00:26 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/main.ts"]
   options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
-[12:00:31 AM] Found 0 errors. Watching for file changes.
+[12:00:29 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/fsWatchWithTimestamp-true-useFsEventsOnParentDirectory.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/fsWatchWithTimestamp-true-useFsEventsOnParentDirectory.js
new file mode 100644
index 0000000000000..2c0f884c3040c
--- /dev/null
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/fsWatchWithTimestamp-true-useFsEventsOnParentDirectory.js
@@ -0,0 +1,161 @@
+currentDirectory:: /user/username/projects/myproject useCaseSensitiveFileNames: false
+Input::
+//// [/a/lib/lib.d.ts]
+/// <reference no-default-lib="true"/>
+interface Boolean {}
+interface Function {}
+interface CallableFunction {}
+interface NewableFunction {}
+interface IArguments {}
+interface Number { toExponential: any; }
+interface Object {}
+interface RegExp {}
+interface String { charAt: any; }
+interface Array<T> { length: number; [n: number]: T; }
+
+//// [/user/username/projects/myproject/main.ts]
+export const x = 10;
+
+//// [/user/username/projects/myproject/tsconfig.json]
+{
+  "files": [
+    "main.ts"
+  ]
+}
+
+
+/a/lib/tsc.js -w --extendedDiagnostics --watchFile useFsEventsOnParentDirectory
+Output::
+[12:00:21 AM] Starting compilation in watch mode...
+
+Current directory: /user/username/projects/myproject CaseSensitiveFileNames: false
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/tsconfig.json 2000 {"watchFile":5} Config file
+Synchronizing program
+CreatingProgramWith::
+  roots: ["/user/username/projects/myproject/main.ts"]
+  options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main.ts 250 {"watchFile":5} Source file
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 250 {"watchFile":5} Source file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"watchFile":5} Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"watchFile":5} Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node_modules/@types 1 {"watchFile":5} Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node_modules/@types 1 {"watchFile":5} Type roots
+[12:00:24 AM] Found 0 errors. Watching for file changes.
+
+
+
+//// [/user/username/projects/myproject/main.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.x = void 0;
+exports.x = 10;
+
+
+
+PolledWatches::
+/user/username/projects/myproject/node_modules/@types: *new*
+  {"pollingInterval":500}
+/user/username/projects/node_modules/@types: *new*
+  {"pollingInterval":500}
+
+FsWatches::
+/a/lib: *new*
+  {}
+/user/username/projects/myproject: *new*
+  {}
+
+Program root files: [
+  "/user/username/projects/myproject/main.ts"
+]
+Program options: {
+  "watch": true,
+  "extendedDiagnostics": true,
+  "configFilePath": "/user/username/projects/myproject/tsconfig.json"
+}
+Program structureReused: Not
+Program files::
+/a/lib/lib.d.ts
+/user/username/projects/myproject/main.ts
+
+Semantic diagnostics in builder refreshed for::
+/a/lib/lib.d.ts
+/user/username/projects/myproject/main.ts
+
+Shape signatures in builder refreshed for::
+/a/lib/lib.d.ts (used version)
+/user/username/projects/myproject/main.ts (used version)
+
+exitCode:: ExitStatus.undefined
+
+Change:: emulate access
+
+Input::
+
+Before running Timeout callback:: count: 0
+
+After running Timeout callback:: count: 0
+
+
+exitCode:: ExitStatus.undefined
+
+Change:: modify file contents
+
+Input::
+//// [/user/username/projects/myproject/main.ts]
+export const x = 10;export const y = 10;
+
+
+Output::
+FileWatcher:: Triggered with /user/username/projects/myproject/main.ts 1:: WatchInfo: /user/username/projects/myproject/main.ts 250 {"watchFile":5} Source file
+Scheduling update
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/main.ts 1:: WatchInfo: /user/username/projects/myproject/main.ts 250 {"watchFile":5} Source file
+
+
+Timeout callback:: count: 1
+1: timerToUpdateProgram *new*
+
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+
+After running Timeout callback:: count: 0
+Output::
+Synchronizing program
+[12:00:26 AM] File change detected. Starting incremental compilation...
+
+CreatingProgramWith::
+  roots: ["/user/username/projects/myproject/main.ts"]
+  options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
+[12:00:29 AM] Found 0 errors. Watching for file changes.
+
+
+
+//// [/user/username/projects/myproject/main.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.y = exports.x = void 0;
+exports.x = 10;
+exports.y = 10;
+
+
+
+
+Program root files: [
+  "/user/username/projects/myproject/main.ts"
+]
+Program options: {
+  "watch": true,
+  "extendedDiagnostics": true,
+  "configFilePath": "/user/username/projects/myproject/tsconfig.json"
+}
+Program structureReused: Completely
+Program files::
+/a/lib/lib.d.ts
+/user/username/projects/myproject/main.ts
+
+Semantic diagnostics in builder refreshed for::
+/user/username/projects/myproject/main.ts
+
+Shape signatures in builder refreshed for::
+/user/username/projects/myproject/main.ts (computed .d.ts)
+
+exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/fsWatchWithTimestamp-true.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/fsWatchWithTimestamp-true.js
index 0d41c11b03e81..eea9a762bc1cb 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/fsWatchWithTimestamp-true.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/fsWatchWithTimestamp-true.js
@@ -122,12 +122,12 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:00:27 AM] File change detected. Starting incremental compilation...
+[12:00:26 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/main.ts"]
   options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
-[12:00:31 AM] Found 0 errors. Watching for file changes.
+[12:00:29 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-event-ends-with-tilde.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-event-ends-with-tilde.js
index 0c438ca41f80b..1ac77a4f0df70 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-event-ends-with-tilde.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-event-ends-with-tilde.js
@@ -197,7 +197,7 @@ CreatingProgramWith::
                       ~~~~
     'foo2' is declared here.
 
-[12:00:34 AM] Found 1 error. Watching for file changes.
+[12:00:33 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -305,12 +305,12 @@ Before running Timeout callback:: count: 2
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:00:38 AM] File change detected. Starting incremental compilation...
+[12:00:37 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/foo.d.ts","/user/username/projects/myproject/main.ts"]
   options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
-[12:00:42 AM] Found 0 errors. Watching for file changes.
+[12:00:40 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js
index 7697401927942..f5713c1277330 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js
@@ -166,7 +166,7 @@ CreatingProgramWith::
                               ~~~~
     'foo2' is declared here.
 
-[12:00:39 AM] Found 1 error. Watching for file changes.
+[12:00:37 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -250,12 +250,12 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:00:43 AM] File change detected. Starting incremental compilation...
+[12:00:41 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/foo.ts","/user/username/projects/myproject/main.ts"]
   options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
-[12:00:50 AM] Found 0 errors. Watching for file changes.
+[12:00:46 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js
index ecffc0b329cdb..81dbedae17969 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js
@@ -185,7 +185,7 @@ CreatingProgramWith::
                       ~~~~
     'foo2' is declared here.
 
-[12:00:34 AM] Found 1 error. Watching for file changes.
+[12:00:33 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -281,12 +281,12 @@ Before running Timeout callback:: count: 2
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:00:38 AM] File change detected. Starting incremental compilation...
+[12:00:37 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/foo.d.ts","/user/username/projects/myproject/main.ts"]
   options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
-[12:00:42 AM] Found 0 errors. Watching for file changes.
+[12:00:40 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-when-rename-occurs-when-file-is-still-on-the-disk.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-when-rename-occurs-when-file-is-still-on-the-disk.js
index 60ff565ce9077..c98e13c5558f9 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-when-rename-occurs-when-file-is-still-on-the-disk.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-when-rename-occurs-when-file-is-still-on-the-disk.js
@@ -145,7 +145,7 @@ CreatingProgramWith::
                               ~~~~
     'foo2' is declared here.
 
-[12:00:39 AM] Found 1 error. Watching for file changes.
+[12:00:37 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -203,12 +203,12 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 Synchronizing program
-[12:00:43 AM] File change detected. Starting incremental compilation...
+[12:00:41 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/foo.ts","/user/username/projects/myproject/main.ts"]
   options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
-[12:00:50 AM] Found 0 errors. Watching for file changes.
+[12:00:46 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js
index 5d35ce875c969..b776af7409803 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js
@@ -132,7 +132,7 @@ Output::
   The file is in the program because:
     Matched by default include pattern '**/*'
 
-[12:00:41 AM] Found 1 error. Watching for file changes.
+[12:00:40 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -208,14 +208,14 @@ Before running Timeout callback:: count: 2
 After running Timeout callback:: count: 1
 Output::
 >> Screen clear
-[12:00:42 AM] File change detected. Starting incremental compilation...
+[12:00:41 AM] File change detected. Starting incremental compilation...
 
 user/username/projects/myproject/src/file1.ts:1:19 - error TS2307: Cannot find module './file2' or its corresponding type declarations.
 
 1 import { x } from "./file2";
                     ~~~~~~~~~
 
-[12:00:45 AM] Found 1 error. Watching for file changes.
+[12:00:44 AM] Found 1 error. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js
index c8269445cb9d7..e3f0d8a3e51f7 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js
@@ -155,7 +155,7 @@ Output::
 1 import { x } from "file2";
                     ~~~~~~~
 
-[12:00:40 AM] Found 1 error. Watching for file changes.
+[12:00:39 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -242,14 +242,14 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:41 AM] File change detected. Starting incremental compilation...
+[12:00:40 AM] File change detected. Starting incremental compilation...
 
 user/username/projects/myproject/src/file1.ts:1:19 - error TS2307: Cannot find module 'file2' or its corresponding type declarations.
 
 1 import { x } from "file2";
                     ~~~~~~~
 
-[12:00:42 AM] Found 1 error. Watching for file changes.
+[12:00:41 AM] Found 1 error. Watching for file changes.
 
 
 
@@ -372,9 +372,9 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:50 AM] File change detected. Starting incremental compilation...
+[12:00:49 AM] File change detected. Starting incremental compilation...
 
-[12:00:54 AM] Found 0 errors. Watching for file changes.
+[12:00:52 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/using-dynamic-priority-polling.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/using-dynamic-priority-polling.js
index 07ae4729a42ae..39d992c3f1181 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/using-dynamic-priority-polling.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/using-dynamic-priority-polling.js
@@ -606,9 +606,9 @@ Before running Timeout callback:: count: 3
 After running Timeout callback:: count: 2
 Output::
 >> Screen clear
-[12:00:45 AM] File change detected. Starting incremental compilation...
+[12:00:44 AM] File change detected. Starting incremental compilation...
 
-[12:00:49 AM] Found 0 errors. Watching for file changes.
+[12:00:47 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/using-fixed-chunk-size-polling.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/using-fixed-chunk-size-polling.js
index cf49061896ffb..6c4b7d25cdc08 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/using-fixed-chunk-size-polling.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/using-fixed-chunk-size-polling.js
@@ -148,9 +148,9 @@ Before running Timeout callback:: count: 2
 After running Timeout callback:: count: 1
 Output::
 >> Screen clear
-[12:00:32 AM] File change detected. Starting incremental compilation...
+[12:00:31 AM] File change detected. Starting incremental compilation...
 
-[12:00:39 AM] Found 0 errors. Watching for file changes.
+[12:00:36 AM] Found 0 errors. Watching for file changes.
 
 
 

From 3caec2caefe2e82bab06ab5fbc0ee9b07ea77e9d Mon Sep 17 00:00:00 2001
From: Jake Bailey <5341706+jakebailey@users.noreply.github.com>
Date: Thu, 28 Mar 2024 16:13:11 -0700
Subject: [PATCH 3/8] Cherry pick PR 57887 into release-5.4 (#57898)

Co-authored-by: Wesley Wigham <wewigham@microsoft.com>
---
 src/compiler/checker.ts                       | 18 +++-
 .../baselines/reference/ParameterList5.types  |  2 +-
 ...dThisPropertyInitializerDoesntNarrow.types |  2 +-
 tests/baselines/reference/anonterface.types   |  2 +-
 .../anyAssignabilityInInheritance.types       |  2 +-
 .../arrayLiteralContextualType.types          |  2 +-
 .../assignmentCompatWithCallSignatures3.types |  2 +-
 .../assignmentCompatWithCallSignatures4.types |  2 +-
 ...gnmentCompatWithConstructSignatures3.types |  2 +-
 ...gnmentCompatWithConstructSignatures4.types |  2 +-
 ...syncFunctionContextuallyTypedReturns.types |  4 +-
 .../asyncFunctionsAndStrictNullChecks.types   | 10 +-
 ...BindingElementWithLiteralInitializer.types |  2 +-
 ...SignatureAssignabilityInInheritance2.types |  2 +-
 ...SignatureAssignabilityInInheritance3.types |  2 +-
 .../reference/callsOnComplexSignatures.types  |  4 +-
 .../reference/collisionArgumentsInType.types  |  4 +-
 .../collisionRestParameterInType.types        |  2 +-
 .../complexRecursiveCollections.types         | 34 +++----
 .../reference/complicatedPrivacy.types        |  4 +-
 .../computedPropertyNames48_ES5.types         |  2 +-
 .../computedPropertyNames48_ES6.types         |  2 +-
 ...asedContextualTypeReturnTypeWidening.types |  4 +-
 .../constraintWithIndexedAccess.types         |  2 +-
 ...SignatureAssignabilityInInheritance2.types |  2 +-
 ...SignatureAssignabilityInInheritance3.types |  2 +-
 .../contextualReturnTypeOfIIFE3.types         |  2 +-
 ...tualSignatureInArrayElementLibEs2015.types |  2 +-
 ...textualSignatureInArrayElementLibEs5.types |  2 +-
 ...ntextualTypeOfIndexedAccessParameter.types |  2 +-
 .../reference/contextualTypeOnYield1.types    |  2 +-
 .../reference/contextualTypeOnYield2.types    |  2 +-
 .../reference/contextualTyping.types          |  2 +-
 .../reference/contextualTyping23.types        |  2 +-
 .../reference/contextualTyping24.types        |  2 +-
 .../reference/contextualTyping32.types        |  2 +-
 .../reference/contextualTyping33.types        |  2 +-
 .../contextualTypingOfObjectLiterals.types    |  2 +-
 .../reference/controlFlowAliasing.types       |  8 +-
 ...FlowDestructuringVariablesInTryCatch.types |  2 +-
 .../reference/controlFlowInOperator.types     |  2 +-
 .../reference/controlFlowOptionalChain3.types |  2 +-
 ...tParametersOfFunctionAndFunctionType.types |  4 +-
 .../declarationEmitGlobalThisPreserved.types  | 98 +++++++++----------
 ...RetainedAnnotationRetainsImportInOutput.js | 23 +++++
 ...nedAnnotationRetainsImportInOutput.symbols | 37 +++++++
 ...ainedAnnotationRetainsImportInOutput.types | 27 +++++
 .../defaultValueInFunctionTypes.types         |  2 +-
 .../dependentDestructuredVariables.types      | 16 +--
 .../destructuringAssignmentWithDefault.types  |  4 +-
 ...y3(exactoptionalpropertytypes=false).types |  4 +-
 ...ty3(exactoptionalpropertytypes=true).types |  4 +-
 ...iteralProperty_computedNameNegative1.types |  2 +-
 .../emitRestParametersFunctionProperty.types  |  2 +-
 ...mitRestParametersFunctionPropertyES6.types |  2 +-
 .../enumAssignabilityInInheritance.types      |  2 +-
 .../esDecorators-contextualTypes.2.types      |  6 +-
 .../esNextWeakRefs_IterableWeakMap.types      |  4 +-
 ...yCheckingIntersectionWithConditional.types |  4 +-
 .../forInStrictNullChecksNoError.types        |  2 +-
 ...nWithArgumentOfTypeFunctionTypeArray.types |  2 +-
 .../reference/functionLiterals.types          |  4 +-
 .../reference/generatedContextualTyping.types | 30 +++---
 .../reference/generatorTypeCheck29.types      |  2 +-
 .../reference/generatorTypeCheck30.types      |  2 +-
 .../reference/generatorTypeCheck31.types      |  2 +-
 .../reference/generatorTypeCheck45.types      |  4 +-
 ...icCallWithConstructorTypedArguments5.types |  4 +-
 ...nericCallWithFunctionTypedArguments5.types |  4 +-
 ...hOverloadedConstructorTypedArguments.types |  6 +-
 ...OverloadedConstructorTypedArguments2.types |  6 +-
 ...WithOverloadedFunctionTypedArguments.types |  6 +-
 ...ithOverloadedFunctionTypedArguments2.types |  6 +-
 .../reference/genericFunctionInference1.types |  2 +-
 .../reference/genericInterfaceTypeCall.types  |  2 +-
 .../getParameterNameAtPosition.types          |  2 +-
 .../identityAndDivergentNormalizedTypes.types |  4 +-
 ...yFunctionInvocationWithAnyArguements.types |  2 +-
 .../reference/implicitIndexSignatures.types   |  4 +-
 .../indexSignatureAndMappedType.types         |  6 +-
 ...peUnknownStillRequiresIndexSignature.types |  2 +-
 .../reference/indexSignatures1.types          |  4 +-
 .../indexSignaturesInferentialTyping.types    |  4 +-
 .../indexerReturningTypeParameter1.types      |  4 +-
 ...inferFromGenericFunctionReturnTypes3.types |  2 +-
 ...yWithContextSensitiveReturnStatement.types |  2 +-
 .../inferenceDoesNotAddUndefinedOrNull.types  |  2 +-
 .../inferenceOptionalProperties.types         |  2 +-
 .../inferenceOptionalPropertiesStrict.types   |  2 +-
 ...eOptionalPropertiesToIndexSignatures.types |  2 +-
 ...erentialTypingWithFunctionTypeNested.types |  4 +-
 ...inferentialTypingWithFunctionTypeZip.types |  2 +-
 .../baselines/reference/inferingFromAny.types |  4 +-
 .../inferredIndexerOnNamespaceImport.types    |  2 +-
 .../inferrenceInfiniteLoopWithSubtyping.types |  6 +-
 .../innerTypeCheckOfLambdaArgument.types      |  2 +-
 .../instantiateContextualTypes.types          |  2 +-
 .../reference/intraExpressionInferences.types | 42 ++++----
 .../isomorphicMappedTypeInference.types       |  2 +-
 ...ationsImportAliasExposedWithinNamespace.js | 11 ++-
 .../jsxChildrenGenericContextualTypes.types   |  4 +-
 ...omplexSignatureHasApplicabilityError.types |  2 +-
 .../baselines/reference/jsxElementType.types  | 20 ++--
 .../reference/keyofAndIndexedAccess.types     |  6 +-
 .../reference/keyofAndIndexedAccess2.types    |  6 +-
 .../logicalAssignment5(target=es2015).types   | 12 +--
 .../logicalAssignment5(target=es2020).types   | 12 +--
 .../logicalAssignment5(target=es2021).types   | 12 +--
 .../logicalAssignment5(target=esnext).types   | 12 +--
 .../methodSignaturesWithOverloads.types       |  2 +-
 .../methodSignaturesWithOverloads2.types      |  2 +-
 .../reference/namedTupleMembers.types         |  2 +-
 .../noImplicitReturnsExclusions.types         |  4 +-
 .../observableInferenceCanBeMade.types        |  4 +-
 tests/baselines/reference/override19.types    |  2 +-
 .../reference/parserParameterList5.types      |  2 +-
 .../reference/parserRealSource4.types         | 18 ++--
 .../privateNameInLhsReceiverExpression.types  |  2 +-
 .../restTuplesFromContextualTypes.types       |  6 +-
 .../reference/returnTypeTypeArguments.types   |  2 +-
 ...reverseMappedPartiallyInferableTypes.types |  2 +-
 .../reverseMappedUnionInference.types         |  2 +-
 ...natureOverloadReturnTypeWithIndexers.types | 16 +--
 .../reference/strictModeReservedWord.types    |  2 +-
 .../reference/strictOptionalProperties1.types |  4 +-
 .../reference/strictSubtypeAndNarrowing.types |  6 +-
 .../subtypingWithCallSignatures2.types        |  8 +-
 .../subtypingWithCallSignatures3.types        |  4 +-
 .../subtypingWithConstructSignatures2.types   |  8 +-
 .../subtypingWithConstructSignatures3.types   |  4 +-
 .../reference/symbolProperty61.types          |  2 +-
 ...ingsWithManyCallAndMemberExpressions.types |  2 +-
 ...sWithManyCallAndMemberExpressionsES6.types |  2 +-
 .../taggedTemplatesWithTypeArguments1.types   |  2 +-
 .../reference/tslibReExportHelpers2.types     |  2 +-
 ...FunctionComponentsWithTypeArguments1.types |  2 +-
 ...FunctionComponentsWithTypeArguments2.types |  2 +-
 ...FunctionComponentsWithTypeArguments3.types |  4 +-
 ...peArgumentInferenceWithObjectLiteral.types |  2 +-
 .../reference/typeGuardFunction.types         |  2 +-
 .../reference/typeGuardFunctionErrors.types   |  2 +-
 .../reference/typeGuardFunctionGenerics.types | 10 +-
 .../reference/typeLiteralCallback.types       |  2 +-
 tests/baselines/reference/typeMatch1.types    |  2 +-
 tests/baselines/reference/typeName1.types     |  4 +-
 .../typeParameterArgumentEquivalence5.types   |  4 +-
 .../typeVariableConstraintIntersections.types |  2 +-
 .../types.asyncGenerators.es2018.1.types      |  2 +-
 .../reference/unicodeEscapesInJsxtags.types   |  4 +-
 .../unionReductionMutualSubtypes.types        |  2 +-
 .../unionSignaturesWithThisParameter.types    |  2 +-
 .../reference/unionTypeReduction2.types       |  6 +-
 tests/baselines/reference/uniqueSymbols.types |  2 +-
 .../uniqueSymbolsDeclarationsErrors.types     |  2 +-
 tests/baselines/reference/unknownType1.types  |  2 +-
 .../reference/varArgsOnConstructorTypes.types |  2 +-
 ...aratorResolvedDuringContextualTyping.types |  2 +-
 .../reference/voidReturnLambdaValue.types     |  2 +-
 ...RetainedAnnotationRetainsImportInOutput.ts | 10 ++
 .../fourslash/objectLiteralCallSignatures.ts  |  2 +-
 160 files changed, 494 insertions(+), 384 deletions(-)
 create mode 100644 tests/baselines/reference/declarationEmitRetainedAnnotationRetainsImportInOutput.js
 create mode 100644 tests/baselines/reference/declarationEmitRetainedAnnotationRetainsImportInOutput.symbols
 create mode 100644 tests/baselines/reference/declarationEmitRetainedAnnotationRetainsImportInOutput.types
 create mode 100644 tests/cases/compiler/declarationEmitRetainedAnnotationRetainsImportInOutput.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 3fef78b1df9fb..6858ae40b5bec 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -6306,7 +6306,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
         }
     }
 
-    function isEntityNameVisible(entityName: EntityNameOrEntityNameExpression, enclosingDeclaration: Node): SymbolVisibilityResult {
+    function getMeaningOfEntityNameReference(entityName: EntityNameOrEntityNameExpression): SymbolFlags {
         // get symbol of the first identifier of the entityName
         let meaning: SymbolFlags;
         if (
@@ -6319,7 +6319,10 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
         }
         else if (
             entityName.kind === SyntaxKind.QualifiedName || entityName.kind === SyntaxKind.PropertyAccessExpression ||
-            entityName.parent.kind === SyntaxKind.ImportEqualsDeclaration
+            entityName.parent.kind === SyntaxKind.ImportEqualsDeclaration ||
+            (entityName.parent.kind === SyntaxKind.QualifiedName && (entityName.parent as QualifiedName).left === entityName) ||
+            (entityName.parent.kind === SyntaxKind.PropertyAccessExpression && (entityName.parent as PropertyAccessExpression).expression === entityName) ||
+            (entityName.parent.kind === SyntaxKind.ElementAccessExpression && (entityName.parent as ElementAccessExpression).expression === entityName)
         ) {
             // Left identifier from type reference or TypeAlias
             // Entity name of the import declaration
@@ -6329,7 +6332,11 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
             // Type Reference or TypeAlias entity = Identifier
             meaning = SymbolFlags.Type;
         }
+        return meaning;
+    }
 
+    function isEntityNameVisible(entityName: EntityNameOrEntityNameExpression, enclosingDeclaration: Node): SymbolVisibilityResult {
+        const meaning = getMeaningOfEntityNameReference(entityName);
         const firstIdentifier = getFirstIdentifier(entityName);
         const symbol = resolveName(enclosingDeclaration, firstIdentifier.escapedText, meaning, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined, /*isUse*/ false);
         if (symbol && symbol.flags & SymbolFlags.TypeParameter && meaning & SymbolFlags.Type) {
@@ -8512,13 +8519,14 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                 introducesError = true;
                 return { introducesError, node };
             }
-            const sym = resolveEntityName(leftmost, SymbolFlags.All, /*ignoreErrors*/ true, /*dontResolveAlias*/ true);
+            const meaning = getMeaningOfEntityNameReference(node);
+            const sym = resolveEntityName(leftmost, meaning, /*ignoreErrors*/ true, /*dontResolveAlias*/ true);
             if (sym) {
-                if (isSymbolAccessible(sym, context.enclosingDeclaration, SymbolFlags.All, /*shouldComputeAliasesToMakeVisible*/ false).accessibility !== SymbolAccessibility.Accessible) {
+                if (isSymbolAccessible(sym, context.enclosingDeclaration, meaning, /*shouldComputeAliasesToMakeVisible*/ false).accessibility !== SymbolAccessibility.Accessible) {
                     introducesError = true;
                 }
                 else {
-                    context.tracker.trackSymbol(sym, context.enclosingDeclaration, SymbolFlags.All);
+                    context.tracker.trackSymbol(sym, context.enclosingDeclaration, meaning);
                     includePrivateSymbol?.(sym);
                 }
                 if (isIdentifier(node)) {
diff --git a/tests/baselines/reference/ParameterList5.types b/tests/baselines/reference/ParameterList5.types
index e9dde482c5109..b51e74cab968d 100644
--- a/tests/baselines/reference/ParameterList5.types
+++ b/tests/baselines/reference/ParameterList5.types
@@ -2,6 +2,6 @@
 
 === ParameterList5.ts ===
 function A(): (public B) => C {
->A : () => (B: any) => C
+>A : () => (public B) => C
 >B : any
 }
diff --git a/tests/baselines/reference/annotatedThisPropertyInitializerDoesntNarrow.types b/tests/baselines/reference/annotatedThisPropertyInitializerDoesntNarrow.types
index f257b2b453176..45267a2357356 100644
--- a/tests/baselines/reference/annotatedThisPropertyInitializerDoesntNarrow.types
+++ b/tests/baselines/reference/annotatedThisPropertyInitializerDoesntNarrow.types
@@ -4,7 +4,7 @@
 // from webpack/lib/Compilation.js and filed at #26427
 /** @param {{ [s: string]: number }} map */
 function mappy(map) {}
->mappy : (map: { [s: string]: number; }) => void
+>mappy : (map: {    [s: string]: number;}) => void
 >map : { [s: string]: number; }
 
 export class C {
diff --git a/tests/baselines/reference/anonterface.types b/tests/baselines/reference/anonterface.types
index 74274684848d7..59405729860ad 100644
--- a/tests/baselines/reference/anonterface.types
+++ b/tests/baselines/reference/anonterface.types
@@ -8,7 +8,7 @@ module M {
 >C : C
 
         m(fn:{ (n:number):string; },n2:number):string {
->m : (fn: (n: number) => string, n2: number) => string
+>m : (fn: {    (n: number): string;}, n2: number) => string
 >fn : (n: number) => string
 >n : number
 >n2 : number
diff --git a/tests/baselines/reference/anyAssignabilityInInheritance.types b/tests/baselines/reference/anyAssignabilityInInheritance.types
index b96b62e1af6c4..195958de39a4c 100644
--- a/tests/baselines/reference/anyAssignabilityInInheritance.types
+++ b/tests/baselines/reference/anyAssignabilityInInheritance.types
@@ -168,7 +168,7 @@ var r3 = foo3(a); // any
 >a : any
 
 declare function foo12(x: (x) => number): (x) => number;
->foo12 : { (x: (x: any) => number): (x: any) => number; (x: any): any; }
+>foo12 : { (x: (x) => number): (x) => number; (x: any): any; }
 >x : (x: any) => number
 >x : any
 >x : any
diff --git a/tests/baselines/reference/arrayLiteralContextualType.types b/tests/baselines/reference/arrayLiteralContextualType.types
index 5af5173d6112b..d1608304a946c 100644
--- a/tests/baselines/reference/arrayLiteralContextualType.types
+++ b/tests/baselines/reference/arrayLiteralContextualType.types
@@ -35,7 +35,7 @@ function foo(animals: IAnimal[]) { }
 >animals : IAnimal[]
 
 function bar(animals: { [n: number]: IAnimal }) { }
->bar : (animals: { [n: number]: IAnimal; }) => void
+>bar : (animals: {    [n: number]: IAnimal;}) => void
 >animals : { [n: number]: IAnimal; }
 >n : number
 
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures3.types b/tests/baselines/reference/assignmentCompatWithCallSignatures3.types
index c73ecb914c3bf..62cb6fadbe7de 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures3.types
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures3.types
@@ -130,7 +130,7 @@ var a17: {
 
 };
 var a18: {
->a18 : { (x: { (a: number): number; (a: string): string; }): any[]; (x: { (a: boolean): boolean; (a: Date): Date; }): any[]; }
+>a18 : { (x: {    (a: number): number;    (a: string): string;}): any[]; (x: {    (a: boolean): boolean;    (a: Date): Date;}): any[]; }
 
     (x: {
 >x : { (a: number): number; (a: string): string; }
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures4.types b/tests/baselines/reference/assignmentCompatWithCallSignatures4.types
index 8cb1642ff718e..ec644d70aa889 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures4.types
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures4.types
@@ -81,7 +81,7 @@ module Errors {
 >b : number
 
         var a16: {
->a16 : { (x: { (a: number): number; (a?: number): number; }): number[]; (x: { (a: boolean): boolean; (a?: boolean): boolean; }): boolean[]; }
+>a16 : { (x: {    (a: number): number;    (a?: number): number;}): number[]; (x: {    (a: boolean): boolean;    (a?: boolean): boolean;}): boolean[]; }
 
                 (x: {
 >x : { (a: number): number; (a?: number): number; }
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures3.types b/tests/baselines/reference/assignmentCompatWithConstructSignatures3.types
index 8bf8a3a79f3d8..02c9dddbcc30f 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures3.types
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures3.types
@@ -130,7 +130,7 @@ var a17: {
 
 };
 var a18: {
->a18 : { new (x: { new (a: number): number; new (a: string): string; }): any[]; new (x: { new (a: boolean): boolean; new (a: Date): Date; }): any[]; }
+>a18 : { new (x: {    new (a: number): number;    new (a: string): string;}): any[]; new (x: {    new (a: boolean): boolean;    new (a: Date): Date;}): any[]; }
 
     new (x: {
 >x : { new (a: number): number; new (a: string): string; }
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures4.types b/tests/baselines/reference/assignmentCompatWithConstructSignatures4.types
index e854003d55ecc..d58c6ad783bdd 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures4.types
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures4.types
@@ -81,7 +81,7 @@ module Errors {
 >b : number
 
         var a16: {
->a16 : { new (x: { new (a: number): number; new (a?: number): number; }): number[]; new (x: { new (a: boolean): boolean; new (a?: boolean): boolean; }): boolean[]; }
+>a16 : { new (x: {    new (a: number): number;    new (a?: number): number;}): number[]; new (x: {    new (a: boolean): boolean;    new (a?: boolean): boolean;}): boolean[]; }
 
                 new (x: {
 >x : { new (a: number): number; new (a?: number): number; }
diff --git a/tests/baselines/reference/asyncFunctionContextuallyTypedReturns.types b/tests/baselines/reference/asyncFunctionContextuallyTypedReturns.types
index a6bad3686e8a0..1873363c7dcee 100644
--- a/tests/baselines/reference/asyncFunctionContextuallyTypedReturns.types
+++ b/tests/baselines/reference/asyncFunctionContextuallyTypedReturns.types
@@ -104,7 +104,7 @@ h(async v => v ? (def) => { } : Promise.reject());
 
 // repro from #29196
 const increment: (
->increment : (num: number, str: string) => string | Promise<string | ((s: string) => any)>
+>increment : (num: number, str: string) => Promise<((s: string) => any) | string> | string
 
   num: number,
 >num : number
@@ -130,7 +130,7 @@ const increment: (
 }
 
 const increment2: (
->increment2 : (num: number, str: string) => Promise<string | ((s: string) => any)>
+>increment2 : (num: number, str: string) => Promise<((s: string) => any) | string>
 
   num: number,
 >num : number
diff --git a/tests/baselines/reference/asyncFunctionsAndStrictNullChecks.types b/tests/baselines/reference/asyncFunctionsAndStrictNullChecks.types
index cde481af55d4a..e0dadb0d89de0 100644
--- a/tests/baselines/reference/asyncFunctionsAndStrictNullChecks.types
+++ b/tests/baselines/reference/asyncFunctionsAndStrictNullChecks.types
@@ -4,7 +4,7 @@
 declare namespace Windows.Foundation {
     interface IPromise<TResult> {
         then<U>(success?: (value: TResult) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>;
->then : { <U>(success?: ((value: TResult) => IPromise<U>) | undefined, error?: ((error: any) => IPromise<U>) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U>; <U_1>(success?: ((value: TResult) => IPromise<U_1>) | undefined, error?: ((error: any) => U_1) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U_1>; <U_2>(success?: ((value: TResult) => U_2) | undefined, error?: ((error: any) => IPromise<U_2>) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U_2>; <U_3>(success?: ((value: TResult) => U_3) | undefined, error?: ((error: any) => U_3) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U_3>; }
+>then : { <U>(success?: (value: TResult) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U_1>(success?: ((value: TResult) => IPromise<U_1>) | undefined, error?: ((error: any) => U_1) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U_1>; <U_2>(success?: ((value: TResult) => U_2) | undefined, error?: ((error: any) => IPromise<U_2>) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U_2>; <U_3>(success?: ((value: TResult) => U_3) | undefined, error?: ((error: any) => U_3) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U_3>; }
 >success : ((value: TResult) => IPromise<U>) | undefined
 >value : TResult
 >error : ((error: any) => IPromise<U>) | undefined
@@ -13,7 +13,7 @@ declare namespace Windows.Foundation {
 >progress : any
 
         then<U>(success?: (value: TResult) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>;
->then : { <U_1>(success?: ((value: TResult) => IPromise<U_1>) | undefined, error?: ((error: any) => IPromise<U_1>) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U_1>; <U>(success?: ((value: TResult) => IPromise<U>) | undefined, error?: ((error: any) => U) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U>; <U_2>(success?: ((value: TResult) => U_2) | undefined, error?: ((error: any) => IPromise<U_2>) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U_2>; <U_3>(success?: ((value: TResult) => U_3) | undefined, error?: ((error: any) => U_3) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U_3>; }
+>then : { <U_1>(success?: ((value: TResult) => IPromise<U_1>) | undefined, error?: ((error: any) => IPromise<U_1>) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U_1>; <U>(success?: (value: TResult) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U_2>(success?: ((value: TResult) => U_2) | undefined, error?: ((error: any) => IPromise<U_2>) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U_2>; <U_3>(success?: ((value: TResult) => U_3) | undefined, error?: ((error: any) => U_3) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U_3>; }
 >success : ((value: TResult) => IPromise<U>) | undefined
 >value : TResult
 >error : ((error: any) => U) | undefined
@@ -22,7 +22,7 @@ declare namespace Windows.Foundation {
 >progress : any
 
         then<U>(success?: (value: TResult) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>;
->then : { <U_1>(success?: ((value: TResult) => IPromise<U_1>) | undefined, error?: ((error: any) => IPromise<U_1>) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U_1>; <U_2>(success?: ((value: TResult) => IPromise<U_2>) | undefined, error?: ((error: any) => U_2) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U_2>; <U>(success?: ((value: TResult) => U) | undefined, error?: ((error: any) => IPromise<U>) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U>; <U_3>(success?: ((value: TResult) => U_3) | undefined, error?: ((error: any) => U_3) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U_3>; }
+>then : { <U_1>(success?: ((value: TResult) => IPromise<U_1>) | undefined, error?: ((error: any) => IPromise<U_1>) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U_1>; <U_2>(success?: ((value: TResult) => IPromise<U_2>) | undefined, error?: ((error: any) => U_2) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U_2>; <U>(success?: (value: TResult) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U_3>(success?: ((value: TResult) => U_3) | undefined, error?: ((error: any) => U_3) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U_3>; }
 >success : ((value: TResult) => U) | undefined
 >value : TResult
 >error : ((error: any) => IPromise<U>) | undefined
@@ -31,7 +31,7 @@ declare namespace Windows.Foundation {
 >progress : any
 
         then<U>(success?: (value: TResult) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>;
->then : { <U_1>(success?: ((value: TResult) => IPromise<U_1>) | undefined, error?: ((error: any) => IPromise<U_1>) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U_1>; <U_2>(success?: ((value: TResult) => IPromise<U_2>) | undefined, error?: ((error: any) => U_2) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U_2>; <U_3>(success?: ((value: TResult) => U_3) | undefined, error?: ((error: any) => IPromise<U_3>) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U_3>; <U>(success?: ((value: TResult) => U) | undefined, error?: ((error: any) => U) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U>; }
+>then : { <U_1>(success?: ((value: TResult) => IPromise<U_1>) | undefined, error?: ((error: any) => IPromise<U_1>) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U_1>; <U_2>(success?: ((value: TResult) => IPromise<U_2>) | undefined, error?: ((error: any) => U_2) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U_2>; <U_3>(success?: ((value: TResult) => U_3) | undefined, error?: ((error: any) => IPromise<U_3>) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U_3>; <U>(success?: (value: TResult) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }
 >success : ((value: TResult) => U) | undefined
 >value : TResult
 >error : ((error: any) => U) | undefined
@@ -40,7 +40,7 @@ declare namespace Windows.Foundation {
 >progress : any
 
         done<U>(success?: (value: TResult) => any, error?: (error: any) => any, progress?: (progress: any) => void): void;
->done : <U>(success?: ((value: TResult) => any) | undefined, error?: ((error: any) => any) | undefined, progress?: ((progress: any) => void) | undefined) => void
+>done : <U>(success?: (value: TResult) => any, error?: (error: any) => any, progress?: (progress: any) => void) => void
 >success : ((value: TResult) => any) | undefined
 >value : TResult
 >error : ((error: any) => any) | undefined
diff --git a/tests/baselines/reference/avoidNarrowingUsingConstVariableFromBindingElementWithLiteralInitializer.types b/tests/baselines/reference/avoidNarrowingUsingConstVariableFromBindingElementWithLiteralInitializer.types
index 24155c1a02085..649ba1345430e 100644
--- a/tests/baselines/reference/avoidNarrowingUsingConstVariableFromBindingElementWithLiteralInitializer.types
+++ b/tests/baselines/reference/avoidNarrowingUsingConstVariableFromBindingElementWithLiteralInitializer.types
@@ -5,7 +5,7 @@ declare const foo: ["a", string, number] | ["b", string, boolean];
 >foo : ["a", string, number] | ["b", string, boolean]
 
 export function test(arg: { index?: number }) {
->test : (arg: { index?: number | undefined; }) => void
+>test : (arg: {    index?: number;}) => void
 >arg : { index?: number | undefined; }
 >index : number | undefined
 
diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance2.types b/tests/baselines/reference/callSignatureAssignabilityInInheritance2.types
index 3e0c95356ae27..65468978985a7 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance2.types
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance2.types
@@ -134,7 +134,7 @@ interface A { // T
 
     };
     a18: {
->a18 : { (x: { (a: number): number; (a: string): string; }): any[]; (x: { (a: boolean): boolean; (a: Date): Date; }): any[]; }
+>a18 : { (x: {    (a: number): number;    (a: string): string;}): any[]; (x: {    (a: boolean): boolean;    (a: Date): Date;}): any[]; }
 
         (x: {
 >x : { (a: number): number; (a: string): string; }
diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance3.types b/tests/baselines/reference/callSignatureAssignabilityInInheritance3.types
index 19516ba55bde1..33b648a0d18cb 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance3.types
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance3.types
@@ -81,7 +81,7 @@ module Errors {
 >b : number
 
             a16: {
->a16 : { (x: { (a: number): number; (a?: number): number; }): number[]; (x: { (a: boolean): boolean; (a?: boolean): boolean; }): boolean[]; }
+>a16 : { (x: {    (a: number): number;    (a?: number): number;}): number[]; (x: {    (a: boolean): boolean;    (a?: boolean): boolean;}): boolean[]; }
 
                 // type of parameter is overload set which means we can't do inference based on this type
                 (x: {
diff --git a/tests/baselines/reference/callsOnComplexSignatures.types b/tests/baselines/reference/callsOnComplexSignatures.types
index 3a49fd91878ea..998394b702580 100644
--- a/tests/baselines/reference/callsOnComplexSignatures.types
+++ b/tests/baselines/reference/callsOnComplexSignatures.types
@@ -46,13 +46,13 @@ function test2() {
 
     interface Messages {
         readonly foo: (options: { [key: string]: any, b: number }) => string;
->foo : (options: { [key: string]: any; b: number; }) => string
+>foo : (options: {    [key: string]: any;    b: number;}) => string
 >options : { [key: string]: any; b: number; }
 >key : string
 >b : number
 
         readonly bar: (options: { [key: string]: any, a: string }) => string;
->bar : (options: { [key: string]: any; a: string; }) => string
+>bar : (options: {    [key: string]: any;    a: string;}) => string
 >options : { [key: string]: any; a: string; }
 >key : string
 >a : string
diff --git a/tests/baselines/reference/collisionArgumentsInType.types b/tests/baselines/reference/collisionArgumentsInType.types
index 044a9cbf3cbe5..e4afd2460f860 100644
--- a/tests/baselines/reference/collisionArgumentsInType.types
+++ b/tests/baselines/reference/collisionArgumentsInType.types
@@ -12,7 +12,7 @@ var v12: (arguments: number, ...restParameters) => void; // no error - no code g
 >restParameters : any[]
 
 var v2: {
->v2 : { (arguments: number, ...restParameters: any[]): any; new (arguments: number, ...restParameters: any[]): any; foo(arguments: number, ...restParameters: any[]): any; prop: (arguments: number, ...restParameters: any[]) => void; }
+>v2 : { (arguments: number, ...restParameters: any[]): any; new (arguments: number, ...restParameters: any[]): any; foo(arguments: number, ...restParameters: any[]): any; prop: (arguments: number, ...restParameters) => void; }
 
     (arguments: number, ...restParameters); // no error - no code gen
 >arguments : number
@@ -33,7 +33,7 @@ var v2: {
 >restParameters : any[]
 }
 var v21: {
->v21 : { (i: number, ...arguments: any[]): any; new (i: number, ...arguments: any[]): any; foo(i: number, ...arguments: any[]): any; prop: (i: number, ...arguments: any[]) => void; }
+>v21 : { (i: number, ...arguments: any[]): any; new (i: number, ...arguments: any[]): any; foo(i: number, ...arguments: any[]): any; prop: (i: number, ...arguments) => void; }
 
     (i: number, ...arguments); // no error - no code gen
 >i : number
diff --git a/tests/baselines/reference/collisionRestParameterInType.types b/tests/baselines/reference/collisionRestParameterInType.types
index 11322dca66026..fb753a69e157d 100644
--- a/tests/baselines/reference/collisionRestParameterInType.types
+++ b/tests/baselines/reference/collisionRestParameterInType.types
@@ -7,7 +7,7 @@ var v1: (_i: number, ...restParameters) => void; // no error - no code gen
 >restParameters : any[]
 
 var v2: {
->v2 : { (_i: number, ...restParameters: any[]): any; new (_i: number, ...restParameters: any[]): any; foo(_i: number, ...restParameters: any[]): any; prop: (_i: number, ...restParameters: any[]) => void; }
+>v2 : { (_i: number, ...restParameters: any[]): any; new (_i: number, ...restParameters: any[]): any; foo(_i: number, ...restParameters: any[]): any; prop: (_i: number, ...restParameters) => void; }
 
     (_i: number, ...restParameters); // no error - no code gen
 >_i : number
diff --git a/tests/baselines/reference/complexRecursiveCollections.types b/tests/baselines/reference/complexRecursiveCollections.types
index 8fbbe76f6d8bf..82552a83a1e86 100644
--- a/tests/baselines/reference/complexRecursiveCollections.types
+++ b/tests/baselines/reference/complexRecursiveCollections.types
@@ -418,12 +418,12 @@ declare module Immutable {
 >value : this
 
     merge(...collections: Array<Collection<K, V> | {[key: string]: V}>): this;
->merge : (...collections: (Collection<K, V> | { [key: string]: V; })[]) => this
+>merge : (...collections: Array<Collection<K, V> | {    [key: string]: V;}>) => this
 >collections : (Collection<K, V> | { [key: string]: V; })[]
 >key : string
 
     mergeWith(merger: (oldVal: V, newVal: V, key: K) => V, ...collections: Array<Collection<K, V> | {[key: string]: V}>): this;
->mergeWith : (merger: (oldVal: V, newVal: V, key: K) => V, ...collections: (Collection<K, V> | { [key: string]: V; })[]) => this
+>mergeWith : (merger: (oldVal: V, newVal: V, key: K) => V, ...collections: Array<Collection<K, V> | {    [key: string]: V;}>) => this
 >merger : (oldVal: V, newVal: V, key: K) => V
 >oldVal : V
 >newVal : V
@@ -432,12 +432,12 @@ declare module Immutable {
 >key : string
 
     mergeDeep(...collections: Array<Collection<K, V> | {[key: string]: V}>): this;
->mergeDeep : (...collections: (Collection<K, V> | { [key: string]: V; })[]) => this
+>mergeDeep : (...collections: Array<Collection<K, V> | {    [key: string]: V;}>) => this
 >collections : (Collection<K, V> | { [key: string]: V; })[]
 >key : string
 
     mergeDeepWith(merger: (oldVal: V, newVal: V, key: K) => V, ...collections: Array<Collection<K, V> | {[key: string]: V}>): this;
->mergeDeepWith : (merger: (oldVal: V, newVal: V, key: K) => V, ...collections: (Collection<K, V> | { [key: string]: V; })[]) => this
+>mergeDeepWith : (merger: (oldVal: V, newVal: V, key: K) => V, ...collections: Array<Collection<K, V> | {    [key: string]: V;}>) => this
 >merger : (oldVal: V, newVal: V, key: K) => V
 >oldVal : V
 >newVal : V
@@ -500,7 +500,7 @@ declare module Immutable {
 >collections : Iterable<[KC, VC]>[]
 
     concat<C>(...collections: Array<{[key: string]: C}>): Map<K | string, V | C>;
->concat : { <KC, VC>(...collections: Iterable<[KC, VC]>[]): Map<K | KC, V | VC>; <C>(...collections: { [key: string]: C; }[]): Map<K | string, V | C>; }
+>concat : { <KC, VC>(...collections: Iterable<[KC, VC]>[]): Map<K | KC, V | VC>; <C>(...collections: Array<{    [key: string]: C;}>): Map<K | string, V | C>; }
 >collections : { [key: string]: C; }[]
 >key : string
 
@@ -585,7 +585,7 @@ declare module Immutable {
 >collections : Iterable<[KC, VC]>[]
 
     concat<C>(...collections: Array<{[key: string]: C}>): OrderedMap<K | string, V | C>;
->concat : { <KC, VC>(...collections: Iterable<[KC, VC]>[]): OrderedMap<K | KC, V | VC>; <C>(...collections: { [key: string]: C; }[]): OrderedMap<K | string, V | C>; }
+>concat : { <KC, VC>(...collections: Iterable<[KC, VC]>[]): OrderedMap<K | KC, V | VC>; <C>(...collections: Array<{    [key: string]: C;}>): OrderedMap<K | string, V | C>; }
 >collections : { [key: string]: C; }[]
 >key : string
 
@@ -653,7 +653,7 @@ declare module Immutable {
 >iter : Collection<T, any>
 
     function fromKeys(obj: {[key: string]: any}): Set<string>;
->fromKeys : { <T>(iter: Collection<T, any>): Set<T>; (obj: { [key: string]: any; }): Set<string>; }
+>fromKeys : { <T>(iter: Collection<T, any>): Set<T>; (obj: {    [key: string]: any;}): Set<string>; }
 >obj : { [key: string]: any; }
 >key : string
 
@@ -775,7 +775,7 @@ declare module Immutable {
 >iter : Collection<T, any>
 
     function fromKeys(obj: {[key: string]: any}): OrderedSet<string>;
->fromKeys : { <T>(iter: Collection<T, any>): OrderedSet<T>; (obj: { [key: string]: any; }): OrderedSet<string>; }
+>fromKeys : { <T>(iter: Collection<T, any>): OrderedSet<T>; (obj: {    [key: string]: any;}): OrderedSet<string>; }
 >obj : { [key: string]: any; }
 >key : string
   }
@@ -1156,7 +1156,7 @@ declare module Immutable {
 >Seq : any
 
     export function Keyed<V>(obj: {[key: string]: V}): Seq.Keyed<string, V>;
->Keyed : { <K, V_1>(collection: Iterable<[K, V_1]>): Keyed<K, V_1>; <V>(obj: { [key: string]: V; }): Seq.Keyed<string, V>; <K_1, V_2>(): Keyed<K_1, V_2>; (): Keyed<any, any>; }
+>Keyed : { <K, V_1>(collection: Iterable<[K, V_1]>): Keyed<K, V_1>; <V>(obj: {    [key: string]: V;}): Seq.Keyed<string, V>; <K_1, V_2>(): Keyed<K_1, V_2>; (): Keyed<any, any>; }
 >obj : { [key: string]: V; }
 >key : string
 >Seq : any
@@ -1176,7 +1176,7 @@ declare module Immutable {
 >toJS : () => Object
 
       toJSON(): { [key: string]: V };
->toJSON : () => { [key: string]: V; }
+>toJSON : () => {    [key: string]: V;}
 >key : string
 
       toSeq(): this;
@@ -1188,7 +1188,7 @@ declare module Immutable {
 >Seq : any
 
       concat<C>(...collections: Array<{[key: string]: C}>): Seq.Keyed<K | string, V | C>;
->concat : { <KC, VC>(...collections: Iterable<[KC, VC]>[]): Keyed<K | KC, V | VC>; <C>(...collections: { [key: string]: C; }[]): Seq.Keyed<K | string, V | C>; }
+>concat : { <KC, VC>(...collections: Iterable<[KC, VC]>[]): Keyed<K | KC, V | VC>; <C>(...collections: Array<{    [key: string]: C;}>): Seq.Keyed<K | string, V | C>; }
 >collections : { [key: string]: C; }[]
 >key : string
 >Seq : any
@@ -1500,7 +1500,7 @@ declare module Immutable {
 >Collection : any
 
     export function Keyed<V>(obj: {[key: string]: V}): Collection.Keyed<string, V>;
->Keyed : { <K, V_1>(collection: Iterable<[K, V_1]>): Keyed<K, V_1>; <V>(obj: { [key: string]: V; }): Collection.Keyed<string, V>; }
+>Keyed : { <K, V_1>(collection: Iterable<[K, V_1]>): Keyed<K, V_1>; <V>(obj: {    [key: string]: V;}): Collection.Keyed<string, V>; }
 >obj : { [key: string]: V; }
 >key : string
 >Collection : any
@@ -1510,7 +1510,7 @@ declare module Immutable {
 >toJS : () => Object
 
       toJSON(): { [key: string]: V };
->toJSON : () => { [key: string]: V; }
+>toJSON : () => {    [key: string]: V;}
 >key : string
 
       toSeq(): Seq.Keyed<K, V>;
@@ -1527,7 +1527,7 @@ declare module Immutable {
 >Collection : any
 
       concat<C>(...collections: Array<{[key: string]: C}>): Collection.Keyed<K | string, V | C>;
->concat : { <KC, VC>(...collections: Iterable<[KC, VC]>[]): Keyed<K | KC, V | VC>; <C>(...collections: { [key: string]: C; }[]): Collection.Keyed<K | string, V | C>; }
+>concat : { <KC, VC>(...collections: Iterable<[KC, VC]>[]): Keyed<K | KC, V | VC>; <C>(...collections: Array<{    [key: string]: C;}>): Collection.Keyed<K | string, V | C>; }
 >collections : { [key: string]: C; }[]
 >key : string
 >Collection : any
@@ -1875,18 +1875,18 @@ declare module Immutable {
 
     // Conversion to JavaScript types
     toJS(): Array<any> | { [key: string]: any };
->toJS : () => any[] | { [key: string]: any; }
+>toJS : () => Array<any> | {    [key: string]: any;}
 >key : string
 
     toJSON(): Array<V> | { [key: string]: V };
->toJSON : () => V[] | { [key: string]: V; }
+>toJSON : () => Array<V> | {    [key: string]: V;}
 >key : string
 
     toArray(): Array<V>;
 >toArray : () => Array<V>
 
     toObject(): { [key: string]: V };
->toObject : () => { [key: string]: V; }
+>toObject : () => {    [key: string]: V;}
 >key : string
 
     // Conversion to Collections
diff --git a/tests/baselines/reference/complicatedPrivacy.types b/tests/baselines/reference/complicatedPrivacy.types
index c43b086d817f3..c8e8e522759a5 100644
--- a/tests/baselines/reference/complicatedPrivacy.types
+++ b/tests/baselines/reference/complicatedPrivacy.types
@@ -52,7 +52,7 @@ module m1 {
     }
 
     export function f3(): {
->f3 : () => (a: number) => C1
+>f3 : () => {    (a: number): C1;}
 
         (a: number) : C1;
 >a : number
@@ -74,7 +74,7 @@ module m1 {
 
 
     export function f5(arg2: {
->f5 : (arg2: new (arg1: C1) => C1) => void
+>f5 : (arg2: {    new (arg1: C1): C1;}) => void
 >arg2 : new (arg1: C1) => C1
 
         new (arg1: C1) : C1
diff --git a/tests/baselines/reference/computedPropertyNames48_ES5.types b/tests/baselines/reference/computedPropertyNames48_ES5.types
index a55489c7bda34..2d34a248f4268 100644
--- a/tests/baselines/reference/computedPropertyNames48_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames48_ES5.types
@@ -2,7 +2,7 @@
 
 === computedPropertyNames48_ES5.ts ===
 declare function extractIndexer<T>(p: { [n: number]: T }): T;
->extractIndexer : <T>(p: { [n: number]: T; }) => T
+>extractIndexer : <T>(p: {    [n: number]: T;}) => T
 >p : { [n: number]: T; }
 >n : number
 
diff --git a/tests/baselines/reference/computedPropertyNames48_ES6.types b/tests/baselines/reference/computedPropertyNames48_ES6.types
index d34121937baff..db27fafd2664f 100644
--- a/tests/baselines/reference/computedPropertyNames48_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames48_ES6.types
@@ -2,7 +2,7 @@
 
 === computedPropertyNames48_ES6.ts ===
 declare function extractIndexer<T>(p: { [n: number]: T }): T;
->extractIndexer : <T>(p: { [n: number]: T; }) => T
+>extractIndexer : <T>(p: {    [n: number]: T;}) => T
 >p : { [n: number]: T; }
 >n : number
 
diff --git a/tests/baselines/reference/conditionalTypeBasedContextualTypeReturnTypeWidening.types b/tests/baselines/reference/conditionalTypeBasedContextualTypeReturnTypeWidening.types
index 67e4c763b30fb..6922ad1d6a5d8 100644
--- a/tests/baselines/reference/conditionalTypeBasedContextualTypeReturnTypeWidening.types
+++ b/tests/baselines/reference/conditionalTypeBasedContextualTypeReturnTypeWidening.types
@@ -6,7 +6,7 @@ declare function useState1<S>(initialState: (S extends (() => any) ? never : S)
 >initialState : (S extends () => any ? never : S) | (() => S)
 
 declare function useState2<S>(initialState: (S extends ((...args: any[]) => any) ? never : S) | (() => S)): S; // Any args
->useState2 : <S>(initialState: (S extends (...args: any[]) => any ? never : S) | (() => S)) => S
+>useState2 : <S>(initialState: (S extends ((...args: any[]) => any) ? never : S) | (() => S)) => S
 >initialState : (S extends (...args: any[]) => any ? never : S) | (() => S)
 >args : any[]
 
@@ -31,7 +31,7 @@ declare function useState3<S, T extends S>(initialState: (T extends (() => any)
 >initialState : (T extends () => any ? never : T) | (() => S)
 
 declare function useState4<S, T extends S>(initialState: (T extends ((...args: any[]) => any) ? never : T) | (() => S)): S; // Any args
->useState4 : <S, T extends S>(initialState: (T extends (...args: any[]) => any ? never : T) | (() => S)) => S
+>useState4 : <S, T extends S>(initialState: (T extends ((...args: any[]) => any) ? never : T) | (() => S)) => S
 >initialState : (T extends (...args: any[]) => any ? never : T) | (() => S)
 >args : any[]
 
diff --git a/tests/baselines/reference/constraintWithIndexedAccess.types b/tests/baselines/reference/constraintWithIndexedAccess.types
index c448e08e22320..e3f595d5095ed 100644
--- a/tests/baselines/reference/constraintWithIndexedAccess.types
+++ b/tests/baselines/reference/constraintWithIndexedAccess.types
@@ -3,7 +3,7 @@
 === constraintWithIndexedAccess.ts ===
 // #52399
 type DataFetchFns = {
->DataFetchFns : { Boat: { requiresLicense: (id: string) => boolean; maxGroundSpeed: (id: string) => number; description: (id: string) => string; displacement: (id: string) => number; name: (id: string) => string; }; Plane: { requiresLicense: (id: string) => boolean; maxGroundSpeed: (id: string) => number; maxTakeoffWeight: (id: string) => number; maxCruisingAltitude: (id: string) => number; name: (id: string) => string; }; }
+>DataFetchFns : { Boat: {    requiresLicense: (id: string) => boolean;    maxGroundSpeed: (id: string) => number;    description: (id: string) => string;    displacement: (id: string) => number;    name: (id: string) => string;}; Plane: {    requiresLicense: (id: string) => boolean;    maxGroundSpeed: (id: string) => number;    maxTakeoffWeight: (id: string) => number;    maxCruisingAltitude: (id: string) => number;    name: (id: string) => string;}; }
 
     Boat: {
 >Boat : { requiresLicense: (id: string) => boolean; maxGroundSpeed: (id: string) => number; description: (id: string) => string; displacement: (id: string) => number; name: (id: string) => string; }
diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.types b/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.types
index 2ff0dba4385c1..53d47fecbc1a2 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.types
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.types
@@ -134,7 +134,7 @@ interface A { // T
 
     };
     a18: {
->a18 : { new (x: { new (a: number): number; new (a: string): string; }): any[]; new (x: { new (a: boolean): boolean; new (a: Date): Date; }): any[]; }
+>a18 : { new (x: {    new (a: number): number;    new (a: string): string;}): any[]; new (x: {    new (a: boolean): boolean;    new (a: Date): Date;}): any[]; }
 
         new (x: {
 >x : { new (a: number): number; new (a: string): string; }
diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.types b/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.types
index e342e13f9b931..a97e1f409ea18 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.types
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.types
@@ -81,7 +81,7 @@ module Errors {
 >b : number
 
             a16: {
->a16 : { new (x: { new (a: number): number; new (a?: number): number; }): number[]; new (x: { new (a: boolean): boolean; new (a?: boolean): boolean; }): boolean[]; }
+>a16 : { new (x: {    new (a: number): number;    new (a?: number): number;}): number[]; new (x: {    new (a: boolean): boolean;    new (a?: boolean): boolean;}): boolean[]; }
 
                 // type of parameter is overload set which means we can't do inference based on this type
                 new (x: {
diff --git a/tests/baselines/reference/contextualReturnTypeOfIIFE3.types b/tests/baselines/reference/contextualReturnTypeOfIIFE3.types
index 002881a35da44..93ebf51cc6a53 100644
--- a/tests/baselines/reference/contextualReturnTypeOfIIFE3.types
+++ b/tests/baselines/reference/contextualReturnTypeOfIIFE3.types
@@ -5,7 +5,7 @@ declare namespace app {
 >app : typeof app
 
   var foo: {
->foo : { bar: { someFun: (arg: number) => void; }; }
+>foo : { bar: {    someFun: (arg: number) => void;}; }
 
     bar: {
 >bar : { someFun: (arg: number) => void; }
diff --git a/tests/baselines/reference/contextualSignatureInArrayElementLibEs2015.types b/tests/baselines/reference/contextualSignatureInArrayElementLibEs2015.types
index b5a202c16ed61..e159a9aa5b4cd 100644
--- a/tests/baselines/reference/contextualSignatureInArrayElementLibEs2015.types
+++ b/tests/baselines/reference/contextualSignatureInArrayElementLibEs2015.types
@@ -4,7 +4,7 @@
 // See: https://github.com/microsoft/TypeScript/pull/53280#discussion_r1138684984
 
 declare function test(
->test : (arg: Record<string, (arg: string) => void> | ((arg: number) => void)[]) => void
+>test : (arg: Record<string, (arg: string) => void> | Array<(arg: number) => void>) => void
 
   arg: Record<string, (arg: string) => void> | Array<(arg: number) => void>
 >arg : Record<string, (arg: string) => void> | ((arg: number) => void)[]
diff --git a/tests/baselines/reference/contextualSignatureInArrayElementLibEs5.types b/tests/baselines/reference/contextualSignatureInArrayElementLibEs5.types
index 5b4a4cc65891b..93c92a5ebf257 100644
--- a/tests/baselines/reference/contextualSignatureInArrayElementLibEs5.types
+++ b/tests/baselines/reference/contextualSignatureInArrayElementLibEs5.types
@@ -4,7 +4,7 @@
 // See: https://github.com/microsoft/TypeScript/pull/53280#discussion_r1138684984
 
 declare function test(
->test : (arg: Record<string, (arg: string) => void> | ((arg: number) => void)[]) => void
+>test : (arg: Record<string, (arg: string) => void> | Array<(arg: number) => void>) => void
 
   arg: Record<string, (arg: string) => void> | Array<(arg: number) => void>
 >arg : Record<string, (arg: string) => void> | ((arg: number) => void)[]
diff --git a/tests/baselines/reference/contextualTypeOfIndexedAccessParameter.types b/tests/baselines/reference/contextualTypeOfIndexedAccessParameter.types
index 49aa2be3ac271..7b6ea19ac5998 100644
--- a/tests/baselines/reference/contextualTypeOfIndexedAccessParameter.types
+++ b/tests/baselines/reference/contextualTypeOfIndexedAccessParameter.types
@@ -5,7 +5,7 @@ type Keys = "a" | "b";
 >Keys : "a" | "b"
 
 type OptionsForKey = { a: { cb: (p: number) => number } } & { b: {} };
->OptionsForKey : { a: { cb: (p: number) => number; }; } & { b: {}; }
+>OptionsForKey : { a: {    cb: (p: number) => number;}; } & { b: {}; }
 >a : { cb: (p: number) => number; }
 >cb : (p: number) => number
 >p : number
diff --git a/tests/baselines/reference/contextualTypeOnYield1.types b/tests/baselines/reference/contextualTypeOnYield1.types
index abca3a3176923..422e6dddade25 100644
--- a/tests/baselines/reference/contextualTypeOnYield1.types
+++ b/tests/baselines/reference/contextualTypeOnYield1.types
@@ -2,7 +2,7 @@
 
 === contextualTypeOnYield1.ts ===
 type FuncOrGeneratorFunc = () => (number | Generator<(arg: number) => void, any, void>)
->FuncOrGeneratorFunc : () => number | Generator<(arg: number) => void, any, void>
+>FuncOrGeneratorFunc : () => (number | Generator<(arg: number) => void, any, void>)
 >arg : number
 
 const f: FuncOrGeneratorFunc = function*() {
diff --git a/tests/baselines/reference/contextualTypeOnYield2.types b/tests/baselines/reference/contextualTypeOnYield2.types
index 0d54bdf7dd790..38c097b4d2d8e 100644
--- a/tests/baselines/reference/contextualTypeOnYield2.types
+++ b/tests/baselines/reference/contextualTypeOnYield2.types
@@ -2,7 +2,7 @@
 
 === contextualTypeOnYield2.ts ===
 type OrGen = () => (number | Generator<string, (arg: number) => void, undefined>);
->OrGen : () => number | Generator<string, (arg: number) => void, undefined>
+>OrGen : () => (number | Generator<string, (arg: number) => void, undefined>)
 >arg : number
 
 const g: OrGen = function* () {
diff --git a/tests/baselines/reference/contextualTyping.types b/tests/baselines/reference/contextualTyping.types
index 435a3ccce2802..3da7f32f34479 100644
--- a/tests/baselines/reference/contextualTyping.types
+++ b/tests/baselines/reference/contextualTyping.types
@@ -327,7 +327,7 @@ interface IPlaceHolder {
     }
 
 var objc8: {
->objc8 : { t1: (s: string) => string; t2: IFoo; t3: number[]; t4: () => IFoo; t5: (n: number) => IFoo; t6: (n: number, s: string) => IFoo; t7: (n: number, s: string) => number; t8: (n: number, s: string) => number; t9: number[][]; t10: IFoo[]; t11: ((n: number, s: string) => string)[]; t12: IBar; t13: IFoo; t14: IFoo; }
+>objc8 : { t1: (s: string) => string; t2: IFoo; t3: number[]; t4: () => IFoo; t5: (n: number) => IFoo; t6: (n: number, s: string) => IFoo; t7: {    (n: number, s: string): number;}; t8: (n: number, s: string) => number; t9: number[][]; t10: IFoo[]; t11: {    (n: number, s: string): string;}[]; t12: IBar; t13: IFoo; t14: IFoo; }
 
     t1: (s: string) => string;
 >t1 : (s: string) => string
diff --git a/tests/baselines/reference/contextualTyping23.types b/tests/baselines/reference/contextualTyping23.types
index 2aa3139ae530e..6909452a3b648 100644
--- a/tests/baselines/reference/contextualTyping23.types
+++ b/tests/baselines/reference/contextualTyping23.types
@@ -2,7 +2,7 @@
 
 === contextualTyping23.ts ===
 var foo:(a:{():number; (i:number):number; })=>number; foo = function(a){return 5};
->foo : (a: { (): number; (i: number): number; }) => number
+>foo : (a: {    (): number;    (i: number): number;}) => number
 >a : { (): number; (i: number): number; }
 >i : number
 >foo = function(a){return 5} : (a: { (): number; (i: number): number; }) => number
diff --git a/tests/baselines/reference/contextualTyping24.types b/tests/baselines/reference/contextualTyping24.types
index 8e4b45d78565a..e00365599babd 100644
--- a/tests/baselines/reference/contextualTyping24.types
+++ b/tests/baselines/reference/contextualTyping24.types
@@ -2,7 +2,7 @@
 
 === contextualTyping24.ts ===
 var foo:(a:{():number; (i:number):number; })=>number; foo = function(this: void, a:string){return 5};
->foo : (a: { (): number; (i: number): number; }) => number
+>foo : (a: {    (): number;    (i: number): number;}) => number
 >a : { (): number; (i: number): number; }
 >i : number
 >foo = function(this: void, a:string){return 5} : (this: void, a: string) => number
diff --git a/tests/baselines/reference/contextualTyping32.types b/tests/baselines/reference/contextualTyping32.types
index 00e0c8821b8cb..666cec7af547d 100644
--- a/tests/baselines/reference/contextualTyping32.types
+++ b/tests/baselines/reference/contextualTyping32.types
@@ -2,7 +2,7 @@
 
 === contextualTyping32.ts ===
 function foo(param: {():number; (i:number):number; }[]) { }; foo([function(){return 1;}, function(){return 4}]);
->foo : (param: { (): number; (i: number): number; }[]) => void
+>foo : (param: {    (): number;    (i: number): number;}[]) => void
 >param : { (): number; (i: number): number; }[]
 >i : number
 >foo([function(){return 1;}, function(){return 4}]) : void
diff --git a/tests/baselines/reference/contextualTyping33.types b/tests/baselines/reference/contextualTyping33.types
index e575ca6d232da..c4ca89867a8ef 100644
--- a/tests/baselines/reference/contextualTyping33.types
+++ b/tests/baselines/reference/contextualTyping33.types
@@ -2,7 +2,7 @@
 
 === contextualTyping33.ts ===
 function foo(param: {():number; (i:number):number; }[]) { }; foo([function(){return 1;}, function(){return "foo"}]);
->foo : (param: { (): number; (i: number): number; }[]) => void
+>foo : (param: {    (): number;    (i: number): number;}[]) => void
 >param : { (): number; (i: number): number; }[]
 >i : number
 >foo([function(){return 1;}, function(){return "foo"}]) : void
diff --git a/tests/baselines/reference/contextualTypingOfObjectLiterals.types b/tests/baselines/reference/contextualTypingOfObjectLiterals.types
index a27bfba1cc990..732562feed36c 100644
--- a/tests/baselines/reference/contextualTypingOfObjectLiterals.types
+++ b/tests/baselines/reference/contextualTypingOfObjectLiterals.types
@@ -22,7 +22,7 @@ obj1 = obj2; // Error - indexer doesn't match
 >obj2 : { x: string; }
 
 function f(x: { [s: string]: string }) { }
->f : (x: { [s: string]: string; }) => void
+>f : (x: {    [s: string]: string;}) => void
 >x : { [s: string]: string; }
 >s : string
 
diff --git a/tests/baselines/reference/controlFlowAliasing.types b/tests/baselines/reference/controlFlowAliasing.types
index ea5ee6edf01f3..502041f2fedb8 100644
--- a/tests/baselines/reference/controlFlowAliasing.types
+++ b/tests/baselines/reference/controlFlowAliasing.types
@@ -580,7 +580,7 @@ function f28(obj?: { kind: 'foo', foo: string } | { kind: 'bar', bar: number })
 // Narrowing by aliased discriminant property access
 
 function f30(obj: { kind: 'foo', foo: string } | { kind: 'bar', bar: number }) {
->f30 : (obj: { kind: 'foo'; foo: string; } | { kind: 'bar'; bar: number; }) => void
+>f30 : (obj: {    kind: 'foo';    foo: string;} | {    kind: 'bar';    bar: number;}) => void
 >obj : { kind: 'foo'; foo: string; } | { kind: 'bar'; bar: number; }
 >kind : "foo"
 >foo : string
@@ -612,7 +612,7 @@ function f30(obj: { kind: 'foo', foo: string } | { kind: 'bar', bar: number }) {
 }
 
 function f31(obj: { kind: 'foo', foo: string } | { kind: 'bar', bar: number }) {
->f31 : (obj: { kind: 'foo'; foo: string; } | { kind: 'bar'; bar: number; }) => void
+>f31 : (obj: {    kind: 'foo';    foo: string;} | {    kind: 'bar';    bar: number;}) => void
 >obj : { kind: 'foo'; foo: string; } | { kind: 'bar'; bar: number; }
 >kind : "foo"
 >foo : string
@@ -673,7 +673,7 @@ function f32(obj: { kind: 'foo', foo: string } | { kind: 'bar', bar: number }) {
 }
 
 function f33(obj: { kind: 'foo', foo: string } | { kind: 'bar', bar: number }) {
->f33 : (obj: { kind: 'foo'; foo: string; } | { kind: 'bar'; bar: number; }) => void
+>f33 : (obj: {    kind: 'foo';    foo: string;} | {    kind: 'bar';    bar: number;}) => void
 >obj : { kind: 'foo'; foo: string; } | { kind: 'bar'; bar: number; }
 >kind : "foo"
 >foo : string
@@ -809,7 +809,7 @@ class C11 {
 // Mixing of aliased discriminants and conditionals
 
 function f40(obj: { kind: 'foo', foo?: string } | { kind: 'bar', bar?: number }) {
->f40 : (obj: { kind: 'foo'; foo?: string | undefined; } | { kind: 'bar'; bar?: number | undefined; }) => void
+>f40 : (obj: {    kind: 'foo';    foo?: string;} | {    kind: 'bar';    bar?: number;}) => void
 >obj : { kind: 'foo'; foo?: string | undefined; } | { kind: 'bar'; bar?: number | undefined; }
 >kind : "foo"
 >foo : string | undefined
diff --git a/tests/baselines/reference/controlFlowDestructuringVariablesInTryCatch.types b/tests/baselines/reference/controlFlowDestructuringVariablesInTryCatch.types
index e8c8848631f79..8198939b7e78b 100644
--- a/tests/baselines/reference/controlFlowDestructuringVariablesInTryCatch.types
+++ b/tests/baselines/reference/controlFlowDestructuringVariablesInTryCatch.types
@@ -8,7 +8,7 @@ declare function f2(): [b: string];
 >f2 : () => [b: string]
 
 declare function f3(): { c: string };
->f3 : () => { c: string; }
+>f3 : () => {    c: string;}
 >c : string
 
 try {
diff --git a/tests/baselines/reference/controlFlowInOperator.types b/tests/baselines/reference/controlFlowInOperator.types
index 7ef3c0fbd807e..30cc52d710ee0 100644
--- a/tests/baselines/reference/controlFlowInOperator.types
+++ b/tests/baselines/reference/controlFlowInOperator.types
@@ -75,7 +75,7 @@ if (d in c) {
 // repro from https://github.com/microsoft/TypeScript/issues/54790
 
 function uniqueID_54790(
->uniqueID_54790 : (id: string | undefined, seenIDs: { [key: string]: string; }) => string
+>uniqueID_54790 : (id: string | undefined, seenIDs: {    [key: string]: string;}) => string
 
   id: string | undefined,
 >id : string
diff --git a/tests/baselines/reference/controlFlowOptionalChain3.types b/tests/baselines/reference/controlFlowOptionalChain3.types
index 2ef7dc502c01a..a225ecea9ad95 100644
--- a/tests/baselines/reference/controlFlowOptionalChain3.types
+++ b/tests/baselines/reference/controlFlowOptionalChain3.types
@@ -52,7 +52,7 @@ function test2(foo: Foo | undefined) {
 }
 
 function Test3({ foo }: { foo: Foo | undefined }) {
->Test3 : ({ foo }: { foo: Foo | undefined; }) => JSX.Element
+>Test3 : ({ foo }: {    foo: Foo | undefined;}) => JSX.Element
 >foo : Foo | undefined
 >foo : Foo | undefined
 
diff --git a/tests/baselines/reference/declFileRestParametersOfFunctionAndFunctionType.types b/tests/baselines/reference/declFileRestParametersOfFunctionAndFunctionType.types
index 08094cb05a401..8e5e3f6f67d1e 100644
--- a/tests/baselines/reference/declFileRestParametersOfFunctionAndFunctionType.types
+++ b/tests/baselines/reference/declFileRestParametersOfFunctionAndFunctionType.types
@@ -6,12 +6,12 @@ function f1(...args) { }
 >args : any[]
 
 function f2(x: (...args) => void) { }
->f2 : (x: (...args: any[]) => void) => void
+>f2 : (x: (...args) => void) => void
 >x : (...args: any[]) => void
 >args : any[]
 
 function f3(x: { (...args): void }) { }
->f3 : (x: (...args: any[]) => void) => void
+>f3 : (x: {    (...args): void;}) => void
 >x : (...args: any[]) => void
 >args : any[]
 
diff --git a/tests/baselines/reference/declarationEmitGlobalThisPreserved.types b/tests/baselines/reference/declarationEmitGlobalThisPreserved.types
index d1df7e2f893fa..3c813484cc652 100644
--- a/tests/baselines/reference/declarationEmitGlobalThisPreserved.types
+++ b/tests/baselines/reference/declarationEmitGlobalThisPreserved.types
@@ -11,8 +11,8 @@
 // Broken inference cases.
 
 export const a1 = (isNaN: typeof globalThis.isNaN): typeof globalThis.isNaN => isNaN;
->a1 : (isNaN: (number: number) => boolean) => (number: number) => boolean
->(isNaN: typeof globalThis.isNaN): typeof globalThis.isNaN => isNaN : (isNaN: (number: number) => boolean) => (number: number) => boolean
+>a1 : (isNaN: typeof globalThis.isNaN) => typeof globalThis.isNaN
+>(isNaN: typeof globalThis.isNaN): typeof globalThis.isNaN => isNaN : (isNaN: typeof globalThis.isNaN) => typeof globalThis.isNaN
 >isNaN : (number: number) => boolean
 >globalThis.isNaN : (number: number) => boolean
 >globalThis : typeof globalThis
@@ -23,8 +23,8 @@ export const a1 = (isNaN: typeof globalThis.isNaN): typeof globalThis.isNaN => i
 >isNaN : (number: number) => boolean
 
 export const a2 = (isNaN: typeof globalThis.isNaN, bar?: typeof globalThis.isNaN): typeof globalThis.isNaN => bar ?? isNaN;
->a2 : (isNaN: (number: number) => boolean, bar?: (number: number) => boolean) => (number: number) => boolean
->(isNaN: typeof globalThis.isNaN, bar?: typeof globalThis.isNaN): typeof globalThis.isNaN => bar ?? isNaN : (isNaN: (number: number) => boolean, bar?: (number: number) => boolean) => (number: number) => boolean
+>a2 : (isNaN: typeof globalThis.isNaN, bar?: typeof globalThis.isNaN) => typeof globalThis.isNaN
+>(isNaN: typeof globalThis.isNaN, bar?: typeof globalThis.isNaN): typeof globalThis.isNaN => bar ?? isNaN : (isNaN: typeof globalThis.isNaN, bar?: typeof globalThis.isNaN) => typeof globalThis.isNaN
 >isNaN : (number: number) => boolean
 >globalThis.isNaN : (number: number) => boolean
 >globalThis : typeof globalThis
@@ -41,8 +41,8 @@ export const a2 = (isNaN: typeof globalThis.isNaN, bar?: typeof globalThis.isNaN
 >isNaN : (number: number) => boolean
 
 export const a3 = (isNaN: number, bar: typeof globalThis.isNaN): typeof globalThis.isNaN => bar;
->a3 : (isNaN: number, bar: (number: number) => boolean) => (number: number) => boolean
->(isNaN: number, bar: typeof globalThis.isNaN): typeof globalThis.isNaN => bar : (isNaN: number, bar: (number: number) => boolean) => (number: number) => boolean
+>a3 : (isNaN: number, bar: typeof globalThis.isNaN) => typeof globalThis.isNaN
+>(isNaN: number, bar: typeof globalThis.isNaN): typeof globalThis.isNaN => bar : (isNaN: number, bar: typeof globalThis.isNaN) => typeof globalThis.isNaN
 >isNaN : number
 >bar : (number: number) => boolean
 >globalThis.isNaN : (number: number) => boolean
@@ -54,8 +54,8 @@ export const a3 = (isNaN: number, bar: typeof globalThis.isNaN): typeof globalTh
 >bar : (number: number) => boolean
 
 export const a4 = (isNaN: number): typeof globalThis.isNaN => globalThis.isNaN;
->a4 : (isNaN: number) => (number: number) => boolean
->(isNaN: number): typeof globalThis.isNaN => globalThis.isNaN : (isNaN: number) => (number: number) => boolean
+>a4 : (isNaN: number) => typeof globalThis.isNaN
+>(isNaN: number): typeof globalThis.isNaN => globalThis.isNaN : (isNaN: number) => typeof globalThis.isNaN
 >isNaN : number
 >globalThis.isNaN : (number: number) => boolean
 >globalThis : typeof globalThis
@@ -65,12 +65,12 @@ export const a4 = (isNaN: number): typeof globalThis.isNaN => globalThis.isNaN;
 >isNaN : (number: number) => boolean
 
 export const aObj = {
->aObj : { a1: (isNaN: (number: number) => boolean) => (number: number) => boolean; a2: (isNaN: (number: number) => boolean, bar?: (number: number) => boolean) => (number: number) => boolean; a3: (isNaN: number, bar: (number: number) => boolean) => (number: number) => boolean; a4: (isNaN: number) => (number: number) => boolean; }
->{    a1: (isNaN: typeof globalThis.isNaN): typeof globalThis.isNaN => isNaN,    a2: (isNaN: typeof globalThis.isNaN, bar?: typeof globalThis.isNaN): typeof globalThis.isNaN => bar ?? isNaN,    a3: (isNaN: number, bar: typeof globalThis.isNaN): typeof globalThis.isNaN => bar,    a4: (isNaN: number): typeof globalThis.isNaN => globalThis.isNaN,} : { a1: (isNaN: (number: number) => boolean) => (number: number) => boolean; a2: (isNaN: (number: number) => boolean, bar?: (number: number) => boolean) => (number: number) => boolean; a3: (isNaN: number, bar: (number: number) => boolean) => (number: number) => boolean; a4: (isNaN: number) => (number: number) => boolean; }
+>aObj : { a1: (isNaN: typeof globalThis.isNaN) => typeof globalThis.isNaN; a2: (isNaN: typeof globalThis.isNaN, bar?: typeof globalThis.isNaN) => typeof globalThis.isNaN; a3: (isNaN: number, bar: typeof globalThis.isNaN) => typeof globalThis.isNaN; a4: (isNaN: number) => typeof globalThis.isNaN; }
+>{    a1: (isNaN: typeof globalThis.isNaN): typeof globalThis.isNaN => isNaN,    a2: (isNaN: typeof globalThis.isNaN, bar?: typeof globalThis.isNaN): typeof globalThis.isNaN => bar ?? isNaN,    a3: (isNaN: number, bar: typeof globalThis.isNaN): typeof globalThis.isNaN => bar,    a4: (isNaN: number): typeof globalThis.isNaN => globalThis.isNaN,} : { a1: (isNaN: typeof globalThis.isNaN) => typeof globalThis.isNaN; a2: (isNaN: typeof globalThis.isNaN, bar?: typeof globalThis.isNaN) => typeof globalThis.isNaN; a3: (isNaN: number, bar: typeof globalThis.isNaN) => typeof globalThis.isNaN; a4: (isNaN: number) => typeof globalThis.isNaN; }
 
     a1: (isNaN: typeof globalThis.isNaN): typeof globalThis.isNaN => isNaN,
->a1 : (isNaN: (number: number) => boolean) => (number: number) => boolean
->(isNaN: typeof globalThis.isNaN): typeof globalThis.isNaN => isNaN : (isNaN: (number: number) => boolean) => (number: number) => boolean
+>a1 : (isNaN: typeof globalThis.isNaN) => typeof globalThis.isNaN
+>(isNaN: typeof globalThis.isNaN): typeof globalThis.isNaN => isNaN : (isNaN: typeof globalThis.isNaN) => typeof globalThis.isNaN
 >isNaN : (number: number) => boolean
 >globalThis.isNaN : (number: number) => boolean
 >globalThis : typeof globalThis
@@ -81,8 +81,8 @@ export const aObj = {
 >isNaN : (number: number) => boolean
 
     a2: (isNaN: typeof globalThis.isNaN, bar?: typeof globalThis.isNaN): typeof globalThis.isNaN => bar ?? isNaN,
->a2 : (isNaN: (number: number) => boolean, bar?: (number: number) => boolean) => (number: number) => boolean
->(isNaN: typeof globalThis.isNaN, bar?: typeof globalThis.isNaN): typeof globalThis.isNaN => bar ?? isNaN : (isNaN: (number: number) => boolean, bar?: (number: number) => boolean) => (number: number) => boolean
+>a2 : (isNaN: typeof globalThis.isNaN, bar?: typeof globalThis.isNaN) => typeof globalThis.isNaN
+>(isNaN: typeof globalThis.isNaN, bar?: typeof globalThis.isNaN): typeof globalThis.isNaN => bar ?? isNaN : (isNaN: typeof globalThis.isNaN, bar?: typeof globalThis.isNaN) => typeof globalThis.isNaN
 >isNaN : (number: number) => boolean
 >globalThis.isNaN : (number: number) => boolean
 >globalThis : typeof globalThis
@@ -99,8 +99,8 @@ export const aObj = {
 >isNaN : (number: number) => boolean
 
     a3: (isNaN: number, bar: typeof globalThis.isNaN): typeof globalThis.isNaN => bar,
->a3 : (isNaN: number, bar: (number: number) => boolean) => (number: number) => boolean
->(isNaN: number, bar: typeof globalThis.isNaN): typeof globalThis.isNaN => bar : (isNaN: number, bar: (number: number) => boolean) => (number: number) => boolean
+>a3 : (isNaN: number, bar: typeof globalThis.isNaN) => typeof globalThis.isNaN
+>(isNaN: number, bar: typeof globalThis.isNaN): typeof globalThis.isNaN => bar : (isNaN: number, bar: typeof globalThis.isNaN) => typeof globalThis.isNaN
 >isNaN : number
 >bar : (number: number) => boolean
 >globalThis.isNaN : (number: number) => boolean
@@ -112,8 +112,8 @@ export const aObj = {
 >bar : (number: number) => boolean
 
     a4: (isNaN: number): typeof globalThis.isNaN => globalThis.isNaN,
->a4 : (isNaN: number) => (number: number) => boolean
->(isNaN: number): typeof globalThis.isNaN => globalThis.isNaN : (isNaN: number) => (number: number) => boolean
+>a4 : (isNaN: number) => typeof globalThis.isNaN
+>(isNaN: number): typeof globalThis.isNaN => globalThis.isNaN : (isNaN: number) => typeof globalThis.isNaN
 >isNaN : number
 >globalThis.isNaN : (number: number) => boolean
 >globalThis : typeof globalThis
@@ -132,8 +132,8 @@ export type a4oReturn = ReturnType<ReturnType<typeof aObj['a4']>>;
 >aObj : { a1: (isNaN: (number: number) => boolean) => (number: number) => boolean; a2: (isNaN: (number: number) => boolean, bar?: (number: number) => boolean) => (number: number) => boolean; a3: (isNaN: number, bar: (number: number) => boolean) => (number: number) => boolean; a4: (isNaN: number) => (number: number) => boolean; }
 
 export const b1 = (isNaN: typeof globalThis.isNaN) => isNaN;
->b1 : (isNaN: (number: number) => boolean) => (number: number) => boolean
->(isNaN: typeof globalThis.isNaN) => isNaN : (isNaN: (number: number) => boolean) => (number: number) => boolean
+>b1 : (isNaN: typeof globalThis.isNaN) => (number: number) => boolean
+>(isNaN: typeof globalThis.isNaN) => isNaN : (isNaN: typeof globalThis.isNaN) => (number: number) => boolean
 >isNaN : (number: number) => boolean
 >globalThis.isNaN : (number: number) => boolean
 >globalThis : typeof globalThis
@@ -141,8 +141,8 @@ export const b1 = (isNaN: typeof globalThis.isNaN) => isNaN;
 >isNaN : (number: number) => boolean
 
 export const b2 = (isNaN: typeof globalThis.isNaN, bar?: typeof globalThis.isNaN) => bar ?? isNaN;
->b2 : (isNaN: (number: number) => boolean, bar?: (number: number) => boolean) => (number: number) => boolean
->(isNaN: typeof globalThis.isNaN, bar?: typeof globalThis.isNaN) => bar ?? isNaN : (isNaN: (number: number) => boolean, bar?: (number: number) => boolean) => (number: number) => boolean
+>b2 : (isNaN: typeof globalThis.isNaN, bar?: typeof globalThis.isNaN) => (number: number) => boolean
+>(isNaN: typeof globalThis.isNaN, bar?: typeof globalThis.isNaN) => bar ?? isNaN : (isNaN: typeof globalThis.isNaN, bar?: typeof globalThis.isNaN) => (number: number) => boolean
 >isNaN : (number: number) => boolean
 >globalThis.isNaN : (number: number) => boolean
 >globalThis : typeof globalThis
@@ -156,8 +156,8 @@ export const b2 = (isNaN: typeof globalThis.isNaN, bar?: typeof globalThis.isNaN
 >isNaN : (number: number) => boolean
 
 export const b3 = (isNaN: number, bar: typeof globalThis.isNaN) => bar;
->b3 : (isNaN: number, bar: (number: number) => boolean) => (number: number) => boolean
->(isNaN: number, bar: typeof globalThis.isNaN) => bar : (isNaN: number, bar: (number: number) => boolean) => (number: number) => boolean
+>b3 : (isNaN: number, bar: typeof globalThis.isNaN) => (number: number) => boolean
+>(isNaN: number, bar: typeof globalThis.isNaN) => bar : (isNaN: number, bar: typeof globalThis.isNaN) => (number: number) => boolean
 >isNaN : number
 >bar : (number: number) => boolean
 >globalThis.isNaN : (number: number) => boolean
@@ -174,12 +174,12 @@ export const b4 = (isNaN: number) => globalThis.isNaN;
 >isNaN : (number: number) => boolean
 
 export const bObj = {
->bObj : { b1: (isNaN: (number: number) => boolean) => (number: number) => boolean; b2: (isNaN: (number: number) => boolean, bar?: (number: number) => boolean) => (number: number) => boolean; b3: (isNaN: number, bar: (number: number) => boolean) => (number: number) => boolean; b4: (isNaN: number) => (number: number) => boolean; }
->{    b1: (isNaN: typeof globalThis.isNaN) => isNaN,    b2: (isNaN: typeof globalThis.isNaN, bar?: typeof globalThis.isNaN) => bar ?? isNaN,    b3: (isNaN: number, bar: typeof globalThis.isNaN) => bar,    b4: (isNaN: number) => globalThis.isNaN,} : { b1: (isNaN: (number: number) => boolean) => (number: number) => boolean; b2: (isNaN: (number: number) => boolean, bar?: (number: number) => boolean) => (number: number) => boolean; b3: (isNaN: number, bar: (number: number) => boolean) => (number: number) => boolean; b4: (isNaN: number) => (number: number) => boolean; }
+>bObj : { b1: (isNaN: typeof globalThis.isNaN) => (number: number) => boolean; b2: (isNaN: typeof globalThis.isNaN, bar?: typeof globalThis.isNaN) => (number: number) => boolean; b3: (isNaN: number, bar: typeof globalThis.isNaN) => (number: number) => boolean; b4: (isNaN: number) => (number: number) => boolean; }
+>{    b1: (isNaN: typeof globalThis.isNaN) => isNaN,    b2: (isNaN: typeof globalThis.isNaN, bar?: typeof globalThis.isNaN) => bar ?? isNaN,    b3: (isNaN: number, bar: typeof globalThis.isNaN) => bar,    b4: (isNaN: number) => globalThis.isNaN,} : { b1: (isNaN: typeof globalThis.isNaN) => (number: number) => boolean; b2: (isNaN: typeof globalThis.isNaN, bar?: typeof globalThis.isNaN) => (number: number) => boolean; b3: (isNaN: number, bar: typeof globalThis.isNaN) => (number: number) => boolean; b4: (isNaN: number) => (number: number) => boolean; }
 
     b1: (isNaN: typeof globalThis.isNaN) => isNaN,
->b1 : (isNaN: (number: number) => boolean) => (number: number) => boolean
->(isNaN: typeof globalThis.isNaN) => isNaN : (isNaN: (number: number) => boolean) => (number: number) => boolean
+>b1 : (isNaN: typeof globalThis.isNaN) => (number: number) => boolean
+>(isNaN: typeof globalThis.isNaN) => isNaN : (isNaN: typeof globalThis.isNaN) => (number: number) => boolean
 >isNaN : (number: number) => boolean
 >globalThis.isNaN : (number: number) => boolean
 >globalThis : typeof globalThis
@@ -187,8 +187,8 @@ export const bObj = {
 >isNaN : (number: number) => boolean
 
     b2: (isNaN: typeof globalThis.isNaN, bar?: typeof globalThis.isNaN) => bar ?? isNaN,
->b2 : (isNaN: (number: number) => boolean, bar?: (number: number) => boolean) => (number: number) => boolean
->(isNaN: typeof globalThis.isNaN, bar?: typeof globalThis.isNaN) => bar ?? isNaN : (isNaN: (number: number) => boolean, bar?: (number: number) => boolean) => (number: number) => boolean
+>b2 : (isNaN: typeof globalThis.isNaN, bar?: typeof globalThis.isNaN) => (number: number) => boolean
+>(isNaN: typeof globalThis.isNaN, bar?: typeof globalThis.isNaN) => bar ?? isNaN : (isNaN: typeof globalThis.isNaN, bar?: typeof globalThis.isNaN) => (number: number) => boolean
 >isNaN : (number: number) => boolean
 >globalThis.isNaN : (number: number) => boolean
 >globalThis : typeof globalThis
@@ -202,8 +202,8 @@ export const bObj = {
 >isNaN : (number: number) => boolean
 
     b3: (isNaN: number, bar: typeof globalThis.isNaN) => bar,
->b3 : (isNaN: number, bar: (number: number) => boolean) => (number: number) => boolean
->(isNaN: number, bar: typeof globalThis.isNaN) => bar : (isNaN: number, bar: (number: number) => boolean) => (number: number) => boolean
+>b3 : (isNaN: number, bar: typeof globalThis.isNaN) => (number: number) => boolean
+>(isNaN: number, bar: typeof globalThis.isNaN) => bar : (isNaN: number, bar: typeof globalThis.isNaN) => (number: number) => boolean
 >isNaN : number
 >bar : (number: number) => boolean
 >globalThis.isNaN : (number: number) => boolean
@@ -267,11 +267,11 @@ export function c4(isNaN: number) { return globalThis.isNaN; }
 >isNaN : (number: number) => boolean
 
 export const cObj = {
->cObj : { c1(isNaN: (number: number) => boolean): (number: number) => boolean; c2(isNaN: (number: number) => boolean, bar?: (number: number) => boolean): (number: number) => boolean; c3(isNaN: number, bar: (number: number) => boolean): (number: number) => boolean; c4(isNaN: number): (number: number) => boolean; }
->{    c1(isNaN: typeof globalThis.isNaN) { return isNaN },    c2(isNaN: typeof globalThis.isNaN, bar?: typeof globalThis.isNaN) { return bar ?? isNaN },    c3(isNaN: number, bar: typeof globalThis.isNaN) { return bar },    c4(isNaN: number) { return globalThis.isNaN; },} : { c1(isNaN: (number: number) => boolean): (number: number) => boolean; c2(isNaN: (number: number) => boolean, bar?: (number: number) => boolean): (number: number) => boolean; c3(isNaN: number, bar: (number: number) => boolean): (number: number) => boolean; c4(isNaN: number): (number: number) => boolean; }
+>cObj : { c1(isNaN: typeof globalThis.isNaN): (number: number) => boolean; c2(isNaN: typeof globalThis.isNaN, bar?: typeof globalThis.isNaN): (number: number) => boolean; c3(isNaN: number, bar: typeof globalThis.isNaN): (number: number) => boolean; c4(isNaN: number): (number: number) => boolean; }
+>{    c1(isNaN: typeof globalThis.isNaN) { return isNaN },    c2(isNaN: typeof globalThis.isNaN, bar?: typeof globalThis.isNaN) { return bar ?? isNaN },    c3(isNaN: number, bar: typeof globalThis.isNaN) { return bar },    c4(isNaN: number) { return globalThis.isNaN; },} : { c1(isNaN: typeof globalThis.isNaN): (number: number) => boolean; c2(isNaN: typeof globalThis.isNaN, bar?: typeof globalThis.isNaN): (number: number) => boolean; c3(isNaN: number, bar: typeof globalThis.isNaN): (number: number) => boolean; c4(isNaN: number): (number: number) => boolean; }
 
     c1(isNaN: typeof globalThis.isNaN) { return isNaN },
->c1 : (isNaN: (number: number) => boolean) => (number: number) => boolean
+>c1 : (isNaN: typeof globalThis.isNaN) => (number: number) => boolean
 >isNaN : (number: number) => boolean
 >globalThis.isNaN : (number: number) => boolean
 >globalThis : typeof globalThis
@@ -279,7 +279,7 @@ export const cObj = {
 >isNaN : (number: number) => boolean
 
     c2(isNaN: typeof globalThis.isNaN, bar?: typeof globalThis.isNaN) { return bar ?? isNaN },
->c2 : (isNaN: (number: number) => boolean, bar?: (number: number) => boolean) => (number: number) => boolean
+>c2 : (isNaN: typeof globalThis.isNaN, bar?: typeof globalThis.isNaN) => (number: number) => boolean
 >isNaN : (number: number) => boolean
 >globalThis.isNaN : (number: number) => boolean
 >globalThis : typeof globalThis
@@ -293,7 +293,7 @@ export const cObj = {
 >isNaN : (number: number) => boolean
 
     c3(isNaN: number, bar: typeof globalThis.isNaN) { return bar },
->c3 : (isNaN: number, bar: (number: number) => boolean) => (number: number) => boolean
+>c3 : (isNaN: number, bar: typeof globalThis.isNaN) => (number: number) => boolean
 >isNaN : number
 >bar : (number: number) => boolean
 >globalThis.isNaN : (number: number) => boolean
@@ -318,11 +318,11 @@ export type c4oReturn = ReturnType<ReturnType<typeof cObj['c4']>>;
 >cObj : { c1(isNaN: (number: number) => boolean): (number: number) => boolean; c2(isNaN: (number: number) => boolean, bar?: (number: number) => boolean): (number: number) => boolean; c3(isNaN: number, bar: (number: number) => boolean): (number: number) => boolean; c4(isNaN: number): (number: number) => boolean; }
 
 export function d1() {
->d1 : () => () => (isNaN: (number: number) => boolean) => (number: number) => boolean
+>d1 : () => () => (isNaN: typeof globalThis.isNaN) => typeof globalThis.isNaN
 
     const fn = (isNaN: typeof globalThis.isNaN): typeof globalThis.isNaN => isNaN;
->fn : (isNaN: (number: number) => boolean) => (number: number) => boolean
->(isNaN: typeof globalThis.isNaN): typeof globalThis.isNaN => isNaN : (isNaN: (number: number) => boolean) => (number: number) => boolean
+>fn : (isNaN: typeof globalThis.isNaN) => typeof globalThis.isNaN
+>(isNaN: typeof globalThis.isNaN): typeof globalThis.isNaN => isNaN : (isNaN: typeof globalThis.isNaN) => typeof globalThis.isNaN
 >isNaN : (number: number) => boolean
 >globalThis.isNaN : (number: number) => boolean
 >globalThis : typeof globalThis
@@ -338,11 +338,11 @@ export function d1() {
 }
 
 export function d2() {
->d2 : () => () => (isNaN: (number: number) => boolean, bar?: (number: number) => boolean) => (number: number) => boolean
+>d2 : () => () => (isNaN: typeof globalThis.isNaN, bar?: typeof globalThis.isNaN) => typeof globalThis.isNaN
 
     const fn = (isNaN: typeof globalThis.isNaN, bar?: typeof globalThis.isNaN): typeof globalThis.isNaN => bar ?? isNaN;
->fn : (isNaN: (number: number) => boolean, bar?: (number: number) => boolean) => (number: number) => boolean
->(isNaN: typeof globalThis.isNaN, bar?: typeof globalThis.isNaN): typeof globalThis.isNaN => bar ?? isNaN : (isNaN: (number: number) => boolean, bar?: (number: number) => boolean) => (number: number) => boolean
+>fn : (isNaN: typeof globalThis.isNaN, bar?: typeof globalThis.isNaN) => typeof globalThis.isNaN
+>(isNaN: typeof globalThis.isNaN, bar?: typeof globalThis.isNaN): typeof globalThis.isNaN => bar ?? isNaN : (isNaN: typeof globalThis.isNaN, bar?: typeof globalThis.isNaN) => typeof globalThis.isNaN
 >isNaN : (number: number) => boolean
 >globalThis.isNaN : (number: number) => boolean
 >globalThis : typeof globalThis
@@ -364,11 +364,11 @@ export function d2() {
 }
 
 export function d3() {
->d3 : () => () => (isNaN: number, bar: (number: number) => boolean) => (number: number) => boolean
+>d3 : () => () => (isNaN: number, bar: typeof globalThis.isNaN) => typeof globalThis.isNaN
 
     const fn = (isNaN: number, bar: typeof globalThis.isNaN): typeof globalThis.isNaN => bar;
->fn : (isNaN: number, bar: (number: number) => boolean) => (number: number) => boolean
->(isNaN: number, bar: typeof globalThis.isNaN): typeof globalThis.isNaN => bar : (isNaN: number, bar: (number: number) => boolean) => (number: number) => boolean
+>fn : (isNaN: number, bar: typeof globalThis.isNaN) => typeof globalThis.isNaN
+>(isNaN: number, bar: typeof globalThis.isNaN): typeof globalThis.isNaN => bar : (isNaN: number, bar: typeof globalThis.isNaN) => typeof globalThis.isNaN
 >isNaN : number
 >bar : (number: number) => boolean
 >globalThis.isNaN : (number: number) => boolean
@@ -385,11 +385,11 @@ export function d3() {
 }
 
 export function d4() {
->d4 : () => () => (isNaN: number) => (number: number) => boolean
+>d4 : () => () => (isNaN: number) => typeof globalThis.isNaN
 
     const fn = (isNaN: number): typeof globalThis.isNaN => globalThis.isNaN;
->fn : (isNaN: number) => (number: number) => boolean
->(isNaN: number): typeof globalThis.isNaN => globalThis.isNaN : (isNaN: number) => (number: number) => boolean
+>fn : (isNaN: number) => typeof globalThis.isNaN
+>(isNaN: number): typeof globalThis.isNaN => globalThis.isNaN : (isNaN: number) => typeof globalThis.isNaN
 >isNaN : number
 >globalThis.isNaN : (number: number) => boolean
 >globalThis : typeof globalThis
diff --git a/tests/baselines/reference/declarationEmitRetainedAnnotationRetainsImportInOutput.js b/tests/baselines/reference/declarationEmitRetainedAnnotationRetainsImportInOutput.js
new file mode 100644
index 0000000000000..3bbe347a63e50
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitRetainedAnnotationRetainsImportInOutput.js
@@ -0,0 +1,23 @@
+//// [tests/cases/compiler/declarationEmitRetainedAnnotationRetainsImportInOutput.ts] ////
+
+//// [index.d.ts]
+export type Whatever<T> = {x: T};
+export declare function something<T>(cb: () => Whatever<T>): Whatever<T>;
+
+//// [index.ts]
+import * as E from 'whatever';
+
+export const run = <E>(i: () => E.Whatever<E>): E.Whatever<E> => E.something(i);
+
+//// [index.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.run = void 0;
+var E = require("whatever");
+var run = function (i) { return E.something(i); };
+exports.run = run;
+
+
+//// [index.d.ts]
+import * as E from 'whatever';
+export declare const run: <E>(i: () => E.Whatever<E>) => E.Whatever<E>;
diff --git a/tests/baselines/reference/declarationEmitRetainedAnnotationRetainsImportInOutput.symbols b/tests/baselines/reference/declarationEmitRetainedAnnotationRetainsImportInOutput.symbols
new file mode 100644
index 0000000000000..4efb920d98b99
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitRetainedAnnotationRetainsImportInOutput.symbols
@@ -0,0 +1,37 @@
+//// [tests/cases/compiler/declarationEmitRetainedAnnotationRetainsImportInOutput.ts] ////
+
+=== node_modules/whatever/index.d.ts ===
+export type Whatever<T> = {x: T};
+>Whatever : Symbol(Whatever, Decl(index.d.ts, 0, 0))
+>T : Symbol(T, Decl(index.d.ts, 0, 21))
+>x : Symbol(x, Decl(index.d.ts, 0, 27))
+>T : Symbol(T, Decl(index.d.ts, 0, 21))
+
+export declare function something<T>(cb: () => Whatever<T>): Whatever<T>;
+>something : Symbol(something, Decl(index.d.ts, 0, 33))
+>T : Symbol(T, Decl(index.d.ts, 1, 34))
+>cb : Symbol(cb, Decl(index.d.ts, 1, 37))
+>Whatever : Symbol(Whatever, Decl(index.d.ts, 0, 0))
+>T : Symbol(T, Decl(index.d.ts, 1, 34))
+>Whatever : Symbol(Whatever, Decl(index.d.ts, 0, 0))
+>T : Symbol(T, Decl(index.d.ts, 1, 34))
+
+=== index.ts ===
+import * as E from 'whatever';
+>E : Symbol(E, Decl(index.ts, 0, 6))
+
+export const run = <E>(i: () => E.Whatever<E>): E.Whatever<E> => E.something(i);
+>run : Symbol(run, Decl(index.ts, 2, 12))
+>E : Symbol(E, Decl(index.ts, 2, 20))
+>i : Symbol(i, Decl(index.ts, 2, 23))
+>E : Symbol(E, Decl(index.ts, 0, 6))
+>Whatever : Symbol(E.Whatever, Decl(index.d.ts, 0, 0))
+>E : Symbol(E, Decl(index.ts, 2, 20))
+>E : Symbol(E, Decl(index.ts, 0, 6))
+>Whatever : Symbol(E.Whatever, Decl(index.d.ts, 0, 0))
+>E : Symbol(E, Decl(index.ts, 2, 20))
+>E.something : Symbol(E.something, Decl(index.d.ts, 0, 33))
+>E : Symbol(E, Decl(index.ts, 0, 6))
+>something : Symbol(E.something, Decl(index.d.ts, 0, 33))
+>i : Symbol(i, Decl(index.ts, 2, 23))
+
diff --git a/tests/baselines/reference/declarationEmitRetainedAnnotationRetainsImportInOutput.types b/tests/baselines/reference/declarationEmitRetainedAnnotationRetainsImportInOutput.types
new file mode 100644
index 0000000000000..1051d467d4a2d
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitRetainedAnnotationRetainsImportInOutput.types
@@ -0,0 +1,27 @@
+//// [tests/cases/compiler/declarationEmitRetainedAnnotationRetainsImportInOutput.ts] ////
+
+=== node_modules/whatever/index.d.ts ===
+export type Whatever<T> = {x: T};
+>Whatever : Whatever<T>
+>x : T
+
+export declare function something<T>(cb: () => Whatever<T>): Whatever<T>;
+>something : <T>(cb: () => Whatever<T>) => Whatever<T>
+>cb : () => Whatever<T>
+
+=== index.ts ===
+import * as E from 'whatever';
+>E : typeof E
+
+export const run = <E>(i: () => E.Whatever<E>): E.Whatever<E> => E.something(i);
+>run : <E>(i: () => E.Whatever<E>) => E.Whatever<E>
+><E>(i: () => E.Whatever<E>): E.Whatever<E> => E.something(i) : <E>(i: () => E.Whatever<E>) => E.Whatever<E>
+>i : () => E.Whatever<E>
+>E : any
+>E : any
+>E.something(i) : E.Whatever<E>
+>E.something : <T>(cb: () => E.Whatever<T>) => E.Whatever<T>
+>E : typeof E
+>something : <T>(cb: () => E.Whatever<T>) => E.Whatever<T>
+>i : () => E.Whatever<E>
+
diff --git a/tests/baselines/reference/defaultValueInFunctionTypes.types b/tests/baselines/reference/defaultValueInFunctionTypes.types
index 38e4e17edacad..50060f43ed68f 100644
--- a/tests/baselines/reference/defaultValueInFunctionTypes.types
+++ b/tests/baselines/reference/defaultValueInFunctionTypes.types
@@ -2,7 +2,7 @@
 
 === defaultValueInFunctionTypes.ts ===
 type Foo = ({ first = 0 }: { first?: number }) => unknown;
->Foo : ({ first }: { first?: number; }) => unknown
+>Foo : ({ first }: {    first?: number;}) => unknown
 >first : number
 >0 : 0
 >first : number
diff --git a/tests/baselines/reference/dependentDestructuredVariables.types b/tests/baselines/reference/dependentDestructuredVariables.types
index 0480bb1631c62..0196e27ada4bb 100644
--- a/tests/baselines/reference/dependentDestructuredVariables.types
+++ b/tests/baselines/reference/dependentDestructuredVariables.types
@@ -743,10 +743,10 @@ reducer("concat", { firstArr: [1, 2], secondArr: [3, 4] });
 // repro from https://github.com/microsoft/TypeScript/pull/47190#issuecomment-1057603588
 
 type FooMethod = {
->FooMethod : { method(...args: [type: "str", cb: (e: string) => void] | [type: "num", cb: (e: number) => void]): void; }
+>FooMethod : { method(...args: [    type: "str",    cb: (e: string) => void] | [    type: "num",    cb: (e: number) => void]): void; }
 
   method(...args:
->method : (...args: [type: "str", cb: (e: string) => void] | [type: "num", cb: (e: number) => void]) => void
+>method : (...args: [    type: "str",    cb: (e: string) => void] | [    type: "num",    cb: (e: number) => void]) => void
 >args : [type: "str", cb: (e: string) => void] | [type: "num", cb: (e: number) => void]
 
     [type: "str", cb: (e: string) => void] |
@@ -787,10 +787,10 @@ let fooM: FooMethod = {
 };
 
 type FooAsyncMethod = {
->FooAsyncMethod : { method(...args: [type: "str", cb: (e: string) => void] | [type: "num", cb: (e: number) => void]): Promise<any>; }
+>FooAsyncMethod : { method(...args: [    type: "str",    cb: (e: string) => void] | [    type: "num",    cb: (e: number) => void]): Promise<any>; }
 
   method(...args:
->method : (...args: [type: "str", cb: (e: string) => void] | [type: "num", cb: (e: number) => void]) => Promise<any>
+>method : (...args: [    type: "str",    cb: (e: string) => void] | [    type: "num",    cb: (e: number) => void]) => Promise<any>
 >args : [type: "str", cb: (e: string) => void] | [type: "num", cb: (e: number) => void]
 
     [type: "str", cb: (e: string) => void] |
@@ -831,10 +831,10 @@ let fooAsyncM: FooAsyncMethod = {
 };
 
 type FooGenMethod = {
->FooGenMethod : { method(...args: [type: "str", cb: (e: string) => void] | [type: "num", cb: (e: number) => void]): Generator<any, any, any>; }
+>FooGenMethod : { method(...args: [    type: "str",    cb: (e: string) => void] | [    type: "num",    cb: (e: number) => void]): Generator<any, any, any>; }
 
   method(...args:
->method : (...args: [type: "str", cb: (e: string) => void] | [type: "num", cb: (e: number) => void]) => Generator<any, any, any>
+>method : (...args: [    type: "str",    cb: (e: string) => void] | [    type: "num",    cb: (e: number) => void]) => Generator<any, any, any>
 >args : [type: "str", cb: (e: string) => void] | [type: "num", cb: (e: number) => void]
 
     [type: "str", cb: (e: string) => void] |
@@ -875,10 +875,10 @@ let fooGenM: FooGenMethod = {
 };
 
 type FooAsyncGenMethod = {
->FooAsyncGenMethod : { method(...args: [type: "str", cb: (e: string) => void] | [type: "num", cb: (e: number) => void]): AsyncGenerator<any, any, any>; }
+>FooAsyncGenMethod : { method(...args: [    type: "str",    cb: (e: string) => void] | [    type: "num",    cb: (e: number) => void]): AsyncGenerator<any, any, any>; }
 
   method(...args:
->method : (...args: [type: "str", cb: (e: string) => void] | [type: "num", cb: (e: number) => void]) => AsyncGenerator<any, any, any>
+>method : (...args: [    type: "str",    cb: (e: string) => void] | [    type: "num",    cb: (e: number) => void]) => AsyncGenerator<any, any, any>
 >args : [type: "str", cb: (e: string) => void] | [type: "num", cb: (e: number) => void]
 
     [type: "str", cb: (e: string) => void] |
diff --git a/tests/baselines/reference/destructuringAssignmentWithDefault.types b/tests/baselines/reference/destructuringAssignmentWithDefault.types
index 2475aa92c4267..e53d6c735e332 100644
--- a/tests/baselines/reference/destructuringAssignmentWithDefault.types
+++ b/tests/baselines/reference/destructuringAssignmentWithDefault.types
@@ -21,7 +21,7 @@ let x = 0;
 // Repro from #26235
 
 function f1(options?: { color?: string, width?: number }) {
->f1 : (options?: { color?: string | undefined; width?: number | undefined; } | undefined) => void
+>f1 : (options?: {    color?: string;    width?: number;}) => void
 >options : { color?: string | undefined; width?: number | undefined; } | undefined
 >color : string | undefined
 >width : number | undefined
@@ -93,7 +93,7 @@ function f2(options?: [string?, number?]) {
 }
 
 function f3(options?: { color: string, width: number }) {
->f3 : (options?: { color: string; width: number; } | undefined) => void
+>f3 : (options?: {    color: string;    width: number;}) => void
 >options : { color: string; width: number; } | undefined
 >color : string
 >width : number
diff --git a/tests/baselines/reference/discriminateWithOptionalProperty3(exactoptionalpropertytypes=false).types b/tests/baselines/reference/discriminateWithOptionalProperty3(exactoptionalpropertytypes=false).types
index 8557468ab571e..f16f9997e9df7 100644
--- a/tests/baselines/reference/discriminateWithOptionalProperty3(exactoptionalpropertytypes=false).types
+++ b/tests/baselines/reference/discriminateWithOptionalProperty3(exactoptionalpropertytypes=false).types
@@ -27,7 +27,7 @@ interface ExecutionContext {
 }
 
 type CoercedVariableValues =
->CoercedVariableValues : { errors: ReadonlyArray<GraphQLError>; coerced?: undefined; } | { coerced: { [variable: string]: unknown; }; errors?: undefined; }
+>CoercedVariableValues : { errors: ReadonlyArray<GraphQLError>; coerced?: undefined; } | { coerced: {    [variable: string]: unknown;}; errors?: undefined; }
 
   | { errors: ReadonlyArray<GraphQLError>; coerced?: never }
 >errors : readonly GraphQLError[]
@@ -39,7 +39,7 @@ type CoercedVariableValues =
 >errors : undefined
 
 declare function getVariableValues(inputs: {
->getVariableValues : (inputs: { readonly [variable: string]: unknown; }) => CoercedVariableValues
+>getVariableValues : (inputs: {    readonly [variable: string]: unknown;}) => CoercedVariableValues
 >inputs : { readonly [variable: string]: unknown; }
 
   readonly [variable: string]: unknown;
diff --git a/tests/baselines/reference/discriminateWithOptionalProperty3(exactoptionalpropertytypes=true).types b/tests/baselines/reference/discriminateWithOptionalProperty3(exactoptionalpropertytypes=true).types
index cb2203fa0ad1d..d81d2d67fc27c 100644
--- a/tests/baselines/reference/discriminateWithOptionalProperty3(exactoptionalpropertytypes=true).types
+++ b/tests/baselines/reference/discriminateWithOptionalProperty3(exactoptionalpropertytypes=true).types
@@ -27,7 +27,7 @@ interface ExecutionContext {
 }
 
 type CoercedVariableValues =
->CoercedVariableValues : { errors: ReadonlyArray<GraphQLError>; coerced?: never; } | { coerced: { [variable: string]: unknown; }; errors?: never; }
+>CoercedVariableValues : { errors: ReadonlyArray<GraphQLError>; coerced?: never; } | { coerced: {    [variable: string]: unknown;}; errors?: never; }
 
   | { errors: ReadonlyArray<GraphQLError>; coerced?: never }
 >errors : readonly GraphQLError[]
@@ -39,7 +39,7 @@ type CoercedVariableValues =
 >errors : undefined
 
 declare function getVariableValues(inputs: {
->getVariableValues : (inputs: { readonly [variable: string]: unknown; }) => CoercedVariableValues
+>getVariableValues : (inputs: {    readonly [variable: string]: unknown;}) => CoercedVariableValues
 >inputs : { readonly [variable: string]: unknown; }
 
   readonly [variable: string]: unknown;
diff --git a/tests/baselines/reference/duplicateObjectLiteralProperty_computedNameNegative1.types b/tests/baselines/reference/duplicateObjectLiteralProperty_computedNameNegative1.types
index dcb52f928ee05..4a8627ca3562b 100644
--- a/tests/baselines/reference/duplicateObjectLiteralProperty_computedNameNegative1.types
+++ b/tests/baselines/reference/duplicateObjectLiteralProperty_computedNameNegative1.types
@@ -4,7 +4,7 @@
 // repro from https://github.com/microsoft/TypeScript/issues/56341
 
 function bar(props: { x?: string; y?: string }) {
->bar : (props: { x?: string | undefined; y?: string | undefined; }) => { [x: string]: number; }
+>bar : (props: {    x?: string;    y?: string;}) => { [x: string]: number; }
 >props : { x?: string | undefined; y?: string | undefined; }
 >x : string | undefined
 >y : string | undefined
diff --git a/tests/baselines/reference/emitRestParametersFunctionProperty.types b/tests/baselines/reference/emitRestParametersFunctionProperty.types
index b0a048771c982..e8ea41cd019ec 100644
--- a/tests/baselines/reference/emitRestParametersFunctionProperty.types
+++ b/tests/baselines/reference/emitRestParametersFunctionProperty.types
@@ -2,7 +2,7 @@
 
 === emitRestParametersFunctionProperty.ts ===
 var obj: {
->obj : { func1: (...rest: any[]) => void; }
+>obj : { func1: (...rest) => void; }
 
     func1: (...rest) => void
 >func1 : (...rest: any[]) => void
diff --git a/tests/baselines/reference/emitRestParametersFunctionPropertyES6.types b/tests/baselines/reference/emitRestParametersFunctionPropertyES6.types
index 16d508a5043ba..8ff0271410a08 100644
--- a/tests/baselines/reference/emitRestParametersFunctionPropertyES6.types
+++ b/tests/baselines/reference/emitRestParametersFunctionPropertyES6.types
@@ -2,7 +2,7 @@
 
 === emitRestParametersFunctionPropertyES6.ts ===
 var obj: {
->obj : { func1: (...rest: any[]) => void; }
+>obj : { func1: (...rest) => void; }
 
     func1: (...rest) => void
 >func1 : (...rest: any[]) => void
diff --git a/tests/baselines/reference/enumAssignabilityInInheritance.types b/tests/baselines/reference/enumAssignabilityInInheritance.types
index f1bbea0277f17..e70ae995d6d9d 100644
--- a/tests/baselines/reference/enumAssignabilityInInheritance.types
+++ b/tests/baselines/reference/enumAssignabilityInInheritance.types
@@ -207,7 +207,7 @@ var r4 = foo10(E.A);
 >A : E
 
 declare function foo11(x: (x) => number): (x) => number;
->foo11 : { (x: (x: any) => number): (x: any) => number; (x: E): E; }
+>foo11 : { (x: (x) => number): (x) => number; (x: E): E; }
 >x : (x: any) => number
 >x : any
 >x : any
diff --git a/tests/baselines/reference/esDecorators-contextualTypes.2.types b/tests/baselines/reference/esDecorators-contextualTypes.2.types
index e0e2caf638f53..fc2b84e73b140 100644
--- a/tests/baselines/reference/esDecorators-contextualTypes.2.types
+++ b/tests/baselines/reference/esDecorators-contextualTypes.2.types
@@ -35,14 +35,14 @@ export { C };
 >C : typeof C
 
 function boundMethodLogger<This, Args extends any[], Return>(source: string, bound = true) {
->boundMethodLogger : <This, Args extends any[], Return>(source: string, bound?: boolean) => (target: (this: This, ...args: Args) => Return, context: ClassMethodDecoratorContext<This, (this: This, ...args: Args) => Return>) => (this: This, ...args: Args) => Return
+>boundMethodLogger : <This, Args extends any[], Return>(source: string, bound?: boolean) => (target: (this: This, ...args: Args) => Return, context: ClassMethodDecoratorContext<This, (this: This, ...args: Args) => Return>) => ((this: This, ...args: Args) => Return)
 >source : string
 >bound : boolean
 >true : true
 
     return function loggedDecorator(
->function loggedDecorator(        target: (this: This, ...args: Args) => Return,        context: ClassMethodDecoratorContext<This, (this: This, ...args: Args) => Return>    ): ((this: This, ...args: Args) => Return) {        if (bound) {            context.addInitializer(function () {                (this as any)[context.name] = (this as any)[context.name].bind(this);            });        }        return function (this, ...args) {            console.log(`<${source}>: I'm logging stuff from ${context.name.toString()}!`);            return target.apply(this, args);        }    } : (target: (this: This, ...args: Args) => Return, context: ClassMethodDecoratorContext<This, (this: This, ...args: Args) => Return>) => (this: This, ...args: Args) => Return
->loggedDecorator : (target: (this: This, ...args: Args) => Return, context: ClassMethodDecoratorContext<This, (this: This, ...args: Args) => Return>) => (this: This, ...args: Args) => Return
+>function loggedDecorator(        target: (this: This, ...args: Args) => Return,        context: ClassMethodDecoratorContext<This, (this: This, ...args: Args) => Return>    ): ((this: This, ...args: Args) => Return) {        if (bound) {            context.addInitializer(function () {                (this as any)[context.name] = (this as any)[context.name].bind(this);            });        }        return function (this, ...args) {            console.log(`<${source}>: I'm logging stuff from ${context.name.toString()}!`);            return target.apply(this, args);        }    } : (target: (this: This, ...args: Args) => Return, context: ClassMethodDecoratorContext<This, (this: This, ...args: Args) => Return>) => ((this: This, ...args: Args) => Return)
+>loggedDecorator : (target: (this: This, ...args: Args) => Return, context: ClassMethodDecoratorContext<This, (this: This, ...args: Args) => Return>) => ((this: This, ...args: Args) => Return)
 
         target: (this: This, ...args: Args) => Return,
 >target : (this: This, ...args: Args) => Return
diff --git a/tests/baselines/reference/esNextWeakRefs_IterableWeakMap.types b/tests/baselines/reference/esNextWeakRefs_IterableWeakMap.types
index e1c63b94db34a..f01353028c5c0 100644
--- a/tests/baselines/reference/esNextWeakRefs_IterableWeakMap.types
+++ b/tests/baselines/reference/esNextWeakRefs_IterableWeakMap.types
@@ -3,8 +3,8 @@
 === esNextWeakRefs_IterableWeakMap.ts ===
 /** `static #cleanup` */
 const IterableWeakMap_cleanup = ({ ref, set }: {
->IterableWeakMap_cleanup : ({ ref, set }: { readonly ref: WeakRef<object>; readonly set: Set<WeakRef<object>>; }) => void
->({ ref, set }: {    readonly ref: WeakRef<object>;    readonly set: Set<WeakRef<object>>;}) => {    set.delete(ref);} : ({ ref, set }: { readonly ref: WeakRef<object>; readonly set: Set<WeakRef<object>>; }) => void
+>IterableWeakMap_cleanup : ({ ref, set }: {    readonly ref: WeakRef<object>;    readonly set: Set<WeakRef<object>>;}) => void
+>({ ref, set }: {    readonly ref: WeakRef<object>;    readonly set: Set<WeakRef<object>>;}) => {    set.delete(ref);} : ({ ref, set }: {    readonly ref: WeakRef<object>;    readonly set: Set<WeakRef<object>>;}) => void
 >ref : WeakRef<object>
 >set : Set<WeakRef<object>>
 
diff --git a/tests/baselines/reference/excessPropertyCheckingIntersectionWithConditional.types b/tests/baselines/reference/excessPropertyCheckingIntersectionWithConditional.types
index 5e2a24c01df20..22810225c66d3 100644
--- a/tests/baselines/reference/excessPropertyCheckingIntersectionWithConditional.types
+++ b/tests/baselines/reference/excessPropertyCheckingIntersectionWithConditional.types
@@ -6,8 +6,8 @@ type Foo<K> = K extends unknown ? { a: number } : unknown
 >a : number
 
 const createDefaultExample = <K,>(x: K): Foo<K> & { x: K; } => {
->createDefaultExample : <K>(x: K) => Foo<K> & { x: K; }
-><K,>(x: K): Foo<K> & { x: K; } => {  return { a: 1, x: x }; // okay in TS 4.7.4, error in TS 4.8.2} : <K>(x: K) => Foo<K> & { x: K; }
+>createDefaultExample : <K>(x: K) => Foo<K> & {    x: K;}
+><K,>(x: K): Foo<K> & { x: K; } => {  return { a: 1, x: x }; // okay in TS 4.7.4, error in TS 4.8.2} : <K>(x: K) => Foo<K> & {    x: K;}
 >x : K
 >x : K
 
diff --git a/tests/baselines/reference/forInStrictNullChecksNoError.types b/tests/baselines/reference/forInStrictNullChecksNoError.types
index 24d5586144add..3baf3da546d91 100644
--- a/tests/baselines/reference/forInStrictNullChecksNoError.types
+++ b/tests/baselines/reference/forInStrictNullChecksNoError.types
@@ -2,7 +2,7 @@
 
 === forInStrictNullChecksNoError.ts ===
 function f(x: { [key: string]: number; } | null | undefined) {
->f : (x: { [key: string]: number; } | null | undefined) => void
+>f : (x: {    [key: string]: number;} | null | undefined) => void
 >x : { [key: string]: number; } | null | undefined
 >key : string
 
diff --git a/tests/baselines/reference/functionDeclarationWithArgumentOfTypeFunctionTypeArray.types b/tests/baselines/reference/functionDeclarationWithArgumentOfTypeFunctionTypeArray.types
index 0fcad4f3b53d4..7dd9c2d2cb0c9 100644
--- a/tests/baselines/reference/functionDeclarationWithArgumentOfTypeFunctionTypeArray.types
+++ b/tests/baselines/reference/functionDeclarationWithArgumentOfTypeFunctionTypeArray.types
@@ -2,7 +2,7 @@
 
 === functionDeclarationWithArgumentOfTypeFunctionTypeArray.ts ===
 function foo(args: { (x): number }[]) {
->foo : (args: ((x: any) => number)[]) => number
+>foo : (args: {    (x): number;}[]) => number
 >args : ((x: any) => number)[]
 >x : any
 
diff --git a/tests/baselines/reference/functionLiterals.types b/tests/baselines/reference/functionLiterals.types
index 17f64c39de6c8..29a49ab24fc6e 100644
--- a/tests/baselines/reference/functionLiterals.types
+++ b/tests/baselines/reference/functionLiterals.types
@@ -4,7 +4,7 @@
 // PropName<TypeParamList>(ParamList):ReturnType is equivalent to PropName: { <TypeParamList>(ParamList): ReturnType }
 
 var b: {
->b : { func1(x: number): number; func2: (x: number) => number; func3: (x: number) => number; }
+>b : { func1(x: number): number; func2: (x: number) => number; func3: {    (x: number): number;}; }
 
     func1(x: number): number;         // Method signature
 >func1 : (x: number) => number
@@ -75,7 +75,7 @@ b.func3 = b.func2;
 >func2 : (x: number) => number
 
 var c: {
->c : { func4(x: number): number; func4(s: string): string; func5: { (x: number): number; (s: string): string; }; }
+>c : { func4(x: number): number; func4(s: string): string; func5: {    (x: number): number;    (s: string): string;}; }
 
     func4(x: number): number;
 >func4 : { (x: number): number; (s: string): string; }
diff --git a/tests/baselines/reference/generatedContextualTyping.types b/tests/baselines/reference/generatedContextualTyping.types
index 9be31bf829d59..0d545d2def796 100644
--- a/tests/baselines/reference/generatedContextualTyping.types
+++ b/tests/baselines/reference/generatedContextualTyping.types
@@ -1093,7 +1093,7 @@ function x128(parm: Array<Base> = [d1, d2]) { }
 >d2 : Derived2
 
 function x129(parm: { [n: number]: Base; } = [d1, d2]) { }
->x129 : (parm?: { [n: number]: Base; }) => void
+>x129 : (parm?: {    [n: number]: Base;}) => void
 >parm : { [n: number]: Base; }
 >n : number
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -1186,7 +1186,7 @@ function x140(): Array<Base> { return [d1, d2]; }
 >d2 : Derived2
 
 function x141(): { [n: number]: Base; } { return [d1, d2]; }
->x141 : () => { [n: number]: Base; }
+>x141 : () => {    [n: number]: Base;}
 >n : number
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -1307,7 +1307,7 @@ function x152(): Array<Base> { return [d1, d2]; return [d1, d2]; }
 >d2 : Derived2
 
 function x153(): { [n: number]: Base; } { return [d1, d2]; return [d1, d2]; }
->x153 : () => { [n: number]: Base; }
+>x153 : () => {    [n: number]: Base;}
 >n : number
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -1422,7 +1422,7 @@ var x164: () => Array<Base> = () => { return [d1, d2]; };
 >d2 : Derived2
 
 var x165: () => { [n: number]: Base; } = () => { return [d1, d2]; };
->x165 : () => { [n: number]: Base; }
+>x165 : () => {    [n: number]: Base;}
 >n : number
 >() => { return [d1, d2]; } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -1523,7 +1523,7 @@ var x176: () => Array<Base> = function() { return [d1, d2]; };
 >d2 : Derived2
 
 var x177: () => { [n: number]: Base; } = function() { return [d1, d2]; };
->x177 : () => { [n: number]: Base; }
+>x177 : () => {    [n: number]: Base;}
 >n : number
 >function() { return [d1, d2]; } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -2122,7 +2122,7 @@ var x244: { n: Array<Base>; } = { n: [d1, d2] };
 >d2 : Derived2
 
 var x245: { n: { [n: number]: Base; }; } = { n: [d1, d2] };
->x245 : { n: { [n: number]: Base; }; }
+>x245 : { n: {    [n: number]: Base;}; }
 >n : { [n: number]: Base; }
 >n : number
 >{ n: [d1, d2] } : { n: (Derived1 | Derived2)[]; }
@@ -2974,7 +2974,7 @@ function x328(n: Array<Base>) { }; x328([d1, d2]);
 >d2 : Derived2
 
 function x329(n: { [n: number]: Base; }) { }; x329([d1, d2]);
->x329 : (n: { [n: number]: Base; }) => void
+>x329 : (n: {    [n: number]: Base;}) => void
 >n : { [n: number]: Base; }
 >n : number
 >x329([d1, d2]) : void
@@ -3115,8 +3115,8 @@ var x340 = (n: Array<Base>) => n; x340([d1, d2]);
 >d2 : Derived2
 
 var x341 = (n: { [n: number]: Base; }) => n; x341([d1, d2]);
->x341 : (n: { [n: number]: Base; }) => { [n: number]: Base; }
->(n: { [n: number]: Base; }) => n : (n: { [n: number]: Base; }) => { [n: number]: Base; }
+>x341 : (n: {    [n: number]: Base;}) => { [n: number]: Base; }
+>(n: { [n: number]: Base; }) => n : (n: {    [n: number]: Base;}) => { [n: number]: Base; }
 >n : { [n: number]: Base; }
 >n : number
 >n : { [n: number]: Base; }
@@ -3127,8 +3127,8 @@ var x341 = (n: { [n: number]: Base; }) => n; x341([d1, d2]);
 >d2 : Derived2
 
 var x342 = (n: {n: Base[]; } ) => n; x342({ n: [d1, d2] });
->x342 : (n: { n: Base[]; }) => { n: Base[]; }
->(n: {n: Base[]; } ) => n : (n: { n: Base[]; }) => { n: Base[]; }
+>x342 : (n: {    n: Base[];}) => { n: Base[]; }
+>(n: {n: Base[]; } ) => n : (n: {    n: Base[];}) => { n: Base[]; }
 >n : { n: Base[]; }
 >n : Base[]
 >n : { n: Base[]; }
@@ -3256,8 +3256,8 @@ var x352 = function(n: Array<Base>) { }; x352([d1, d2]);
 >d2 : Derived2
 
 var x353 = function(n: { [n: number]: Base; }) { }; x353([d1, d2]);
->x353 : (n: { [n: number]: Base; }) => void
->function(n: { [n: number]: Base; }) { } : (n: { [n: number]: Base; }) => void
+>x353 : (n: {    [n: number]: Base;}) => void
+>function(n: { [n: number]: Base; }) { } : (n: {    [n: number]: Base;}) => void
 >n : { [n: number]: Base; }
 >n : number
 >x353([d1, d2]) : void
@@ -3267,8 +3267,8 @@ var x353 = function(n: { [n: number]: Base; }) { }; x353([d1, d2]);
 >d2 : Derived2
 
 var x354 = function(n: {n: Base[]; } ) { }; x354({ n: [d1, d2] });
->x354 : (n: { n: Base[]; }) => void
->function(n: {n: Base[]; } ) { } : (n: { n: Base[]; }) => void
+>x354 : (n: {    n: Base[];}) => void
+>function(n: {n: Base[]; } ) { } : (n: {    n: Base[];}) => void
 >n : { n: Base[]; }
 >n : Base[]
 >x354({ n: [d1, d2] }) : void
diff --git a/tests/baselines/reference/generatorTypeCheck29.types b/tests/baselines/reference/generatorTypeCheck29.types
index c6c64c184a90b..3679c7afad03d 100644
--- a/tests/baselines/reference/generatorTypeCheck29.types
+++ b/tests/baselines/reference/generatorTypeCheck29.types
@@ -2,7 +2,7 @@
 
 === generatorTypeCheck29.ts ===
 function* g2(): Iterator<Iterable<(x: string) => number>> {
->g2 : () => Iterator<Iterable<(x: string) => number>, any, undefined>
+>g2 : () => Iterator<Iterable<(x: string) => number>>
 >x : string
 
     yield function* () {
diff --git a/tests/baselines/reference/generatorTypeCheck30.types b/tests/baselines/reference/generatorTypeCheck30.types
index a4259dfaefafa..e522c7cbb8a6c 100644
--- a/tests/baselines/reference/generatorTypeCheck30.types
+++ b/tests/baselines/reference/generatorTypeCheck30.types
@@ -2,7 +2,7 @@
 
 === generatorTypeCheck30.ts ===
 function* g2(): Iterator<Iterable<(x: string) => number>> {
->g2 : () => Iterator<Iterable<(x: string) => number>, any, undefined>
+>g2 : () => Iterator<Iterable<(x: string) => number>>
 >x : string
 
     yield function* () {
diff --git a/tests/baselines/reference/generatorTypeCheck31.types b/tests/baselines/reference/generatorTypeCheck31.types
index f25afe8ec55dd..50b48fa47bee5 100644
--- a/tests/baselines/reference/generatorTypeCheck31.types
+++ b/tests/baselines/reference/generatorTypeCheck31.types
@@ -2,7 +2,7 @@
 
 === generatorTypeCheck31.ts ===
 function* g2(): Iterator<() => Iterable<(x: string) => number>> {
->g2 : () => Iterator<() => Iterable<(x: string) => number>, any, undefined>
+>g2 : () => Iterator<() => Iterable<(x: string) => number>>
 >x : string
 
     yield function* () {
diff --git a/tests/baselines/reference/generatorTypeCheck45.types b/tests/baselines/reference/generatorTypeCheck45.types
index e85d46a50e152..646d73827b320 100644
--- a/tests/baselines/reference/generatorTypeCheck45.types
+++ b/tests/baselines/reference/generatorTypeCheck45.types
@@ -2,9 +2,9 @@
 
 === generatorTypeCheck45.ts ===
 declare function foo<T, U>(x: T, fun: () => Iterator<(x: T) => U>, fun2: (y: U) => T): T;
->foo : <T, U>(x: T, fun: () => Iterator<(x: T) => U, any, undefined>, fun2: (y: U) => T) => T
+>foo : <T, U>(x: T, fun: () => Iterator<(x: T) => U>, fun2: (y: U) => T) => T
 >x : T
->fun : () => Iterator<(x: T) => U, any, undefined>
+>fun : () => Iterator<(x: T) => U>
 >x : T
 >fun2 : (y: U) => T
 >y : U
diff --git a/tests/baselines/reference/genericCallWithConstructorTypedArguments5.types b/tests/baselines/reference/genericCallWithConstructorTypedArguments5.types
index 47bff51439e16..e6d18ddadbe67 100644
--- a/tests/baselines/reference/genericCallWithConstructorTypedArguments5.types
+++ b/tests/baselines/reference/genericCallWithConstructorTypedArguments5.types
@@ -4,7 +4,7 @@
 // Generic call with parameter of object type with member of function type of n args passed object whose associated member is call signature with n+1 args
 
 function foo<T, U>(arg: { cb: new(t: T) => U }) {
->foo : <T, U>(arg: { cb: new (t: T) => U; }) => U
+>foo : <T, U>(arg: {    cb: new (t: T) => U;}) => U
 >arg : { cb: new (t: T) => U; }
 >cb : new (t: T) => U
 >t : T
@@ -53,7 +53,7 @@ var r3 = foo(arg3); // error
 >arg3 : { cb: new (x: string, y: number) => string; }
 
 function foo2<T, U>(arg: { cb: new(t: T, t2: T) => U }) {
->foo2 : <T, U>(arg: { cb: new (t: T, t2: T) => U; }) => U
+>foo2 : <T, U>(arg: {    cb: new (t: T, t2: T) => U;}) => U
 >arg : { cb: new (t: T, t2: T) => U; }
 >cb : new (t: T, t2: T) => U
 >t : T
diff --git a/tests/baselines/reference/genericCallWithFunctionTypedArguments5.types b/tests/baselines/reference/genericCallWithFunctionTypedArguments5.types
index aa75032d49894..a2a0146cc95f7 100644
--- a/tests/baselines/reference/genericCallWithFunctionTypedArguments5.types
+++ b/tests/baselines/reference/genericCallWithFunctionTypedArguments5.types
@@ -4,7 +4,7 @@
 // Generic call with parameter of object type with member of function type of n args passed object whose associated member is call signature with n+1 args
 
 function foo<T, U>(arg: { cb: (t: T) => U }) {
->foo : <T, U>(arg: { cb: (t: T) => U; }) => U
+>foo : <T, U>(arg: {    cb: (t: T) => U;}) => U
 >arg : { cb: (t: T) => U; }
 >cb : (t: T) => U
 >t : T
@@ -54,7 +54,7 @@ var r3 = foo({ cb: (x: string, y: number) => '' }); // error
 >'' : ""
 
 function foo2<T, U>(arg: { cb: (t: T, t2: T) => U }) {
->foo2 : <T, U>(arg: { cb: (t: T, t2: T) => U; }) => U
+>foo2 : <T, U>(arg: {    cb: (t: T, t2: T) => U;}) => U
 >arg : { cb: (t: T, t2: T) => U; }
 >cb : (t: T, t2: T) => U
 >t : T
diff --git a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.types b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.types
index 94df87dabc2eb..d45d0d8172ed4 100644
--- a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.types
+++ b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.types
@@ -48,7 +48,7 @@ module GenericParameter {
 >GenericParameter : typeof GenericParameter
 
     function foo5<T>(cb: { new(x: T): string; new(x: number): T }) {
->foo5 : <T>(cb: { new (x: T): string; new (x: number): T; }) => { new (x: T): string; new (x: number): T; }
+>foo5 : <T>(cb: {    new (x: T): string;    new (x: number): T;}) => { new (x: T): string; new (x: number): T; }
 >cb : { new (x: T): string; new (x: number): T; }
 >x : T
 >x : number
@@ -84,7 +84,7 @@ module GenericParameter {
 >b : { new <T>(x: T): string; new <T_1>(x: number): T_1; }
 
     function foo6<T>(cb: { new(x: T): string; new(x: T, y?: T): string }) {
->foo6 : <T>(cb: { new (x: T): string; new (x: T, y?: T): string; }) => { new (x: T): string; new (x: T, y?: T): string; }
+>foo6 : <T>(cb: {    new (x: T): string;    new (x: T, y?: T): string;}) => { new (x: T): string; new (x: T, y?: T): string; }
 >cb : { new (x: T): string; new (x: T, y?: T): string; }
 >x : T
 >x : T
@@ -107,7 +107,7 @@ module GenericParameter {
 >b : { new <T>(x: T): string; new <T_1>(x: number): T_1; }
 
     function foo7<T>(x:T, cb: { new(x: T): string; new(x: T, y?: T): string }) {
->foo7 : <T>(x: T, cb: { new (x: T): string; new (x: T, y?: T): string; }) => { new (x: T): string; new (x: T, y?: T): string; }
+>foo7 : <T>(x: T, cb: {    new (x: T): string;    new (x: T, y?: T): string;}) => { new (x: T): string; new (x: T, y?: T): string; }
 >x : T
 >cb : { new (x: T): string; new (x: T, y?: T): string; }
 >x : T
diff --git a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.types b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.types
index 791ce86fc9574..b59731ed5482b 100644
--- a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.types
+++ b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.types
@@ -41,7 +41,7 @@ module GenericParameter {
 >GenericParameter : typeof GenericParameter
 
     function foo5<T>(cb: { new(x: T): string; new(x: number): T }) {
->foo5 : <T>(cb: { new (x: T): string; new (x: number): T; }) => { new (x: T): string; new (x: number): T; }
+>foo5 : <T>(cb: {    new (x: T): string;    new (x: number): T;}) => { new (x: T): string; new (x: number): T; }
 >cb : { new (x: T): string; new (x: number): T; }
 >x : T
 >x : number
@@ -61,7 +61,7 @@ module GenericParameter {
 >a : new <T>(x: T) => T
 
     function foo6<T>(cb: { new(x: T): string; new(x: T, y?: T): string }) {
->foo6 : <T>(cb: { new (x: T): string; new (x: T, y?: T): string; }) => { new (x: T): string; new (x: T, y?: T): string; }
+>foo6 : <T>(cb: {    new (x: T): string;    new (x: T, y?: T): string;}) => { new (x: T): string; new (x: T, y?: T): string; }
 >cb : { new (x: T): string; new (x: T, y?: T): string; }
 >x : T
 >x : T
@@ -83,7 +83,7 @@ module GenericParameter {
 >b : new <T>(x: T, y: T) => string
 
     function foo7<T>(x:T, cb: { new(x: T): string; new(x: T, y?: T): string }) {
->foo7 : <T>(x: T, cb: { new (x: T): string; new (x: T, y?: T): string; }) => { new (x: T): string; new (x: T, y?: T): string; }
+>foo7 : <T>(x: T, cb: {    new (x: T): string;    new (x: T, y?: T): string;}) => { new (x: T): string; new (x: T, y?: T): string; }
 >x : T
 >cb : { new (x: T): string; new (x: T, y?: T): string; }
 >x : T
diff --git a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.types b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.types
index bb7832a8e3a99..8c9fe30bd83e3 100644
--- a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.types
+++ b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.types
@@ -53,7 +53,7 @@ module GenericParameter {
 >GenericParameter : typeof GenericParameter
 
     function foo5<T>(cb: { (x: T): string; (x: number): T }) {
->foo5 : <T>(cb: { (x: T): string; (x: number): T; }) => { (x: T): string; (x: number): T; }
+>foo5 : <T>(cb: {    (x: T): string;    (x: number): T;}) => { (x: T): string; (x: number): T; }
 >cb : { (x: T): string; (x: number): T; }
 >x : T
 >x : number
@@ -82,7 +82,7 @@ module GenericParameter {
 >a : { <T>(x: T): string; <T_1>(x: number): T_1; }
 
     function foo6<T>(cb: { (x: T): string; (x: T, y?: T): string }) {
->foo6 : <T>(cb: { (x: T): string; (x: T, y?: T): string; }) => { (x: T): string; (x: T, y?: T): string; }
+>foo6 : <T>(cb: {    (x: T): string;    (x: T, y?: T): string;}) => { (x: T): string; (x: T, y?: T): string; }
 >cb : { (x: T): string; (x: T, y?: T): string; }
 >x : T
 >x : T
@@ -118,7 +118,7 @@ module GenericParameter {
 >'' : ""
 
     function foo7<T>(x:T, cb: { (x: T): string; (x: T, y?: T): string }) {
->foo7 : <T>(x: T, cb: { (x: T): string; (x: T, y?: T): string; }) => { (x: T): string; (x: T, y?: T): string; }
+>foo7 : <T>(x: T, cb: {    (x: T): string;    (x: T, y?: T): string;}) => { (x: T): string; (x: T, y?: T): string; }
 >x : T
 >cb : { (x: T): string; (x: T, y?: T): string; }
 >x : T
diff --git a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.types b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.types
index af5874bcd73b5..7d894ea158fd6 100644
--- a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.types
+++ b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.types
@@ -40,7 +40,7 @@ module GenericParameter {
 >GenericParameter : typeof GenericParameter
 
     function foo5<T>(cb: { (x: T): string; (x: number): T }) {
->foo5 : <T>(cb: { (x: T): string; (x: number): T; }) => { (x: T): string; (x: number): T; }
+>foo5 : <T>(cb: {    (x: T): string;    (x: number): T;}) => { (x: T): string; (x: number): T; }
 >cb : { (x: T): string; (x: number): T; }
 >x : T
 >x : number
@@ -58,7 +58,7 @@ module GenericParameter {
 >x : T
 
     function foo6<T>(cb: { (x: T): string; (x: T, y?: T): string }) {
->foo6 : <T>(cb: { (x: T): string; (x: T, y?: T): string; }) => { (x: T): string; (x: T, y?: T): string; }
+>foo6 : <T>(cb: {    (x: T): string;    (x: T, y?: T): string;}) => { (x: T): string; (x: T, y?: T): string; }
 >cb : { (x: T): string; (x: T, y?: T): string; }
 >x : T
 >x : T
@@ -78,7 +78,7 @@ module GenericParameter {
 >'' : ""
 
     function foo7<T>(x:T, cb: { (x: T): string; (x: T, y?: T): string }) {
->foo7 : <T>(x: T, cb: { (x: T): string; (x: T, y?: T): string; }) => { (x: T): string; (x: T, y?: T): string; }
+>foo7 : <T>(x: T, cb: {    (x: T): string;    (x: T, y?: T): string;}) => { (x: T): string; (x: T, y?: T): string; }
 >x : T
 >cb : { (x: T): string; (x: T, y?: T): string; }
 >x : T
diff --git a/tests/baselines/reference/genericFunctionInference1.types b/tests/baselines/reference/genericFunctionInference1.types
index f51ff23ee1cfb..d0b62deb64fea 100644
--- a/tests/baselines/reference/genericFunctionInference1.types
+++ b/tests/baselines/reference/genericFunctionInference1.types
@@ -411,7 +411,7 @@ const f41 = pipe4([box, list]);
 >list : <T>(a: T) => T[]
 
 declare function pipe5<A, B>(f: (a: A) => B): { f: (a: A) => B };
->pipe5 : <A, B>(f: (a: A) => B) => { f: (a: A) => B; }
+>pipe5 : <A, B>(f: (a: A) => B) => {    f: (a: A) => B;}
 >f : (a: A) => B
 >a : A
 >f : (a: A) => B
diff --git a/tests/baselines/reference/genericInterfaceTypeCall.types b/tests/baselines/reference/genericInterfaceTypeCall.types
index aea27faa0a15d..0d7c655bb6fb7 100644
--- a/tests/baselines/reference/genericInterfaceTypeCall.types
+++ b/tests/baselines/reference/genericInterfaceTypeCall.types
@@ -16,7 +16,7 @@ interface bar<T> {
 >arg : T
 
     fail2(func2: { (arg: T): void; }): void;
->fail2 : (func2: (arg: T) => void) => void
+>fail2 : (func2: {    (arg: T): void;}) => void
 >func2 : (arg: T) => void
 >arg : T
 }
diff --git a/tests/baselines/reference/getParameterNameAtPosition.types b/tests/baselines/reference/getParameterNameAtPosition.types
index f86cc68820d1f..917f60f2bb723 100644
--- a/tests/baselines/reference/getParameterNameAtPosition.types
+++ b/tests/baselines/reference/getParameterNameAtPosition.types
@@ -18,7 +18,7 @@ declare function cases(tester: Tester): void;
 >tester : Tester
 
 declare function fn<Y extends any[]>(implementation?: (...args: Y) => any): Mock<Y>;
->fn : <Y extends any[]>(implementation?: ((...args: Y) => any) | undefined) => Mock<Y>
+>fn : <Y extends any[]>(implementation?: (...args: Y) => any) => Mock<Y>
 >implementation : ((...args: Y) => any) | undefined
 >args : Y
 
diff --git a/tests/baselines/reference/identityAndDivergentNormalizedTypes.types b/tests/baselines/reference/identityAndDivergentNormalizedTypes.types
index 5c86e8d8f594a..ae62486c370fe 100644
--- a/tests/baselines/reference/identityAndDivergentNormalizedTypes.types
+++ b/tests/baselines/reference/identityAndDivergentNormalizedTypes.types
@@ -30,8 +30,8 @@ type PostBody<PATH extends PostPath> = Extract<ApiPost, { path: PATH }>["body"];
 >path : PATH
 
 const post = <PATH extends PostPath>(
->post : <PATH extends "/login" | "/user">(path: PATH, { body, ...options }: Omit<RequestInit, "body"> & { body: PostBody<PATH>; }) => void
-><PATH extends PostPath>(    path: PATH,    {body, ...options}: Omit<RequestInit, 'body'> & {body: PostBody<PATH>}) => {} : <PATH extends "/login" | "/user">(path: PATH, { body, ...options }: Omit<RequestInit, "body"> & { body: PostBody<PATH>; }) => void
+>post : <PATH extends "/login" | "/user">(path: PATH, { body, ...options }: Omit<RequestInit, 'body'> & {    body: PostBody<PATH>;}) => void
+><PATH extends PostPath>(    path: PATH,    {body, ...options}: Omit<RequestInit, 'body'> & {body: PostBody<PATH>}) => {} : <PATH extends "/login" | "/user">(path: PATH, { body, ...options }: Omit<RequestInit, 'body'> & {    body: PostBody<PATH>;}) => void
 
     path: PATH,
 >path : PATH
diff --git a/tests/baselines/reference/implicitAnyFunctionInvocationWithAnyArguements.types b/tests/baselines/reference/implicitAnyFunctionInvocationWithAnyArguements.types
index 4492651611974..e8c18512c9f82 100644
--- a/tests/baselines/reference/implicitAnyFunctionInvocationWithAnyArguements.types
+++ b/tests/baselines/reference/implicitAnyFunctionInvocationWithAnyArguements.types
@@ -42,7 +42,7 @@ function testObjLiteral(objLit: { v: any; w: any }) { };
 >w : any
 
 function testFuncLiteral(funcLit: (y2) => number) { };
->testFuncLiteral : (funcLit: (y2: any) => number) => void
+>testFuncLiteral : (funcLit: (y2) => number) => void
 >funcLit : (y2: any) => number
 >y2 : any
 
diff --git a/tests/baselines/reference/implicitIndexSignatures.types b/tests/baselines/reference/implicitIndexSignatures.types
index f0a157ae69c76..52e94ad84278b 100644
--- a/tests/baselines/reference/implicitIndexSignatures.types
+++ b/tests/baselines/reference/implicitIndexSignatures.types
@@ -58,12 +58,12 @@ map = names2;
 >names2 : { a: string; b: string; }
 
 declare function getStringIndexValue<T>(map: { [x: string]: T }): T;
->getStringIndexValue : <T>(map: { [x: string]: T; }) => T
+>getStringIndexValue : <T>(map: {    [x: string]: T;}) => T
 >map : { [x: string]: T; }
 >x : string
 
 declare function getNumberIndexValue<T>(map: { [x: number]: T }): T;
->getNumberIndexValue : <T>(map: { [x: number]: T; }) => T
+>getNumberIndexValue : <T>(map: {    [x: number]: T;}) => T
 >map : { [x: number]: T; }
 >x : number
 
diff --git a/tests/baselines/reference/indexSignatureAndMappedType.types b/tests/baselines/reference/indexSignatureAndMappedType.types
index 68995d70c54d5..6532f35075005 100644
--- a/tests/baselines/reference/indexSignatureAndMappedType.types
+++ b/tests/baselines/reference/indexSignatureAndMappedType.types
@@ -5,7 +5,7 @@
 // { [key: string]: Y } if X is related to Y.
 
 function f1<T, K extends string>(x: { [key: string]: T }, y: Record<K, T>) {
->f1 : <T, K extends string>(x: { [key: string]: T; }, y: Record<K, T>) => void
+>f1 : <T, K extends string>(x: {    [key: string]: T;}, y: Record<K, T>) => void
 >x : { [key: string]: T; }
 >key : string
 >y : Record<K, T>
@@ -22,7 +22,7 @@ function f1<T, K extends string>(x: { [key: string]: T }, y: Record<K, T>) {
 }
 
 function f2<T>(x: { [key: string]: T }, y: Record<string, T>) {
->f2 : <T>(x: { [key: string]: T; }, y: Record<string, T>) => void
+>f2 : <T>(x: {    [key: string]: T;}, y: Record<string, T>) => void
 >x : { [key: string]: T; }
 >key : string
 >y : Record<string, T>
@@ -39,7 +39,7 @@ function f2<T>(x: { [key: string]: T }, y: Record<string, T>) {
 }
 
 function f3<T, U, K extends string>(x: { [key: string]: T }, y: Record<K, U>) {
->f3 : <T, U, K extends string>(x: { [key: string]: T; }, y: Record<K, U>) => void
+>f3 : <T, U, K extends string>(x: {    [key: string]: T;}, y: Record<K, U>) => void
 >x : { [key: string]: T; }
 >key : string
 >y : Record<K, U>
diff --git a/tests/baselines/reference/indexSignatureOfTypeUnknownStillRequiresIndexSignature.types b/tests/baselines/reference/indexSignatureOfTypeUnknownStillRequiresIndexSignature.types
index 4761d930a15b0..29879fc79cf3e 100644
--- a/tests/baselines/reference/indexSignatureOfTypeUnknownStillRequiresIndexSignature.types
+++ b/tests/baselines/reference/indexSignatureOfTypeUnknownStillRequiresIndexSignature.types
@@ -2,7 +2,7 @@
 
 === indexSignatureOfTypeUnknownStillRequiresIndexSignature.ts ===
 declare function f<T extends unknown = unknown>(x: { [x: string]: T }): T;
->f : <T extends unknown = unknown>(x: { [x: string]: T; }) => T
+>f : <T extends unknown = unknown>(x: {    [x: string]: T;}) => T
 >x : { [x: string]: T; }
 >x : string
 
diff --git a/tests/baselines/reference/indexSignatures1.types b/tests/baselines/reference/indexSignatures1.types
index 144face6af93b..24b0af61566f2 100644
--- a/tests/baselines/reference/indexSignatures1.types
+++ b/tests/baselines/reference/indexSignatures1.types
@@ -9,7 +9,7 @@ const sym = Symbol();
 >Symbol : SymbolConstructor
 
 function gg3(x: { [key: string]: string }, y: { [key: symbol]: string }, z: { [sym]: number }) {
->gg3 : (x: { [key: string]: string; }, y: { [key: symbol]: string; }, z: {    [sym]: number;}) => void
+>gg3 : (x: {    [key: string]: string;}, y: {    [key: symbol]: string;}, z: {    [sym]: number;}) => void
 >x : { [key: string]: string; }
 >key : string
 >y : { [key: symbol]: string; }
@@ -32,7 +32,7 @@ function gg3(x: { [key: string]: string }, y: { [key: symbol]: string }, z: { [s
 // Overlapping index signatures
 
 function gg1(x: { [key: `a${string}`]: string, [key: `${string}a`]: string }, y: { [key: `a${string}a`]: string }) {
->gg1 : (x: { [key: `a${string}`]: string; [key: `${string}a`]: string; }, y: { [key: `a${string}a`]: string; }) => void
+>gg1 : (x: {    [key: `a${string}`]: string;    [key: `${string}a`]: string;}, y: {    [key: `a${string}a`]: string;}) => void
 >x : { [key: `a${string}`]: string; [key: `${string}a`]: string; }
 >key : `a${string}`
 >key : `${string}a`
diff --git a/tests/baselines/reference/indexSignaturesInferentialTyping.types b/tests/baselines/reference/indexSignaturesInferentialTyping.types
index 9d5d0be42c466..f853b4490ddbf 100644
--- a/tests/baselines/reference/indexSignaturesInferentialTyping.types
+++ b/tests/baselines/reference/indexSignaturesInferentialTyping.types
@@ -2,13 +2,13 @@
 
 === indexSignaturesInferentialTyping.ts ===
 function foo<T>(items: { [index: number]: T }): T { return undefined; }
->foo : <T>(items: { [index: number]: T; }) => T
+>foo : <T>(items: {    [index: number]: T;}) => T
 >items : { [index: number]: T; }
 >index : number
 >undefined : undefined
 
 function bar<T>(items: { [index: string]: T }): T { return undefined; }
->bar : <T>(items: { [index: string]: T; }) => T
+>bar : <T>(items: {    [index: string]: T;}) => T
 >items : { [index: string]: T; }
 >index : string
 >undefined : undefined
diff --git a/tests/baselines/reference/indexerReturningTypeParameter1.types b/tests/baselines/reference/indexerReturningTypeParameter1.types
index d691d27c4dd43..ddc46141f0611 100644
--- a/tests/baselines/reference/indexerReturningTypeParameter1.types
+++ b/tests/baselines/reference/indexerReturningTypeParameter1.types
@@ -3,7 +3,7 @@
 === indexerReturningTypeParameter1.ts ===
 interface f {
     groupBy<T>(): { [key: string]: T[]; };
->groupBy : <T>() => { [key: string]: T[]; }
+>groupBy : <T>() => {    [key: string]: T[];}
 >key : string
 }
 var a: f;
@@ -20,7 +20,7 @@ class c {
 >c : c
 
     groupBy<T>(): { [key: string]: T[]; } {
->groupBy : <T>() => { [key: string]: T[]; }
+>groupBy : <T>() => {    [key: string]: T[];}
 >key : string
 
         return null;
diff --git a/tests/baselines/reference/inferFromGenericFunctionReturnTypes3.types b/tests/baselines/reference/inferFromGenericFunctionReturnTypes3.types
index 7d001af103620..5d84cf56eae6f 100644
--- a/tests/baselines/reference/inferFromGenericFunctionReturnTypes3.types
+++ b/tests/baselines/reference/inferFromGenericFunctionReturnTypes3.types
@@ -522,7 +522,7 @@ class ClassWithConvert<T> {
 >val : T
 
   convert(converter: { to: (v: T) => T; }) { }
->convert : (converter: { to: (v: T) => T; }) => void
+>convert : (converter: {    to: (v: T) => T;}) => void
 >converter : { to: (v: T) => T; }
 >to : (v: T) => T
 >v : T
diff --git a/tests/baselines/reference/inferPropertyWithContextSensitiveReturnStatement.types b/tests/baselines/reference/inferPropertyWithContextSensitiveReturnStatement.types
index fdf38766558b9..2a4fe954e188e 100644
--- a/tests/baselines/reference/inferPropertyWithContextSensitiveReturnStatement.types
+++ b/tests/baselines/reference/inferPropertyWithContextSensitiveReturnStatement.types
@@ -4,7 +4,7 @@
 // repro #50687
 
 declare function repro<T>(config: {
->repro : <T>(config: { params: T; callback: () => (params: T) => number; }) => void
+>repro : <T>(config: {    params: T;    callback: () => (params: T) => number;}) => void
 >config : { params: T; callback: () => (params: T) => number; }
 
   params: T;
diff --git a/tests/baselines/reference/inferenceDoesNotAddUndefinedOrNull.types b/tests/baselines/reference/inferenceDoesNotAddUndefinedOrNull.types
index fb0cadb30bedc..123c4ed08a176 100644
--- a/tests/baselines/reference/inferenceDoesNotAddUndefinedOrNull.types
+++ b/tests/baselines/reference/inferenceDoesNotAddUndefinedOrNull.types
@@ -5,7 +5,7 @@ interface NodeArray<T extends Node> extends ReadonlyArray<T> {}
 
 interface Node {
     forEachChild<T>(cbNode: (node: Node) => T | undefined, cbNodeArray?: (nodes: NodeArray<Node>) => T | undefined): T | undefined;
->forEachChild : <T>(cbNode: (node: Node) => T | undefined, cbNodeArray?: ((nodes: NodeArray<Node>) => T | undefined) | undefined) => T | undefined
+>forEachChild : <T>(cbNode: (node: Node) => T | undefined, cbNodeArray?: (nodes: NodeArray<Node>) => T | undefined) => T | undefined
 >cbNode : (node: Node) => T | undefined
 >node : Node
 >cbNodeArray : ((nodes: NodeArray<Node>) => T | undefined) | undefined
diff --git a/tests/baselines/reference/inferenceOptionalProperties.types b/tests/baselines/reference/inferenceOptionalProperties.types
index a31c9c350bf7c..23c6edc450770 100644
--- a/tests/baselines/reference/inferenceOptionalProperties.types
+++ b/tests/baselines/reference/inferenceOptionalProperties.types
@@ -2,7 +2,7 @@
 
 === inferenceOptionalProperties.ts ===
 declare function test<T>(x: { [key: string]: T }): T;
->test : <T>(x: { [key: string]: T; }) => T
+>test : <T>(x: {    [key: string]: T;}) => T
 >x : { [key: string]: T; }
 >key : string
 
diff --git a/tests/baselines/reference/inferenceOptionalPropertiesStrict.types b/tests/baselines/reference/inferenceOptionalPropertiesStrict.types
index 0e42a10b2a432..01cca0a641f6b 100644
--- a/tests/baselines/reference/inferenceOptionalPropertiesStrict.types
+++ b/tests/baselines/reference/inferenceOptionalPropertiesStrict.types
@@ -2,7 +2,7 @@
 
 === inferenceOptionalPropertiesStrict.ts ===
 declare function test<T>(x: { [key: string]: T }): T;
->test : <T>(x: { [key: string]: T; }) => T
+>test : <T>(x: {    [key: string]: T;}) => T
 >x : { [key: string]: T; }
 >key : string
 
diff --git a/tests/baselines/reference/inferenceOptionalPropertiesToIndexSignatures.types b/tests/baselines/reference/inferenceOptionalPropertiesToIndexSignatures.types
index d882f908a34b2..e018bf014d15f 100644
--- a/tests/baselines/reference/inferenceOptionalPropertiesToIndexSignatures.types
+++ b/tests/baselines/reference/inferenceOptionalPropertiesToIndexSignatures.types
@@ -2,7 +2,7 @@
 
 === inferenceOptionalPropertiesToIndexSignatures.ts ===
 declare function foo<T>(obj: { [x: string]: T }): T;
->foo : <T>(obj: { [x: string]: T; }) => T
+>foo : <T>(obj: {    [x: string]: T;}) => T
 >obj : { [x: string]: T; }
 >x : string
 
diff --git a/tests/baselines/reference/inferentialTypingWithFunctionTypeNested.types b/tests/baselines/reference/inferentialTypingWithFunctionTypeNested.types
index a6f8ee49178b9..22f16e3857501 100644
--- a/tests/baselines/reference/inferentialTypingWithFunctionTypeNested.types
+++ b/tests/baselines/reference/inferentialTypingWithFunctionTypeNested.types
@@ -2,9 +2,9 @@
 
 === inferentialTypingWithFunctionTypeNested.ts ===
 declare function map<T, U>(x: T, f: () => { x: (s: T) => U }): U;
->map : <T, U>(x: T, f: () => { x: (s: T) => U; }) => U
+>map : <T, U>(x: T, f: () => {    x: (s: T) => U;}) => U
 >x : T
->f : () => { x: (s: T) => U; }
+>f : () => {    x: (s: T) => U;}
 >x : (s: T) => U
 >s : T
 
diff --git a/tests/baselines/reference/inferentialTypingWithFunctionTypeZip.types b/tests/baselines/reference/inferentialTypingWithFunctionTypeZip.types
index 6f6794341460c..b3f36c1eb9ae2 100644
--- a/tests/baselines/reference/inferentialTypingWithFunctionTypeZip.types
+++ b/tests/baselines/reference/inferentialTypingWithFunctionTypeZip.types
@@ -2,7 +2,7 @@
 
 === inferentialTypingWithFunctionTypeZip.ts ===
 var pair: <T, S>(x: T) => (y: S) => { x: T; y: S; }
->pair : <T, S>(x: T) => (y: S) => { x: T; y: S; }
+>pair : <T, S>(x: T) => (y: S) => {    x: T;    y: S;}
 >x : T
 >y : S
 >x : T
diff --git a/tests/baselines/reference/inferingFromAny.types b/tests/baselines/reference/inferingFromAny.types
index a022326b86517..363567a2d7f32 100644
--- a/tests/baselines/reference/inferingFromAny.types
+++ b/tests/baselines/reference/inferingFromAny.types
@@ -49,12 +49,12 @@ declare function f9<T>(x: new () => T): T;
 >x : new () => T
 
 declare function f10<T>(x: { [x: string]: T }): T;
->f10 : <T>(x: { [x: string]: T; }) => T
+>f10 : <T>(x: {    [x: string]: T;}) => T
 >x : { [x: string]: T; }
 >x : string
 
 declare function f11<T>(x: { [x: number]: T }): T;
->f11 : <T>(x: { [x: number]: T; }) => T
+>f11 : <T>(x: {    [x: number]: T;}) => T
 >x : { [x: number]: T; }
 >x : number
 
diff --git a/tests/baselines/reference/inferredIndexerOnNamespaceImport.types b/tests/baselines/reference/inferredIndexerOnNamespaceImport.types
index 1935a3a7c1f3e..61f3989968ca6 100644
--- a/tests/baselines/reference/inferredIndexerOnNamespaceImport.types
+++ b/tests/baselines/reference/inferredIndexerOnNamespaceImport.types
@@ -14,7 +14,7 @@ import * as foo from "./foo";
 >foo : typeof foo
 
 function f(map: { [k: string]: number }) {
->f : (map: { [k: string]: number; }) => void
+>f : (map: {    [k: string]: number;}) => void
 >map : { [k: string]: number; }
 >k : string
 
diff --git a/tests/baselines/reference/inferrenceInfiniteLoopWithSubtyping.types b/tests/baselines/reference/inferrenceInfiniteLoopWithSubtyping.types
index 6a8632ec2a38d..3bb85736896c4 100644
--- a/tests/baselines/reference/inferrenceInfiniteLoopWithSubtyping.types
+++ b/tests/baselines/reference/inferrenceInfiniteLoopWithSubtyping.types
@@ -15,7 +15,7 @@ export class EnumTypeComposer {
 >EnumTypeComposer : EnumTypeComposer
 
   public setFields(fields: { [name: string]: { [key: string]: any } }): this;
->setFields : (fields: { [name: string]: { [key: string]: any; }; }) => this
+>setFields : (fields: {    [name: string]: {        [key: string]: any;    };}) => this
 >fields : { [name: string]: { [key: string]: any; }; }
 >name : string
 >key : string
@@ -38,10 +38,10 @@ export class Resolver {
 >Resolver : Resolver
 
   public wrapArgs<NewContext>(
->wrapArgs : <NewContext>(cb: () => { [argName: string]: Thunk<Readonly<EnumTypeComposer>>; }) => void
+>wrapArgs : <NewContext>(cb: () => {    [argName: string]: Thunk<Readonly<EnumTypeComposer>>;}) => void
 
     cb: () => {
->cb : () => { [argName: string]: Thunk<Readonly<EnumTypeComposer>>; }
+>cb : () => {    [argName: string]: Thunk<Readonly<EnumTypeComposer>>;}
 
       [argName: string]: Thunk<Readonly<EnumTypeComposer>>;
 >argName : string
diff --git a/tests/baselines/reference/innerTypeCheckOfLambdaArgument.types b/tests/baselines/reference/innerTypeCheckOfLambdaArgument.types
index fe0e4bb9d6c5e..267fc89f6ff6f 100644
--- a/tests/baselines/reference/innerTypeCheckOfLambdaArgument.types
+++ b/tests/baselines/reference/innerTypeCheckOfLambdaArgument.types
@@ -2,7 +2,7 @@
 
 === innerTypeCheckOfLambdaArgument.ts ===
 function takesCallback(callback: (n) =>any) {
->takesCallback : (callback: (n: any) => any) => void
+>takesCallback : (callback: (n) => any) => void
 >callback : (n: any) => any
 >n : any
 
diff --git a/tests/baselines/reference/instantiateContextualTypes.types b/tests/baselines/reference/instantiateContextualTypes.types
index 24ba01d0a5b85..c49fd57ad2213 100644
--- a/tests/baselines/reference/instantiateContextualTypes.types
+++ b/tests/baselines/reference/instantiateContextualTypes.types
@@ -67,7 +67,7 @@ new GenericComponent({ initialValues: 12, nextValues: val => 12 });
 // #22149
 
 declare function useStringOrNumber<T extends string | number>(t: T, useIt: T extends string ? ((s: string) => void) : ((n: number) => void)): void;
->useStringOrNumber : <T extends string | number>(t: T, useIt: T extends string ? (s: string) => void : (n: number) => void) => void
+>useStringOrNumber : <T extends string | number>(t: T, useIt: T extends string ? ((s: string) => void) : ((n: number) => void)) => void
 >t : T
 >useIt : T extends string ? (s: string) => void : (n: number) => void
 >s : string
diff --git a/tests/baselines/reference/intraExpressionInferences.types b/tests/baselines/reference/intraExpressionInferences.types
index e38c271c8614a..fecbbbba069de 100644
--- a/tests/baselines/reference/intraExpressionInferences.types
+++ b/tests/baselines/reference/intraExpressionInferences.types
@@ -4,7 +4,7 @@
 // Repros from #47599
 
 declare function callIt<T>(obj: {
->callIt : <T>(obj: { produce: (n: number) => T; consume: (x: T) => void; }) => void
+>callIt : <T>(obj: {    produce: (n: number) => T;    consume: (x: T) => void;}) => void
 >obj : { produce: (n: number) => T; consume: (x: T) => void; }
 
     produce: (n: number) => T,
@@ -160,7 +160,7 @@ const myGeneric = inferTypeFn({
 // Repro #38623
 
 function make<M>(o: { mutations: M,  action: (m: M) => void }) { }
->make : <M>(o: { mutations: M; action: (m: M) => void; }) => void
+>make : <M>(o: {    mutations: M;    action: (m: M) => void;}) => void
 >o : { mutations: M; action: (m: M) => void; }
 >mutations : M
 >action : (m: M) => void
@@ -193,7 +193,7 @@ make({
 // Repro from #38845
 
 declare function foo<A>(options: { a: A, b: (a: A) => void }): void;
->foo : <A>(options: { a: A; b: (a: A) => void; }) => void
+>foo : <A>(options: {    a: A;    b: (a: A) => void;}) => void
 >options : { a: A; b: (a: A) => void; }
 >a : A
 >b : (a: A) => void
@@ -425,14 +425,14 @@ createMappingComponent({
 // Repro from #48279
 
 function simplified<T>(props: { generator: () => T, receiver: (t: T) => any }) {}
->simplified : <T>(props: { generator: () => T; receiver: (t: T) => any; }) => void
+>simplified : <T>(props: {    generator: () => T;    receiver: (t: T) => any;}) => void
 >props : { generator: () => T; receiver: (t: T) => any; }
 >generator : () => T
 >receiver : (t: T) => any
 >t : T
 
 function whatIWant<T>(props: { generator: (bob: any) => T, receiver: (t: T) => any }) {}
->whatIWant : <T>(props: { generator: (bob: any) => T; receiver: (t: T) => any; }) => void
+>whatIWant : <T>(props: {    generator: (bob: any) => T;    receiver: (t: T) => any;}) => void
 >props : { generator: (bob: any) => T; receiver: (t: T) => any; }
 >generator : (bob: any) => T
 >bob : any
@@ -620,7 +620,7 @@ example({
 // Repro from #45255
 
 declare const branch:
->branch : <T, U extends T>(_: { test: T; if: (t: T) => t is U; then: (u: U) => void; }) => void
+>branch : <T, U extends T>(_: {    test: T;    if: (t: T) => t is U;    then: (u: U) => void;}) => void
 
   <T, U extends T>(_: { test: T, if: (t: T) => t is U, then: (u: U) => void }) => void
 >_ : { test: T; if: (t: T) => t is U; then: (u: U) => void; }
@@ -705,8 +705,8 @@ Foo({
 });
 
 declare function nested<T>(arg: {
->nested : <T>(arg: { prop: { produce: (arg1: number) => T; consume: (arg2: T) => void; }; }) => T
->arg : { prop: { produce: (arg1: number) => T; consume: (arg2: T) => void; }; }
+>nested : <T>(arg: {    prop: {        produce: (arg1: number) => T;        consume: (arg2: T) => void;    };}) => T
+>arg : { prop: {    produce: (arg1: number) => T;    consume: (arg2: T) => void;}; }
 
   prop: {
 >prop : { produce: (arg1: number) => T; consume: (arg2: T) => void; }
@@ -753,7 +753,7 @@ const resNested = nested({
 });
 
 declare function twoConsumers<T>(arg: {
->twoConsumers : <T>(arg: { a: (arg: string) => T; consume1: (arg1: T) => void; consume2: (arg2: T) => void; }) => T
+>twoConsumers : <T>(arg: {    a: (arg: string) => T;    consume1: (arg1: T) => void;    consume2: (arg2: T) => void;}) => T
 >arg : { a: (arg: string) => T; consume1: (arg1: T) => void; consume2: (arg2: T) => void; }
 
   a: (arg: string) => T;
@@ -796,7 +796,7 @@ const resTwoConsumers = twoConsumers({
 });
 
 declare function multipleProducersBeforeConsumers<T, T2>(arg: {
->multipleProducersBeforeConsumers : <T, T2>(arg: { a: (arg: string) => T; b: (arg: string) => T2; consume1: (arg1: T) => void; consume2: (arg2: T2) => void; }) => [T, T2]
+>multipleProducersBeforeConsumers : <T, T2>(arg: {    a: (arg: string) => T;    b: (arg: string) => T2;    consume1: (arg1: T) => void;    consume2: (arg2: T2) => void;}) => [T, T2]
 >arg : { a: (arg: string) => T; b: (arg: string) => T2; consume1: (arg1: T) => void; consume2: (arg2: T2) => void; }
 
   a: (arg: string) => T;
@@ -851,7 +851,7 @@ const resMultipleProducersBeforeConsumers = multipleProducersBeforeConsumers({
 });
 
 declare function withConditionalExpression<T, T2, T3>(arg: {
->withConditionalExpression : <T, T2, T3>(arg: { a: (arg1: string) => T; b: (arg2: T) => T2; c: (arg2: T2) => T3; }) => [T, T2, T3]
+>withConditionalExpression : <T, T2, T3>(arg: {    a: (arg1: string) => T;    b: (arg2: T) => T2;    c: (arg2: T2) => T3;}) => [T, T2, T3]
 >arg : { a: (arg1: string) => T; b: (arg2: T) => T2; c: (arg2: T2) => T3; }
 
   a: (arg1: string) => T;
@@ -908,15 +908,15 @@ const resWithConditionalExpression = withConditionalExpression({
 });
 
 declare function onion<T, T2, T3>(arg: {
->onion : <T, T2, T3>(arg: { a: (arg1: string) => T; nested: { b: (arg2: T) => T2; nested2: { c: (arg2: T2) => T3; }; }; }) => [T, T2, T3]
->arg : { a: (arg1: string) => T; nested: { b: (arg2: T) => T2; nested2: { c: (arg2: T2) => T3; }; }; }
+>onion : <T, T2, T3>(arg: {    a: (arg1: string) => T;    nested: {        b: (arg2: T) => T2;        nested2: {            c: (arg2: T2) => T3;        };    };}) => [T, T2, T3]
+>arg : { a: (arg1: string) => T; nested: {    b: (arg2: T) => T2;    nested2: {        c: (arg2: T2) => T3;    };}; }
 
   a: (arg1: string) => T;
 >a : (arg1: string) => T
 >arg1 : string
 
   nested: {
->nested : { b: (arg2: T) => T2; nested2: { c: (arg2: T2) => T3; }; }
+>nested : { b: (arg2: T) => T2; nested2: {    c: (arg2: T2) => T3;}; }
 
     b: (arg2: T) => T2;
 >b : (arg2: T) => T2
@@ -977,15 +977,15 @@ const resOnion = onion({
 });
 
 declare function onion2<T, T2, T3, T4>(arg: {
->onion2 : <T, T2, T3, T4>(arg: { a: (arg1: string) => T; nested: { b: (arg2: T) => T2; c: (arg3: T) => T3; nested2: { d: (arg4: T3) => T4; }; }; }) => [T, T2, T3, T4]
->arg : { a: (arg1: string) => T; nested: { b: (arg2: T) => T2; c: (arg3: T) => T3; nested2: { d: (arg4: T3) => T4; }; }; }
+>onion2 : <T, T2, T3, T4>(arg: {    a: (arg1: string) => T;    nested: {        b: (arg2: T) => T2;        c: (arg3: T) => T3;        nested2: {            d: (arg4: T3) => T4;        };    };}) => [T, T2, T3, T4]
+>arg : { a: (arg1: string) => T; nested: {    b: (arg2: T) => T2;    c: (arg3: T) => T3;    nested2: {        d: (arg4: T3) => T4;    };}; }
 
   a: (arg1: string) => T;
 >a : (arg1: string) => T
 >arg1 : string
 
   nested: {
->nested : { b: (arg2: T) => T2; c: (arg3: T) => T3; nested2: { d: (arg4: T3) => T4; }; }
+>nested : { b: (arg2: T) => T2; c: (arg3: T) => T3; nested2: {    d: (arg4: T3) => T4;}; }
 
     b: (arg2: T) => T2;
 >b : (arg2: T) => T2
@@ -1058,14 +1058,14 @@ const resOnion2 = onion2({
 });
 
 declare function distant<T>(args: {
->distant : <T>(args: { foo: { bar: { baz: { producer: (arg: string) => T; }; }; }; consumer: (val: T) => unknown; }) => T
->args : { foo: { bar: { baz: { producer: (arg: string) => T; }; }; }; consumer: (val: T) => unknown; }
+>distant : <T>(args: {    foo: {        bar: {            baz: {                producer: (arg: string) => T;            };        };    };    consumer: (val: T) => unknown;}) => T
+>args : { foo: {    bar: {        baz: {            producer: (arg: string) => T;        };    };}; consumer: (val: T) => unknown; }
 
   foo: {
->foo : { bar: { baz: { producer: (arg: string) => T; }; }; }
+>foo : { bar: {    baz: {        producer: (arg: string) => T;    };}; }
 
     bar: {
->bar : { baz: { producer: (arg: string) => T; }; }
+>bar : { baz: {    producer: (arg: string) => T;}; }
 
       baz: {
 >baz : { producer: (arg: string) => T; }
diff --git a/tests/baselines/reference/isomorphicMappedTypeInference.types b/tests/baselines/reference/isomorphicMappedTypeInference.types
index 32b74150e53ee..91b2d3fc83555 100644
--- a/tests/baselines/reference/isomorphicMappedTypeInference.types
+++ b/tests/baselines/reference/isomorphicMappedTypeInference.types
@@ -317,7 +317,7 @@ function f5(s: string) {
 }
 
 function makeDictionary<T>(obj: { [x: string]: T }) {
->makeDictionary : <T>(obj: { [x: string]: T; }) => { [x: string]: T; }
+>makeDictionary : <T>(obj: {    [x: string]: T;}) => { [x: string]: T; }
 >obj : { [x: string]: T; }
 >x : string
 
diff --git a/tests/baselines/reference/jsDeclarationsImportAliasExposedWithinNamespace.js b/tests/baselines/reference/jsDeclarationsImportAliasExposedWithinNamespace.js
index b600a72f5cd6b..f08a35dfa3a3d 100644
--- a/tests/baselines/reference/jsDeclarationsImportAliasExposedWithinNamespace.js
+++ b/tests/baselines/reference/jsDeclarationsImportAliasExposedWithinNamespace.js
@@ -67,10 +67,15 @@ export namespace myTypes {
         prop2: string;
     };
     type typeC = myTypes.typeB | Function;
-    let myTypes: {
-        [x: string]: any;
-    };
 }
+/**
+ * @namespace myTypes
+ * @global
+ * @type {Object<string,*>}
+ */
+export const myTypes: {
+    [x: string]: any;
+};
 //// [file2.d.ts]
 export namespace testFnTypes {
     type input = boolean | myTypes.typeC;
diff --git a/tests/baselines/reference/jsxChildrenGenericContextualTypes.types b/tests/baselines/reference/jsxChildrenGenericContextualTypes.types
index 01bf65beb0045..ceb6da2de0364 100644
--- a/tests/baselines/reference/jsxChildrenGenericContextualTypes.types
+++ b/tests/baselines/reference/jsxChildrenGenericContextualTypes.types
@@ -14,8 +14,8 @@ namespace JSX {
 >key : string
 }
 const Elem = <T,U=never>(p: { prop: T, children: (t: T) => T }) => <div></div>;
->Elem : <T, U = never>(p: { prop: T; children: (t: T) => T; }) => JSX.Element
-><T,U=never>(p: { prop: T, children: (t: T) => T }) => <div></div> : <T, U = never>(p: { prop: T; children: (t: T) => T; }) => JSX.Element
+>Elem : <T, U = never>(p: {    prop: T;    children: (t: T) => T;}) => JSX.Element
+><T,U=never>(p: { prop: T, children: (t: T) => T }) => <div></div> : <T, U = never>(p: {    prop: T;    children: (t: T) => T;}) => JSX.Element
 >p : { prop: T; children: (t: T) => T; }
 >prop : T
 >children : (t: T) => T
diff --git a/tests/baselines/reference/jsxComplexSignatureHasApplicabilityError.types b/tests/baselines/reference/jsxComplexSignatureHasApplicabilityError.types
index 56342bfc23c12..95e495fb6bf75 100644
--- a/tests/baselines/reference/jsxComplexSignatureHasApplicabilityError.types
+++ b/tests/baselines/reference/jsxComplexSignatureHasApplicabilityError.types
@@ -159,7 +159,7 @@ export type FilterOptionsHandler<TValue = OptionValues> = (options: Options<TVal
 >currentValues : Options<TValue>
 
 export type InputRendererHandler = (props: { [key: string]: any }) => HandlerRendererResult;
->InputRendererHandler : (props: { [key: string]: any; }) => HandlerRendererResult
+>InputRendererHandler : (props: {    [key: string]: any;}) => HandlerRendererResult
 >props : { [key: string]: any; }
 >key : string
 
diff --git a/tests/baselines/reference/jsxElementType.types b/tests/baselines/reference/jsxElementType.types
index 36a03d571128f..9da500e29f47f 100644
--- a/tests/baselines/reference/jsxElementType.types
+++ b/tests/baselines/reference/jsxElementType.types
@@ -57,8 +57,8 @@ let Component: NewReactJSXElementConstructor<{ title: string }>;
 >title : string
 
 const RenderElement = ({ title }: { title: string }) => <div>{title}</div>;
->RenderElement : ({ title }: { title: string; }) => JSX.Element
->({ title }: { title: string }) => <div>{title}</div> : ({ title }: { title: string; }) => JSX.Element
+>RenderElement : ({ title }: {    title: string;}) => JSX.Element
+>({ title }: { title: string }) => <div>{title}</div> : ({ title }: {    title: string;}) => JSX.Element
 >title : string
 >title : string
 ><div>{title}</div> : JSX.Element
@@ -86,8 +86,8 @@ Component = RenderElement;
 >excessProp : true
 
 const RenderString = ({ title }: { title: string }) => title;
->RenderString : ({ title }: { title: string; }) => string
->({ title }: { title: string }) => title : ({ title }: { title: string; }) => string
+>RenderString : ({ title }: {    title: string;}) => string
+>({ title }: { title: string }) => title : ({ title }: {    title: string;}) => string
 >title : string
 >title : string
 >title : string
@@ -112,8 +112,8 @@ Component = RenderString;
 >excessProp : true
 
 const RenderNumber = ({ title }: { title: string }) => title.length;
->RenderNumber : ({ title }: { title: string; }) => number
->({ title }: { title: string }) => title.length : ({ title }: { title: string; }) => number
+>RenderNumber : ({ title }: {    title: string;}) => number
+>({ title }: { title: string }) => title.length : ({ title }: {    title: string;}) => number
 >title : string
 >title : string
 >title.length : number
@@ -140,8 +140,8 @@ Component = RenderNumber;
 >excessProp : true
 
 const RenderArray = ({ title }: { title: string }) => [title];
->RenderArray : ({ title }: { title: string; }) => string[]
->({ title }: { title: string }) => [title] : ({ title }: { title: string; }) => string[]
+>RenderArray : ({ title }: {    title: string;}) => string[]
+>({ title }: { title: string }) => [title] : ({ title }: {    title: string;}) => string[]
 >title : string
 >title : string
 >[title] : string[]
@@ -168,8 +168,8 @@ Component = RenderArray;
 
 // React Server Component
 const RenderPromise = async ({ title }: { title: string }) => "react";
->RenderPromise : ({ title }: { title: string; }) => Promise<string>
->async ({ title }: { title: string }) => "react" : ({ title }: { title: string; }) => Promise<string>
+>RenderPromise : ({ title }: {    title: string;}) => Promise<string>
+>async ({ title }: { title: string }) => "react" : ({ title }: {    title: string;}) => Promise<string>
 >title : string
 >title : string
 >"react" : "react"
diff --git a/tests/baselines/reference/keyofAndIndexedAccess.types b/tests/baselines/reference/keyofAndIndexedAccess.types
index d1aca03181660..8b154af7ee27c 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.types
+++ b/tests/baselines/reference/keyofAndIndexedAccess.types
@@ -651,7 +651,7 @@ function f51<T, K extends keyof T>(k: K, s: string) {
 }
 
 function f52<T>(obj: { [x: string]: boolean }, k: Exclude<keyof T, symbol>, s: string, n: number) {
->f52 : <T>(obj: { [x: string]: boolean; }, k: Exclude<keyof T, symbol>, s: string, n: number) => void
+>f52 : <T>(obj: {    [x: string]: boolean;}, k: Exclude<keyof T, symbol>, s: string, n: number) => void
 >obj : { [x: string]: boolean; }
 >x : string
 >k : Exclude<keyof T, symbol>
@@ -678,7 +678,7 @@ function f52<T>(obj: { [x: string]: boolean }, k: Exclude<keyof T, symbol>, s: s
 }
 
 function f53<T, K extends Exclude<keyof T, symbol>>(obj: { [x: string]: boolean }, k: K, s: string, n: number) {
->f53 : <T, K extends Exclude<keyof T, symbol>>(obj: { [x: string]: boolean; }, k: K, s: string, n: number) => void
+>f53 : <T, K extends Exclude<keyof T, symbol>>(obj: {    [x: string]: boolean;}, k: K, s: string, n: number) => void
 >obj : { [x: string]: boolean; }
 >x : string
 >k : K
@@ -1776,7 +1776,7 @@ function updateIds<T extends Record<K, string>, K extends string>(
 // Repro from #13285
 
 function updateIds2<T extends { [x: string]: string }, K extends keyof T>(
->updateIds2 : <T extends { [x: string]: string; }, K extends keyof T>(obj: T, key: K, stringMap: { [oldId: string]: string; }) => void
+>updateIds2 : <T extends { [x: string]: string; }, K extends keyof T>(obj: T, key: K, stringMap: {    [oldId: string]: string;}) => void
 >x : string
 
     obj: T,
diff --git a/tests/baselines/reference/keyofAndIndexedAccess2.types b/tests/baselines/reference/keyofAndIndexedAccess2.types
index b0ec73165f6e6..da43703c72ce1 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess2.types
+++ b/tests/baselines/reference/keyofAndIndexedAccess2.types
@@ -76,7 +76,7 @@ function f1(obj: { a: number, b: 0 | 1, c: string }, k0: 'a', k1: 'a' | 'b', k2:
 }
 
 function f2<T extends { [key: string]: number }>(a: { x: number, y: number }, b: { [key: string]: number }, c: T, k: keyof T) {
->f2 : <T extends { [key: string]: number; }>(a: {    x: number;    y: number;}, b: { [key: string]: number; }, c: T, k: keyof T) => void
+>f2 : <T extends { [key: string]: number; }>(a: {    x: number;    y: number;}, b: {    [key: string]: number;}, c: T, k: keyof T) => void
 >key : string
 >a : { x: number; y: number; }
 >x : number
@@ -166,7 +166,7 @@ function f2<T extends { [key: string]: number }>(a: { x: number, y: number }, b:
 }
 
 function f3<K extends string>(a: { [P in K]: number }, b: { [key: string]: number }, k: K) {
->f3 : <K extends string>(a: { [P in K]: number; }, b: { [key: string]: number; }, k: K) => void
+>f3 : <K extends string>(a: { [P in K]: number; }, b: {    [key: string]: number;}, k: K) => void
 >a : { [P in K]: number; }
 >b : { [key: string]: number; }
 >key : string
@@ -213,7 +213,7 @@ function f3b<K extends string>(a: { [P in K]: number }, b: { [P in string]: numb
 }
 
 function f4<K extends string>(a: { [key: string]: number }[K], b: number) {
->f4 : <K extends string>(a: number, b: number) => void
+>f4 : <K extends string>(a: {    [key: string]: number;}[K], b: number) => void
 >a : number
 >key : string
 >b : number
diff --git a/tests/baselines/reference/logicalAssignment5(target=es2015).types b/tests/baselines/reference/logicalAssignment5(target=es2015).types
index 288026e606178..d4be6e09c6ab2 100644
--- a/tests/baselines/reference/logicalAssignment5(target=es2015).types
+++ b/tests/baselines/reference/logicalAssignment5(target=es2015).types
@@ -2,7 +2,7 @@
 
 === logicalAssignment5.ts ===
 function foo1 (f?: (a: number) => void) {
->foo1 : (f?: ((a: number) => void) | undefined) => void
+>foo1 : (f?: (a: number) => void) => void
 >f : ((a: number) => void) | undefined
 >a : number
 
@@ -21,7 +21,7 @@ function foo1 (f?: (a: number) => void) {
 }
 
 function foo2 (f?: (a: number) => void) {
->foo2 : (f?: ((a: number) => void) | undefined) => void
+>foo2 : (f?: (a: number) => void) => void
 >f : ((a: number) => void) | undefined
 >a : number
 
@@ -40,7 +40,7 @@ function foo2 (f?: (a: number) => void) {
 }
 
 function foo3 (f?: (a: number) => void) {
->foo3 : (f?: ((a: number) => void) | undefined) => void
+>foo3 : (f?: (a: number) => void) => void
 >f : ((a: number) => void) | undefined
 >a : number
 
@@ -59,7 +59,7 @@ function foo3 (f?: (a: number) => void) {
 }
 
 function bar1 (f?: (a: number) => void) {
->bar1 : (f?: ((a: number) => void) | undefined) => void
+>bar1 : (f?: (a: number) => void) => void
 >f : ((a: number) => void) | undefined
 >a : number
 
@@ -84,7 +84,7 @@ function bar1 (f?: (a: number) => void) {
 }
 
 function bar2 (f?: (a: number) => void) {
->bar2 : (f?: ((a: number) => void) | undefined) => void
+>bar2 : (f?: (a: number) => void) => void
 >f : ((a: number) => void) | undefined
 >a : number
 
@@ -109,7 +109,7 @@ function bar2 (f?: (a: number) => void) {
 }
 
 function bar3 (f?: (a: number) => void) {
->bar3 : (f?: ((a: number) => void) | undefined) => void
+>bar3 : (f?: (a: number) => void) => void
 >f : ((a: number) => void) | undefined
 >a : number
 
diff --git a/tests/baselines/reference/logicalAssignment5(target=es2020).types b/tests/baselines/reference/logicalAssignment5(target=es2020).types
index 288026e606178..d4be6e09c6ab2 100644
--- a/tests/baselines/reference/logicalAssignment5(target=es2020).types
+++ b/tests/baselines/reference/logicalAssignment5(target=es2020).types
@@ -2,7 +2,7 @@
 
 === logicalAssignment5.ts ===
 function foo1 (f?: (a: number) => void) {
->foo1 : (f?: ((a: number) => void) | undefined) => void
+>foo1 : (f?: (a: number) => void) => void
 >f : ((a: number) => void) | undefined
 >a : number
 
@@ -21,7 +21,7 @@ function foo1 (f?: (a: number) => void) {
 }
 
 function foo2 (f?: (a: number) => void) {
->foo2 : (f?: ((a: number) => void) | undefined) => void
+>foo2 : (f?: (a: number) => void) => void
 >f : ((a: number) => void) | undefined
 >a : number
 
@@ -40,7 +40,7 @@ function foo2 (f?: (a: number) => void) {
 }
 
 function foo3 (f?: (a: number) => void) {
->foo3 : (f?: ((a: number) => void) | undefined) => void
+>foo3 : (f?: (a: number) => void) => void
 >f : ((a: number) => void) | undefined
 >a : number
 
@@ -59,7 +59,7 @@ function foo3 (f?: (a: number) => void) {
 }
 
 function bar1 (f?: (a: number) => void) {
->bar1 : (f?: ((a: number) => void) | undefined) => void
+>bar1 : (f?: (a: number) => void) => void
 >f : ((a: number) => void) | undefined
 >a : number
 
@@ -84,7 +84,7 @@ function bar1 (f?: (a: number) => void) {
 }
 
 function bar2 (f?: (a: number) => void) {
->bar2 : (f?: ((a: number) => void) | undefined) => void
+>bar2 : (f?: (a: number) => void) => void
 >f : ((a: number) => void) | undefined
 >a : number
 
@@ -109,7 +109,7 @@ function bar2 (f?: (a: number) => void) {
 }
 
 function bar3 (f?: (a: number) => void) {
->bar3 : (f?: ((a: number) => void) | undefined) => void
+>bar3 : (f?: (a: number) => void) => void
 >f : ((a: number) => void) | undefined
 >a : number
 
diff --git a/tests/baselines/reference/logicalAssignment5(target=es2021).types b/tests/baselines/reference/logicalAssignment5(target=es2021).types
index 288026e606178..d4be6e09c6ab2 100644
--- a/tests/baselines/reference/logicalAssignment5(target=es2021).types
+++ b/tests/baselines/reference/logicalAssignment5(target=es2021).types
@@ -2,7 +2,7 @@
 
 === logicalAssignment5.ts ===
 function foo1 (f?: (a: number) => void) {
->foo1 : (f?: ((a: number) => void) | undefined) => void
+>foo1 : (f?: (a: number) => void) => void
 >f : ((a: number) => void) | undefined
 >a : number
 
@@ -21,7 +21,7 @@ function foo1 (f?: (a: number) => void) {
 }
 
 function foo2 (f?: (a: number) => void) {
->foo2 : (f?: ((a: number) => void) | undefined) => void
+>foo2 : (f?: (a: number) => void) => void
 >f : ((a: number) => void) | undefined
 >a : number
 
@@ -40,7 +40,7 @@ function foo2 (f?: (a: number) => void) {
 }
 
 function foo3 (f?: (a: number) => void) {
->foo3 : (f?: ((a: number) => void) | undefined) => void
+>foo3 : (f?: (a: number) => void) => void
 >f : ((a: number) => void) | undefined
 >a : number
 
@@ -59,7 +59,7 @@ function foo3 (f?: (a: number) => void) {
 }
 
 function bar1 (f?: (a: number) => void) {
->bar1 : (f?: ((a: number) => void) | undefined) => void
+>bar1 : (f?: (a: number) => void) => void
 >f : ((a: number) => void) | undefined
 >a : number
 
@@ -84,7 +84,7 @@ function bar1 (f?: (a: number) => void) {
 }
 
 function bar2 (f?: (a: number) => void) {
->bar2 : (f?: ((a: number) => void) | undefined) => void
+>bar2 : (f?: (a: number) => void) => void
 >f : ((a: number) => void) | undefined
 >a : number
 
@@ -109,7 +109,7 @@ function bar2 (f?: (a: number) => void) {
 }
 
 function bar3 (f?: (a: number) => void) {
->bar3 : (f?: ((a: number) => void) | undefined) => void
+>bar3 : (f?: (a: number) => void) => void
 >f : ((a: number) => void) | undefined
 >a : number
 
diff --git a/tests/baselines/reference/logicalAssignment5(target=esnext).types b/tests/baselines/reference/logicalAssignment5(target=esnext).types
index 288026e606178..d4be6e09c6ab2 100644
--- a/tests/baselines/reference/logicalAssignment5(target=esnext).types
+++ b/tests/baselines/reference/logicalAssignment5(target=esnext).types
@@ -2,7 +2,7 @@
 
 === logicalAssignment5.ts ===
 function foo1 (f?: (a: number) => void) {
->foo1 : (f?: ((a: number) => void) | undefined) => void
+>foo1 : (f?: (a: number) => void) => void
 >f : ((a: number) => void) | undefined
 >a : number
 
@@ -21,7 +21,7 @@ function foo1 (f?: (a: number) => void) {
 }
 
 function foo2 (f?: (a: number) => void) {
->foo2 : (f?: ((a: number) => void) | undefined) => void
+>foo2 : (f?: (a: number) => void) => void
 >f : ((a: number) => void) | undefined
 >a : number
 
@@ -40,7 +40,7 @@ function foo2 (f?: (a: number) => void) {
 }
 
 function foo3 (f?: (a: number) => void) {
->foo3 : (f?: ((a: number) => void) | undefined) => void
+>foo3 : (f?: (a: number) => void) => void
 >f : ((a: number) => void) | undefined
 >a : number
 
@@ -59,7 +59,7 @@ function foo3 (f?: (a: number) => void) {
 }
 
 function bar1 (f?: (a: number) => void) {
->bar1 : (f?: ((a: number) => void) | undefined) => void
+>bar1 : (f?: (a: number) => void) => void
 >f : ((a: number) => void) | undefined
 >a : number
 
@@ -84,7 +84,7 @@ function bar1 (f?: (a: number) => void) {
 }
 
 function bar2 (f?: (a: number) => void) {
->bar2 : (f?: ((a: number) => void) | undefined) => void
+>bar2 : (f?: (a: number) => void) => void
 >f : ((a: number) => void) | undefined
 >a : number
 
@@ -109,7 +109,7 @@ function bar2 (f?: (a: number) => void) {
 }
 
 function bar3 (f?: (a: number) => void) {
->bar3 : (f?: ((a: number) => void) | undefined) => void
+>bar3 : (f?: (a: number) => void) => void
 >f : ((a: number) => void) | undefined
 >a : number
 
diff --git a/tests/baselines/reference/methodSignaturesWithOverloads.types b/tests/baselines/reference/methodSignaturesWithOverloads.types
index c216519d3a4bf..91f95a13b31e6 100644
--- a/tests/baselines/reference/methodSignaturesWithOverloads.types
+++ b/tests/baselines/reference/methodSignaturesWithOverloads.types
@@ -4,7 +4,7 @@
 // Object type literals permit overloads with optionality but they must match
 
 var c: {
->c : { func4?(x: number): number; func4?(s: string): string; func5?: { (x: number): number; (s: string): string; }; }
+>c : { func4?(x: number): number; func4?(s: string): string; func5?: {    (x: number): number;    (s: string): string;}; }
 
     func4?(x: number): number;
 >func4 : { (x: number): number; (s: string): string; }
diff --git a/tests/baselines/reference/methodSignaturesWithOverloads2.types b/tests/baselines/reference/methodSignaturesWithOverloads2.types
index 2dead056a2c0a..9ebf4942cef0c 100644
--- a/tests/baselines/reference/methodSignaturesWithOverloads2.types
+++ b/tests/baselines/reference/methodSignaturesWithOverloads2.types
@@ -4,7 +4,7 @@
 // Object type literals permit overloads with optionality but they must match
 
 var c: {
->c : { func4?(x: number): number; func4?(s: string): string; func5?: { (x: number): number; (s: string): string; }; }
+>c : { func4?(x: number): number; func4?(s: string): string; func5?: {    (x: number): number;    (s: string): string;}; }
 
     func4?(x: number): number;
 >func4 : { (x: number): number; (s: string): string; }
diff --git a/tests/baselines/reference/namedTupleMembers.types b/tests/baselines/reference/namedTupleMembers.types
index 5ce7ecd46815b..ba22af0c3a80b 100644
--- a/tests/baselines/reference/namedTupleMembers.types
+++ b/tests/baselines/reference/namedTupleMembers.types
@@ -102,7 +102,7 @@ export const func = null as any as Func<SegmentAnnotated>;
 >null as any : any
 
 export function useState<T>(initial: T): [value: T, setter: (T) => void] {
->useState : <T>(initial: T) => [value: T, setter: (T: any) => void]
+>useState : <T>(initial: T) => [value: T, setter: (T) => void]
 >initial : T
 >T : any
 
diff --git a/tests/baselines/reference/noImplicitReturnsExclusions.types b/tests/baselines/reference/noImplicitReturnsExclusions.types
index 9ee2be8951683..06d9bfa7d3731 100644
--- a/tests/baselines/reference/noImplicitReturnsExclusions.types
+++ b/tests/baselines/reference/noImplicitReturnsExclusions.types
@@ -147,7 +147,7 @@ declare class HistoryItem {
 
 interface Thenable<T> {
   then<TResult>(
->then : { <TResult>(onfulfilled?: ((value: T) => TResult | Thenable<TResult>) | undefined, onrejected?: ((reason: any) => TResult | Thenable<TResult>) | undefined): Thenable<TResult>; <TResult_1>(onfulfilled?: ((value: T) => TResult_1 | Thenable<TResult_1>) | undefined, onrejected?: ((reason: any) => void) | undefined): Thenable<TResult_1>; }
+>then : { <TResult>(onfulfilled?: (value: T) => TResult | Thenable<TResult>, onrejected?: (reason: any) => TResult | Thenable<TResult>): Thenable<TResult>; <TResult_1>(onfulfilled?: ((value: T) => TResult_1 | Thenable<TResult_1>) | undefined, onrejected?: ((reason: any) => void) | undefined): Thenable<TResult_1>; }
 
     onfulfilled?: (value: T) => TResult | Thenable<TResult>,
 >onfulfilled : ((value: T) => TResult | Thenable<TResult>) | undefined
@@ -159,7 +159,7 @@ interface Thenable<T> {
 
   ): Thenable<TResult>;
   then<TResult>(
->then : { <TResult_1>(onfulfilled?: ((value: T) => TResult_1 | Thenable<TResult_1>) | undefined, onrejected?: ((reason: any) => TResult_1 | Thenable<TResult_1>) | undefined): Thenable<TResult_1>; <TResult>(onfulfilled?: ((value: T) => TResult | Thenable<TResult>) | undefined, onrejected?: ((reason: any) => void) | undefined): Thenable<TResult>; }
+>then : { <TResult_1>(onfulfilled?: ((value: T) => TResult_1 | Thenable<TResult_1>) | undefined, onrejected?: ((reason: any) => TResult_1 | Thenable<TResult_1>) | undefined): Thenable<TResult_1>; <TResult>(onfulfilled?: (value: T) => TResult | Thenable<TResult>, onrejected?: (reason: any) => void): Thenable<TResult>; }
 
     onfulfilled?: (value: T) => TResult | Thenable<TResult>,
 >onfulfilled : ((value: T) => TResult | Thenable<TResult>) | undefined
diff --git a/tests/baselines/reference/observableInferenceCanBeMade.types b/tests/baselines/reference/observableInferenceCanBeMade.types
index a3124e5fd9fb8..a82a69d21049e 100644
--- a/tests/baselines/reference/observableInferenceCanBeMade.types
+++ b/tests/baselines/reference/observableInferenceCanBeMade.types
@@ -16,7 +16,7 @@ type ObservedValueOf<O> = O extends ObservableInput<infer T> ? T : never;
 
 interface Subscribable<T> {
     subscribe(next?: (value: T) => void, error?: (error: any) => void, complete?: () => void): void;
->subscribe : (next?: ((value: T) => void) | undefined, error?: ((error: any) => void) | undefined, complete?: () => void) => void
+>subscribe : (next?: (value: T) => void, error?: (error: any) => void, complete?: () => void) => void
 >next : ((value: T) => void) | undefined
 >value : T
 >error : ((error: any) => void) | undefined
@@ -31,7 +31,7 @@ declare class Observable<T> implements Subscribable<T> {
 >Observable : Observable<T>
 
     subscribe(next?: (value: T) => void, error?: (error: any) => void, complete?: () => void): void;
->subscribe : (next?: ((value: T) => void) | undefined, error?: ((error: any) => void) | undefined, complete?: () => void) => void
+>subscribe : (next?: (value: T) => void, error?: (error: any) => void, complete?: () => void) => void
 >next : ((value: T) => void) | undefined
 >value : T
 >error : ((error: any) => void) | undefined
diff --git a/tests/baselines/reference/override19.types b/tests/baselines/reference/override19.types
index 8aa0d3c811bed..12a116f046b63 100644
--- a/tests/baselines/reference/override19.types
+++ b/tests/baselines/reference/override19.types
@@ -6,7 +6,7 @@ type Foo = abstract new(...args: any) => any;
 >args : any
 
 declare function CreateMixin<C extends Foo, T extends Foo>(Context: C, Base: T): T & {
->CreateMixin : <C extends Foo, T extends Foo>(Context: C, Base: T) => T & (new (...args: any[]) => {    context: InstanceType<C>;})
+>CreateMixin : <C extends Foo, T extends Foo>(Context: C, Base: T) => T & {    new (...args: any[]): {        context: InstanceType<C>;    };}
 >Context : C
 >Base : T
 
diff --git a/tests/baselines/reference/parserParameterList5.types b/tests/baselines/reference/parserParameterList5.types
index cc64f785b60f2..1497a6cd3a244 100644
--- a/tests/baselines/reference/parserParameterList5.types
+++ b/tests/baselines/reference/parserParameterList5.types
@@ -2,6 +2,6 @@
 
 === parserParameterList5.ts ===
 function A(): (public B) => C {
->A : () => (B: any) => C
+>A : () => (public B) => C
 >B : any
 }
diff --git a/tests/baselines/reference/parserRealSource4.types b/tests/baselines/reference/parserRealSource4.types
index 7bc56dad4d643..bf0940a0af769 100644
--- a/tests/baselines/reference/parserRealSource4.types
+++ b/tests/baselines/reference/parserRealSource4.types
@@ -66,7 +66,7 @@ module TypeScript {
 >data : any
 
         map(fn: (k: string, v, c) => void , context): void;
->map : (fn: (k: string, v: any, c: any) => void, context: any) => void
+>map : (fn: (k: string, v, c) => void, context: any) => void
 >fn : (k: string, v: any, c: any) => void
 >k : string
 >v : any
@@ -74,7 +74,7 @@ module TypeScript {
 >context : any
 
         every(fn: (k: string, v, c) => boolean, context): boolean;
->every : (fn: (k: string, v: any, c: any) => boolean, context: any) => boolean
+>every : (fn: (k: string, v, c) => boolean, context: any) => boolean
 >fn : (k: string, v: any, c: any) => boolean
 >k : string
 >v : any
@@ -82,7 +82,7 @@ module TypeScript {
 >context : any
 
         some(fn: (k: string, v, c) => boolean, context): boolean;
->some : (fn: (k: string, v: any, c: any) => boolean, context: any) => boolean
+>some : (fn: (k: string, v, c) => boolean, context: any) => boolean
 >fn : (k: string, v: any, c: any) => boolean
 >k : string
 >v : any
@@ -230,7 +230,7 @@ module TypeScript {
         }
 
         public map(fn: (k: string, v, c) => void , context) {
->map : (fn: (k: string, v: any, c: any) => void, context: any) => void
+>map : (fn: (k: string, v, c) => void, context: any) => void
 >fn : (k: string, v: any, c: any) => void
 >k : string
 >v : any
@@ -271,7 +271,7 @@ module TypeScript {
         }
 
         public every(fn: (k: string, v, c) => boolean, context) {
->every : (fn: (k: string, v: any, c: any) => boolean, context: any) => boolean
+>every : (fn: (k: string, v, c) => boolean, context: any) => boolean
 >fn : (k: string, v: any, c: any) => boolean
 >k : string
 >v : any
@@ -319,7 +319,7 @@ module TypeScript {
         }
 
         public some(fn: (k: string, v, c) => boolean, context) {
->some : (fn: (k: string, v: any, c: any) => boolean, context: any) => boolean
+>some : (fn: (k: string, v, c) => boolean, context: any) => boolean
 >fn : (k: string, v: any, c: any) => boolean
 >k : string
 >v : any
@@ -502,7 +502,7 @@ module TypeScript {
         }
 
         public map(fn: (k: string, v, c) => void , context) {
->map : (fn: (k: string, v: any, c: any) => void, context: any) => void
+>map : (fn: (k: string, v, c) => void, context: any) => void
 >fn : (k: string, v: any, c: any) => void
 >k : string
 >v : any
@@ -531,7 +531,7 @@ module TypeScript {
         }
 
         public every(fn: (k: string, v, c) => boolean, context) {
->every : (fn: (k: string, v: any, c: any) => boolean, context: any) => boolean
+>every : (fn: (k: string, v, c) => boolean, context: any) => boolean
 >fn : (k: string, v: any, c: any) => boolean
 >k : string
 >v : any
@@ -559,7 +559,7 @@ module TypeScript {
         }
 
         public some(fn: (k: string, v, c) => boolean, context) {
->some : (fn: (k: string, v: any, c: any) => boolean, context: any) => boolean
+>some : (fn: (k: string, v, c) => boolean, context: any) => boolean
 >fn : (k: string, v: any, c: any) => boolean
 >k : string
 >v : any
diff --git a/tests/baselines/reference/privateNameInLhsReceiverExpression.types b/tests/baselines/reference/privateNameInLhsReceiverExpression.types
index 550cf97a76157..68300b742b0a4 100644
--- a/tests/baselines/reference/privateNameInLhsReceiverExpression.types
+++ b/tests/baselines/reference/privateNameInLhsReceiverExpression.types
@@ -9,7 +9,7 @@ class Test {
 >123 : 123
 
     static something(obj: { [key: string]: Test }) {
->something : (obj: { [key: string]: Test; }) => void
+>something : (obj: {    [key: string]: Test;}) => void
 >obj : { [key: string]: Test; }
 >key : string
 
diff --git a/tests/baselines/reference/restTuplesFromContextualTypes.types b/tests/baselines/reference/restTuplesFromContextualTypes.types
index a9de22bade988..e668ce861ca26 100644
--- a/tests/baselines/reference/restTuplesFromContextualTypes.types
+++ b/tests/baselines/reference/restTuplesFromContextualTypes.types
@@ -53,7 +53,7 @@ declare const t1: [number, boolean, string];
 >t1 : [number, boolean, string]
 
 declare function f1(cb: (...args: typeof t1) => void): void;
->f1 : (cb: (args_0: number, args_1: boolean, args_2: string) => void) => void
+>f1 : (cb: (...args: typeof t1) => void) => void
 >cb : (args_0: number, args_1: boolean, args_2: string) => void
 >args : [number, boolean, string]
 >t1 : [number, boolean, string]
@@ -148,7 +148,7 @@ declare const t2: [number, boolean, ...string[]];
 >t2 : [number, boolean, ...string[]]
 
 declare function f2(cb: (...args: typeof t2) => void): void;
->f2 : (cb: (args_0: number, args_1: boolean, ...args_2: string[]) => void) => void
+>f2 : (cb: (...args: typeof t2) => void) => void
 >cb : (args_0: number, args_1: boolean, ...args_2: string[]) => void
 >args : [number, boolean, ...string[]]
 >t2 : [number, boolean, ...string[]]
@@ -248,7 +248,7 @@ declare const t3: [boolean, ...string[]];
 >t3 : [boolean, ...string[]]
 
 declare function f3(cb: (x: number, ...args: typeof t3) => void): void;
->f3 : (cb: (x: number, args_0: boolean, ...args_1: string[]) => void) => void
+>f3 : (cb: (x: number, ...args: typeof t3) => void) => void
 >cb : (x: number, args_0: boolean, ...args_1: string[]) => void
 >x : number
 >args : [boolean, ...string[]]
diff --git a/tests/baselines/reference/returnTypeTypeArguments.types b/tests/baselines/reference/returnTypeTypeArguments.types
index 4934a1f1d75d8..d1f68991fc63d 100644
--- a/tests/baselines/reference/returnTypeTypeArguments.types
+++ b/tests/baselines/reference/returnTypeTypeArguments.types
@@ -137,7 +137,7 @@ class X<T>
 }
 
 declare var a: {
->a : { p1: () => X; p2: { [idx: number]: any; }; p3: X[]; p4: I<X>; p5: any; p6: () => Y; p7: { [idx: number]: any; }; p8: Y[]; p9: I<Y>; pa: any; }
+>a : { p1: () => X; p2: {    [idx: number]: X;}; p3: X[]; p4: I<X>; p5: any; p6: () => Y; p7: {    [idx: number]: Y;}; p8: Y[]; p9: I<Y>; pa: any; }
 
     p1: () => X;
 >p1 : () => any
diff --git a/tests/baselines/reference/reverseMappedPartiallyInferableTypes.types b/tests/baselines/reference/reverseMappedPartiallyInferableTypes.types
index eac9cbd9b1c25..aa0aa474b269a 100644
--- a/tests/baselines/reference/reverseMappedPartiallyInferableTypes.types
+++ b/tests/baselines/reference/reverseMappedPartiallyInferableTypes.types
@@ -47,7 +47,7 @@ export type PropsDefinition<T> = RecordPropsDefinition<T>;
 
 
 declare function extend<T>({ props }: { props: PropsDefinition<T> }):  PropsDefinition<T>;
->extend : <T>({ props }: { props: PropsDefinition<T>; }) => PropsDefinition<T>
+>extend : <T>({ props }: {    props: PropsDefinition<T>;}) => PropsDefinition<T>
 >props : RecordPropsDefinition<T>
 >props : RecordPropsDefinition<T>
 
diff --git a/tests/baselines/reference/reverseMappedUnionInference.types b/tests/baselines/reference/reverseMappedUnionInference.types
index 6eb20a8c8ce1d..c2614e63d5593 100644
--- a/tests/baselines/reference/reverseMappedUnionInference.types
+++ b/tests/baselines/reference/reverseMappedUnionInference.types
@@ -22,7 +22,7 @@ interface Extractor<T, Result> {
 }
 
 declare function createExtractor<T, Result>(params: {
->createExtractor : <T, Result>(params: { matcher: (node: unknown) => node is T; extract: (node: T) => Result; }) => Extractor<T, Result>
+>createExtractor : <T, Result>(params: {    matcher: (node: unknown) => node is T;    extract: (node: T) => Result;}) => Extractor<T, Result>
 >params : { matcher: (node: unknown) => node is T; extract: (node: T) => Result; }
 
   matcher: (node: unknown) => node is T;
diff --git a/tests/baselines/reference/specializedSignatureOverloadReturnTypeWithIndexers.types b/tests/baselines/reference/specializedSignatureOverloadReturnTypeWithIndexers.types
index 2a798477a1880..f6643f5281bf2 100644
--- a/tests/baselines/reference/specializedSignatureOverloadReturnTypeWithIndexers.types
+++ b/tests/baselines/reference/specializedSignatureOverloadReturnTypeWithIndexers.types
@@ -3,45 +3,45 @@
 === specializedSignatureOverloadReturnTypeWithIndexers.ts ===
 interface A {
     f(p: string): { [p: string]: string; };
->f : { (p: string): { [p: string]: string; }; (p: "spec"): { [p: string]: any; }; }
+>f : { (p: string): {    [p: string]: string;}; (p: "spec"): { [p: string]: any; }; }
 >p : string
 >p : string
 
     f(p: "spec"): { [p: string]: any; } // Should be ok
->f : { (p: string): { [p: string]: string; }; (p: "spec"): { [p: string]: any; }; }
+>f : { (p: string): { [p: string]: string; }; (p: "spec"): {    [p: string]: any;}; }
 >p : "spec"
 >p : string
 }
 interface B {
     f(p: string): { [p: number]: string; };
->f : { (p: string): { [p: number]: string; }; (p: "spec"): { [p: string]: any; }; }
+>f : { (p: string): {    [p: number]: string;}; (p: "spec"): { [p: string]: any; }; }
 >p : string
 >p : number
 
     f(p: "spec"): { [p: string]: any; } // Should be ok
->f : { (p: string): { [p: number]: string; }; (p: "spec"): { [p: string]: any; }; }
+>f : { (p: string): { [p: number]: string; }; (p: "spec"): {    [p: string]: any;}; }
 >p : "spec"
 >p : string
 }
 interface C {
     f(p: string): { [p: number]: string; };
->f : { (p: string): { [p: number]: string; }; (p: "spec"): { [p: number]: any; }; }
+>f : { (p: string): {    [p: number]: string;}; (p: "spec"): { [p: number]: any; }; }
 >p : string
 >p : number
 
     f(p: "spec"): { [p: number]: any; } // Should be ok
->f : { (p: string): { [p: number]: string; }; (p: "spec"): { [p: number]: any; }; }
+>f : { (p: string): { [p: number]: string; }; (p: "spec"): {    [p: number]: any;}; }
 >p : "spec"
 >p : number
 }
 interface D {
     f(p: string): { [p: string]: string; };
->f : { (p: string): { [p: string]: string; }; (p: "spec"): { [p: number]: any; }; }
+>f : { (p: string): {    [p: string]: string;}; (p: "spec"): { [p: number]: any; }; }
 >p : string
 >p : string
 
     f(p: "spec"): { [p: number]: any; } // Should be error
->f : { (p: string): { [p: string]: string; }; (p: "spec"): { [p: number]: any; }; }
+>f : { (p: string): { [p: string]: string; }; (p: "spec"): {    [p: number]: any;}; }
 >p : "spec"
 >p : number
 }
diff --git a/tests/baselines/reference/strictModeReservedWord.types b/tests/baselines/reference/strictModeReservedWord.types
index 1529e440356df..4fe5a085cf828 100644
--- a/tests/baselines/reference/strictModeReservedWord.types
+++ b/tests/baselines/reference/strictModeReservedWord.types
@@ -40,7 +40,7 @@ function foo() {
 >baz : <implements, protected>() => void
 
     function barn(cb: (private, public, package) => void) { }
->barn : (cb: (private: any, public: any, package: any) => void) => void
+>barn : (cb: (private, public, package) => void) => void
 >cb : (private: any, public: any, package: any) => void
 >private : any
 >public : any
diff --git a/tests/baselines/reference/strictOptionalProperties1.types b/tests/baselines/reference/strictOptionalProperties1.types
index 6dfefa5876bf7..aa439d7d64a25 100644
--- a/tests/baselines/reference/strictOptionalProperties1.types
+++ b/tests/baselines/reference/strictOptionalProperties1.types
@@ -2,7 +2,7 @@
 
 === strictOptionalProperties1.ts ===
 function f1(obj: { a?: string, b?: string | undefined }) {
->f1 : (obj: { a?: string; b?: string | undefined; }) => void
+>f1 : (obj: {    a?: string;    b?: string | undefined;}) => void
 >obj : { a?: string; b?: string | undefined; }
 >a : string | undefined
 >b : string | undefined
@@ -220,7 +220,7 @@ function f2(obj: { a?: string, b?: string | undefined }) {
 }
 
 function f3(obj: Partial<{ a: string, b: string | undefined }>) {
->f3 : (obj: Partial<{ a: string; b: string | undefined; }>) => void
+>f3 : (obj: Partial<{    a: string;    b: string | undefined;}>) => void
 >obj : Partial<{ a: string; b: string | undefined; }>
 >a : string
 >b : string | undefined
diff --git a/tests/baselines/reference/strictSubtypeAndNarrowing.types b/tests/baselines/reference/strictSubtypeAndNarrowing.types
index 3892eefe407d1..a1f440b17a109 100644
--- a/tests/baselines/reference/strictSubtypeAndNarrowing.types
+++ b/tests/baselines/reference/strictSubtypeAndNarrowing.types
@@ -336,7 +336,7 @@ declare function isArrayLike(value: any): value is { length: number };
 >length : number
 
 function ff1(value: { [index: number]: boolean, length: number } | undefined) {
->ff1 : (value: { [index: number]: boolean; length: number; } | undefined) => void
+>ff1 : (value: {    [index: number]: boolean;    length: number;} | undefined) => void
 >value : { [index: number]: boolean; length: number; } | undefined
 >index : number
 >length : number
@@ -358,7 +358,7 @@ function ff1(value: { [index: number]: boolean, length: number } | undefined) {
 }
 
 function ff2(value: { [index: number]: boolean, length: number } | string) {
->ff2 : (value: string | { [index: number]: boolean; length: number; }) => void
+>ff2 : (value: {    [index: number]: boolean;    length: number;} | string) => void
 >value : string | { [index: number]: boolean; length: number; }
 >index : number
 >length : number
@@ -380,7 +380,7 @@ function ff2(value: { [index: number]: boolean, length: number } | string) {
 }
 
 function ff3(value: string | string[] | { [index: number]: boolean, length: number } | [number, boolean] | number | { length: string } | { a: string } | null | undefined) {
->ff3 : (value: string | number | { [index: number]: boolean; length: number; } | [number, boolean] | { length: string; } | { a: string; } | string[] | null | undefined) => void
+>ff3 : (value: string | string[] | {    [index: number]: boolean;    length: number;} | [number, boolean] | number | {    length: string;} | {    a: string;} | null | undefined) => void
 >value : string | number | { [index: number]: boolean; length: number; } | [number, boolean] | { length: string; } | { a: string; } | string[] | null | undefined
 >index : number
 >length : number
diff --git a/tests/baselines/reference/subtypingWithCallSignatures2.types b/tests/baselines/reference/subtypingWithCallSignatures2.types
index 56aacd670482e..0c16bdef45100 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures2.types
+++ b/tests/baselines/reference/subtypingWithCallSignatures2.types
@@ -184,7 +184,7 @@ declare function foo14(a: any): any;
 >a : any
 
 declare function foo15(a: { 
->foo15 : { (a: { (x: number): number[]; (x: string): string[]; }): typeof a; (a: any): any; }
+>foo15 : { (a: {    (x: number): number[];    (x: string): string[];}): typeof a; (a: any): any; }
 >a : { (x: number): number[]; (x: string): string[]; }
 
     (x: number): number[];
@@ -218,7 +218,7 @@ declare function foo16(a: any): any;
 >a : any
 
 declare function foo17(a: {
->foo17 : { (a: { (x: (a: number) => number): number[]; (x: (a: string) => string): string[]; }): typeof a; (a: any): any; }
+>foo17 : { (a: {    (x: (a: number) => number): number[];    (x: (a: string) => string): string[];}): typeof a; (a: any): any; }
 >a : { (x: (a: number) => number): number[]; (x: (a: string) => string): string[]; }
 
     (x: (a: number) => number): number[];
@@ -237,8 +237,8 @@ declare function foo17(a: any): any;
 >a : any
 
 declare function foo18(a: {
->foo18 : { (a: { (x: { (a: number): number; (a: string): string; }): any[]; (x: { (a: boolean): boolean; (a: Date): Date; }): any[]; }): typeof a; (a: any): any; }
->a : { (x: { (a: number): number; (a: string): string; }): any[]; (x: { (a: boolean): boolean; (a: Date): Date; }): any[]; }
+>foo18 : { (a: {    (x: {        (a: number): number;        (a: string): string;    }): any[];    (x: {        (a: boolean): boolean;        (a: Date): Date;    }): any[];}): typeof a; (a: any): any; }
+>a : { (x: {    (a: number): number;    (a: string): string;}): any[]; (x: {    (a: boolean): boolean;    (a: Date): Date;}): any[]; }
 
     (x: {
 >x : { (a: number): number; (a: string): string; }
diff --git a/tests/baselines/reference/subtypingWithCallSignatures3.types b/tests/baselines/reference/subtypingWithCallSignatures3.types
index 38349bb1ece68..d878133bde703 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures3.types
+++ b/tests/baselines/reference/subtypingWithCallSignatures3.types
@@ -110,8 +110,8 @@ module Errors {
 >a2 : any
 
     declare function foo16(a2: {
->foo16 : { (a2: { (x: { (a: number): number; (a?: number): number; }): number[]; (x: { (a: boolean): boolean; (a?: boolean): boolean; }): boolean[]; }): { (x: { (a: number): number; (a?: number): number; }): number[]; (x: { (a: boolean): boolean; (a?: boolean): boolean; }): boolean[]; }; (a2: any): any; }
->a2 : { (x: { (a: number): number; (a?: number): number; }): number[]; (x: { (a: boolean): boolean; (a?: boolean): boolean; }): boolean[]; }
+>foo16 : { (a2: {    (x: {        (a: number): number;        (a?: number): number;    }): number[];    (x: {        (a: boolean): boolean;        (a?: boolean): boolean;    }): boolean[];}): { (x: {    (a: number): number;    (a?: number): number;}): number[]; (x: {    (a: boolean): boolean;    (a?: boolean): boolean;}): boolean[]; }; (a2: any): any; }
+>a2 : { (x: {    (a: number): number;    (a?: number): number;}): number[]; (x: {    (a: boolean): boolean;    (a?: boolean): boolean;}): boolean[]; }
 
         // type of parameter is overload set which means we can't do inference based on this type
         (x: {
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures2.types b/tests/baselines/reference/subtypingWithConstructSignatures2.types
index 2b4f592cd3f38..84bd8c69e54f9 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures2.types
+++ b/tests/baselines/reference/subtypingWithConstructSignatures2.types
@@ -184,7 +184,7 @@ declare function foo14(a: any): any;
 >a : any
 
 declare function foo15(a: { 
->foo15 : { (a: { new (x: number): number[]; new (x: string): string[]; }): typeof a; (a: any): any; }
+>foo15 : { (a: {    new (x: number): number[];    new (x: string): string[];}): typeof a; (a: any): any; }
 >a : { new (x: number): number[]; new (x: string): string[]; }
 
     new (x: number): number[];
@@ -218,7 +218,7 @@ declare function foo16(a: any): any;
 >a : any
 
 declare function foo17(a: {
->foo17 : { (a: { new (x: (a: number) => number): number[]; new (x: (a: string) => string): string[]; }): typeof a; (a: any): any; }
+>foo17 : { (a: {    new (x: (a: number) => number): number[];    new (x: (a: string) => string): string[];}): typeof a; (a: any): any; }
 >a : { new (x: (a: number) => number): number[]; new (x: (a: string) => string): string[]; }
 
     new (x: (a: number) => number): number[];
@@ -237,8 +237,8 @@ declare function foo17(a: any): any;
 >a : any
 
 declare function foo18(a: {
->foo18 : { (a: { new (x: { new (a: number): number; new (a: string): string; }): any[]; new (x: { new (a: boolean): boolean; new (a: Date): Date; }): any[]; }): typeof a; (a: any): any; }
->a : { new (x: { new (a: number): number; new (a: string): string; }): any[]; new (x: { new (a: boolean): boolean; new (a: Date): Date; }): any[]; }
+>foo18 : { (a: {    new (x: {        new (a: number): number;        new (a: string): string;    }): any[];    new (x: {        new (a: boolean): boolean;        new (a: Date): Date;    }): any[];}): typeof a; (a: any): any; }
+>a : { new (x: {    new (a: number): number;    new (a: string): string;}): any[]; new (x: {    new (a: boolean): boolean;    new (a: Date): Date;}): any[]; }
 
     new (x: {
 >x : { new (a: number): number; new (a: string): string; }
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures3.types b/tests/baselines/reference/subtypingWithConstructSignatures3.types
index 7e2e81ca46cc7..38983724c5cc2 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures3.types
+++ b/tests/baselines/reference/subtypingWithConstructSignatures3.types
@@ -110,8 +110,8 @@ module Errors {
 >a2 : any
 
     declare function foo16(a2: {
->foo16 : { (a2: { new (x: { new (a: number): number; new (a?: number): number; }): number[]; new (x: { new (a: boolean): boolean; new (a?: boolean): boolean; }): boolean[]; }): { new (x: { new (a: number): number; new (a?: number): number; }): number[]; new (x: { new (a: boolean): boolean; new (a?: boolean): boolean; }): boolean[]; }; (a2: any): any; }
->a2 : { new (x: { new (a: number): number; new (a?: number): number; }): number[]; new (x: { new (a: boolean): boolean; new (a?: boolean): boolean; }): boolean[]; }
+>foo16 : { (a2: {    new (x: {        new (a: number): number;        new (a?: number): number;    }): number[];    new (x: {        new (a: boolean): boolean;        new (a?: boolean): boolean;    }): boolean[];}): { new (x: {    new (a: number): number;    new (a?: number): number;}): number[]; new (x: {    new (a: boolean): boolean;    new (a?: boolean): boolean;}): boolean[]; }; (a2: any): any; }
+>a2 : { new (x: {    new (a: number): number;    new (a?: number): number;}): number[]; new (x: {    new (a: boolean): boolean;    new (a?: boolean): boolean;}): boolean[]; }
 
         // type of parameter is overload set which means we can't do inference based on this type
         new (x: {
diff --git a/tests/baselines/reference/symbolProperty61.types b/tests/baselines/reference/symbolProperty61.types
index 7e6482c2a095c..29b7ef6835236 100644
--- a/tests/baselines/reference/symbolProperty61.types
+++ b/tests/baselines/reference/symbolProperty61.types
@@ -51,7 +51,7 @@ type InteropObservable<T> = {
 >InteropObservable : InteropObservable<T>
 
     [Symbol.obs]: () => { subscribe(next: (val: T) => void): void }
->[Symbol.obs] : () => { subscribe(next: (val: T) => void): void; }
+>[Symbol.obs] : () => {    subscribe(next: (val: T) => void): void;}
 >Symbol.obs : unique symbol
 >Symbol : SymbolConstructor
 >obs : unique symbol
diff --git a/tests/baselines/reference/taggedTemplateStringsWithManyCallAndMemberExpressions.types b/tests/baselines/reference/taggedTemplateStringsWithManyCallAndMemberExpressions.types
index 7fda78de0ffae..c0c2ab9e1073c 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithManyCallAndMemberExpressions.types
+++ b/tests/baselines/reference/taggedTemplateStringsWithManyCallAndMemberExpressions.types
@@ -7,7 +7,7 @@ interface I {
 >subs : number[]
 
     member: {
->member : new (s: string) => new (n: number) => {    new (): boolean;}
+>member : new (s: string) => {    new (n: number): {        new (): boolean;    };}
 
         new (s: string): {
 >s : string
diff --git a/tests/baselines/reference/taggedTemplateStringsWithManyCallAndMemberExpressionsES6.types b/tests/baselines/reference/taggedTemplateStringsWithManyCallAndMemberExpressionsES6.types
index 7ca5153a048c7..85715c5dfc845 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithManyCallAndMemberExpressionsES6.types
+++ b/tests/baselines/reference/taggedTemplateStringsWithManyCallAndMemberExpressionsES6.types
@@ -7,7 +7,7 @@ interface I {
 >subs : number[]
 
     member: {
->member : new (s: string) => new (n: number) => {    new (): boolean;}
+>member : new (s: string) => {    new (n: number): {        new (): boolean;    };}
 
         new (s: string): {
 >s : string
diff --git a/tests/baselines/reference/taggedTemplatesWithTypeArguments1.types b/tests/baselines/reference/taggedTemplatesWithTypeArguments1.types
index 3d9a23e9aaa8e..3ac9fba42eb3d 100644
--- a/tests/baselines/reference/taggedTemplatesWithTypeArguments1.types
+++ b/tests/baselines/reference/taggedTemplatesWithTypeArguments1.types
@@ -2,7 +2,7 @@
 
 === taggedTemplatesWithTypeArguments1.ts ===
 declare function f<T>(strs: TemplateStringsArray, ...callbacks: Array<(x: T) => any>): void;
->f : <T>(strs: TemplateStringsArray, ...callbacks: ((x: T) => any)[]) => void
+>f : <T>(strs: TemplateStringsArray, ...callbacks: Array<(x: T) => any>) => void
 >strs : TemplateStringsArray
 >callbacks : ((x: T) => any)[]
 >x : T
diff --git a/tests/baselines/reference/tslibReExportHelpers2.types b/tests/baselines/reference/tslibReExportHelpers2.types
index 1c0b27ec23bd0..4ca51dbbcd372 100644
--- a/tests/baselines/reference/tslibReExportHelpers2.types
+++ b/tests/baselines/reference/tslibReExportHelpers2.types
@@ -2,7 +2,7 @@
 
 === /node_modules/tslib/index.d.ts ===
 export declare function __classPrivateFieldGet<T extends object, V>(
->__classPrivateFieldGet : { <T extends object, V>(receiver: T, state: { has(o: T): boolean; get(o: T): V | undefined; }, kind?: "f"): V; <T_1 extends new (...args: any[]) => unknown, V_1>(receiver: T_1, state: T_1, kind: "f", f: { value: V_1; }): V_1; }
+>__classPrivateFieldGet : { <T extends object, V>(receiver: T, state: {    has(o: T): boolean;    get(o: T): V | undefined;}, kind?: "f"): V; <T_1 extends new (...args: any[]) => unknown, V_1>(receiver: T_1, state: T_1, kind: "f", f: { value: V_1; }): V_1; }
 
   receiver: T,
 >receiver : T
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments1.types b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments1.types
index 54739ce5187d5..ed790c1f91c21 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments1.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments1.types
@@ -38,7 +38,7 @@ function Baz<T,U>(key1: T, value: U) {
 }
 
 declare function Link<U>(l: {func: (arg: U)=>void}): JSX.Element;
->Link : <U>(l: { func: (arg: U) => void; }) => JSX.Element
+>Link : <U>(l: {    func: (arg: U) => void;}) => JSX.Element
 >l : { func: (arg: U) => void; }
 >func : (arg: U) => void
 >arg : U
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.types b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.types
index aae77bbb45b6d..1cbca0da3ab32 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.types
@@ -45,7 +45,7 @@ function Baz<T>(arg: T) {
 }
 
 declare function Link<U>(l: {func: (arg: U)=>void}): JSX.Element;
->Link : <U>(l: { func: (arg: U) => void; }) => JSX.Element
+>Link : <U>(l: {    func: (arg: U) => void;}) => JSX.Element
 >l : { func: (arg: U) => void; }
 >func : (arg: U) => void
 >arg : U
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.types b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.types
index 98db4b9d6b071..642080fe05e0a 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.types
@@ -83,14 +83,14 @@ function Baz<T extends {b: number}, U extends {a: boolean, b:string}>(arg1: T, a
 }
 
 declare function Link<U>(l: {func: (arg: U)=>void}): JSX.Element;
->Link : { <U>(l: { func: (arg: U) => void; }): JSX.Element; <U_1>(l: { func: (arg1: U_1, arg2: string) => void; }): JSX.Element; }
+>Link : { <U>(l: {    func: (arg: U) => void;}): JSX.Element; <U_1>(l: { func: (arg1: U_1, arg2: string) => void; }): JSX.Element; }
 >l : { func: (arg: U) => void; }
 >func : (arg: U) => void
 >arg : U
 >JSX : any
 
 declare function Link<U>(l: {func: (arg1:U, arg2: string)=>void}): JSX.Element;
->Link : { <U_1>(l: { func: (arg: U_1) => void; }): JSX.Element; <U>(l: { func: (arg1: U, arg2: string) => void; }): JSX.Element; }
+>Link : { <U_1>(l: { func: (arg: U_1) => void; }): JSX.Element; <U>(l: {    func: (arg1: U, arg2: string) => void;}): JSX.Element; }
 >l : { func: (arg1: U, arg2: string) => void; }
 >func : (arg1: U, arg2: string) => void
 >arg1 : U
diff --git a/tests/baselines/reference/typeArgumentInferenceWithObjectLiteral.types b/tests/baselines/reference/typeArgumentInferenceWithObjectLiteral.types
index 29c99795bbcf8..29d365030c44b 100644
--- a/tests/baselines/reference/typeArgumentInferenceWithObjectLiteral.types
+++ b/tests/baselines/reference/typeArgumentInferenceWithObjectLiteral.types
@@ -68,7 +68,7 @@ enum E2 { X }
 // Check that we infer from both a.r and b before fixing T in a.w
 
 declare function f1<T, U>(a: { w: (x: T) => U; r: () => T; }, b: T): U;
->f1 : <T, U>(a: { w: (x: T) => U; r: () => T; }, b: T) => U
+>f1 : <T, U>(a: {    w: (x: T) => U;    r: () => T;}, b: T) => U
 >a : { w: (x: T) => U; r: () => T; }
 >w : (x: T) => U
 >x : T
diff --git a/tests/baselines/reference/typeGuardFunction.types b/tests/baselines/reference/typeGuardFunction.types
index 6a1ccbc3c8d40..9bb7015bcde47 100644
--- a/tests/baselines/reference/typeGuardFunction.types
+++ b/tests/baselines/reference/typeGuardFunction.types
@@ -170,7 +170,7 @@ acceptingBoolean(isA(a));
 
 // Type predicates with different parameter name.
 declare function acceptingTypeGuardFunction(p1: (item) => item is A);
->acceptingTypeGuardFunction : (p1: (item: any) => item is A) => any
+>acceptingTypeGuardFunction : (p1: (item) => item is A) => any
 >p1 : (item: any) => item is A
 >item : any
 
diff --git a/tests/baselines/reference/typeGuardFunctionErrors.types b/tests/baselines/reference/typeGuardFunctionErrors.types
index 24be6f7c2f6c8..fdd45f1ec3250 100644
--- a/tests/baselines/reference/typeGuardFunctionErrors.types
+++ b/tests/baselines/reference/typeGuardFunctionErrors.types
@@ -157,7 +157,7 @@ if (hasNoTypeGuard(a)) {
 
 // Type predicate type is not assignable
 declare function acceptingDifferentSignatureTypeGuardFunction(p1: (p1) => p1 is B);
->acceptingDifferentSignatureTypeGuardFunction : (p1: (p1: any) => p1 is B) => any
+>acceptingDifferentSignatureTypeGuardFunction : (p1: (p1) => p1 is B) => any
 >p1 : (p1: any) => p1 is B
 >p1 : any
 
diff --git a/tests/baselines/reference/typeGuardFunctionGenerics.types b/tests/baselines/reference/typeGuardFunctionGenerics.types
index 75d1ab867f5c8..97de353aba8bd 100644
--- a/tests/baselines/reference/typeGuardFunctionGenerics.types
+++ b/tests/baselines/reference/typeGuardFunctionGenerics.types
@@ -36,29 +36,29 @@ declare function retC(x): C;
 >x : any
 
 declare function funA<T>(p1: (p1) => T): T;
->funA : <T>(p1: (p1: any) => T) => T
+>funA : <T>(p1: (p1) => T) => T
 >p1 : (p1: any) => T
 >p1 : any
 
 declare function funB<T>(p1: (p1) => T, p2: any): p2 is T;
->funB : <T>(p1: (p1: any) => T, p2: any) => p2 is T
+>funB : <T>(p1: (p1) => T, p2: any) => p2 is T
 >p1 : (p1: any) => T
 >p1 : any
 >p2 : any
 
 declare function funC<T>(p1: (p1) => p1 is T): T;
->funC : <T>(p1: (p1: any) => p1 is T) => T
+>funC : <T>(p1: (p1) => p1 is T) => T
 >p1 : (p1: any) => p1 is T
 >p1 : any
 
 declare function funD<T>(p1: (p1) => p1 is T, p2: any): p2 is T;
->funD : <T>(p1: (p1: any) => p1 is T, p2: any) => p2 is T
+>funD : <T>(p1: (p1) => p1 is T, p2: any) => p2 is T
 >p1 : (p1: any) => p1 is T
 >p1 : any
 >p2 : any
 
 declare function funE<T, U>(p1: (p1) => p1 is T, p2: U): T;
->funE : <T, U>(p1: (p1: any) => p1 is T, p2: U) => T
+>funE : <T, U>(p1: (p1) => p1 is T, p2: U) => T
 >p1 : (p1: any) => p1 is T
 >p1 : any
 >p2 : U
diff --git a/tests/baselines/reference/typeLiteralCallback.types b/tests/baselines/reference/typeLiteralCallback.types
index 96ec8f2ee1769..c9a6ca48a5cd9 100644
--- a/tests/baselines/reference/typeLiteralCallback.types
+++ b/tests/baselines/reference/typeLiteralCallback.types
@@ -16,7 +16,7 @@ interface bar<T> {
 >arg : T
 
     fail2(func: { (arg: T): void ; }): void ;
->fail2 : (func: (arg: T) => void) => void
+>fail2 : (func: {    (arg: T): void;}) => void
 >func : (arg: T) => void
 >arg : T
 }
diff --git a/tests/baselines/reference/typeMatch1.types b/tests/baselines/reference/typeMatch1.types
index a899fa691582b..95f2d2f923dda 100644
--- a/tests/baselines/reference/typeMatch1.types
+++ b/tests/baselines/reference/typeMatch1.types
@@ -16,7 +16,7 @@ var x1: { z: number; f(n: number): string; f(s: string): number; }
 >s : string
 
 var x2: { z:number;f:{(n:number):string;(s:string):number;}; } = x1;
->x2 : { z: number; f: { (n: number): string; (s: string): number; }; }
+>x2 : { z: number; f: {    (n: number): string;    (s: string): number;}; }
 >z : number
 >f : { (n: number): string; (s: string): number; }
 >n : number
diff --git a/tests/baselines/reference/typeName1.types b/tests/baselines/reference/typeName1.types
index 9f4686cd59072..4c81c52491fcf 100644
--- a/tests/baselines/reference/typeName1.types
+++ b/tests/baselines/reference/typeName1.types
@@ -60,7 +60,7 @@ var x5:{ (s:string):number;(n:number):string;x;y;z:number;f(n:number):string;f(s
 >3 : 3
 
 var x6:{ z:number;f:{(n:number):string;(s:string):number;}; }=3;
->x6 : { z: number; f: { (n: number): string; (s: string): number; }; }
+>x6 : { z: number; f: {    (n: number): string;    (s: string): number;}; }
 >z : number
 >f : { (n: number): string; (s: string): number; }
 >n : number
@@ -98,7 +98,7 @@ var x11:{z:I;x:boolean;}[][]=3;
 >3 : 3
 
 var x12:{z:I;x:boolean;y:(s:string)=>boolean;w:{ z:I;[s:string]:{ x; y; };[n:number]:{x; y;};():boolean; };}[][]=3;
->x12 : { z: I; x: boolean; y: (s: string) => boolean; w: { (): boolean; [s: string]: { x: any; y: any; }; [n: number]: { x: any; y: any; }; z: I; }; }[][]
+>x12 : { z: I; x: boolean; y: (s: string) => boolean; w: {    z: I;    [s: string]: {        x;        y;    };    [n: number]: {        x;        y;    };    (): boolean;}; }[][]
 >z : I
 >x : boolean
 >y : (s: string) => boolean
diff --git a/tests/baselines/reference/typeParameterArgumentEquivalence5.types b/tests/baselines/reference/typeParameterArgumentEquivalence5.types
index c2e515de64206..586990bfc2b9e 100644
--- a/tests/baselines/reference/typeParameterArgumentEquivalence5.types
+++ b/tests/baselines/reference/typeParameterArgumentEquivalence5.types
@@ -5,11 +5,11 @@ function foo<T,U>() {
 >foo : <T, U>() => void
 
     var x: () => (item) => U;
->x : () => (item: any) => U
+>x : () => (item) => U
 >item : any
 
     var y: () => (item) => T;
->y : () => (item: any) => T
+>y : () => (item) => T
 >item : any
 
     x = y;  // Should be an error
diff --git a/tests/baselines/reference/typeVariableConstraintIntersections.types b/tests/baselines/reference/typeVariableConstraintIntersections.types
index 6d89a64f8a0b8..1717c85c3048b 100644
--- a/tests/baselines/reference/typeVariableConstraintIntersections.types
+++ b/tests/baselines/reference/typeVariableConstraintIntersections.types
@@ -233,7 +233,7 @@ const optionHandlers: OptionHandlers = {
 };
 
 function handleOption<K extends Options['kind']>(option: Options & { kind: K }): string {
->handleOption : <K extends "one" | "two">(option: Options & { kind: K; }) => string
+>handleOption : <K extends "one" | "two">(option: Options & {    kind: K;}) => string
 >option : Options & { kind: K; }
 >kind : K
 
diff --git a/tests/baselines/reference/types.asyncGenerators.es2018.1.types b/tests/baselines/reference/types.asyncGenerators.es2018.1.types
index 1dab8448cf487..ad815ffa21462 100644
--- a/tests/baselines/reference/types.asyncGenerators.es2018.1.types
+++ b/tests/baselines/reference/types.asyncGenerators.es2018.1.types
@@ -433,7 +433,7 @@ async function * awaitedType2() {
 >1 : 1
 }
 async function * nextType1(): { next(...args: [] | [number | PromiseLike<number>]): any } {
->nextType1 : () => { next(...args: [] | [number | PromiseLike<number>]): any; }
+>nextType1 : () => {    next(...args: [] | [number | PromiseLike<number>]): any;}
 >next : (...args: [] | [number | PromiseLike<number>]) => any
 >args : [] | [number | PromiseLike<number>]
 
diff --git a/tests/baselines/reference/unicodeEscapesInJsxtags.types b/tests/baselines/reference/unicodeEscapesInJsxtags.types
index e8439dc05b388..2a835986a6f9f 100644
--- a/tests/baselines/reference/unicodeEscapesInJsxtags.types
+++ b/tests/baselines/reference/unicodeEscapesInJsxtags.types
@@ -18,8 +18,8 @@ declare global {
     }
 }
 const Compa = (x: {x: number}) => <div>{"" + x}</div>;
->Compa : (x: { x: number; }) => JSX.Element
->(x: {x: number}) => <div>{"" + x}</div> : (x: { x: number; }) => JSX.Element
+>Compa : (x: {    x: number;}) => JSX.Element
+>(x: {x: number}) => <div>{"" + x}</div> : (x: {    x: number;}) => JSX.Element
 >x : { x: number; }
 >x : number
 ><div>{"" + x}</div> : JSX.Element
diff --git a/tests/baselines/reference/unionReductionMutualSubtypes.types b/tests/baselines/reference/unionReductionMutualSubtypes.types
index 2307384f878a1..dba96258452ae 100644
--- a/tests/baselines/reference/unionReductionMutualSubtypes.types
+++ b/tests/baselines/reference/unionReductionMutualSubtypes.types
@@ -17,7 +17,7 @@ declare const val: ReturnVal;
 >val : ReturnVal
 
 function run(options: { something?(b?: string): void }) {
->run : (options: { something?(b?: string): void; }) => void
+>run : (options: {    something?(b?: string): void;}) => void
 >options : { something?(b?: string): void; }
 >something : ((b?: string) => void) | undefined
 >b : string | undefined
diff --git a/tests/baselines/reference/unionSignaturesWithThisParameter.types b/tests/baselines/reference/unionSignaturesWithThisParameter.types
index da59997272e51..0debb675309a8 100644
--- a/tests/baselines/reference/unionSignaturesWithThisParameter.types
+++ b/tests/baselines/reference/unionSignaturesWithThisParameter.types
@@ -4,7 +4,7 @@
 // Repro from #20802
 
 function x<T>(ctor: {
->x : <T>(ctor: { (this: {}, v: T): void; new (v: T): void; } | { (v: T): void; new (v: T): void; }, t: T) => void
+>x : <T>(ctor: {    (this: {}, v: T): void;    new (v: T): void;} | {    (v: T): void;    new (v: T): void;}, t: T) => void
 >ctor : { (this: {}, v: T): void; new (v: T): void; } | { (v: T): void; new (v: T): void; }
 
     (this: {}, v: T): void;
diff --git a/tests/baselines/reference/unionTypeReduction2.types b/tests/baselines/reference/unionTypeReduction2.types
index 269b8f5ca6faa..cbd4e779044c9 100644
--- a/tests/baselines/reference/unionTypeReduction2.types
+++ b/tests/baselines/reference/unionTypeReduction2.types
@@ -2,7 +2,7 @@
 
 === unionTypeReduction2.ts ===
 function f1(x: { f(): void }, y: { f(x?: string): void }) {
->f1 : (x: {    f(): void;}, y: { f(x?: string): void; }) => void
+>f1 : (x: {    f(): void;}, y: {    f(x?: string): void;}) => void
 >x : { f(): void; }
 >f : () => void
 >y : { f(x?: string): void; }
@@ -33,7 +33,7 @@ function f1(x: { f(): void }, y: { f(x?: string): void }) {
 }
 
 function f2(x: { f(x: string | undefined): void }, y: { f(x?: string): void }) {
->f2 : (x: { f(x: string | undefined): void; }, y: { f(x?: string): void; }) => void
+>f2 : (x: {    f(x: string | undefined): void;}, y: {    f(x?: string): void;}) => void
 >x : { f(x: string | undefined): void; }
 >f : (x: string | undefined) => void
 >x : string | undefined
@@ -229,7 +229,7 @@ declare const val: ReturnVal;
 >val : ReturnVal
 
 function run(options: { something?(b?: string): void }) {
->run : (options: { something?(b?: string): void; }) => void
+>run : (options: {    something?(b?: string): void;}) => void
 >options : { something?(b?: string): void; }
 >something : ((b?: string) => void) | undefined
 >b : string | undefined
diff --git a/tests/baselines/reference/uniqueSymbols.types b/tests/baselines/reference/uniqueSymbols.types
index 2733ed076ca87..10f462af87b6a 100644
--- a/tests/baselines/reference/uniqueSymbols.types
+++ b/tests/baselines/reference/uniqueSymbols.types
@@ -912,7 +912,7 @@ const ce0 = class {
 };
 
 function funcInferredReturnType(obj: { method(p: typeof s): void }) {
->funcInferredReturnType : (obj: { method(p: typeof s): void; }) => { method(p: typeof s): void; }
+>funcInferredReturnType : (obj: {    method(p: typeof s): void;}) => { method(p: typeof s): void; }
 >obj : { method(p: typeof s): void; }
 >method : (p: typeof s) => void
 >p : unique symbol
diff --git a/tests/baselines/reference/uniqueSymbolsDeclarationsErrors.types b/tests/baselines/reference/uniqueSymbolsDeclarationsErrors.types
index 90d461473f4cc..defd18906b902 100644
--- a/tests/baselines/reference/uniqueSymbolsDeclarationsErrors.types
+++ b/tests/baselines/reference/uniqueSymbolsDeclarationsErrors.types
@@ -55,7 +55,7 @@ export const classExpression = class {
 };
 
 export function funcInferredReturnType(obj: { method(p: typeof s): void }) {
->funcInferredReturnType : (obj: { method(p: typeof s): void; }) => { method(p: typeof s): void; }
+>funcInferredReturnType : (obj: {    method(p: typeof s): void;}) => { method(p: typeof s): void; }
 >obj : { method(p: typeof s): void; }
 >method : (p: typeof s) => void
 >p : unique symbol
diff --git a/tests/baselines/reference/unknownType1.types b/tests/baselines/reference/unknownType1.types
index b929a29d5fdd6..e3b30a8316194 100644
--- a/tests/baselines/reference/unknownType1.types
+++ b/tests/baselines/reference/unknownType1.types
@@ -342,7 +342,7 @@ function f23<T extends unknown>(x: T) {
 // Anything fresh but primitive assignable to { [x: string]: unknown }
 
 function f24(x: { [x: string]: unknown }) {
->f24 : (x: { [x: string]: unknown; }) => void
+>f24 : (x: {    [x: string]: unknown;}) => void
 >x : { [x: string]: unknown; }
 >x : string
 
diff --git a/tests/baselines/reference/varArgsOnConstructorTypes.types b/tests/baselines/reference/varArgsOnConstructorTypes.types
index a23c91dab25cc..71e463d404bd7 100644
--- a/tests/baselines/reference/varArgsOnConstructorTypes.types
+++ b/tests/baselines/reference/varArgsOnConstructorTypes.types
@@ -50,7 +50,7 @@ export interface I1 {
 >params : any[]
 
     register(inputClass: { new (...params: any[]): A; }[]);
->register : { (inputClass: new (...params: any[]) => A): any; (inputClass: (new (...params: any[]) => A)[]): any; }
+>register : { (inputClass: new (...params: any[]) => A): any; (inputClass: {    new (...params: any[]): A;}[]): any; }
 >inputClass : (new (...params: any[]) => A)[]
 >params : any[]
 }
diff --git a/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.types b/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.types
index fcb1942c1b5f7..a97d88e44e0b1 100644
--- a/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.types
+++ b/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.types
@@ -39,7 +39,7 @@ module WinJS {
 >value : any
 
         static join(promises: { [name: string]: Promise; }): Promise;
->join : { (promises: { [name: string]: Promise; }): Promise; (promises: Promise[]): Promise; }
+>join : { (promises: {    [name: string]: Promise;}): Promise; (promises: Promise[]): Promise; }
 >promises : { [name: string]: Promise; }
 >name : string
 
diff --git a/tests/baselines/reference/voidReturnLambdaValue.types b/tests/baselines/reference/voidReturnLambdaValue.types
index 0efe3d9aa7647..bda1e53232349 100644
--- a/tests/baselines/reference/voidReturnLambdaValue.types
+++ b/tests/baselines/reference/voidReturnLambdaValue.types
@@ -2,7 +2,7 @@
 
 === voidReturnLambdaValue.ts ===
 function foo(arg1, arg2, callback:(v1,v2,v3) => void):void {
->foo : (arg1: any, arg2: any, callback: (v1: any, v2: any, v3: any) => void) => void
+>foo : (arg1: any, arg2: any, callback: (v1, v2, v3) => void) => void
 >arg1 : any
 >arg2 : any
 >callback : (v1: any, v2: any, v3: any) => void
diff --git a/tests/cases/compiler/declarationEmitRetainedAnnotationRetainsImportInOutput.ts b/tests/cases/compiler/declarationEmitRetainedAnnotationRetainsImportInOutput.ts
new file mode 100644
index 0000000000000..6ba10cbc49032
--- /dev/null
+++ b/tests/cases/compiler/declarationEmitRetainedAnnotationRetainsImportInOutput.ts
@@ -0,0 +1,10 @@
+// @strict: true
+// @declaration: true
+// @filename: node_modules/whatever/index.d.ts
+export type Whatever<T> = {x: T};
+export declare function something<T>(cb: () => Whatever<T>): Whatever<T>;
+
+// @filename: index.ts
+import * as E from 'whatever';
+
+export const run = <E>(i: () => E.Whatever<E>): E.Whatever<E> => E.something(i);
\ No newline at end of file
diff --git a/tests/cases/fourslash/objectLiteralCallSignatures.ts b/tests/cases/fourslash/objectLiteralCallSignatures.ts
index 3c6d30ae7e458..3749d26fb4e62 100644
--- a/tests/cases/fourslash/objectLiteralCallSignatures.ts
+++ b/tests/cases/fourslash/objectLiteralCallSignatures.ts
@@ -22,6 +22,6 @@
 
 verify.not.errorExistsAfterMarker('1');
 verify.quickInfos({
-    1: "var x: {\n    func1(x: number): number;\n    func2: (x: number) => number;\n    func3: (x: number) => number;\n}",
+    1: "var x: {\n    func1(x: number): number;\n    func2: (x: number) => number;\n    func3: {\n        (x: number): number;\n    };\n}",
     2: "var y: {\n    func4(x: number): number;\n    func4(s: string): string;\n    func5: {\n        (x: number): number;\n        (s: string): string;\n    };\n}"
 });

From 1c25c7fb552eb098cfe326ce369d83daea4ae0fa Mon Sep 17 00:00:00 2001
From: TypeScript Bot <ts_bot@rcavanaugh.com>
Date: Thu, 28 Mar 2024 16:13:51 -0700
Subject: [PATCH 4/8] =?UTF-8?q?=F0=9F=A4=96=20Pick=20PR=20#57968=20(Normal?=
 =?UTF-8?q?ize=20slashes=20for=20paths=20in=20watc...)=20into=20release-5.?=
 =?UTF-8?q?4=20(#57970)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Sheetal Nandi <shkamat@microsoft.com>
---
 src/server/editorServices.ts                  |    2 +-
 .../unittests/tsserver/events/watchEvents.ts  |   96 +-
 .../canUseWatchEvents-on-windows.js           | 1390 +++++++++++++++++
 3 files changed, 1478 insertions(+), 10 deletions(-)
 create mode 100644 tests/baselines/reference/tsserver/events/watchEvents/canUseWatchEvents-on-windows.js

diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
index d8ee13561b397..af0427af971ad 100644
--- a/src/server/editorServices.ts
+++ b/src/server/editorServices.ts
@@ -997,7 +997,7 @@ function createWatchFactoryHostUsingWatchEvents(service: ProjectService, canUseW
         cb: (callback: T, eventPath: string) => void,
     ) {
         hostWatcherMap.idToCallbacks.get(id)?.forEach(callback => {
-            eventPaths.forEach(eventPath => cb(callback, eventPath));
+            eventPaths.forEach(eventPath => cb(callback, normalizeSlashes(eventPath)));
         });
     }
 }
diff --git a/src/testRunner/unittests/tsserver/events/watchEvents.ts b/src/testRunner/unittests/tsserver/events/watchEvents.ts
index 88c6450a7ae52..6666ce455a775 100644
--- a/src/testRunner/unittests/tsserver/events/watchEvents.ts
+++ b/src/testRunner/unittests/tsserver/events/watchEvents.ts
@@ -93,8 +93,8 @@ describe("unittests:: tsserver:: events:: watchEvents", () => {
     function updateFileOnHost(session: TestSession, file: string, log: string, content?: string) {
         // Change b.ts
         session.logger.log(`${log}: ${file}`);
-        if (content) session.host.appendFile(file, content);
-        else session.host.writeFile(file, session.host.readFile("/user/username/projects/myproject/a.ts")!);
+        if (content && session.host.fileExists(file)) session.host.appendFile(file, content);
+        else session.host.writeFile(file, content ?? session.host.readFile("/user/username/projects/myproject/a.ts")!);
         session.host.runQueuedTimeoutCallbacks();
     }
 
@@ -150,12 +150,13 @@ describe("unittests:: tsserver:: events:: watchEvents", () => {
         session: TestSession,
         file: string,
         eventType: "created" | "deleted" | "updated",
+        eventPath?: string,
     ) {
         return collectWatchChanges(
             session,
             (session.logger.host as TestServerHostWithCustomWatch).factoryData.watchUtils.pollingWatches,
             file,
-            file,
+            eventPath ?? file,
             eventType,
         );
     }
@@ -185,21 +186,21 @@ describe("unittests:: tsserver:: events:: watchEvents", () => {
         }
     }
 
-    function addFile(session: TestSession, path: string) {
-        updateFileOnHost(session, path, "Add file");
+    function addFile(session: TestSession, path: string, content?: string, eventPath?: string) {
+        updateFileOnHost(session, path, "Add file", content);
         invokeWatchChange(
             session,
-            collectDirectoryWatcherChanges(session, "/user/username/projects/myproject", path, "created"),
+            collectDirectoryWatcherChanges(session, ts.getDirectoryPath(path), eventPath ?? path, "created"),
         );
         session.host.runQueuedTimeoutCallbacks();
     }
 
-    function changeFile(session: TestSession, path: string, content?: string) {
+    function changeFile(session: TestSession, path: string, content?: string, eventPath?: string) {
         updateFileOnHost(session, path, "Change File", content);
         invokeWatchChange(
             session,
-            collectFileWatcherChanges(session, path, "updated"),
-            collectDirectoryWatcherChanges(session, ts.getDirectoryPath(path), path, "updated"),
+            collectFileWatcherChanges(session, path, "updated", eventPath),
+            collectDirectoryWatcherChanges(session, ts.getDirectoryPath(path), eventPath ?? path, "updated"),
         );
         session.host.runQueuedTimeoutCallbacks();
     }
@@ -321,4 +322,81 @@ describe("unittests:: tsserver:: events:: watchEvents", () => {
 
         baselineTsserverLogs("events/watchEvents", `canUseWatchEvents without canUseEvents`, session);
     });
+
+    it("canUseWatchEvents on windows", () => {
+        const inputHost = createServerHost({
+            "c:\\projects\\myproject\\tsconfig.json": "{}",
+            "c:\\projects\\myproject\\a.ts": `export class a { prop = "hello"; foo() { return this.prop; } }`,
+            "c:\\projects\\myproject\\b.ts": `export class b { prop = "hello"; foo() { return this.prop; } }`,
+            "c:\\projects\\myproject\\m.ts": `import { x } from "something"`,
+            "c:\\projects\\myproject\\node_modules\\something\\index.d.ts": `export const x = 10;`,
+            [libFile.path]: libFile.content,
+        }, { windowsStyleRoot: "c:\\" });
+        const logger = createLoggerWithInMemoryLogs(inputHost);
+        const host = createTestServerHostWithCustomWatch(logger);
+
+        const session = createSessionWithCustomEventHandler({ host, canUseWatchEvents: true, logger }, handleWatchEvents);
+        openFilesForSession(["c:\\projects\\myproject\\a.ts"], session);
+
+        // Directory watcher
+        addFile(session, "c:/projects/myproject/c.ts", `export xyx = 10;`, "c:\\projects\\myproject\\c.ts");
+
+        // File Watcher
+        changeFile(session, "c:/projects/myproject/b.ts", "export const ss = 20;", "c:\\projects\\myproject\\b.ts");
+
+        // Close watcher
+        openFilesForSession(["c:\\projects\\myproject\\b.ts"], session);
+
+        // Re watch
+        closeFilesForSession(["c:\\projects\\myproject\\b.ts"], session);
+
+        // Update c.ts
+        changeFile(session, "c:/projects/myproject/c.ts", "export const ss = 20;", "c:\\projects\\myproject\\b.ts");
+
+        // Update with npm install
+        session.logger.log("update with npm install");
+        session.host.appendFile("c:\\projects\\myproject\\node_modules\\something\\index.d.ts", `export const y = 20;`);
+        session.host.runQueuedTimeoutCallbacks();
+        invokeWatchChange(
+            session,
+            collectDirectoryWatcherChanges(
+                session,
+                "c:/projects/myproject/node_modules",
+                "c:\\projects\\myproject\\node_modules\\something\\index.d.ts",
+                "updated",
+            ),
+        );
+        session.host.runQueuedTimeoutCallbacks();
+        host.runQueuedTimeoutCallbacks();
+
+        // Add and change multiple files - combine and send multiple requests together
+        updateFileOnHost(session, "c:/projects/myproject/d.ts", "Add file", "export const yy = 10;");
+        updateFileOnHost(session, "c:/projects/myproject/c.ts", "Change File", `export const z = 30;`);
+        updateFileOnHost(session, "c:/projects/myproject/e.ts", "Add File", "export const zz = 40;");
+        invokeWatchChange(
+            session,
+            collectDirectoryWatcherChanges(session, "c:/projects/myproject", "c:\\projects\\myproject\\d.ts", "created"),
+            collectFileWatcherChanges(session, "c:/projects/myproject/c.ts", "updated", "c:\\projects\\myproject\\c.ts"),
+            collectDirectoryWatcherChanges(session, "c:/projects/myproject", "c:\\projects\\myproject\\c.ts", "updated"),
+            collectDirectoryWatcherChanges(session, "c:/projects/myproject", "c:\\projects\\myproject\\e.ts", "created"),
+        );
+        session.host.runQueuedTimeoutCallbacks();
+
+        baselineTsserverLogs("events/watchEvents", `canUseWatchEvents on windows`, session);
+        function handleWatchEvents(event: ts.server.ProjectServiceEvent) {
+            switch (event.eventName) {
+                case ts.server.CreateFileWatcherEvent:
+                    host.factoryData.watchFile(event.data);
+                    break;
+                case ts.server.CreateDirectoryWatcherEvent:
+                    host.factoryData.watchDirectory(event.data);
+                    break;
+                case ts.server.CloseFileWatcherEvent:
+                    host.factoryData.closeWatcher(event.data);
+                    break;
+                default:
+                    break;
+            }
+        }
+    });
 });
diff --git a/tests/baselines/reference/tsserver/events/watchEvents/canUseWatchEvents-on-windows.js b/tests/baselines/reference/tsserver/events/watchEvents/canUseWatchEvents-on-windows.js
new file mode 100644
index 0000000000000..90983324af87f
--- /dev/null
+++ b/tests/baselines/reference/tsserver/events/watchEvents/canUseWatchEvents-on-windows.js
@@ -0,0 +1,1390 @@
+currentDirectory:: c:\ useCaseSensitiveFileNames: false
+Info seq  [hh:mm:ss:mss] Provided types map file "/typesMap.json" doesn't exist
+Before request
+//// [c:/projects/myproject/tsconfig.json]
+{}
+
+//// [c:/projects/myproject/a.ts]
+export class a { prop = "hello"; foo() { return this.prop; } }
+
+//// [c:/projects/myproject/b.ts]
+export class b { prop = "hello"; foo() { return this.prop; } }
+
+//// [c:/projects/myproject/m.ts]
+import { x } from "something"
+
+//// [c:/projects/myproject/node_modules/something/index.d.ts]
+export const x = 10;
+
+//// [c:/a/lib/lib.d.ts]
+/// <reference no-default-lib="true"/>
+interface Boolean {}
+interface Function {}
+interface CallableFunction {}
+interface NewableFunction {}
+interface IArguments {}
+interface Number { toExponential: any; }
+interface Object {}
+interface RegExp {}
+interface String { charAt: any; }
+interface Array<T> { length: number; [n: number]: T; }
+
+
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "command": "open",
+      "arguments": {
+        "file": "c:\\projects\\myproject\\a.ts"
+      },
+      "seq": 1,
+      "type": "request"
+    }
+Info seq  [hh:mm:ss:mss] Search path: c:/projects/myproject
+Info seq  [hh:mm:ss:mss] For info: c:/projects/myproject/a.ts :: Config file name: c:/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] Creating configuration project c:/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: c:/projects/myproject/tsconfig.json 2000 undefined Project: c:/projects/myproject/tsconfig.json WatchType: Config file
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "CustomHandler::createFileWatcher",
+      "body": {
+        "id": 1,
+        "path": "c:/projects/myproject/tsconfig.json"
+      }
+    }
+Custom watchFile: 1: c:/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "CustomHandler::projectLoadingStart",
+      "body": {
+        "project": "c:/projects/myproject/tsconfig.json",
+        "reason": "Creating possible configured project for c:/projects/myproject/a.ts to open"
+      }
+    }
+Info seq  [hh:mm:ss:mss] Config: c:/projects/myproject/tsconfig.json : {
+ "rootNames": [
+  "c:/projects/myproject/a.ts",
+  "c:/projects/myproject/b.ts",
+  "c:/projects/myproject/m.ts"
+ ],
+ "options": {
+  "configFilePath": "c:/projects/myproject/tsconfig.json"
+ }
+}
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: c:/projects/myproject 1 undefined Config: c:/projects/myproject/tsconfig.json WatchType: Wild card directory
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "CustomHandler::createDirectoryWatcher",
+      "body": {
+        "id": 2,
+        "path": "c:/projects/myproject",
+        "recursive": true,
+        "ignoreUpdate": true
+      }
+    }
+Custom watchDirectory: 2: c:/projects/myproject true true
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/projects/myproject 1 undefined Config: c:/projects/myproject/tsconfig.json WatchType: Wild card directory
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: c:/projects/myproject/b.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "CustomHandler::createFileWatcher",
+      "body": {
+        "id": 3,
+        "path": "c:/projects/myproject/b.ts"
+      }
+    }
+Custom watchFile: 3: c:/projects/myproject/b.ts
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: c:/projects/myproject/m.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "CustomHandler::createFileWatcher",
+      "body": {
+        "id": 4,
+        "path": "c:/projects/myproject/m.ts"
+      }
+    }
+Custom watchFile: 4: c:/projects/myproject/m.ts
+Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: c:/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: c:/projects/myproject/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "CustomHandler::createDirectoryWatcher",
+      "body": {
+        "id": 5,
+        "path": "c:/projects/myproject/node_modules",
+        "recursive": true
+      }
+    }
+Custom watchDirectory: 5: c:/projects/myproject/node_modules true undefined
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/projects/myproject/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: c:/a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "CustomHandler::createFileWatcher",
+      "body": {
+        "id": 6,
+        "path": "c:/a/lib/lib.d.ts"
+      }
+    }
+Custom watchFile: 6: c:/a/lib/lib.d.ts
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: c:/projects/myproject/node_modules 1 undefined Project: c:/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/projects/myproject/node_modules 1 undefined Project: c:/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: c:/projects/myproject/node_modules/@types 1 undefined Project: c:/projects/myproject/tsconfig.json WatchType: Type roots
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "CustomHandler::createDirectoryWatcher",
+      "body": {
+        "id": 7,
+        "path": "c:/projects/myproject/node_modules/@types",
+        "recursive": true,
+        "ignoreUpdate": true
+      }
+    }
+Custom watchDirectory: 7: c:/projects/myproject/node_modules/@types true true
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/projects/myproject/node_modules/@types 1 undefined Project: c:/projects/myproject/tsconfig.json WatchType: Type roots
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: c:/projects/node_modules/@types 1 undefined Project: c:/projects/myproject/tsconfig.json WatchType: Type roots
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "CustomHandler::createDirectoryWatcher",
+      "body": {
+        "id": 8,
+        "path": "c:/projects/node_modules/@types",
+        "recursive": true,
+        "ignoreUpdate": true
+      }
+    }
+Custom watchDirectory: 8: c:/projects/node_modules/@types true true
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/projects/node_modules/@types 1 undefined Project: c:/projects/myproject/tsconfig.json WatchType: Type roots
+Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: c:/projects/myproject/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Info seq  [hh:mm:ss:mss] Project 'c:/projects/myproject/tsconfig.json' (Configured)
+Info seq  [hh:mm:ss:mss] 	Files (5)
+	c:/a/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; }"
+	c:/projects/myproject/a.ts SVC-1-0 "export class a { prop = \"hello\"; foo() { return this.prop; } }"
+	c:/projects/myproject/b.ts Text-1 "export class b { prop = \"hello\"; foo() { return this.prop; } }"
+	c:/projects/myproject/node_modules/something/index.d.ts Text-1 "export const x = 10;"
+	c:/projects/myproject/m.ts Text-1 "import { x } from \"something\""
+
+
+	../../a/lib/lib.d.ts
+	  Default library for target 'es5'
+	a.ts
+	  Matched by default include pattern '**/*'
+	b.ts
+	  Matched by default include pattern '**/*'
+	node_modules/something/index.d.ts
+	  Imported via "something" from file 'm.ts'
+	m.ts
+	  Matched by default include pattern '**/*'
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "CustomHandler::projectLoadingFinish",
+      "body": {
+        "project": "c:/projects/myproject/tsconfig.json"
+      }
+    }
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "CustomHandler::projectInfo",
+      "body": {
+        "projectId": "97f177d0a126eace4239f1be3ea802bded2784e559d112a10ed01c6617b1a28f",
+        "fileStats": {
+          "js": 0,
+          "jsSize": 0,
+          "jsx": 0,
+          "jsxSize": 0,
+          "ts": 3,
+          "tsSize": 153,
+          "tsx": 0,
+          "tsxSize": 0,
+          "dts": 2,
+          "dtsSize": 354,
+          "deferred": 0,
+          "deferredSize": 0
+        },
+        "compilerOptions": {},
+        "typeAcquisition": {
+          "enable": false,
+          "include": false,
+          "exclude": false
+        },
+        "extends": false,
+        "files": false,
+        "include": false,
+        "exclude": false,
+        "compileOnSave": false,
+        "configFileName": "tsconfig.json",
+        "projectType": "configured",
+        "languageServiceEnabled": true,
+        "version": "FakeVersion"
+      }
+    }
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "CustomHandler::configFileDiag",
+      "body": {
+        "configFileName": "c:/projects/myproject/tsconfig.json",
+        "diagnostics": [],
+        "triggerFile": "c:/projects/myproject/a.ts"
+      }
+    }
+Info seq  [hh:mm:ss:mss] Project 'c:/projects/myproject/tsconfig.json' (Configured)
+Info seq  [hh:mm:ss:mss] 	Files (5)
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] Open files: 
+Info seq  [hh:mm:ss:mss] 	FileName: c:/projects/myproject/a.ts ProjectRootPath: undefined
+Info seq  [hh:mm:ss:mss] 		Projects: c:/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "responseRequired": false
+    }
+After request
+
+Custom WatchedFiles::
+c:/a/lib/lib.d.ts: *new*
+  {"id":6,"path":"c:/a/lib/lib.d.ts"}
+c:/projects/myproject/b.ts: *new*
+  {"id":3,"path":"c:/projects/myproject/b.ts"}
+c:/projects/myproject/m.ts: *new*
+  {"id":4,"path":"c:/projects/myproject/m.ts"}
+c:/projects/myproject/tsconfig.json: *new*
+  {"id":1,"path":"c:/projects/myproject/tsconfig.json"}
+
+Custom WatchedDirectoriesRecursive::
+c:/projects/myproject: *new*
+  {"id":2,"path":"c:/projects/myproject","recursive":true,"ignoreUpdate":true}
+c:/projects/myproject/node_modules: *new*
+  {"id":5,"path":"c:/projects/myproject/node_modules","recursive":true}
+c:/projects/myproject/node_modules/@types: *new*
+  {"id":7,"path":"c:/projects/myproject/node_modules/@types","recursive":true,"ignoreUpdate":true}
+c:/projects/node_modules/@types: *new*
+  {"id":8,"path":"c:/projects/node_modules/@types","recursive":true,"ignoreUpdate":true}
+
+Projects::
+c:/projects/myproject/tsconfig.json (Configured) *new*
+    projectStateVersion: 1
+    projectProgramVersion: 1
+
+ScriptInfos::
+c:/a/lib/lib.d.ts *new*
+    version: Text-1
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/a.ts (Open) *new*
+    version: SVC-1-0
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json *default*
+c:/projects/myproject/b.ts *new*
+    version: Text-1
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/m.ts *new*
+    version: Text-1
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/node_modules/something/index.d.ts *new*
+    version: Text-1
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+
+Add file: c:/projects/myproject/c.ts
+Before running Timeout callback:: count: 0
+//// [c:/projects/myproject/c.ts]
+export xyx = 10;
+
+
+After running Timeout callback:: count: 0
+
+Custom watch:: c:/projects/myproject c:\projects\myproject\c.ts created
+Before request
+
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "command": "watchChange",
+      "arguments": {
+        "id": 2,
+        "created": [
+          "c:\\projects\\myproject\\c.ts"
+        ]
+      },
+      "seq": 2,
+      "type": "request"
+    }
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with c:/projects/myproject/c.ts :: WatchInfo: c:/projects/myproject 1 undefined Config: c:/projects/myproject/tsconfig.json WatchType: Wild card directory
+Info seq  [hh:mm:ss:mss] Scheduled: c:/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with c:/projects/myproject/c.ts :: WatchInfo: c:/projects/myproject 1 undefined Config: c:/projects/myproject/tsconfig.json WatchType: Wild card directory
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "responseRequired": false
+    }
+After request
+
+Timeout callback:: count: 2
+1: c:/projects/myproject/tsconfig.json *new*
+2: *ensureProjectForOpenFiles* *new*
+
+Projects::
+c:/projects/myproject/tsconfig.json (Configured) *changed*
+    projectStateVersion: 2 *changed*
+    projectProgramVersion: 1
+    dirty: true *changed*
+
+Before running Timeout callback:: count: 2
+1: c:/projects/myproject/tsconfig.json
+2: *ensureProjectForOpenFiles*
+
+Info seq  [hh:mm:ss:mss] Running: c:/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: c:/projects/myproject/c.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "CustomHandler::createFileWatcher",
+      "body": {
+        "id": 9,
+        "path": "c:/projects/myproject/c.ts"
+      }
+    }
+Custom watchFile: 9: c:/projects/myproject/c.ts
+Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: c:/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: c:/projects/myproject/tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Info seq  [hh:mm:ss:mss] Project 'c:/projects/myproject/tsconfig.json' (Configured)
+Info seq  [hh:mm:ss:mss] 	Files (6)
+	c:/a/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; }"
+	c:/projects/myproject/a.ts SVC-1-0 "export class a { prop = \"hello\"; foo() { return this.prop; } }"
+	c:/projects/myproject/b.ts Text-1 "export class b { prop = \"hello\"; foo() { return this.prop; } }"
+	c:/projects/myproject/node_modules/something/index.d.ts Text-1 "export const x = 10;"
+	c:/projects/myproject/m.ts Text-1 "import { x } from \"something\""
+	c:/projects/myproject/c.ts Text-1 "export xyx = 10;"
+
+
+	../../a/lib/lib.d.ts
+	  Default library for target 'es5'
+	a.ts
+	  Matched by default include pattern '**/*'
+	b.ts
+	  Matched by default include pattern '**/*'
+	node_modules/something/index.d.ts
+	  Imported via "something" from file 'm.ts'
+	m.ts
+	  Matched by default include pattern '**/*'
+	c.ts
+	  Matched by default include pattern '**/*'
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles*
+Info seq  [hh:mm:ss:mss] Before ensureProjectForOpenFiles:
+Info seq  [hh:mm:ss:mss] Project 'c:/projects/myproject/tsconfig.json' (Configured)
+Info seq  [hh:mm:ss:mss] 	Files (6)
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] Open files: 
+Info seq  [hh:mm:ss:mss] 	FileName: c:/projects/myproject/a.ts ProjectRootPath: undefined
+Info seq  [hh:mm:ss:mss] 		Projects: c:/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] After ensureProjectForOpenFiles:
+Info seq  [hh:mm:ss:mss] Project 'c:/projects/myproject/tsconfig.json' (Configured)
+Info seq  [hh:mm:ss:mss] 	Files (6)
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] Open files: 
+Info seq  [hh:mm:ss:mss] 	FileName: c:/projects/myproject/a.ts ProjectRootPath: undefined
+Info seq  [hh:mm:ss:mss] 		Projects: c:/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "CustomHandler::projectsUpdatedInBackground",
+      "body": {
+        "openFiles": [
+          "c:/projects/myproject/a.ts"
+        ]
+      }
+    }
+After running Timeout callback:: count: 0
+
+Custom WatchedFiles::
+c:/a/lib/lib.d.ts:
+  {"id":6,"path":"c:/a/lib/lib.d.ts"}
+c:/projects/myproject/b.ts:
+  {"id":3,"path":"c:/projects/myproject/b.ts"}
+c:/projects/myproject/c.ts: *new*
+  {"id":9,"path":"c:/projects/myproject/c.ts"}
+c:/projects/myproject/m.ts:
+  {"id":4,"path":"c:/projects/myproject/m.ts"}
+c:/projects/myproject/tsconfig.json:
+  {"id":1,"path":"c:/projects/myproject/tsconfig.json"}
+
+Custom WatchedDirectoriesRecursive::
+c:/projects/myproject:
+  {"id":2,"path":"c:/projects/myproject","recursive":true,"ignoreUpdate":true}
+c:/projects/myproject/node_modules:
+  {"id":5,"path":"c:/projects/myproject/node_modules","recursive":true}
+c:/projects/myproject/node_modules/@types:
+  {"id":7,"path":"c:/projects/myproject/node_modules/@types","recursive":true,"ignoreUpdate":true}
+c:/projects/node_modules/@types:
+  {"id":8,"path":"c:/projects/node_modules/@types","recursive":true,"ignoreUpdate":true}
+
+Projects::
+c:/projects/myproject/tsconfig.json (Configured) *changed*
+    projectStateVersion: 2
+    projectProgramVersion: 2 *changed*
+    dirty: false *changed*
+
+ScriptInfos::
+c:/a/lib/lib.d.ts
+    version: Text-1
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/a.ts (Open)
+    version: SVC-1-0
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json *default*
+c:/projects/myproject/b.ts
+    version: Text-1
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/c.ts *new*
+    version: Text-1
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/m.ts
+    version: Text-1
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/node_modules/something/index.d.ts
+    version: Text-1
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+
+Change File: c:/projects/myproject/b.ts
+Before running Timeout callback:: count: 0
+//// [c:/projects/myproject/b.ts]
+export class b { prop = "hello"; foo() { return this.prop; } }export const ss = 20;
+
+
+After running Timeout callback:: count: 0
+
+Custom watch:: c:/projects/myproject/b.ts c:\projects\myproject\b.ts updated
+Custom watch:: c:/projects/myproject c:\projects\myproject\b.ts updated
+Before request
+
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "command": "watchChange",
+      "arguments": {
+        "id": 3,
+        "updated": [
+          "c:\\projects\\myproject\\b.ts"
+        ]
+      },
+      "seq": 3,
+      "type": "request"
+    }
+Info seq  [hh:mm:ss:mss] FileWatcher:: Triggered with c:/projects/myproject/b.ts 1:: WatchInfo: c:/projects/myproject/b.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] Scheduled: c:/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with c:/projects/myproject/b.ts 1:: WatchInfo: c:/projects/myproject/b.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "responseRequired": false
+    }
+After request
+
+Timeout callback:: count: 2
+3: c:/projects/myproject/tsconfig.json *new*
+4: *ensureProjectForOpenFiles* *new*
+
+Projects::
+c:/projects/myproject/tsconfig.json (Configured) *changed*
+    projectStateVersion: 3 *changed*
+    projectProgramVersion: 2
+    dirty: true *changed*
+
+ScriptInfos::
+c:/a/lib/lib.d.ts
+    version: Text-1
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/a.ts (Open)
+    version: SVC-1-0
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json *default*
+c:/projects/myproject/b.ts *changed*
+    version: Text-1
+    pendingReloadFromDisk: true *changed*
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/c.ts
+    version: Text-1
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/m.ts
+    version: Text-1
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/node_modules/something/index.d.ts
+    version: Text-1
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+
+Before running Timeout callback:: count: 2
+3: c:/projects/myproject/tsconfig.json
+4: *ensureProjectForOpenFiles*
+
+Info seq  [hh:mm:ss:mss] Running: c:/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: c:/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: c:/projects/myproject/tsconfig.json projectStateVersion: 3 projectProgramVersion: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Info seq  [hh:mm:ss:mss] Project 'c:/projects/myproject/tsconfig.json' (Configured)
+Info seq  [hh:mm:ss:mss] 	Files (6)
+	c:/a/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; }"
+	c:/projects/myproject/a.ts SVC-1-0 "export class a { prop = \"hello\"; foo() { return this.prop; } }"
+	c:/projects/myproject/b.ts Text-2 "export class b { prop = \"hello\"; foo() { return this.prop; } }export const ss = 20;"
+	c:/projects/myproject/node_modules/something/index.d.ts Text-1 "export const x = 10;"
+	c:/projects/myproject/m.ts Text-1 "import { x } from \"something\""
+	c:/projects/myproject/c.ts Text-1 "export xyx = 10;"
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles*
+Info seq  [hh:mm:ss:mss] Before ensureProjectForOpenFiles:
+Info seq  [hh:mm:ss:mss] Project 'c:/projects/myproject/tsconfig.json' (Configured)
+Info seq  [hh:mm:ss:mss] 	Files (6)
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] Open files: 
+Info seq  [hh:mm:ss:mss] 	FileName: c:/projects/myproject/a.ts ProjectRootPath: undefined
+Info seq  [hh:mm:ss:mss] 		Projects: c:/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] After ensureProjectForOpenFiles:
+Info seq  [hh:mm:ss:mss] Project 'c:/projects/myproject/tsconfig.json' (Configured)
+Info seq  [hh:mm:ss:mss] 	Files (6)
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] Open files: 
+Info seq  [hh:mm:ss:mss] 	FileName: c:/projects/myproject/a.ts ProjectRootPath: undefined
+Info seq  [hh:mm:ss:mss] 		Projects: c:/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "CustomHandler::projectsUpdatedInBackground",
+      "body": {
+        "openFiles": [
+          "c:/projects/myproject/a.ts"
+        ]
+      }
+    }
+After running Timeout callback:: count: 0
+
+Projects::
+c:/projects/myproject/tsconfig.json (Configured) *changed*
+    projectStateVersion: 3
+    projectProgramVersion: 2
+    dirty: false *changed*
+
+ScriptInfos::
+c:/a/lib/lib.d.ts
+    version: Text-1
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/a.ts (Open)
+    version: SVC-1-0
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json *default*
+c:/projects/myproject/b.ts *changed*
+    version: Text-2 *changed*
+    pendingReloadFromDisk: false *changed*
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/c.ts
+    version: Text-1
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/m.ts
+    version: Text-1
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/node_modules/something/index.d.ts
+    version: Text-1
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+
+Before request
+
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "command": "open",
+      "arguments": {
+        "file": "c:\\projects\\myproject\\b.ts"
+      },
+      "seq": 4,
+      "type": "request"
+    }
+Info seq  [hh:mm:ss:mss] FileWatcher:: Close:: WatchInfo: c:/projects/myproject/b.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "CustomHandler::closeFileWatcher",
+      "body": {
+        "id": 3
+      }
+    }
+Custom watchFile:: Close:: 3: c:/projects/myproject/b.ts
+Info seq  [hh:mm:ss:mss] Search path: c:/projects/myproject
+Info seq  [hh:mm:ss:mss] For info: c:/projects/myproject/b.ts :: Config file name: c:/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] Project 'c:/projects/myproject/tsconfig.json' (Configured)
+Info seq  [hh:mm:ss:mss] 	Files (6)
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] Open files: 
+Info seq  [hh:mm:ss:mss] 	FileName: c:/projects/myproject/a.ts ProjectRootPath: undefined
+Info seq  [hh:mm:ss:mss] 		Projects: c:/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] 	FileName: c:/projects/myproject/b.ts ProjectRootPath: undefined
+Info seq  [hh:mm:ss:mss] 		Projects: c:/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "responseRequired": false
+    }
+After request
+
+Custom WatchedFiles::
+c:/a/lib/lib.d.ts:
+  {"id":6,"path":"c:/a/lib/lib.d.ts"}
+c:/projects/myproject/c.ts:
+  {"id":9,"path":"c:/projects/myproject/c.ts"}
+c:/projects/myproject/m.ts:
+  {"id":4,"path":"c:/projects/myproject/m.ts"}
+c:/projects/myproject/tsconfig.json:
+  {"id":1,"path":"c:/projects/myproject/tsconfig.json"}
+
+Custom WatchedFiles *deleted*::
+c:/projects/myproject/b.ts:
+  {"id":3,"path":"c:/projects/myproject/b.ts"}
+
+Custom WatchedDirectoriesRecursive::
+c:/projects/myproject:
+  {"id":2,"path":"c:/projects/myproject","recursive":true,"ignoreUpdate":true}
+c:/projects/myproject/node_modules:
+  {"id":5,"path":"c:/projects/myproject/node_modules","recursive":true}
+c:/projects/myproject/node_modules/@types:
+  {"id":7,"path":"c:/projects/myproject/node_modules/@types","recursive":true,"ignoreUpdate":true}
+c:/projects/node_modules/@types:
+  {"id":8,"path":"c:/projects/node_modules/@types","recursive":true,"ignoreUpdate":true}
+
+ScriptInfos::
+c:/a/lib/lib.d.ts
+    version: Text-1
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/a.ts (Open)
+    version: SVC-1-0
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json *default*
+c:/projects/myproject/b.ts (Open) *changed*
+    open: true *changed*
+    version: Text-2
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json *default*
+c:/projects/myproject/c.ts
+    version: Text-1
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/m.ts
+    version: Text-1
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/node_modules/something/index.d.ts
+    version: Text-1
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+
+Before request
+
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "command": "close",
+      "arguments": {
+        "file": "c:\\projects\\myproject\\b.ts"
+      },
+      "seq": 5,
+      "type": "request"
+    }
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: c:/projects/myproject/b.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "CustomHandler::createFileWatcher",
+      "body": {
+        "id": 10,
+        "path": "c:/projects/myproject/b.ts"
+      }
+    }
+Custom watchFile: 10: c:/projects/myproject/b.ts
+Info seq  [hh:mm:ss:mss] Project 'c:/projects/myproject/tsconfig.json' (Configured)
+Info seq  [hh:mm:ss:mss] 	Files (6)
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] Open files: 
+Info seq  [hh:mm:ss:mss] 	FileName: c:/projects/myproject/a.ts ProjectRootPath: undefined
+Info seq  [hh:mm:ss:mss] 		Projects: c:/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "responseRequired": false
+    }
+After request
+
+Custom WatchedFiles::
+c:/a/lib/lib.d.ts:
+  {"id":6,"path":"c:/a/lib/lib.d.ts"}
+c:/projects/myproject/b.ts: *new*
+  {"id":10,"path":"c:/projects/myproject/b.ts"}
+c:/projects/myproject/c.ts:
+  {"id":9,"path":"c:/projects/myproject/c.ts"}
+c:/projects/myproject/m.ts:
+  {"id":4,"path":"c:/projects/myproject/m.ts"}
+c:/projects/myproject/tsconfig.json:
+  {"id":1,"path":"c:/projects/myproject/tsconfig.json"}
+
+Custom WatchedDirectoriesRecursive::
+c:/projects/myproject:
+  {"id":2,"path":"c:/projects/myproject","recursive":true,"ignoreUpdate":true}
+c:/projects/myproject/node_modules:
+  {"id":5,"path":"c:/projects/myproject/node_modules","recursive":true}
+c:/projects/myproject/node_modules/@types:
+  {"id":7,"path":"c:/projects/myproject/node_modules/@types","recursive":true,"ignoreUpdate":true}
+c:/projects/node_modules/@types:
+  {"id":8,"path":"c:/projects/node_modules/@types","recursive":true,"ignoreUpdate":true}
+
+ScriptInfos::
+c:/a/lib/lib.d.ts
+    version: Text-1
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/a.ts (Open)
+    version: SVC-1-0
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json *default*
+c:/projects/myproject/b.ts *changed*
+    open: false *changed*
+    version: Text-2
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/c.ts
+    version: Text-1
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/m.ts
+    version: Text-1
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/node_modules/something/index.d.ts
+    version: Text-1
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+
+Change File: c:/projects/myproject/c.ts
+Before running Timeout callback:: count: 0
+//// [c:/projects/myproject/c.ts]
+export xyx = 10;export const ss = 20;
+
+
+After running Timeout callback:: count: 0
+
+Custom watch:: c:/projects/myproject/c.ts c:\projects\myproject\b.ts updated
+Custom watch:: c:/projects/myproject c:\projects\myproject\b.ts updated
+Before request
+
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "command": "watchChange",
+      "arguments": {
+        "id": 9,
+        "updated": [
+          "c:\\projects\\myproject\\b.ts"
+        ]
+      },
+      "seq": 6,
+      "type": "request"
+    }
+Info seq  [hh:mm:ss:mss] FileWatcher:: Triggered with c:/projects/myproject/b.ts 1:: WatchInfo: c:/projects/myproject/c.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] Scheduled: c:/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with c:/projects/myproject/b.ts 1:: WatchInfo: c:/projects/myproject/c.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "responseRequired": false
+    }
+After request
+
+Timeout callback:: count: 2
+5: c:/projects/myproject/tsconfig.json *new*
+6: *ensureProjectForOpenFiles* *new*
+
+Projects::
+c:/projects/myproject/tsconfig.json (Configured) *changed*
+    projectStateVersion: 4 *changed*
+    projectProgramVersion: 2
+    dirty: true *changed*
+
+ScriptInfos::
+c:/a/lib/lib.d.ts
+    version: Text-1
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/a.ts (Open)
+    version: SVC-1-0
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json *default*
+c:/projects/myproject/b.ts
+    version: Text-2
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/c.ts *changed*
+    version: Text-1
+    pendingReloadFromDisk: true *changed*
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/m.ts
+    version: Text-1
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/node_modules/something/index.d.ts
+    version: Text-1
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+
+Before running Timeout callback:: count: 2
+5: c:/projects/myproject/tsconfig.json
+6: *ensureProjectForOpenFiles*
+
+Info seq  [hh:mm:ss:mss] Running: c:/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: c:/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: c:/projects/myproject/tsconfig.json projectStateVersion: 4 projectProgramVersion: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Info seq  [hh:mm:ss:mss] Project 'c:/projects/myproject/tsconfig.json' (Configured)
+Info seq  [hh:mm:ss:mss] 	Files (6)
+	c:/a/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; }"
+	c:/projects/myproject/a.ts SVC-1-0 "export class a { prop = \"hello\"; foo() { return this.prop; } }"
+	c:/projects/myproject/b.ts Text-2 "export class b { prop = \"hello\"; foo() { return this.prop; } }export const ss = 20;"
+	c:/projects/myproject/node_modules/something/index.d.ts Text-1 "export const x = 10;"
+	c:/projects/myproject/m.ts Text-1 "import { x } from \"something\""
+	c:/projects/myproject/c.ts Text-2 "export xyx = 10;export const ss = 20;"
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles*
+Info seq  [hh:mm:ss:mss] Before ensureProjectForOpenFiles:
+Info seq  [hh:mm:ss:mss] Project 'c:/projects/myproject/tsconfig.json' (Configured)
+Info seq  [hh:mm:ss:mss] 	Files (6)
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] Open files: 
+Info seq  [hh:mm:ss:mss] 	FileName: c:/projects/myproject/a.ts ProjectRootPath: undefined
+Info seq  [hh:mm:ss:mss] 		Projects: c:/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] After ensureProjectForOpenFiles:
+Info seq  [hh:mm:ss:mss] Project 'c:/projects/myproject/tsconfig.json' (Configured)
+Info seq  [hh:mm:ss:mss] 	Files (6)
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] Open files: 
+Info seq  [hh:mm:ss:mss] 	FileName: c:/projects/myproject/a.ts ProjectRootPath: undefined
+Info seq  [hh:mm:ss:mss] 		Projects: c:/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "CustomHandler::projectsUpdatedInBackground",
+      "body": {
+        "openFiles": [
+          "c:/projects/myproject/a.ts"
+        ]
+      }
+    }
+After running Timeout callback:: count: 0
+
+Projects::
+c:/projects/myproject/tsconfig.json (Configured) *changed*
+    projectStateVersion: 4
+    projectProgramVersion: 2
+    dirty: false *changed*
+
+ScriptInfos::
+c:/a/lib/lib.d.ts
+    version: Text-1
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/a.ts (Open)
+    version: SVC-1-0
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json *default*
+c:/projects/myproject/b.ts
+    version: Text-2
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/c.ts *changed*
+    version: Text-2 *changed*
+    pendingReloadFromDisk: false *changed*
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/m.ts
+    version: Text-1
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/node_modules/something/index.d.ts
+    version: Text-1
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+
+update with npm install
+Before running Timeout callback:: count: 0
+//// [c:/projects/myproject/node_modules/something/index.d.ts]
+export const x = 10;export const y = 20;
+
+
+After running Timeout callback:: count: 0
+
+Custom watch:: c:/projects/myproject/node_modules c:\projects\myproject\node_modules\something\index.d.ts updated
+Before request
+
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "command": "watchChange",
+      "arguments": {
+        "id": 5,
+        "updated": [
+          "c:\\projects\\myproject\\node_modules\\something\\index.d.ts"
+        ]
+      },
+      "seq": 7,
+      "type": "request"
+    }
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with c:/projects/myproject/node_modules/something/index.d.ts :: WatchInfo: c:/projects/myproject/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+Info seq  [hh:mm:ss:mss] Scheduled: c:/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with c:/projects/myproject/node_modules/something/index.d.ts :: WatchInfo: c:/projects/myproject/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with c:/projects/myproject/node_modules/something/index.d.ts :: WatchInfo: c:/projects/myproject/node_modules 1 undefined Project: c:/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
+Info seq  [hh:mm:ss:mss] Scheduled: c:/projects/myproject/tsconfig.jsonFailedLookupInvalidation
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with c:/projects/myproject/node_modules/something/index.d.ts :: WatchInfo: c:/projects/myproject/node_modules 1 undefined Project: c:/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "responseRequired": false
+    }
+After request
+
+Timeout callback:: count: 3
+7: c:/projects/myproject/tsconfig.json *new*
+8: *ensureProjectForOpenFiles* *new*
+9: c:/projects/myproject/tsconfig.jsonFailedLookupInvalidation *new*
+
+Projects::
+c:/projects/myproject/tsconfig.json (Configured) *changed*
+    projectStateVersion: 5 *changed*
+    projectProgramVersion: 2
+    dirty: true *changed*
+
+ScriptInfos::
+c:/a/lib/lib.d.ts
+    version: Text-1
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/a.ts (Open)
+    version: SVC-1-0
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json *default*
+c:/projects/myproject/b.ts
+    version: Text-2
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/c.ts
+    version: Text-2
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/m.ts
+    version: Text-1
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/node_modules/something/index.d.ts *changed*
+    version: Text-1
+    pendingReloadFromDisk: true *changed*
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+
+Before running Timeout callback:: count: 3
+7: c:/projects/myproject/tsconfig.json
+8: *ensureProjectForOpenFiles*
+9: c:/projects/myproject/tsconfig.jsonFailedLookupInvalidation
+
+Info seq  [hh:mm:ss:mss] Running: c:/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: c:/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: c:/projects/myproject/tsconfig.json projectStateVersion: 5 projectProgramVersion: 2 structureChanged: true structureIsReused:: SafeModules Elapsed:: *ms
+Info seq  [hh:mm:ss:mss] Project 'c:/projects/myproject/tsconfig.json' (Configured)
+Info seq  [hh:mm:ss:mss] 	Files (6)
+	c:/a/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; }"
+	c:/projects/myproject/a.ts SVC-1-0 "export class a { prop = \"hello\"; foo() { return this.prop; } }"
+	c:/projects/myproject/b.ts Text-2 "export class b { prop = \"hello\"; foo() { return this.prop; } }export const ss = 20;"
+	c:/projects/myproject/node_modules/something/index.d.ts Text-2 "export const x = 10;export const y = 20;"
+	c:/projects/myproject/m.ts Text-1 "import { x } from \"something\""
+	c:/projects/myproject/c.ts Text-2 "export xyx = 10;export const ss = 20;"
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+After running Timeout callback:: count: 1
+
+Timeout callback:: count: 1
+8: *ensureProjectForOpenFiles* *deleted*
+9: c:/projects/myproject/tsconfig.jsonFailedLookupInvalidation *deleted*
+10: *ensureProjectForOpenFiles* *new*
+
+Projects::
+c:/projects/myproject/tsconfig.json (Configured) *changed*
+    projectStateVersion: 5
+    projectProgramVersion: 3 *changed*
+    dirty: false *changed*
+
+ScriptInfos::
+c:/a/lib/lib.d.ts
+    version: Text-1
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/a.ts (Open)
+    version: SVC-1-0
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json *default*
+c:/projects/myproject/b.ts
+    version: Text-2
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/c.ts
+    version: Text-2
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/m.ts
+    version: Text-1
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/node_modules/something/index.d.ts *changed*
+    version: Text-2 *changed*
+    pendingReloadFromDisk: false *changed*
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+
+Before running Timeout callback:: count: 1
+10: *ensureProjectForOpenFiles*
+
+Info seq  [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles*
+Info seq  [hh:mm:ss:mss] Before ensureProjectForOpenFiles:
+Info seq  [hh:mm:ss:mss] Project 'c:/projects/myproject/tsconfig.json' (Configured)
+Info seq  [hh:mm:ss:mss] 	Files (6)
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] Open files: 
+Info seq  [hh:mm:ss:mss] 	FileName: c:/projects/myproject/a.ts ProjectRootPath: undefined
+Info seq  [hh:mm:ss:mss] 		Projects: c:/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] After ensureProjectForOpenFiles:
+Info seq  [hh:mm:ss:mss] Project 'c:/projects/myproject/tsconfig.json' (Configured)
+Info seq  [hh:mm:ss:mss] 	Files (6)
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] Open files: 
+Info seq  [hh:mm:ss:mss] 	FileName: c:/projects/myproject/a.ts ProjectRootPath: undefined
+Info seq  [hh:mm:ss:mss] 		Projects: c:/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "CustomHandler::projectsUpdatedInBackground",
+      "body": {
+        "openFiles": [
+          "c:/projects/myproject/a.ts"
+        ]
+      }
+    }
+After running Timeout callback:: count: 0
+
+Add file: c:/projects/myproject/d.ts
+Before running Timeout callback:: count: 0
+//// [c:/projects/myproject/d.ts]
+export const yy = 10;
+
+
+After running Timeout callback:: count: 0
+
+Change File: c:/projects/myproject/c.ts
+Before running Timeout callback:: count: 0
+//// [c:/projects/myproject/c.ts]
+export xyx = 10;export const ss = 20;export const z = 30;
+
+
+After running Timeout callback:: count: 0
+
+Add File: c:/projects/myproject/e.ts
+Before running Timeout callback:: count: 0
+//// [c:/projects/myproject/e.ts]
+export const zz = 40;
+
+
+After running Timeout callback:: count: 0
+
+Custom watch:: c:/projects/myproject c:\projects\myproject\d.ts created
+Custom watch:: c:/projects/myproject/c.ts c:\projects\myproject\c.ts updated
+Custom watch:: c:/projects/myproject c:\projects\myproject\c.ts updated
+Custom watch:: c:/projects/myproject c:\projects\myproject\e.ts created
+Before request
+
+Info seq  [hh:mm:ss:mss] request:
+    {
+      "command": "watchChange",
+      "arguments": [
+        {
+          "id": 2,
+          "created": [
+            "c:\\projects\\myproject\\d.ts",
+            "c:\\projects\\myproject\\e.ts"
+          ]
+        },
+        {
+          "id": 9,
+          "updated": [
+            "c:\\projects\\myproject\\c.ts"
+          ]
+        }
+      ],
+      "seq": 8,
+      "type": "request"
+    }
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with c:/projects/myproject/d.ts :: WatchInfo: c:/projects/myproject 1 undefined Config: c:/projects/myproject/tsconfig.json WatchType: Wild card directory
+Info seq  [hh:mm:ss:mss] Scheduled: c:/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with c:/projects/myproject/d.ts :: WatchInfo: c:/projects/myproject 1 undefined Config: c:/projects/myproject/tsconfig.json WatchType: Wild card directory
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Triggered with c:/projects/myproject/e.ts :: WatchInfo: c:/projects/myproject 1 undefined Config: c:/projects/myproject/tsconfig.json WatchType: Wild card directory
+Info seq  [hh:mm:ss:mss] Scheduled: c:/projects/myproject/tsconfig.json, Cancelled earlier one
+Info seq  [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with c:/projects/myproject/e.ts :: WatchInfo: c:/projects/myproject 1 undefined Config: c:/projects/myproject/tsconfig.json WatchType: Wild card directory
+Info seq  [hh:mm:ss:mss] FileWatcher:: Triggered with c:/projects/myproject/c.ts 1:: WatchInfo: c:/projects/myproject/c.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] Scheduled: c:/projects/myproject/tsconfig.json, Cancelled earlier one
+Info seq  [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with c:/projects/myproject/c.ts 1:: WatchInfo: c:/projects/myproject/c.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] response:
+    {
+      "responseRequired": false
+    }
+After request
+
+Timeout callback:: count: 2
+15: c:/projects/myproject/tsconfig.json *new*
+16: *ensureProjectForOpenFiles* *new*
+
+Projects::
+c:/projects/myproject/tsconfig.json (Configured) *changed*
+    projectStateVersion: 6 *changed*
+    projectProgramVersion: 3
+    dirty: true *changed*
+
+ScriptInfos::
+c:/a/lib/lib.d.ts
+    version: Text-1
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/a.ts (Open)
+    version: SVC-1-0
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json *default*
+c:/projects/myproject/b.ts
+    version: Text-2
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/c.ts *changed*
+    version: Text-2
+    pendingReloadFromDisk: true *changed*
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/m.ts
+    version: Text-1
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/node_modules/something/index.d.ts
+    version: Text-2
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+
+Before running Timeout callback:: count: 2
+15: c:/projects/myproject/tsconfig.json
+16: *ensureProjectForOpenFiles*
+
+Info seq  [hh:mm:ss:mss] Running: c:/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: c:/projects/myproject/d.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "CustomHandler::createFileWatcher",
+      "body": {
+        "id": 11,
+        "path": "c:/projects/myproject/d.ts"
+      }
+    }
+Custom watchFile: 11: c:/projects/myproject/d.ts
+Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: c:/projects/myproject/e.ts 500 undefined WatchType: Closed Script info
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "CustomHandler::createFileWatcher",
+      "body": {
+        "id": 12,
+        "path": "c:/projects/myproject/e.ts"
+      }
+    }
+Custom watchFile: 12: c:/projects/myproject/e.ts
+Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: c:/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: c:/projects/myproject/tsconfig.json projectStateVersion: 6 projectProgramVersion: 3 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Info seq  [hh:mm:ss:mss] Project 'c:/projects/myproject/tsconfig.json' (Configured)
+Info seq  [hh:mm:ss:mss] 	Files (8)
+	c:/a/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; }"
+	c:/projects/myproject/a.ts SVC-1-0 "export class a { prop = \"hello\"; foo() { return this.prop; } }"
+	c:/projects/myproject/b.ts Text-2 "export class b { prop = \"hello\"; foo() { return this.prop; } }export const ss = 20;"
+	c:/projects/myproject/node_modules/something/index.d.ts Text-2 "export const x = 10;export const y = 20;"
+	c:/projects/myproject/m.ts Text-1 "import { x } from \"something\""
+	c:/projects/myproject/c.ts Text-3 "export xyx = 10;export const ss = 20;export const z = 30;"
+	c:/projects/myproject/d.ts Text-1 "export const yy = 10;"
+	c:/projects/myproject/e.ts Text-1 "export const zz = 40;"
+
+
+	../../a/lib/lib.d.ts
+	  Default library for target 'es5'
+	a.ts
+	  Matched by default include pattern '**/*'
+	b.ts
+	  Matched by default include pattern '**/*'
+	node_modules/something/index.d.ts
+	  Imported via "something" from file 'm.ts'
+	m.ts
+	  Matched by default include pattern '**/*'
+	c.ts
+	  Matched by default include pattern '**/*'
+	d.ts
+	  Matched by default include pattern '**/*'
+	e.ts
+	  Matched by default include pattern '**/*'
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles*
+Info seq  [hh:mm:ss:mss] Before ensureProjectForOpenFiles:
+Info seq  [hh:mm:ss:mss] Project 'c:/projects/myproject/tsconfig.json' (Configured)
+Info seq  [hh:mm:ss:mss] 	Files (8)
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] Open files: 
+Info seq  [hh:mm:ss:mss] 	FileName: c:/projects/myproject/a.ts ProjectRootPath: undefined
+Info seq  [hh:mm:ss:mss] 		Projects: c:/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] After ensureProjectForOpenFiles:
+Info seq  [hh:mm:ss:mss] Project 'c:/projects/myproject/tsconfig.json' (Configured)
+Info seq  [hh:mm:ss:mss] 	Files (8)
+
+Info seq  [hh:mm:ss:mss] -----------------------------------------------
+Info seq  [hh:mm:ss:mss] Open files: 
+Info seq  [hh:mm:ss:mss] 	FileName: c:/projects/myproject/a.ts ProjectRootPath: undefined
+Info seq  [hh:mm:ss:mss] 		Projects: c:/projects/myproject/tsconfig.json
+Info seq  [hh:mm:ss:mss] event:
+    {
+      "seq": 0,
+      "type": "event",
+      "event": "CustomHandler::projectsUpdatedInBackground",
+      "body": {
+        "openFiles": [
+          "c:/projects/myproject/a.ts"
+        ]
+      }
+    }
+After running Timeout callback:: count: 0
+
+Custom WatchedFiles::
+c:/a/lib/lib.d.ts:
+  {"id":6,"path":"c:/a/lib/lib.d.ts"}
+c:/projects/myproject/b.ts:
+  {"id":10,"path":"c:/projects/myproject/b.ts"}
+c:/projects/myproject/c.ts:
+  {"id":9,"path":"c:/projects/myproject/c.ts"}
+c:/projects/myproject/d.ts: *new*
+  {"id":11,"path":"c:/projects/myproject/d.ts"}
+c:/projects/myproject/e.ts: *new*
+  {"id":12,"path":"c:/projects/myproject/e.ts"}
+c:/projects/myproject/m.ts:
+  {"id":4,"path":"c:/projects/myproject/m.ts"}
+c:/projects/myproject/tsconfig.json:
+  {"id":1,"path":"c:/projects/myproject/tsconfig.json"}
+
+Custom WatchedDirectoriesRecursive::
+c:/projects/myproject:
+  {"id":2,"path":"c:/projects/myproject","recursive":true,"ignoreUpdate":true}
+c:/projects/myproject/node_modules:
+  {"id":5,"path":"c:/projects/myproject/node_modules","recursive":true}
+c:/projects/myproject/node_modules/@types:
+  {"id":7,"path":"c:/projects/myproject/node_modules/@types","recursive":true,"ignoreUpdate":true}
+c:/projects/node_modules/@types:
+  {"id":8,"path":"c:/projects/node_modules/@types","recursive":true,"ignoreUpdate":true}
+
+Projects::
+c:/projects/myproject/tsconfig.json (Configured) *changed*
+    projectStateVersion: 6
+    projectProgramVersion: 4 *changed*
+    dirty: false *changed*
+
+ScriptInfos::
+c:/a/lib/lib.d.ts
+    version: Text-1
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/a.ts (Open)
+    version: SVC-1-0
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json *default*
+c:/projects/myproject/b.ts
+    version: Text-2
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/c.ts *changed*
+    version: Text-3 *changed*
+    pendingReloadFromDisk: false *changed*
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/d.ts *new*
+    version: Text-1
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/e.ts *new*
+    version: Text-1
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/m.ts
+    version: Text-1
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json
+c:/projects/myproject/node_modules/something/index.d.ts
+    version: Text-2
+    containingProjects: 1
+        c:/projects/myproject/tsconfig.json

From 6d8134e5afe0661ff97f2ad1f0e0341087d58908 Mon Sep 17 00:00:00 2001
From: TypeScript Bot <ts_bot@rcavanaugh.com>
Date: Thu, 28 Mar 2024 16:18:41 -0700
Subject: [PATCH 5/8] =?UTF-8?q?=F0=9F=A4=96=20Pick=20PR=20#57637=20(Fixed?=
 =?UTF-8?q?=20a=20regression=20related=20to=20deter...)=20into=20release-5?=
 =?UTF-8?q?.4=20(#57987)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Mateusz Burzyński <mateuszburzynski@gmail.com>
---
 src/services/completions.ts                   |   3 +-
 src/services/signatureHelp.ts                 | 103 ++-
 ...seline => signatureHelpRestArgs1.baseline} |  16 +-
 .../reference/signatureHelpRestArgs2.baseline | 201 +++++
 .../signatureHelpSkippedArgs1.baseline        | 702 ++++++++++++++++++
 ...pRestArgs.ts => signatureHelpRestArgs1.ts} |   0
 .../cases/fourslash/signatureHelpRestArgs2.ts |  18 +
 .../fourslash/signatureHelpSkippedArgs1.ts    |   6 +
 8 files changed, 982 insertions(+), 67 deletions(-)
 rename tests/baselines/reference/{signatureHelpRestArgs.baseline => signatureHelpRestArgs1.baseline} (97%)
 create mode 100644 tests/baselines/reference/signatureHelpRestArgs2.baseline
 create mode 100644 tests/baselines/reference/signatureHelpSkippedArgs1.baseline
 rename tests/cases/fourslash/{signatureHelpRestArgs.ts => signatureHelpRestArgs1.ts} (100%)
 create mode 100644 tests/cases/fourslash/signatureHelpRestArgs2.ts
 create mode 100644 tests/cases/fourslash/signatureHelpSkippedArgs1.ts

diff --git a/src/services/completions.ts b/src/services/completions.ts
index 38a547c5d8ffe..f41a00c716c8b 100644
--- a/src/services/completions.ts
+++ b/src/services/completions.ts
@@ -3126,8 +3126,7 @@ function getContextualType(previousToken: Node, position: number, sourceFile: So
         default:
             const argInfo = SignatureHelp.getArgumentInfoForCompletions(previousToken, position, sourceFile, checker);
             return argInfo ?
-                // At `,`, treat this as the next argument after the comma.
-                checker.getContextualTypeForArgumentAtIndex(argInfo.invocation, argInfo.argumentIndex + (previousToken.kind === SyntaxKind.CommaToken ? 1 : 0)) :
+                checker.getContextualTypeForArgumentAtIndex(argInfo.invocation, argInfo.argumentIndex) :
                 isEqualityOperatorKind(previousToken.kind) && isBinaryExpression(parent) && isEqualityOperatorKind(parent.operatorToken.kind) ?
                 // completion at `x ===/**/` should be for the right side
                 checker.getTypeAtLocation(parent.left) :
diff --git a/src/services/signatureHelp.ts b/src/services/signatureHelp.ts
index 2caf2aaa8530c..28f0d188854bb 100644
--- a/src/services/signatureHelp.ts
+++ b/src/services/signatureHelp.ts
@@ -6,7 +6,6 @@ import {
     canHaveSymbol,
     CheckFlags,
     contains,
-    countWhere,
     createPrinterWithRemoveComments,
     createTextSpan,
     createTextSpanFromBounds,
@@ -60,7 +59,6 @@ import {
     JsxTagNameExpression,
     last,
     lastOrUndefined,
-    length,
     ListFormat,
     map,
     mapToDisplayParts,
@@ -288,7 +286,7 @@ function getArgumentOrParameterListInfo(node: Node, position: number, sourceFile
     if (!info) return undefined;
     const { list, argumentIndex } = info;
 
-    const argumentCount = getArgumentCount(list, /*ignoreTrailingComma*/ isInString(sourceFile, position, node), checker);
+    const argumentCount = getArgumentCount(checker, list);
     if (argumentIndex !== 0) {
         Debug.assertLessThan(argumentIndex, argumentCount);
     }
@@ -309,7 +307,7 @@ function getArgumentOrParameterListAndIndex(node: Node, sourceFile: SourceFile,
         //   - On the target of the call (parent.func)
         //   - On the 'new' keyword in a 'new' expression
         const list = findContainingList(node);
-        return list && { list, argumentIndex: getArgumentIndex(list, node, checker) };
+        return list && { list, argumentIndex: getArgumentIndex(checker, list, node) };
     }
 }
 
@@ -481,37 +479,6 @@ function chooseBetterSymbol(s: Symbol): Symbol {
         : s;
 }
 
-function getArgumentIndex(argumentsList: Node, node: Node, checker: TypeChecker) {
-    // The list we got back can include commas.  In the presence of errors it may
-    // also just have nodes without commas.  For example "Foo(a b c)" will have 3
-    // args without commas. We want to find what index we're at.  So we count
-    // forward until we hit ourselves, only incrementing the index if it isn't a
-    // comma.
-    //
-    // Note: the subtlety around trailing commas (in getArgumentCount) does not apply
-    // here.  That's because we're only walking forward until we hit the node we're
-    // on.  In that case, even if we're after the trailing comma, we'll still see
-    // that trailing comma in the list, and we'll have generated the appropriate
-    // arg index.
-    const args = argumentsList.getChildren();
-    let argumentIndex = 0;
-    for (let pos = 0; pos < length(args); pos++) {
-        const child = args[pos];
-        if (child === node) {
-            break;
-        }
-        if (isSpreadElement(child)) {
-            argumentIndex = argumentIndex + getSpreadElementCount(child, checker) + (pos > 0 ? pos : 0);
-        }
-        else {
-            if (child.kind !== SyntaxKind.CommaToken) {
-                argumentIndex++;
-            }
-        }
-    }
-    return argumentIndex;
-}
-
 function getSpreadElementCount(node: SpreadElement, checker: TypeChecker) {
     const spreadType = checker.getTypeAtLocation(node.expression);
     if (checker.isTupleType(spreadType)) {
@@ -525,32 +492,54 @@ function getSpreadElementCount(node: SpreadElement, checker: TypeChecker) {
     return 0;
 }
 
-function getArgumentCount(argumentsList: Node, ignoreTrailingComma: boolean, checker: TypeChecker) {
-    // The argument count for a list is normally the number of non-comma children it has.
-    // For example, if you have "Foo(a,b)" then there will be three children of the arg
-    // list 'a' '<comma>' 'b'.  So, in this case the arg count will be 2.  However, there
-    // is a small subtlety.  If you have "Foo(a,)", then the child list will just have
-    // 'a' '<comma>'.  So, in the case where the last child is a comma, we increase the
-    // arg count by one to compensate.
-    //
-    // Note: this subtlety only applies to the last comma.  If you had "Foo(a,," then
-    // we'll have: 'a' '<comma>' '<missing>'
-    // That will give us 2 non-commas.  We then add one for the last comma, giving us an
-    // arg count of 3.
-    const listChildren = argumentsList.getChildren();
-
-    let argumentCount = 0;
-    for (const child of listChildren) {
+function getArgumentIndex(checker: TypeChecker, argumentsList: Node, node: Node) {
+    return getArgumentIndexOrCount(checker, argumentsList, node);
+}
+
+function getArgumentCount(checker: TypeChecker, argumentsList: Node) {
+    return getArgumentIndexOrCount(checker, argumentsList, /*node*/ undefined);
+}
+
+function getArgumentIndexOrCount(checker: TypeChecker, argumentsList: Node, node: Node | undefined) {
+    // The list we got back can include commas. In the presence of errors it may
+    // also just have nodes without commas. For example "Foo(a b c)" will have 3
+    // args without commas.
+    const args = argumentsList.getChildren();
+    let argumentIndex = 0;
+    let skipComma = false;
+    for (const child of args) {
+        if (node && child === node) {
+            if (!skipComma && child.kind === SyntaxKind.CommaToken) {
+                argumentIndex++;
+            }
+            return argumentIndex;
+        }
         if (isSpreadElement(child)) {
-            argumentCount = argumentCount + getSpreadElementCount(child, checker);
+            argumentIndex += getSpreadElementCount(child, checker);
+            skipComma = true;
+            continue;
+        }
+        if (child.kind !== SyntaxKind.CommaToken) {
+            argumentIndex++;
+            skipComma = true;
+            continue;
+        }
+        if (skipComma) {
+            skipComma = false;
+            continue;
         }
+        argumentIndex++;
     }
-
-    argumentCount = argumentCount + countWhere(listChildren, arg => arg.kind !== SyntaxKind.CommaToken);
-    if (!ignoreTrailingComma && listChildren.length > 0 && last(listChildren).kind === SyntaxKind.CommaToken) {
-        argumentCount++;
+    if (node) {
+        return argumentIndex;
     }
-    return argumentCount;
+    // The argument count for a list is normally the number of non-comma children it has.
+    // For example, if you have "Foo(a,b)" then there will be three children of the arg
+    // list 'a' '<comma>' 'b'. So, in this case the arg count will be 2. However, there
+    // is a small subtlety. If you have "Foo(a,)", then the child list will just have
+    // 'a' '<comma>'. So, in the case where the last child is a comma, we increase the
+    // arg count by one to compensate.
+    return args.length && last(args).kind === SyntaxKind.CommaToken ? argumentIndex + 1 : argumentIndex;
 }
 
 // spanIndex is either the index for a given template span.
diff --git a/tests/baselines/reference/signatureHelpRestArgs.baseline b/tests/baselines/reference/signatureHelpRestArgs1.baseline
similarity index 97%
rename from tests/baselines/reference/signatureHelpRestArgs.baseline
rename to tests/baselines/reference/signatureHelpRestArgs1.baseline
index 9242555b3adcf..7514e1c5d29e7 100644
--- a/tests/baselines/reference/signatureHelpRestArgs.baseline
+++ b/tests/baselines/reference/signatureHelpRestArgs1.baseline
@@ -1,5 +1,5 @@
 // === SignatureHelp ===
-=== /tests/cases/fourslash/signatureHelpRestArgs.ts ===
+=== /tests/cases/fourslash/signatureHelpRestArgs1.ts ===
 // function fn(a: number, b: number, c: number) {}
 // const a = [1, 2] as const;
 // const b = [1] as const;
@@ -33,7 +33,7 @@
 [
   {
     "marker": {
-      "fileName": "/tests/cases/fourslash/signatureHelpRestArgs.ts",
+      "fileName": "/tests/cases/fourslash/signatureHelpRestArgs1.ts",
       "position": 109,
       "name": "1"
     },
@@ -163,12 +163,12 @@
       },
       "selectedItemIndex": 0,
       "argumentIndex": 2,
-      "argumentCount": 4
+      "argumentCount": 3
     }
   },
   {
     "marker": {
-      "fileName": "/tests/cases/fourslash/signatureHelpRestArgs.ts",
+      "fileName": "/tests/cases/fourslash/signatureHelpRestArgs1.ts",
       "position": 115,
       "name": "2"
     },
@@ -303,7 +303,7 @@
   },
   {
     "marker": {
-      "fileName": "/tests/cases/fourslash/signatureHelpRestArgs.ts",
+      "fileName": "/tests/cases/fourslash/signatureHelpRestArgs1.ts",
       "position": 134,
       "name": "3"
     },
@@ -433,12 +433,12 @@
       },
       "selectedItemIndex": 0,
       "argumentIndex": 1,
-      "argumentCount": 3
+      "argumentCount": 2
     }
   },
   {
     "marker": {
-      "fileName": "/tests/cases/fourslash/signatureHelpRestArgs.ts",
+      "fileName": "/tests/cases/fourslash/signatureHelpRestArgs1.ts",
       "position": 140,
       "name": "4"
     },
@@ -573,7 +573,7 @@
   },
   {
     "marker": {
-      "fileName": "/tests/cases/fourslash/signatureHelpRestArgs.ts",
+      "fileName": "/tests/cases/fourslash/signatureHelpRestArgs1.ts",
       "position": 148,
       "name": "5"
     },
diff --git a/tests/baselines/reference/signatureHelpRestArgs2.baseline b/tests/baselines/reference/signatureHelpRestArgs2.baseline
new file mode 100644
index 0000000000000..6fd5b762b558b
--- /dev/null
+++ b/tests/baselines/reference/signatureHelpRestArgs2.baseline
@@ -0,0 +1,201 @@
+// === SignatureHelp ===
+=== /tests/cases/fourslash/index.js ===
+// const promisify = function (thisArg, fnName) {
+//     const fn = thisArg[fnName];
+//     return function () {
+//         return new Promise((resolve) => {
+//             fn.call(thisArg, ...arguments, );
+//                                            ^
+// | ----------------------------------------------------------------------
+// | Function.call(thisArg: any, **...argArray: any[]**): any
+// | Calls a method of an object, substituting another object for the current object.
+// | @param thisArg The object to be used as the current object.
+// | @param argArray A list of arguments to be passed to the method.
+// | ----------------------------------------------------------------------
+//         });
+//     };
+// };
+
+[
+  {
+    "marker": {
+      "fileName": "/tests/cases/fourslash/index.js",
+      "position": 189,
+      "name": "1"
+    },
+    "item": {
+      "items": [
+        {
+          "isVariadic": true,
+          "prefixDisplayParts": [
+            {
+              "text": "Function",
+              "kind": "localName"
+            },
+            {
+              "text": ".",
+              "kind": "punctuation"
+            },
+            {
+              "text": "call",
+              "kind": "methodName"
+            },
+            {
+              "text": "(",
+              "kind": "punctuation"
+            }
+          ],
+          "suffixDisplayParts": [
+            {
+              "text": ")",
+              "kind": "punctuation"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "any",
+              "kind": "keyword"
+            }
+          ],
+          "separatorDisplayParts": [
+            {
+              "text": ",",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            }
+          ],
+          "parameters": [
+            {
+              "name": "thisArg",
+              "documentation": [
+                {
+                  "text": "The object to be used as the current object.",
+                  "kind": "text"
+                }
+              ],
+              "displayParts": [
+                {
+                  "text": "thisArg",
+                  "kind": "parameterName"
+                },
+                {
+                  "text": ":",
+                  "kind": "punctuation"
+                },
+                {
+                  "text": " ",
+                  "kind": "space"
+                },
+                {
+                  "text": "any",
+                  "kind": "keyword"
+                }
+              ],
+              "isOptional": false,
+              "isRest": false
+            },
+            {
+              "name": "argArray",
+              "documentation": [
+                {
+                  "text": "A list of arguments to be passed to the method.",
+                  "kind": "text"
+                }
+              ],
+              "displayParts": [
+                {
+                  "text": "...",
+                  "kind": "punctuation"
+                },
+                {
+                  "text": "argArray",
+                  "kind": "parameterName"
+                },
+                {
+                  "text": ":",
+                  "kind": "punctuation"
+                },
+                {
+                  "text": " ",
+                  "kind": "space"
+                },
+                {
+                  "text": "any",
+                  "kind": "keyword"
+                },
+                {
+                  "text": "[",
+                  "kind": "punctuation"
+                },
+                {
+                  "text": "]",
+                  "kind": "punctuation"
+                }
+              ],
+              "isOptional": false,
+              "isRest": false
+            }
+          ],
+          "documentation": [
+            {
+              "text": "Calls a method of an object, substituting another object for the current object.",
+              "kind": "text"
+            }
+          ],
+          "tags": [
+            {
+              "name": "param",
+              "text": [
+                {
+                  "text": "thisArg",
+                  "kind": "parameterName"
+                },
+                {
+                  "text": " ",
+                  "kind": "space"
+                },
+                {
+                  "text": "The object to be used as the current object.",
+                  "kind": "text"
+                }
+              ]
+            },
+            {
+              "name": "param",
+              "text": [
+                {
+                  "text": "argArray",
+                  "kind": "parameterName"
+                },
+                {
+                  "text": " ",
+                  "kind": "space"
+                },
+                {
+                  "text": "A list of arguments to be passed to the method.",
+                  "kind": "text"
+                }
+              ]
+            }
+          ]
+        }
+      ],
+      "applicableSpan": {
+        "start": 166,
+        "length": 23
+      },
+      "selectedItemIndex": 0,
+      "argumentIndex": 1,
+      "argumentCount": 2
+    }
+  }
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/signatureHelpSkippedArgs1.baseline b/tests/baselines/reference/signatureHelpSkippedArgs1.baseline
new file mode 100644
index 0000000000000..4b2cc1546ef6c
--- /dev/null
+++ b/tests/baselines/reference/signatureHelpSkippedArgs1.baseline
@@ -0,0 +1,702 @@
+// === SignatureHelp ===
+=== /tests/cases/fourslash/signatureHelpSkippedArgs1.ts ===
+// function fn(a: number, b: number, c: number) {}
+// fn(, , , , );
+//    ^
+// | ----------------------------------------------------------------------
+// | fn(**a: number**, b: number, c: number): void
+// | ----------------------------------------------------------------------
+//      ^
+// | ----------------------------------------------------------------------
+// | fn(a: number, **b: number**, c: number): void
+// | ----------------------------------------------------------------------
+//        ^
+// | ----------------------------------------------------------------------
+// | fn(a: number, b: number, **c: number**): void
+// | ----------------------------------------------------------------------
+//          ^
+// | ----------------------------------------------------------------------
+// | fn(a: number, b: number, c: number): void
+// | ----------------------------------------------------------------------
+//            ^
+// | ----------------------------------------------------------------------
+// | fn(a: number, b: number, c: number): void
+// | ----------------------------------------------------------------------
+
+[
+  {
+    "marker": {
+      "fileName": "/tests/cases/fourslash/signatureHelpSkippedArgs1.ts",
+      "position": 51,
+      "name": "1"
+    },
+    "item": {
+      "items": [
+        {
+          "isVariadic": false,
+          "prefixDisplayParts": [
+            {
+              "text": "fn",
+              "kind": "functionName"
+            },
+            {
+              "text": "(",
+              "kind": "punctuation"
+            }
+          ],
+          "suffixDisplayParts": [
+            {
+              "text": ")",
+              "kind": "punctuation"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "void",
+              "kind": "keyword"
+            }
+          ],
+          "separatorDisplayParts": [
+            {
+              "text": ",",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            }
+          ],
+          "parameters": [
+            {
+              "name": "a",
+              "documentation": [],
+              "displayParts": [
+                {
+                  "text": "a",
+                  "kind": "parameterName"
+                },
+                {
+                  "text": ":",
+                  "kind": "punctuation"
+                },
+                {
+                  "text": " ",
+                  "kind": "space"
+                },
+                {
+                  "text": "number",
+                  "kind": "keyword"
+                }
+              ],
+              "isOptional": false,
+              "isRest": false
+            },
+            {
+              "name": "b",
+              "documentation": [],
+              "displayParts": [
+                {
+                  "text": "b",
+                  "kind": "parameterName"
+                },
+                {
+                  "text": ":",
+                  "kind": "punctuation"
+                },
+                {
+                  "text": " ",
+                  "kind": "space"
+                },
+                {
+                  "text": "number",
+                  "kind": "keyword"
+                }
+              ],
+              "isOptional": false,
+              "isRest": false
+            },
+            {
+              "name": "c",
+              "documentation": [],
+              "displayParts": [
+                {
+                  "text": "c",
+                  "kind": "parameterName"
+                },
+                {
+                  "text": ":",
+                  "kind": "punctuation"
+                },
+                {
+                  "text": " ",
+                  "kind": "space"
+                },
+                {
+                  "text": "number",
+                  "kind": "keyword"
+                }
+              ],
+              "isOptional": false,
+              "isRest": false
+            }
+          ],
+          "documentation": [],
+          "tags": []
+        }
+      ],
+      "applicableSpan": {
+        "start": 51,
+        "length": 8
+      },
+      "selectedItemIndex": 0,
+      "argumentIndex": 0,
+      "argumentCount": 5
+    }
+  },
+  {
+    "marker": {
+      "fileName": "/tests/cases/fourslash/signatureHelpSkippedArgs1.ts",
+      "position": 53,
+      "name": "2"
+    },
+    "item": {
+      "items": [
+        {
+          "isVariadic": false,
+          "prefixDisplayParts": [
+            {
+              "text": "fn",
+              "kind": "functionName"
+            },
+            {
+              "text": "(",
+              "kind": "punctuation"
+            }
+          ],
+          "suffixDisplayParts": [
+            {
+              "text": ")",
+              "kind": "punctuation"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "void",
+              "kind": "keyword"
+            }
+          ],
+          "separatorDisplayParts": [
+            {
+              "text": ",",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            }
+          ],
+          "parameters": [
+            {
+              "name": "a",
+              "documentation": [],
+              "displayParts": [
+                {
+                  "text": "a",
+                  "kind": "parameterName"
+                },
+                {
+                  "text": ":",
+                  "kind": "punctuation"
+                },
+                {
+                  "text": " ",
+                  "kind": "space"
+                },
+                {
+                  "text": "number",
+                  "kind": "keyword"
+                }
+              ],
+              "isOptional": false,
+              "isRest": false
+            },
+            {
+              "name": "b",
+              "documentation": [],
+              "displayParts": [
+                {
+                  "text": "b",
+                  "kind": "parameterName"
+                },
+                {
+                  "text": ":",
+                  "kind": "punctuation"
+                },
+                {
+                  "text": " ",
+                  "kind": "space"
+                },
+                {
+                  "text": "number",
+                  "kind": "keyword"
+                }
+              ],
+              "isOptional": false,
+              "isRest": false
+            },
+            {
+              "name": "c",
+              "documentation": [],
+              "displayParts": [
+                {
+                  "text": "c",
+                  "kind": "parameterName"
+                },
+                {
+                  "text": ":",
+                  "kind": "punctuation"
+                },
+                {
+                  "text": " ",
+                  "kind": "space"
+                },
+                {
+                  "text": "number",
+                  "kind": "keyword"
+                }
+              ],
+              "isOptional": false,
+              "isRest": false
+            }
+          ],
+          "documentation": [],
+          "tags": []
+        }
+      ],
+      "applicableSpan": {
+        "start": 51,
+        "length": 8
+      },
+      "selectedItemIndex": 0,
+      "argumentIndex": 1,
+      "argumentCount": 5
+    }
+  },
+  {
+    "marker": {
+      "fileName": "/tests/cases/fourslash/signatureHelpSkippedArgs1.ts",
+      "position": 55,
+      "name": "3"
+    },
+    "item": {
+      "items": [
+        {
+          "isVariadic": false,
+          "prefixDisplayParts": [
+            {
+              "text": "fn",
+              "kind": "functionName"
+            },
+            {
+              "text": "(",
+              "kind": "punctuation"
+            }
+          ],
+          "suffixDisplayParts": [
+            {
+              "text": ")",
+              "kind": "punctuation"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "void",
+              "kind": "keyword"
+            }
+          ],
+          "separatorDisplayParts": [
+            {
+              "text": ",",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            }
+          ],
+          "parameters": [
+            {
+              "name": "a",
+              "documentation": [],
+              "displayParts": [
+                {
+                  "text": "a",
+                  "kind": "parameterName"
+                },
+                {
+                  "text": ":",
+                  "kind": "punctuation"
+                },
+                {
+                  "text": " ",
+                  "kind": "space"
+                },
+                {
+                  "text": "number",
+                  "kind": "keyword"
+                }
+              ],
+              "isOptional": false,
+              "isRest": false
+            },
+            {
+              "name": "b",
+              "documentation": [],
+              "displayParts": [
+                {
+                  "text": "b",
+                  "kind": "parameterName"
+                },
+                {
+                  "text": ":",
+                  "kind": "punctuation"
+                },
+                {
+                  "text": " ",
+                  "kind": "space"
+                },
+                {
+                  "text": "number",
+                  "kind": "keyword"
+                }
+              ],
+              "isOptional": false,
+              "isRest": false
+            },
+            {
+              "name": "c",
+              "documentation": [],
+              "displayParts": [
+                {
+                  "text": "c",
+                  "kind": "parameterName"
+                },
+                {
+                  "text": ":",
+                  "kind": "punctuation"
+                },
+                {
+                  "text": " ",
+                  "kind": "space"
+                },
+                {
+                  "text": "number",
+                  "kind": "keyword"
+                }
+              ],
+              "isOptional": false,
+              "isRest": false
+            }
+          ],
+          "documentation": [],
+          "tags": []
+        }
+      ],
+      "applicableSpan": {
+        "start": 51,
+        "length": 8
+      },
+      "selectedItemIndex": 0,
+      "argumentIndex": 2,
+      "argumentCount": 5
+    }
+  },
+  {
+    "marker": {
+      "fileName": "/tests/cases/fourslash/signatureHelpSkippedArgs1.ts",
+      "position": 57,
+      "name": "4"
+    },
+    "item": {
+      "items": [
+        {
+          "isVariadic": false,
+          "prefixDisplayParts": [
+            {
+              "text": "fn",
+              "kind": "functionName"
+            },
+            {
+              "text": "(",
+              "kind": "punctuation"
+            }
+          ],
+          "suffixDisplayParts": [
+            {
+              "text": ")",
+              "kind": "punctuation"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "void",
+              "kind": "keyword"
+            }
+          ],
+          "separatorDisplayParts": [
+            {
+              "text": ",",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            }
+          ],
+          "parameters": [
+            {
+              "name": "a",
+              "documentation": [],
+              "displayParts": [
+                {
+                  "text": "a",
+                  "kind": "parameterName"
+                },
+                {
+                  "text": ":",
+                  "kind": "punctuation"
+                },
+                {
+                  "text": " ",
+                  "kind": "space"
+                },
+                {
+                  "text": "number",
+                  "kind": "keyword"
+                }
+              ],
+              "isOptional": false,
+              "isRest": false
+            },
+            {
+              "name": "b",
+              "documentation": [],
+              "displayParts": [
+                {
+                  "text": "b",
+                  "kind": "parameterName"
+                },
+                {
+                  "text": ":",
+                  "kind": "punctuation"
+                },
+                {
+                  "text": " ",
+                  "kind": "space"
+                },
+                {
+                  "text": "number",
+                  "kind": "keyword"
+                }
+              ],
+              "isOptional": false,
+              "isRest": false
+            },
+            {
+              "name": "c",
+              "documentation": [],
+              "displayParts": [
+                {
+                  "text": "c",
+                  "kind": "parameterName"
+                },
+                {
+                  "text": ":",
+                  "kind": "punctuation"
+                },
+                {
+                  "text": " ",
+                  "kind": "space"
+                },
+                {
+                  "text": "number",
+                  "kind": "keyword"
+                }
+              ],
+              "isOptional": false,
+              "isRest": false
+            }
+          ],
+          "documentation": [],
+          "tags": []
+        }
+      ],
+      "applicableSpan": {
+        "start": 51,
+        "length": 8
+      },
+      "selectedItemIndex": 0,
+      "argumentIndex": 3,
+      "argumentCount": 5
+    }
+  },
+  {
+    "marker": {
+      "fileName": "/tests/cases/fourslash/signatureHelpSkippedArgs1.ts",
+      "position": 59,
+      "name": "5"
+    },
+    "item": {
+      "items": [
+        {
+          "isVariadic": false,
+          "prefixDisplayParts": [
+            {
+              "text": "fn",
+              "kind": "functionName"
+            },
+            {
+              "text": "(",
+              "kind": "punctuation"
+            }
+          ],
+          "suffixDisplayParts": [
+            {
+              "text": ")",
+              "kind": "punctuation"
+            },
+            {
+              "text": ":",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            },
+            {
+              "text": "void",
+              "kind": "keyword"
+            }
+          ],
+          "separatorDisplayParts": [
+            {
+              "text": ",",
+              "kind": "punctuation"
+            },
+            {
+              "text": " ",
+              "kind": "space"
+            }
+          ],
+          "parameters": [
+            {
+              "name": "a",
+              "documentation": [],
+              "displayParts": [
+                {
+                  "text": "a",
+                  "kind": "parameterName"
+                },
+                {
+                  "text": ":",
+                  "kind": "punctuation"
+                },
+                {
+                  "text": " ",
+                  "kind": "space"
+                },
+                {
+                  "text": "number",
+                  "kind": "keyword"
+                }
+              ],
+              "isOptional": false,
+              "isRest": false
+            },
+            {
+              "name": "b",
+              "documentation": [],
+              "displayParts": [
+                {
+                  "text": "b",
+                  "kind": "parameterName"
+                },
+                {
+                  "text": ":",
+                  "kind": "punctuation"
+                },
+                {
+                  "text": " ",
+                  "kind": "space"
+                },
+                {
+                  "text": "number",
+                  "kind": "keyword"
+                }
+              ],
+              "isOptional": false,
+              "isRest": false
+            },
+            {
+              "name": "c",
+              "documentation": [],
+              "displayParts": [
+                {
+                  "text": "c",
+                  "kind": "parameterName"
+                },
+                {
+                  "text": ":",
+                  "kind": "punctuation"
+                },
+                {
+                  "text": " ",
+                  "kind": "space"
+                },
+                {
+                  "text": "number",
+                  "kind": "keyword"
+                }
+              ],
+              "isOptional": false,
+              "isRest": false
+            }
+          ],
+          "documentation": [],
+          "tags": []
+        }
+      ],
+      "applicableSpan": {
+        "start": 51,
+        "length": 8
+      },
+      "selectedItemIndex": 0,
+      "argumentIndex": 4,
+      "argumentCount": 5
+    }
+  }
+]
\ No newline at end of file
diff --git a/tests/cases/fourslash/signatureHelpRestArgs.ts b/tests/cases/fourslash/signatureHelpRestArgs1.ts
similarity index 100%
rename from tests/cases/fourslash/signatureHelpRestArgs.ts
rename to tests/cases/fourslash/signatureHelpRestArgs1.ts
diff --git a/tests/cases/fourslash/signatureHelpRestArgs2.ts b/tests/cases/fourslash/signatureHelpRestArgs2.ts
new file mode 100644
index 0000000000000..983e93de6d68f
--- /dev/null
+++ b/tests/cases/fourslash/signatureHelpRestArgs2.ts
@@ -0,0 +1,18 @@
+/// <reference path="fourslash.ts" />
+
+// @strict: true
+// @allowJs: true
+// @checkJs: true
+
+// @filename: index.js
+
+//// const promisify = function (thisArg, fnName) {
+////     const fn = thisArg[fnName];
+////     return function () {
+////         return new Promise((resolve) => {
+////             fn.call(thisArg, ...arguments, /*1*/);
+////         });
+////     };
+//// };
+
+verify.baselineSignatureHelp();
diff --git a/tests/cases/fourslash/signatureHelpSkippedArgs1.ts b/tests/cases/fourslash/signatureHelpSkippedArgs1.ts
new file mode 100644
index 0000000000000..543991c31940e
--- /dev/null
+++ b/tests/cases/fourslash/signatureHelpSkippedArgs1.ts
@@ -0,0 +1,6 @@
+/// <reference path="fourslash.ts" />
+
+//// function fn(a: number, b: number, c: number) {}
+//// fn(/*1*/, /*2*/, /*3*/, /*4*/, /*5*/);
+
+verify.baselineSignatureHelp();

From 06aae9839d7160c2aff8c3f14b9f1f2d3e76c2d4 Mon Sep 17 00:00:00 2001
From: TypeScript Bot <ts_bot@rcavanaugh.com>
Date: Thu, 28 Mar 2024 16:36:48 -0700
Subject: [PATCH 6/8] =?UTF-8?q?=F0=9F=A4=96=20Pick=20PR=20#57973=20(Compar?=
 =?UTF-8?q?e=20package.json=20paths=20with=20cor...)=20into=20release-5.4?=
 =?UTF-8?q?=20(#57976)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Jake Bailey <5341706+jakebailey@users.noreply.github.com>
---
 src/compiler/moduleSpecifiers.ts              |   9 +-
 .../unittests/tsc/declarationEmit.ts          |  94 +++++++
 ...ing-Windows-paths-and-uppercase-letters.js | 229 ++++++++++++++++++
 3 files changed, 331 insertions(+), 1 deletion(-)
 create mode 100644 tests/baselines/reference/tsc/declarationEmit/when-using-Windows-paths-and-uppercase-letters.js

diff --git a/src/compiler/moduleSpecifiers.ts b/src/compiler/moduleSpecifiers.ts
index fb2a6cb1bb7f3..40261c7e8e35f 100644
--- a/src/compiler/moduleSpecifiers.ts
+++ b/src/compiler/moduleSpecifiers.ts
@@ -550,7 +550,8 @@ function getLocalModuleSpecifier(moduleFileName: string, info: Info, compilerOpt
 
         const nearestTargetPackageJson = getNearestAncestorDirectoryWithPackageJson(host, getDirectoryPath(modulePath));
         const nearestSourcePackageJson = getNearestAncestorDirectoryWithPackageJson(host, sourceDirectory);
-        if (nearestSourcePackageJson !== nearestTargetPackageJson) {
+        const ignoreCase = !hostUsesCaseSensitiveFileNames(host);
+        if (!packageJsonPathsAreEqual(nearestTargetPackageJson, nearestSourcePackageJson, ignoreCase)) {
             // 2. The importing and imported files are part of different packages.
             //
             //      packages/a/
@@ -570,6 +571,12 @@ function getLocalModuleSpecifier(moduleFileName: string, info: Info, compilerOpt
     return isPathRelativeToParent(maybeNonRelative) || countPathComponents(relativePath) < countPathComponents(maybeNonRelative) ? relativePath : maybeNonRelative;
 }
 
+function packageJsonPathsAreEqual(a: string | undefined, b: string | undefined, ignoreCase?: boolean) {
+    if (a === b) return true;
+    if (a === undefined || b === undefined) return false;
+    return comparePaths(a, b, ignoreCase) === Comparison.EqualTo;
+}
+
 /** @internal */
 export function countPathComponents(path: string): number {
     let count = 0;
diff --git a/src/testRunner/unittests/tsc/declarationEmit.ts b/src/testRunner/unittests/tsc/declarationEmit.ts
index 9b531010e6dcb..6655fcc0249ac 100644
--- a/src/testRunner/unittests/tsc/declarationEmit.ts
+++ b/src/testRunner/unittests/tsc/declarationEmit.ts
@@ -258,4 +258,98 @@ ${pluginOneAction()}`,
         ],
         changeCaseFileTestPath: str => str.includes("/pkg1"),
     });
+
+    verifyTscWatch({
+        scenario: "declarationEmit",
+        subScenario: "when using Windows paths and uppercase letters",
+        sys: () =>
+            createWatchedSystem([
+                {
+                    path: `D:\\Work\\pkg1\\package.json`,
+                    content: jsonToReadableText({
+                        name: "ts-specifier-bug",
+                        version: "1.0.0",
+                        description: "",
+                        main: "index.js",
+                        scripts: {
+                            build: "tsc",
+                        },
+                        keywords: [],
+                        author: "",
+                        license: "ISC",
+                        dependencies: {
+                            typescript: "5.4.0-dev.20231222",
+                        },
+                    }),
+                },
+                {
+                    path: `D:\\Work\\pkg1\\tsconfig.json`,
+                    content: jsonToReadableText({
+                        compilerOptions: {
+                            module: "commonjs",
+                            declaration: true,
+                            removeComments: true,
+                            emitDecoratorMetadata: true,
+                            experimentalDecorators: true,
+                            strictPropertyInitialization: false,
+                            allowSyntheticDefaultImports: true,
+                            target: "es2017",
+                            sourceMap: true,
+                            esModuleInterop: true,
+                            outDir: "./dist",
+                            baseUrl: "./",
+                            skipLibCheck: true,
+                            strictNullChecks: false,
+                            noImplicitAny: false,
+                            strictBindCallApply: false,
+                            forceConsistentCasingInFileNames: false,
+                            noFallthroughCasesInSwitch: false,
+                            moduleResolution: "node",
+                            resolveJsonModule: true,
+                        },
+                        include: ["src"],
+                    }),
+                },
+                {
+                    path: `D:\\Work\\pkg1\\src\\main.ts`,
+                    content: Utils.dedent`
+                    import { PartialType } from './utils';
+
+                    class Common {}
+                    
+                    export class Sub extends PartialType(Common) {
+                        id: string;
+                    }
+                `,
+                },
+                {
+                    path: `D:\\Work\\pkg1\\src\\utils\\index.ts`,
+                    content: Utils.dedent`
+                    import { MyType, MyReturnType } from './type-helpers';
+
+                    export function PartialType<T>(classRef: MyType<T>) {
+                        abstract class PartialClassType {
+                            constructor() {}
+                        }
+                    
+                        return PartialClassType as MyReturnType;
+                    }
+                `,
+                },
+                {
+                    path: `D:\\Work\\pkg1\\src\\utils\\type-helpers.ts`,
+                    content: Utils.dedent`
+                    export type MyReturnType = {
+                        new (...args: any[]): any;
+                    };
+                  
+                    export interface MyType<T = any> extends Function {
+                        new (...args: any[]): T;
+                    }
+                `,
+                },
+                libFile,
+            ], { currentDirectory: "D:\\Work\\pkg1", windowsStyleRoot: "D:/" }),
+        commandLineArgs: ["-p", "D:\\Work\\pkg1", "--explainFiles"],
+    });
 });
diff --git a/tests/baselines/reference/tsc/declarationEmit/when-using-Windows-paths-and-uppercase-letters.js b/tests/baselines/reference/tsc/declarationEmit/when-using-Windows-paths-and-uppercase-letters.js
new file mode 100644
index 0000000000000..d8c7e26ff4268
--- /dev/null
+++ b/tests/baselines/reference/tsc/declarationEmit/when-using-Windows-paths-and-uppercase-letters.js
@@ -0,0 +1,229 @@
+currentDirectory:: D:\Work\pkg1 useCaseSensitiveFileNames: false
+Input::
+//// [D:/Work/pkg1/package.json]
+{
+  "name": "ts-specifier-bug",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "build": "tsc"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "typescript": "5.4.0-dev.20231222"
+  }
+}
+
+//// [D:/Work/pkg1/tsconfig.json]
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "declaration": true,
+    "removeComments": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "strictPropertyInitialization": false,
+    "allowSyntheticDefaultImports": true,
+    "target": "es2017",
+    "sourceMap": true,
+    "esModuleInterop": true,
+    "outDir": "./dist",
+    "baseUrl": "./",
+    "skipLibCheck": true,
+    "strictNullChecks": false,
+    "noImplicitAny": false,
+    "strictBindCallApply": false,
+    "forceConsistentCasingInFileNames": false,
+    "noFallthroughCasesInSwitch": false,
+    "moduleResolution": "node",
+    "resolveJsonModule": true
+  },
+  "include": [
+    "src"
+  ]
+}
+
+//// [D:/Work/pkg1/src/main.ts]
+import { PartialType } from './utils';
+
+class Common {}
+
+export class Sub extends PartialType(Common) {
+    id: string;
+}
+
+
+//// [D:/Work/pkg1/src/utils/index.ts]
+import { MyType, MyReturnType } from './type-helpers';
+
+export function PartialType<T>(classRef: MyType<T>) {
+    abstract class PartialClassType {
+        constructor() {}
+    }
+
+    return PartialClassType as MyReturnType;
+}
+
+
+//// [D:/Work/pkg1/src/utils/type-helpers.ts]
+export type MyReturnType = {
+    new (...args: any[]): any;
+};
+
+export interface MyType<T = any> extends Function {
+    new (...args: any[]): T;
+}
+
+
+//// [D:/a/lib/lib.d.ts]
+/// <reference no-default-lib="true"/>
+interface Boolean {}
+interface Function {}
+interface CallableFunction {}
+interface NewableFunction {}
+interface IArguments {}
+interface Number { toExponential: any; }
+interface Object {}
+interface RegExp {}
+interface String { charAt: any; }
+interface Array<T> { length: number; [n: number]: T; }
+
+
+D:/a/lib/tsc.js -p D:\Work\pkg1 --explainFiles
+Output::
+error TS2318: Cannot find global type 'Array'.
+
+error TS2318: Cannot find global type 'Boolean'.
+
+error TS2318: Cannot find global type 'Function'.
+
+error TS2318: Cannot find global type 'IArguments'.
+
+error TS2318: Cannot find global type 'Number'.
+
+error TS2318: Cannot find global type 'Object'.
+
+error TS2318: Cannot find global type 'RegExp'.
+
+error TS2318: Cannot find global type 'String'.
+
+error TS6053: File 'D:/a/lib/lib.es2017.full.d.ts' not found.
+  The file is in the program because:
+    Default library for target 'es2017'
+
+  tsconfig.json:10:15
+    10     "target": "es2017",
+                     ~~~~~~~~
+    File is default library for target specified here.
+
+src/utils/type-helpers.ts:5:42 - error TS4022: 'extends' clause of exported interface 'MyType' has or is using private name 'Function'.
+
+5 export interface MyType<T = any> extends Function {
+                                           ~~~~~~~~
+
+src/utils/type-helpers.ts
+  Imported via './type-helpers' from file 'src/utils/index.ts'
+  Matched by include pattern 'src' in 'tsconfig.json'
+src/utils/index.ts
+  Imported via './utils' from file 'src/main.ts'
+  Matched by include pattern 'src' in 'tsconfig.json'
+src/main.ts
+  Matched by include pattern 'src' in 'tsconfig.json'
+
+Found 10 errors in the same file, starting at: src/utils/type-helpers.ts:5
+
+
+
+//// [D:/Work/pkg1/dist/utils/type-helpers.js.map]
+{"version":3,"file":"type-helpers.js","sourceRoot":"","sources":["../../src/utils/type-helpers.ts"],"names":[],"mappings":""}
+
+//// [D:/Work/pkg1/dist/utils/type-helpers.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=type-helpers.js.map
+
+//// [D:/Work/pkg1/dist/utils/index.js.map]
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;AAEA,SAAgB,WAAW,CAAI,QAAmB;IAC9C,MAAe,gBAAgB;QAC3B,gBAAe,CAAC;KACnB;IAED,OAAO,gBAAgC,CAAC;AAC5C,CAAC;AAND,kCAMC"}
+
+//// [D:/Work/pkg1/dist/utils/index.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PartialType = void 0;
+function PartialType(classRef) {
+    class PartialClassType {
+        constructor() { }
+    }
+    return PartialClassType;
+}
+exports.PartialType = PartialType;
+//# sourceMappingURL=index.js.map
+
+//// [D:/Work/pkg1/dist/utils/index.d.ts]
+import { MyType, MyReturnType } from './type-helpers';
+export declare function PartialType<T>(classRef: MyType<T>): MyReturnType;
+
+
+//// [D:/Work/pkg1/dist/main.js.map]
+{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";;;AAAA,mCAAsC;AAEtC,MAAM,MAAM;CAAG;AAEf,MAAa,GAAI,SAAQ,IAAA,mBAAW,EAAC,MAAM,CAAC;CAE3C;AAFD,kBAEC"}
+
+//// [D:/Work/pkg1/dist/main.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Sub = void 0;
+const utils_1 = require("./utils");
+class Common {
+}
+class Sub extends (0, utils_1.PartialType)(Common) {
+}
+exports.Sub = Sub;
+//# sourceMappingURL=main.js.map
+
+//// [D:/Work/pkg1/dist/main.d.ts]
+declare const Sub_base: import("./utils/type-helpers").MyReturnType;
+export declare class Sub extends Sub_base {
+    id: string;
+}
+export {};
+
+
+
+Program root files: [
+  "D:/Work/pkg1/src/main.ts",
+  "D:/Work/pkg1/src/utils/index.ts",
+  "D:/Work/pkg1/src/utils/type-helpers.ts"
+]
+Program options: {
+  "module": 1,
+  "declaration": true,
+  "removeComments": true,
+  "emitDecoratorMetadata": true,
+  "experimentalDecorators": true,
+  "strictPropertyInitialization": false,
+  "allowSyntheticDefaultImports": true,
+  "target": 4,
+  "sourceMap": true,
+  "esModuleInterop": true,
+  "outDir": "D:/Work/pkg1/dist",
+  "baseUrl": "D:/Work/pkg1",
+  "skipLibCheck": true,
+  "strictNullChecks": false,
+  "noImplicitAny": false,
+  "strictBindCallApply": false,
+  "forceConsistentCasingInFileNames": false,
+  "noFallthroughCasesInSwitch": false,
+  "moduleResolution": 2,
+  "resolveJsonModule": true,
+  "project": "D:/Work/pkg1",
+  "explainFiles": true,
+  "configFilePath": "D:/Work/pkg1/tsconfig.json"
+}
+Program structureReused: Not
+Program files::
+D:/Work/pkg1/src/utils/type-helpers.ts
+D:/Work/pkg1/src/utils/index.ts
+D:/Work/pkg1/src/main.ts
+
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped

From de9096b42b052ffabbf2b46b573557e7c2eb259d Mon Sep 17 00:00:00 2001
From: TypeScript Bot <ts_bot@rcavanaugh.com>
Date: Sun, 31 Mar 2024 17:28:39 -0700
Subject: [PATCH 7/8] =?UTF-8?q?=F0=9F=A4=96=20Pick=20PR=20#57871=20(Divide?=
 =?UTF-8?q?-and-conquer=20strategy=20for=20int...)=20into=20release-5.4=20?=
 =?UTF-8?q?(#57893)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Anders Hejlsberg <andersh@microsoft.com>
---
 src/compiler/checker.ts                       |   8 +
 .../divideAndConquerIntersections.symbols     | 361 ++++++++++++++++++
 .../divideAndConquerIntersections.types       | 231 +++++++++++
 .../compiler/divideAndConquerIntersections.ts | 106 +++++
 4 files changed, 706 insertions(+)
 create mode 100644 tests/baselines/reference/divideAndConquerIntersections.symbols
 create mode 100644 tests/baselines/reference/divideAndConquerIntersections.types
 create mode 100644 tests/cases/compiler/divideAndConquerIntersections.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 6858ae40b5bec..175caa9eef16e 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -17678,6 +17678,14 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                     removeFromEach(typeSet, TypeFlags.Null);
                     result = getUnionType([getIntersectionType(typeSet), nullType], UnionReduction.Literal, aliasSymbol, aliasTypeArguments);
                 }
+                else if (typeSet.length >= 4) {
+                    // When we have four or more constituents, some of which are unions, we employ a "divide and conquer" strategy
+                    // where A & B & C & D is processed as (A & B) & (C & D). Since intersections of unions often produce far smaller
+                    // unions of intersections than the full cartesian product (due to some intersections becoming `never`), this can
+                    // dramatically reduce the overall work.
+                    const middle = Math.floor(typeSet.length / 2);
+                    result = getIntersectionType([getIntersectionType(typeSet.slice(0, middle)), getIntersectionType(typeSet.slice(middle))], aliasSymbol, aliasTypeArguments);
+                }
                 else {
                     // We are attempting to construct a type of the form X & (A | B) & (C | D). Transform this into a type of
                     // the form X & A & C | X & A & D | X & B & C | X & B & D. If the estimated size of the resulting union type
diff --git a/tests/baselines/reference/divideAndConquerIntersections.symbols b/tests/baselines/reference/divideAndConquerIntersections.symbols
new file mode 100644
index 0000000000000..7bf1c7e537888
--- /dev/null
+++ b/tests/baselines/reference/divideAndConquerIntersections.symbols
@@ -0,0 +1,361 @@
+//// [tests/cases/compiler/divideAndConquerIntersections.ts] ////
+
+=== divideAndConquerIntersections.ts ===
+type QQ<T extends string[]> =
+>QQ : Symbol(QQ, Decl(divideAndConquerIntersections.ts, 0, 0))
+>T : Symbol(T, Decl(divideAndConquerIntersections.ts, 0, 8))
+
+    & ("a" | T[0])
+>T : Symbol(T, Decl(divideAndConquerIntersections.ts, 0, 8))
+
+    & ("b" | T[1])
+>T : Symbol(T, Decl(divideAndConquerIntersections.ts, 0, 8))
+
+    & ("c" | T[2])
+>T : Symbol(T, Decl(divideAndConquerIntersections.ts, 0, 8))
+
+    & ("d" | T[3])
+>T : Symbol(T, Decl(divideAndConquerIntersections.ts, 0, 8))
+
+    & ("e" | T[4])
+>T : Symbol(T, Decl(divideAndConquerIntersections.ts, 0, 8))
+
+    & ("f" | T[5])
+>T : Symbol(T, Decl(divideAndConquerIntersections.ts, 0, 8))
+
+    & ("g" | T[6])
+>T : Symbol(T, Decl(divideAndConquerIntersections.ts, 0, 8))
+
+    & ("h" | T[7])
+>T : Symbol(T, Decl(divideAndConquerIntersections.ts, 0, 8))
+
+    & ("i" | T[8])
+>T : Symbol(T, Decl(divideAndConquerIntersections.ts, 0, 8))
+
+    & ("j" | T[9])
+>T : Symbol(T, Decl(divideAndConquerIntersections.ts, 0, 8))
+
+    & ("k" | T[10])
+>T : Symbol(T, Decl(divideAndConquerIntersections.ts, 0, 8))
+
+    & ("l" | T[11])
+>T : Symbol(T, Decl(divideAndConquerIntersections.ts, 0, 8))
+
+    & ("m" | T[12])
+>T : Symbol(T, Decl(divideAndConquerIntersections.ts, 0, 8))
+
+    & ("n" | T[13])
+>T : Symbol(T, Decl(divideAndConquerIntersections.ts, 0, 8))
+
+    & ("q" | T[14])
+>T : Symbol(T, Decl(divideAndConquerIntersections.ts, 0, 8))
+
+    & ("p" | T[15])
+>T : Symbol(T, Decl(divideAndConquerIntersections.ts, 0, 8))
+
+    & ("q" | T[16])
+>T : Symbol(T, Decl(divideAndConquerIntersections.ts, 0, 8))
+
+    & ("r" | T[17])
+>T : Symbol(T, Decl(divideAndConquerIntersections.ts, 0, 8))
+
+    & ("s" | T[18])
+>T : Symbol(T, Decl(divideAndConquerIntersections.ts, 0, 8))
+
+    & ("t" | T[19]);
+>T : Symbol(T, Decl(divideAndConquerIntersections.ts, 0, 8))
+
+// Repro from #57863
+
+export interface Update {
+>Update : Symbol(Update, Decl(divideAndConquerIntersections.ts, 20, 20))
+
+    update_id: number;
+>update_id : Symbol(Update.update_id, Decl(divideAndConquerIntersections.ts, 24, 25))
+
+    message?: { message: string };
+>message : Symbol(Update.message, Decl(divideAndConquerIntersections.ts, 25, 22))
+>message : Symbol(message, Decl(divideAndConquerIntersections.ts, 27, 15))
+
+    edited_message?: { edited_message: string };
+>edited_message : Symbol(Update.edited_message, Decl(divideAndConquerIntersections.ts, 27, 34))
+>edited_message : Symbol(edited_message, Decl(divideAndConquerIntersections.ts, 28, 22))
+
+    channel_post?: { channel_post: string };
+>channel_post : Symbol(Update.channel_post, Decl(divideAndConquerIntersections.ts, 28, 48))
+>channel_post : Symbol(channel_post, Decl(divideAndConquerIntersections.ts, 29, 20))
+
+    edited_channel_post?: { edited_channel_post: string };
+>edited_channel_post : Symbol(Update.edited_channel_post, Decl(divideAndConquerIntersections.ts, 29, 44))
+>edited_channel_post : Symbol(edited_channel_post, Decl(divideAndConquerIntersections.ts, 30, 27))
+
+    message_reaction?: { message_reaction: string };
+>message_reaction : Symbol(Update.message_reaction, Decl(divideAndConquerIntersections.ts, 30, 58))
+>message_reaction : Symbol(message_reaction, Decl(divideAndConquerIntersections.ts, 31, 24))
+
+    message_reaction_count?: { message_reaction_count: string };
+>message_reaction_count : Symbol(Update.message_reaction_count, Decl(divideAndConquerIntersections.ts, 31, 52))
+>message_reaction_count : Symbol(message_reaction_count, Decl(divideAndConquerIntersections.ts, 32, 30))
+
+    inline_query?: { inline_query: string };
+>inline_query : Symbol(Update.inline_query, Decl(divideAndConquerIntersections.ts, 32, 64))
+>inline_query : Symbol(inline_query, Decl(divideAndConquerIntersections.ts, 33, 20))
+
+    chosen_inline_result?: { chosen_inline_result: string };
+>chosen_inline_result : Symbol(Update.chosen_inline_result, Decl(divideAndConquerIntersections.ts, 33, 44))
+>chosen_inline_result : Symbol(chosen_inline_result, Decl(divideAndConquerIntersections.ts, 34, 28))
+
+    callback_query?: { callback_query: string };
+>callback_query : Symbol(Update.callback_query, Decl(divideAndConquerIntersections.ts, 34, 60))
+>callback_query : Symbol(callback_query, Decl(divideAndConquerIntersections.ts, 35, 22))
+
+    shipping_query?: { shipping_query: string };
+>shipping_query : Symbol(Update.shipping_query, Decl(divideAndConquerIntersections.ts, 35, 48))
+>shipping_query : Symbol(shipping_query, Decl(divideAndConquerIntersections.ts, 36, 22))
+
+    pre_checkout_query?: { pre_checkout_query: string };
+>pre_checkout_query : Symbol(Update.pre_checkout_query, Decl(divideAndConquerIntersections.ts, 36, 48))
+>pre_checkout_query : Symbol(pre_checkout_query, Decl(divideAndConquerIntersections.ts, 37, 26))
+
+    poll?: { poll: string };
+>poll : Symbol(Update.poll, Decl(divideAndConquerIntersections.ts, 37, 56))
+>poll : Symbol(poll, Decl(divideAndConquerIntersections.ts, 38, 12))
+
+    poll_answer?: { poll_answer: string };
+>poll_answer : Symbol(Update.poll_answer, Decl(divideAndConquerIntersections.ts, 38, 28))
+>poll_answer : Symbol(poll_answer, Decl(divideAndConquerIntersections.ts, 39, 19))
+
+    my_chat_member?: { my_chat_member: string };
+>my_chat_member : Symbol(Update.my_chat_member, Decl(divideAndConquerIntersections.ts, 39, 42))
+>my_chat_member : Symbol(my_chat_member, Decl(divideAndConquerIntersections.ts, 40, 22))
+
+    chat_member?: { chat_member: string };
+>chat_member : Symbol(Update.chat_member, Decl(divideAndConquerIntersections.ts, 40, 48))
+>chat_member : Symbol(chat_member, Decl(divideAndConquerIntersections.ts, 41, 19))
+
+    chat_join_request?: { chat_join_request: string };
+>chat_join_request : Symbol(Update.chat_join_request, Decl(divideAndConquerIntersections.ts, 41, 42))
+>chat_join_request : Symbol(chat_join_request, Decl(divideAndConquerIntersections.ts, 42, 25))
+
+    chat_boost?: { chat_boost: string };
+>chat_boost : Symbol(Update.chat_boost, Decl(divideAndConquerIntersections.ts, 42, 54))
+>chat_boost : Symbol(chat_boost, Decl(divideAndConquerIntersections.ts, 43, 18))
+
+    removed_chat_boost?: { removed_chat_boost: string };
+>removed_chat_boost : Symbol(Update.removed_chat_boost, Decl(divideAndConquerIntersections.ts, 43, 40))
+>removed_chat_boost : Symbol(removed_chat_boost, Decl(divideAndConquerIntersections.ts, 44, 26))
+}
+
+type FilterFunction<U extends Update, V extends U> = (up: U) => up is V;
+>FilterFunction : Symbol(FilterFunction, Decl(divideAndConquerIntersections.ts, 45, 1))
+>U : Symbol(U, Decl(divideAndConquerIntersections.ts, 47, 20))
+>Update : Symbol(Update, Decl(divideAndConquerIntersections.ts, 20, 20))
+>V : Symbol(V, Decl(divideAndConquerIntersections.ts, 47, 37))
+>U : Symbol(U, Decl(divideAndConquerIntersections.ts, 47, 20))
+>up : Symbol(up, Decl(divideAndConquerIntersections.ts, 47, 54))
+>U : Symbol(U, Decl(divideAndConquerIntersections.ts, 47, 20))
+>up : Symbol(up, Decl(divideAndConquerIntersections.ts, 47, 54))
+>V : Symbol(V, Decl(divideAndConquerIntersections.ts, 47, 37))
+
+export function matchFilter<U extends Update, Q extends FilterQuery>(
+>matchFilter : Symbol(matchFilter, Decl(divideAndConquerIntersections.ts, 47, 72))
+>U : Symbol(U, Decl(divideAndConquerIntersections.ts, 49, 28))
+>Update : Symbol(Update, Decl(divideAndConquerIntersections.ts, 20, 20))
+>Q : Symbol(Q, Decl(divideAndConquerIntersections.ts, 49, 45))
+>FilterQuery : Symbol(FilterQuery, Decl(divideAndConquerIntersections.ts, 55, 1))
+
+    filter: Q | Q[],
+>filter : Symbol(filter, Decl(divideAndConquerIntersections.ts, 49, 69))
+>Q : Symbol(Q, Decl(divideAndConquerIntersections.ts, 49, 45))
+>Q : Symbol(Q, Decl(divideAndConquerIntersections.ts, 49, 45))
+
+): FilterFunction<U, Filter<U, Q>> {
+>FilterFunction : Symbol(FilterFunction, Decl(divideAndConquerIntersections.ts, 45, 1))
+>U : Symbol(U, Decl(divideAndConquerIntersections.ts, 49, 28))
+>Filter : Symbol(Filter, Decl(divideAndConquerIntersections.ts, 58, 58))
+>U : Symbol(U, Decl(divideAndConquerIntersections.ts, 49, 28))
+>Q : Symbol(Q, Decl(divideAndConquerIntersections.ts, 49, 45))
+
+  // ^ errors out
+    console.log("Matching", filter);
+>console.log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
+>console : Symbol(console, Decl(lib.dom.d.ts, --, --))
+>log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
+>filter : Symbol(filter, Decl(divideAndConquerIntersections.ts, 49, 69))
+
+    return (up: U): up is Filter<U, Q> => !!up;
+>up : Symbol(up, Decl(divideAndConquerIntersections.ts, 54, 12))
+>U : Symbol(U, Decl(divideAndConquerIntersections.ts, 49, 28))
+>up : Symbol(up, Decl(divideAndConquerIntersections.ts, 54, 12))
+>Filter : Symbol(Filter, Decl(divideAndConquerIntersections.ts, 58, 58))
+>U : Symbol(U, Decl(divideAndConquerIntersections.ts, 49, 28))
+>Q : Symbol(Q, Decl(divideAndConquerIntersections.ts, 49, 45))
+>up : Symbol(up, Decl(divideAndConquerIntersections.ts, 54, 12))
+}
+
+/** All valid filter queries (every update key except update_id) */
+export type FilterQuery = keyof Omit<Update, "update_id">;
+>FilterQuery : Symbol(FilterQuery, Decl(divideAndConquerIntersections.ts, 55, 1))
+>Omit : Symbol(Omit, Decl(lib.es5.d.ts, --, --))
+>Update : Symbol(Update, Decl(divideAndConquerIntersections.ts, 20, 20))
+
+/** Narrow down an update object based on a filter query */
+export type Filter<U extends Update, Q extends FilterQuery> = PerformQuery<
+>Filter : Symbol(Filter, Decl(divideAndConquerIntersections.ts, 58, 58))
+>U : Symbol(U, Decl(divideAndConquerIntersections.ts, 61, 19))
+>Update : Symbol(Update, Decl(divideAndConquerIntersections.ts, 20, 20))
+>Q : Symbol(Q, Decl(divideAndConquerIntersections.ts, 61, 36))
+>FilterQuery : Symbol(FilterQuery, Decl(divideAndConquerIntersections.ts, 55, 1))
+>PerformQuery : Symbol(PerformQuery, Decl(divideAndConquerIntersections.ts, 75, 12))
+
+    U,
+>U : Symbol(U, Decl(divideAndConquerIntersections.ts, 61, 19))
+
+    RunQuery<Q>
+>RunQuery : Symbol(RunQuery, Decl(divideAndConquerIntersections.ts, 64, 2))
+>Q : Symbol(Q, Decl(divideAndConquerIntersections.ts, 61, 36))
+
+>;
+
+// generate an object structure that can be intersected with updates to narrow them down
+type RunQuery<Q extends string> = Combine<L1Fragment<Q>, Q>;
+>RunQuery : Symbol(RunQuery, Decl(divideAndConquerIntersections.ts, 64, 2))
+>Q : Symbol(Q, Decl(divideAndConquerIntersections.ts, 67, 14))
+>Combine : Symbol(Combine, Decl(divideAndConquerIntersections.ts, 71, 12))
+>L1Fragment : Symbol(L1Fragment, Decl(divideAndConquerIntersections.ts, 67, 60))
+>Q : Symbol(Q, Decl(divideAndConquerIntersections.ts, 67, 14))
+>Q : Symbol(Q, Decl(divideAndConquerIntersections.ts, 67, 14))
+
+// maps each part of the filter query to Record<"key", object>
+type L1Fragment<Q extends string> = Q extends unknown ? Record<Q, object>
+>L1Fragment : Symbol(L1Fragment, Decl(divideAndConquerIntersections.ts, 67, 60))
+>Q : Symbol(Q, Decl(divideAndConquerIntersections.ts, 70, 16))
+>Q : Symbol(Q, Decl(divideAndConquerIntersections.ts, 70, 16))
+>Record : Symbol(Record, Decl(lib.es5.d.ts, --, --))
+>Q : Symbol(Q, Decl(divideAndConquerIntersections.ts, 70, 16))
+
+    : never;
+// define all other fields from query as keys with value `undefined`
+type Combine<U, K extends string> = U extends unknown
+>Combine : Symbol(Combine, Decl(divideAndConquerIntersections.ts, 71, 12))
+>U : Symbol(U, Decl(divideAndConquerIntersections.ts, 73, 13))
+>K : Symbol(K, Decl(divideAndConquerIntersections.ts, 73, 15))
+>U : Symbol(U, Decl(divideAndConquerIntersections.ts, 73, 13))
+
+    ? U & Partial<Record<Exclude<K, keyof U>, undefined>>
+>U : Symbol(U, Decl(divideAndConquerIntersections.ts, 73, 13))
+>Partial : Symbol(Partial, Decl(lib.es5.d.ts, --, --))
+>Record : Symbol(Record, Decl(lib.es5.d.ts, --, --))
+>Exclude : Symbol(Exclude, Decl(lib.es5.d.ts, --, --))
+>K : Symbol(K, Decl(divideAndConquerIntersections.ts, 73, 15))
+>U : Symbol(U, Decl(divideAndConquerIntersections.ts, 73, 13))
+
+    : never;
+
+// apply a query result by intersecting it with update,
+// and then using these values to override the actual update
+type PerformQuery<U extends Update, R extends object> = R extends unknown
+>PerformQuery : Symbol(PerformQuery, Decl(divideAndConquerIntersections.ts, 75, 12))
+>U : Symbol(U, Decl(divideAndConquerIntersections.ts, 79, 18))
+>Update : Symbol(Update, Decl(divideAndConquerIntersections.ts, 20, 20))
+>R : Symbol(R, Decl(divideAndConquerIntersections.ts, 79, 35))
+>R : Symbol(R, Decl(divideAndConquerIntersections.ts, 79, 35))
+
+    ? FilteredEvent<U, Update & R>
+>FilteredEvent : Symbol(FilteredEvent, Decl(divideAndConquerIntersections.ts, 81, 12))
+>U : Symbol(U, Decl(divideAndConquerIntersections.ts, 79, 18))
+>Update : Symbol(Update, Decl(divideAndConquerIntersections.ts, 20, 20))
+>R : Symbol(R, Decl(divideAndConquerIntersections.ts, 79, 35))
+
+    : never;
+
+// narrow down an update by intersecting it with a different update
+type FilteredEvent<E extends Update, U extends Update> =
+>FilteredEvent : Symbol(FilteredEvent, Decl(divideAndConquerIntersections.ts, 81, 12))
+>E : Symbol(E, Decl(divideAndConquerIntersections.ts, 84, 19))
+>Update : Symbol(Update, Decl(divideAndConquerIntersections.ts, 20, 20))
+>U : Symbol(U, Decl(divideAndConquerIntersections.ts, 84, 36))
+>Update : Symbol(Update, Decl(divideAndConquerIntersections.ts, 20, 20))
+
+    & E
+>E : Symbol(E, Decl(divideAndConquerIntersections.ts, 84, 19))
+
+    & Omit<U, "update_id">;
+>Omit : Symbol(Omit, Decl(lib.es5.d.ts, --, --))
+>U : Symbol(U, Decl(divideAndConquerIntersections.ts, 84, 36))
+
+type Middleware<U extends Update> = (ctx: U) => unknown | Promise<unknown>;
+>Middleware : Symbol(Middleware, Decl(divideAndConquerIntersections.ts, 86, 27))
+>U : Symbol(U, Decl(divideAndConquerIntersections.ts, 88, 16))
+>Update : Symbol(Update, Decl(divideAndConquerIntersections.ts, 20, 20))
+>ctx : Symbol(ctx, Decl(divideAndConquerIntersections.ts, 88, 37))
+>U : Symbol(U, Decl(divideAndConquerIntersections.ts, 88, 16))
+>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --))
+
+class EventHub<U extends Update> {
+>EventHub : Symbol(EventHub, Decl(divideAndConquerIntersections.ts, 88, 75))
+>U : Symbol(U, Decl(divideAndConquerIntersections.ts, 89, 15))
+>Update : Symbol(Update, Decl(divideAndConquerIntersections.ts, 20, 20))
+
+    use(...middleware: Array<Middleware<U>>): EventHub<U> {
+>use : Symbol(EventHub.use, Decl(divideAndConquerIntersections.ts, 89, 34))
+>middleware : Symbol(middleware, Decl(divideAndConquerIntersections.ts, 90, 8))
+>Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>Middleware : Symbol(Middleware, Decl(divideAndConquerIntersections.ts, 86, 27))
+>U : Symbol(U, Decl(divideAndConquerIntersections.ts, 89, 15))
+>EventHub : Symbol(EventHub, Decl(divideAndConquerIntersections.ts, 88, 75))
+>U : Symbol(U, Decl(divideAndConquerIntersections.ts, 89, 15))
+
+        console.log("Adding", middleware.length, "generic handlers");
+>console.log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
+>console : Symbol(console, Decl(lib.dom.d.ts, --, --))
+>log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
+>middleware.length : Symbol(Array.length, Decl(lib.es5.d.ts, --, --))
+>middleware : Symbol(middleware, Decl(divideAndConquerIntersections.ts, 90, 8))
+>length : Symbol(Array.length, Decl(lib.es5.d.ts, --, --))
+
+        return this;
+>this : Symbol(EventHub, Decl(divideAndConquerIntersections.ts, 88, 75))
+    }
+    on<Q extends FilterQuery>(
+>on : Symbol(EventHub.on, Decl(divideAndConquerIntersections.ts, 93, 5))
+>Q : Symbol(Q, Decl(divideAndConquerIntersections.ts, 94, 7))
+>FilterQuery : Symbol(FilterQuery, Decl(divideAndConquerIntersections.ts, 55, 1))
+
+        filter: Q | Q[],
+>filter : Symbol(filter, Decl(divideAndConquerIntersections.ts, 94, 30))
+>Q : Symbol(Q, Decl(divideAndConquerIntersections.ts, 94, 7))
+>Q : Symbol(Q, Decl(divideAndConquerIntersections.ts, 94, 7))
+
+        ...middleware: Array<Middleware<Filter<U, Q>>>
+>middleware : Symbol(middleware, Decl(divideAndConquerIntersections.ts, 95, 24))
+>Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>Middleware : Symbol(Middleware, Decl(divideAndConquerIntersections.ts, 86, 27))
+>Filter : Symbol(Filter, Decl(divideAndConquerIntersections.ts, 58, 58))
+>U : Symbol(U, Decl(divideAndConquerIntersections.ts, 89, 15))
+>Q : Symbol(Q, Decl(divideAndConquerIntersections.ts, 94, 7))
+
+                           // ^ errors out
+    ): EventHub<Filter<U, Q>> {
+>EventHub : Symbol(EventHub, Decl(divideAndConquerIntersections.ts, 88, 75))
+>Filter : Symbol(Filter, Decl(divideAndConquerIntersections.ts, 58, 58))
+>U : Symbol(U, Decl(divideAndConquerIntersections.ts, 89, 15))
+>Q : Symbol(Q, Decl(divideAndConquerIntersections.ts, 94, 7))
+
+        console.log("Adding", middleware.length, "handlers for", filter);
+>console.log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
+>console : Symbol(console, Decl(lib.dom.d.ts, --, --))
+>log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
+>middleware.length : Symbol(Array.length, Decl(lib.es5.d.ts, --, --))
+>middleware : Symbol(middleware, Decl(divideAndConquerIntersections.ts, 95, 24))
+>length : Symbol(Array.length, Decl(lib.es5.d.ts, --, --))
+>filter : Symbol(filter, Decl(divideAndConquerIntersections.ts, 94, 30))
+
+        return new EventHub<Filter<U, Q>>();
+>EventHub : Symbol(EventHub, Decl(divideAndConquerIntersections.ts, 88, 75))
+>Filter : Symbol(Filter, Decl(divideAndConquerIntersections.ts, 58, 58))
+>U : Symbol(U, Decl(divideAndConquerIntersections.ts, 89, 15))
+>Q : Symbol(Q, Decl(divideAndConquerIntersections.ts, 94, 7))
+    }
+}
+
diff --git a/tests/baselines/reference/divideAndConquerIntersections.types b/tests/baselines/reference/divideAndConquerIntersections.types
new file mode 100644
index 0000000000000..5e1ce571a1d5a
--- /dev/null
+++ b/tests/baselines/reference/divideAndConquerIntersections.types
@@ -0,0 +1,231 @@
+//// [tests/cases/compiler/divideAndConquerIntersections.ts] ////
+
+=== divideAndConquerIntersections.ts ===
+type QQ<T extends string[]> =
+>QQ : QQ<T>
+
+    & ("a" | T[0])
+    & ("b" | T[1])
+    & ("c" | T[2])
+    & ("d" | T[3])
+    & ("e" | T[4])
+    & ("f" | T[5])
+    & ("g" | T[6])
+    & ("h" | T[7])
+    & ("i" | T[8])
+    & ("j" | T[9])
+    & ("k" | T[10])
+    & ("l" | T[11])
+    & ("m" | T[12])
+    & ("n" | T[13])
+    & ("q" | T[14])
+    & ("p" | T[15])
+    & ("q" | T[16])
+    & ("r" | T[17])
+    & ("s" | T[18])
+    & ("t" | T[19]);
+
+// Repro from #57863
+
+export interface Update {
+    update_id: number;
+>update_id : number
+
+    message?: { message: string };
+>message : { message: string; } | undefined
+>message : string
+
+    edited_message?: { edited_message: string };
+>edited_message : { edited_message: string; } | undefined
+>edited_message : string
+
+    channel_post?: { channel_post: string };
+>channel_post : { channel_post: string; } | undefined
+>channel_post : string
+
+    edited_channel_post?: { edited_channel_post: string };
+>edited_channel_post : { edited_channel_post: string; } | undefined
+>edited_channel_post : string
+
+    message_reaction?: { message_reaction: string };
+>message_reaction : { message_reaction: string; } | undefined
+>message_reaction : string
+
+    message_reaction_count?: { message_reaction_count: string };
+>message_reaction_count : { message_reaction_count: string; } | undefined
+>message_reaction_count : string
+
+    inline_query?: { inline_query: string };
+>inline_query : { inline_query: string; } | undefined
+>inline_query : string
+
+    chosen_inline_result?: { chosen_inline_result: string };
+>chosen_inline_result : { chosen_inline_result: string; } | undefined
+>chosen_inline_result : string
+
+    callback_query?: { callback_query: string };
+>callback_query : { callback_query: string; } | undefined
+>callback_query : string
+
+    shipping_query?: { shipping_query: string };
+>shipping_query : { shipping_query: string; } | undefined
+>shipping_query : string
+
+    pre_checkout_query?: { pre_checkout_query: string };
+>pre_checkout_query : { pre_checkout_query: string; } | undefined
+>pre_checkout_query : string
+
+    poll?: { poll: string };
+>poll : { poll: string; } | undefined
+>poll : string
+
+    poll_answer?: { poll_answer: string };
+>poll_answer : { poll_answer: string; } | undefined
+>poll_answer : string
+
+    my_chat_member?: { my_chat_member: string };
+>my_chat_member : { my_chat_member: string; } | undefined
+>my_chat_member : string
+
+    chat_member?: { chat_member: string };
+>chat_member : { chat_member: string; } | undefined
+>chat_member : string
+
+    chat_join_request?: { chat_join_request: string };
+>chat_join_request : { chat_join_request: string; } | undefined
+>chat_join_request : string
+
+    chat_boost?: { chat_boost: string };
+>chat_boost : { chat_boost: string; } | undefined
+>chat_boost : string
+
+    removed_chat_boost?: { removed_chat_boost: string };
+>removed_chat_boost : { removed_chat_boost: string; } | undefined
+>removed_chat_boost : string
+}
+
+type FilterFunction<U extends Update, V extends U> = (up: U) => up is V;
+>FilterFunction : FilterFunction<U, V>
+>up : U
+
+export function matchFilter<U extends Update, Q extends FilterQuery>(
+>matchFilter : <U extends Update, Q extends "message" | "edited_message" | "channel_post" | "edited_channel_post" | "message_reaction" | "message_reaction_count" | "inline_query" | "chosen_inline_result" | "callback_query" | "shipping_query" | "pre_checkout_query" | "poll" | "poll_answer" | "my_chat_member" | "chat_member" | "chat_join_request" | "chat_boost" | "removed_chat_boost">(filter: Q | Q[]) => FilterFunction<U, Filter<U, Q>>
+
+    filter: Q | Q[],
+>filter : Q | Q[]
+
+): FilterFunction<U, Filter<U, Q>> {
+  // ^ errors out
+    console.log("Matching", filter);
+>console.log("Matching", filter) : void
+>console.log : (...data: any[]) => void
+>console : Console
+>log : (...data: any[]) => void
+>"Matching" : "Matching"
+>filter : "message" | "edited_message" | "channel_post" | "edited_channel_post" | "message_reaction" | "message_reaction_count" | "inline_query" | "chosen_inline_result" | "callback_query" | "shipping_query" | "pre_checkout_query" | "poll" | "poll_answer" | "my_chat_member" | "chat_member" | "chat_join_request" | "chat_boost" | "removed_chat_boost" | Q[]
+
+    return (up: U): up is Filter<U, Q> => !!up;
+>(up: U): up is Filter<U, Q> => !!up : (up: U) => up is PerformQuery<U, Combine<L1Fragment<Q>, Q>>
+>up : U
+>!!up : true
+>!up : false
+>up : U
+}
+
+/** All valid filter queries (every update key except update_id) */
+export type FilterQuery = keyof Omit<Update, "update_id">;
+>FilterQuery : "message" | "edited_message" | "channel_post" | "edited_channel_post" | "message_reaction" | "message_reaction_count" | "inline_query" | "chosen_inline_result" | "callback_query" | "shipping_query" | "pre_checkout_query" | "poll" | "poll_answer" | "my_chat_member" | "chat_member" | "chat_join_request" | "chat_boost" | "removed_chat_boost"
+
+/** Narrow down an update object based on a filter query */
+export type Filter<U extends Update, Q extends FilterQuery> = PerformQuery<
+>Filter : Filter<U, Q>
+
+    U,
+    RunQuery<Q>
+>;
+
+// generate an object structure that can be intersected with updates to narrow them down
+type RunQuery<Q extends string> = Combine<L1Fragment<Q>, Q>;
+>RunQuery : RunQuery<Q>
+
+// maps each part of the filter query to Record<"key", object>
+type L1Fragment<Q extends string> = Q extends unknown ? Record<Q, object>
+>L1Fragment : L1Fragment<Q>
+
+    : never;
+// define all other fields from query as keys with value `undefined`
+type Combine<U, K extends string> = U extends unknown
+>Combine : Combine<U, K>
+
+    ? U & Partial<Record<Exclude<K, keyof U>, undefined>>
+    : never;
+
+// apply a query result by intersecting it with update,
+// and then using these values to override the actual update
+type PerformQuery<U extends Update, R extends object> = R extends unknown
+>PerformQuery : PerformQuery<U, R>
+
+    ? FilteredEvent<U, Update & R>
+    : never;
+
+// narrow down an update by intersecting it with a different update
+type FilteredEvent<E extends Update, U extends Update> =
+>FilteredEvent : FilteredEvent<E, U>
+
+    & E
+    & Omit<U, "update_id">;
+
+type Middleware<U extends Update> = (ctx: U) => unknown | Promise<unknown>;
+>Middleware : Middleware<U>
+>ctx : U
+
+class EventHub<U extends Update> {
+>EventHub : EventHub<U>
+
+    use(...middleware: Array<Middleware<U>>): EventHub<U> {
+>use : (...middleware: Array<Middleware<U>>) => EventHub<U>
+>middleware : Middleware<U>[]
+
+        console.log("Adding", middleware.length, "generic handlers");
+>console.log("Adding", middleware.length, "generic handlers") : void
+>console.log : (...data: any[]) => void
+>console : Console
+>log : (...data: any[]) => void
+>"Adding" : "Adding"
+>middleware.length : number
+>middleware : Middleware<U>[]
+>length : number
+>"generic handlers" : "generic handlers"
+
+        return this;
+>this : this
+    }
+    on<Q extends FilterQuery>(
+>on : <Q extends "message" | "edited_message" | "channel_post" | "edited_channel_post" | "message_reaction" | "message_reaction_count" | "inline_query" | "chosen_inline_result" | "callback_query" | "shipping_query" | "pre_checkout_query" | "poll" | "poll_answer" | "my_chat_member" | "chat_member" | "chat_join_request" | "chat_boost" | "removed_chat_boost">(filter: Q | Q[], ...middleware: Array<Middleware<Filter<U, Q>>>) => EventHub<Filter<U, Q>>
+
+        filter: Q | Q[],
+>filter : Q | Q[]
+
+        ...middleware: Array<Middleware<Filter<U, Q>>>
+>middleware : Middleware<PerformQuery<U, Combine<L1Fragment<Q>, Q>>>[]
+
+                           // ^ errors out
+    ): EventHub<Filter<U, Q>> {
+        console.log("Adding", middleware.length, "handlers for", filter);
+>console.log("Adding", middleware.length, "handlers for", filter) : void
+>console.log : (...data: any[]) => void
+>console : Console
+>log : (...data: any[]) => void
+>"Adding" : "Adding"
+>middleware.length : number
+>middleware : Middleware<PerformQuery<U, Combine<L1Fragment<Q>, Q>>>[]
+>length : number
+>"handlers for" : "handlers for"
+>filter : "message" | "edited_message" | "channel_post" | "edited_channel_post" | "message_reaction" | "message_reaction_count" | "inline_query" | "chosen_inline_result" | "callback_query" | "shipping_query" | "pre_checkout_query" | "poll" | "poll_answer" | "my_chat_member" | "chat_member" | "chat_join_request" | "chat_boost" | "removed_chat_boost" | Q[]
+
+        return new EventHub<Filter<U, Q>>();
+>new EventHub<Filter<U, Q>>() : EventHub<PerformQuery<U, Combine<L1Fragment<Q>, Q>>>
+>EventHub : typeof EventHub
+    }
+}
+
diff --git a/tests/cases/compiler/divideAndConquerIntersections.ts b/tests/cases/compiler/divideAndConquerIntersections.ts
new file mode 100644
index 0000000000000..c3a8e70169e4c
--- /dev/null
+++ b/tests/cases/compiler/divideAndConquerIntersections.ts
@@ -0,0 +1,106 @@
+// @strict: true
+// @noEmit: true
+
+type QQ<T extends string[]> =
+    & ("a" | T[0])
+    & ("b" | T[1])
+    & ("c" | T[2])
+    & ("d" | T[3])
+    & ("e" | T[4])
+    & ("f" | T[5])
+    & ("g" | T[6])
+    & ("h" | T[7])
+    & ("i" | T[8])
+    & ("j" | T[9])
+    & ("k" | T[10])
+    & ("l" | T[11])
+    & ("m" | T[12])
+    & ("n" | T[13])
+    & ("q" | T[14])
+    & ("p" | T[15])
+    & ("q" | T[16])
+    & ("r" | T[17])
+    & ("s" | T[18])
+    & ("t" | T[19]);
+
+// Repro from #57863
+
+export interface Update {
+    update_id: number;
+
+    message?: { message: string };
+    edited_message?: { edited_message: string };
+    channel_post?: { channel_post: string };
+    edited_channel_post?: { edited_channel_post: string };
+    message_reaction?: { message_reaction: string };
+    message_reaction_count?: { message_reaction_count: string };
+    inline_query?: { inline_query: string };
+    chosen_inline_result?: { chosen_inline_result: string };
+    callback_query?: { callback_query: string };
+    shipping_query?: { shipping_query: string };
+    pre_checkout_query?: { pre_checkout_query: string };
+    poll?: { poll: string };
+    poll_answer?: { poll_answer: string };
+    my_chat_member?: { my_chat_member: string };
+    chat_member?: { chat_member: string };
+    chat_join_request?: { chat_join_request: string };
+    chat_boost?: { chat_boost: string };
+    removed_chat_boost?: { removed_chat_boost: string };
+}
+
+type FilterFunction<U extends Update, V extends U> = (up: U) => up is V;
+
+export function matchFilter<U extends Update, Q extends FilterQuery>(
+    filter: Q | Q[],
+): FilterFunction<U, Filter<U, Q>> {
+  // ^ errors out
+    console.log("Matching", filter);
+    return (up: U): up is Filter<U, Q> => !!up;
+}
+
+/** All valid filter queries (every update key except update_id) */
+export type FilterQuery = keyof Omit<Update, "update_id">;
+
+/** Narrow down an update object based on a filter query */
+export type Filter<U extends Update, Q extends FilterQuery> = PerformQuery<
+    U,
+    RunQuery<Q>
+>;
+
+// generate an object structure that can be intersected with updates to narrow them down
+type RunQuery<Q extends string> = Combine<L1Fragment<Q>, Q>;
+
+// maps each part of the filter query to Record<"key", object>
+type L1Fragment<Q extends string> = Q extends unknown ? Record<Q, object>
+    : never;
+// define all other fields from query as keys with value `undefined`
+type Combine<U, K extends string> = U extends unknown
+    ? U & Partial<Record<Exclude<K, keyof U>, undefined>>
+    : never;
+
+// apply a query result by intersecting it with update,
+// and then using these values to override the actual update
+type PerformQuery<U extends Update, R extends object> = R extends unknown
+    ? FilteredEvent<U, Update & R>
+    : never;
+
+// narrow down an update by intersecting it with a different update
+type FilteredEvent<E extends Update, U extends Update> =
+    & E
+    & Omit<U, "update_id">;
+
+type Middleware<U extends Update> = (ctx: U) => unknown | Promise<unknown>;
+class EventHub<U extends Update> {
+    use(...middleware: Array<Middleware<U>>): EventHub<U> {
+        console.log("Adding", middleware.length, "generic handlers");
+        return this;
+    }
+    on<Q extends FilterQuery>(
+        filter: Q | Q[],
+        ...middleware: Array<Middleware<Filter<U, Q>>>
+                           // ^ errors out
+    ): EventHub<Filter<U, Q>> {
+        console.log("Adding", middleware.length, "handlers for", filter);
+        return new EventHub<Filter<U, Q>>();
+    }
+}

From 8eb3367164dd9cdc9c0b85424ed39ab28eff2312 Mon Sep 17 00:00:00 2001
From: TypeScript Bot <typescriptbot@microsoft.com>
Date: Tue, 2 Apr 2024 20:38:05 +0000
Subject: [PATCH 8/8] Bump version to 5.4.4 and LKG

---
 lib/tsc.js                 |  64 ++++++++++---
 lib/tsserver.js            | 188 +++++++++++++++++++++++--------------
 lib/typescript.d.ts        |   8 +-
 lib/typescript.js          | 188 +++++++++++++++++++++++--------------
 lib/typingsInstaller.js    |  36 +++++--
 package-lock.json          |   4 +-
 package.json               |   2 +-
 src/compiler/corePublic.ts |   2 +-
 8 files changed, 327 insertions(+), 165 deletions(-)

diff --git a/lib/tsc.js b/lib/tsc.js
index e6dcc303eb9c7..eb9b776f9c9d8 100644
--- a/lib/tsc.js
+++ b/lib/tsc.js
@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.4";
-var version = "5.4.3";
+var version = "5.4.4";
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -4145,14 +4145,17 @@ function createDynamicPriorityPollingWatchFile(host) {
     pollingIntervalQueue(pollingInterval).pollScheduled = host.setTimeout(pollingInterval === 250 /* Low */ ? pollLowPollingIntervalQueue : pollPollingIntervalQueue, pollingInterval, pollingInterval === 250 /* Low */ ? "pollLowPollingIntervalQueue" : "pollPollingIntervalQueue", pollingIntervalQueue(pollingInterval));
   }
 }
-function createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames2) {
+function createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames2, getModifiedTime3, fsWatchWithTimestamp) {
   const fileWatcherCallbacks = createMultiMap();
+  const fileTimestamps = fsWatchWithTimestamp ? /* @__PURE__ */ new Map() : void 0;
   const dirWatchers = /* @__PURE__ */ new Map();
   const toCanonicalName = createGetCanonicalFileName(useCaseSensitiveFileNames2);
   return nonPollingWatchFile;
   function nonPollingWatchFile(fileName, callback, _pollingInterval, fallbackOptions) {
     const filePath = toCanonicalName(fileName);
-    fileWatcherCallbacks.add(filePath, callback);
+    if (fileWatcherCallbacks.add(filePath, callback).length === 1 && fileTimestamps) {
+      fileTimestamps.set(filePath, getModifiedTime3(fileName) || missingFileModifiedTime);
+    }
     const dirPath = getDirectoryPath(filePath) || ".";
     const watcher = dirWatchers.get(dirPath) || createDirectoryWatcher(getDirectoryPath(fileName) || ".", dirPath, fallbackOptions);
     watcher.referenceCount++;
@@ -4172,14 +4175,31 @@ function createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFi
     const watcher = fsWatch(
       dirName,
       1 /* Directory */,
-      (_eventName, relativeFileName, modifiedTime) => {
+      (eventName, relativeFileName) => {
         if (!isString(relativeFileName))
           return;
         const fileName = getNormalizedAbsolutePath(relativeFileName, dirName);
-        const callbacks = fileName && fileWatcherCallbacks.get(toCanonicalName(fileName));
+        const filePath = toCanonicalName(fileName);
+        const callbacks = fileName && fileWatcherCallbacks.get(filePath);
         if (callbacks) {
+          let currentModifiedTime;
+          let eventKind = 1 /* Changed */;
+          if (fileTimestamps) {
+            const existingTime = fileTimestamps.get(filePath);
+            if (eventName === "change") {
+              currentModifiedTime = getModifiedTime3(fileName) || missingFileModifiedTime;
+              if (currentModifiedTime.getTime() === existingTime.getTime())
+                return;
+            }
+            currentModifiedTime || (currentModifiedTime = getModifiedTime3(fileName) || missingFileModifiedTime);
+            fileTimestamps.set(filePath, currentModifiedTime);
+            if (existingTime === missingFileModifiedTime)
+              eventKind = 0 /* Created */;
+            else if (currentModifiedTime === missingFileModifiedTime)
+              eventKind = 2 /* Deleted */;
+          }
           for (const fileCallback of callbacks) {
-            fileCallback(fileName, 1 /* Changed */, modifiedTime);
+            fileCallback(fileName, eventKind, currentModifiedTime);
           }
         }
       },
@@ -4573,7 +4593,7 @@ function createSystemWatchFunctions({
         );
       case 5 /* UseFsEventsOnParentDirectory */:
         if (!nonPollingWatchFile) {
-          nonPollingWatchFile = createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames2);
+          nonPollingWatchFile = createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames2, getModifiedTime3, fsWatchWithTimestamp);
         }
         return nonPollingWatchFile(fileName, callback, pollingInterval, getFallbackOptions(options));
       default:
@@ -4748,7 +4768,7 @@ function createSystemWatchFunctions({
         return watchPresentFileSystemEntryWithFsWatchFile();
       }
       try {
-        const presentWatcher = (!fsWatchWithTimestamp ? fsWatchWorker : fsWatchWorkerHandlingTimestamp)(
+        const presentWatcher = (entryKind === 1 /* Directory */ || !fsWatchWithTimestamp ? fsWatchWorker : fsWatchWorkerHandlingTimestamp)(
           fileOrDirectory,
           recursive,
           inodeWatching ? callbackChangingToMissingFileSystemEntry : callback
@@ -42862,13 +42882,21 @@ function getLocalModuleSpecifier(moduleFileName, info, compilerOptions, host, im
     }
     const nearestTargetPackageJson = getNearestAncestorDirectoryWithPackageJson(host, getDirectoryPath(modulePath));
     const nearestSourcePackageJson = getNearestAncestorDirectoryWithPackageJson(host, sourceDirectory);
-    if (nearestSourcePackageJson !== nearestTargetPackageJson) {
+    const ignoreCase = !hostUsesCaseSensitiveFileNames(host);
+    if (!packageJsonPathsAreEqual(nearestTargetPackageJson, nearestSourcePackageJson, ignoreCase)) {
       return maybeNonRelative;
     }
     return relativePath;
   }
   return isPathRelativeToParent(maybeNonRelative) || countPathComponents(relativePath) < countPathComponents(maybeNonRelative) ? relativePath : maybeNonRelative;
 }
+function packageJsonPathsAreEqual(a, b, ignoreCase) {
+  if (a === b)
+    return true;
+  if (a === void 0 || b === void 0)
+    return false;
+  return comparePaths(a, b, ignoreCase) === 0 /* EqualTo */;
+}
 function countPathComponents(path) {
   let count = 0;
   for (let i = startsWith(path, "./") ? 2 : 0; i < path.length; i++) {
@@ -47996,15 +48024,19 @@ function createTypeChecker(host) {
       return true;
     }
   }
-  function isEntityNameVisible(entityName, enclosingDeclaration) {
+  function getMeaningOfEntityNameReference(entityName) {
     let meaning;
     if (entityName.parent.kind === 186 /* TypeQuery */ || entityName.parent.kind === 233 /* ExpressionWithTypeArguments */ && !isPartOfTypeNode(entityName.parent) || entityName.parent.kind === 167 /* ComputedPropertyName */) {
       meaning = 111551 /* Value */ | 1048576 /* ExportValue */;
-    } else if (entityName.kind === 166 /* QualifiedName */ || entityName.kind === 211 /* PropertyAccessExpression */ || entityName.parent.kind === 271 /* ImportEqualsDeclaration */) {
+    } else if (entityName.kind === 166 /* QualifiedName */ || entityName.kind === 211 /* PropertyAccessExpression */ || entityName.parent.kind === 271 /* ImportEqualsDeclaration */ || entityName.parent.kind === 166 /* QualifiedName */ && entityName.parent.left === entityName || entityName.parent.kind === 211 /* PropertyAccessExpression */ && entityName.parent.expression === entityName || entityName.parent.kind === 212 /* ElementAccessExpression */ && entityName.parent.expression === entityName) {
       meaning = 1920 /* Namespace */;
     } else {
       meaning = 788968 /* Type */;
     }
+    return meaning;
+  }
+  function isEntityNameVisible(entityName, enclosingDeclaration) {
+    const meaning = getMeaningOfEntityNameReference(entityName);
     const firstIdentifier = getFirstIdentifier(entityName);
     const symbol = resolveName(
       enclosingDeclaration,
@@ -50065,9 +50097,10 @@ function createTypeChecker(host) {
         introducesError = true;
         return { introducesError, node };
       }
+      const meaning = getMeaningOfEntityNameReference(node);
       const sym = resolveEntityName(
         leftmost,
-        -1 /* All */,
+        meaning,
         /*ignoreErrors*/
         true,
         /*dontResolveAlias*/
@@ -50077,13 +50110,13 @@ function createTypeChecker(host) {
         if (isSymbolAccessible(
           sym,
           context.enclosingDeclaration,
-          -1 /* All */,
+          meaning,
           /*shouldComputeAliasesToMakeVisible*/
           false
         ).accessibility !== 0 /* Accessible */) {
           introducesError = true;
         } else {
-          context.tracker.trackSymbol(sym, context.enclosingDeclaration, -1 /* All */);
+          context.tracker.trackSymbol(sym, context.enclosingDeclaration, meaning);
           includePrivateSymbol == null ? void 0 : includePrivateSymbol(sym);
         }
         if (isIdentifier(node)) {
@@ -57990,6 +58023,9 @@ function createTypeChecker(host) {
         } else if (every(typeSet, (t) => !!(t.flags & 1048576 /* Union */ && (t.types[0].flags & 65536 /* Null */ || t.types[1].flags & 65536 /* Null */)))) {
           removeFromEach(typeSet, 65536 /* Null */);
           result = getUnionType([getIntersectionType(typeSet), nullType], 1 /* Literal */, aliasSymbol, aliasTypeArguments);
+        } else if (typeSet.length >= 4) {
+          const middle = Math.floor(typeSet.length / 2);
+          result = getIntersectionType([getIntersectionType(typeSet.slice(0, middle)), getIntersectionType(typeSet.slice(middle))], aliasSymbol, aliasTypeArguments);
         } else {
           if (!checkCrossProductUnion(typeSet)) {
             return errorType;
diff --git a/lib/tsserver.js b/lib/tsserver.js
index bc0e83fb4070a..6a1c0318396c8 100644
--- a/lib/tsserver.js
+++ b/lib/tsserver.js
@@ -2340,7 +2340,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.4";
-var version = "5.4.3";
+var version = "5.4.4";
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -7688,14 +7688,17 @@ function createDynamicPriorityPollingWatchFile(host) {
     pollingIntervalQueue(pollingInterval).pollScheduled = host.setTimeout(pollingInterval === 250 /* Low */ ? pollLowPollingIntervalQueue : pollPollingIntervalQueue, pollingInterval, pollingInterval === 250 /* Low */ ? "pollLowPollingIntervalQueue" : "pollPollingIntervalQueue", pollingIntervalQueue(pollingInterval));
   }
 }
-function createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames2) {
+function createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames2, getModifiedTime3, fsWatchWithTimestamp) {
   const fileWatcherCallbacks = createMultiMap();
+  const fileTimestamps = fsWatchWithTimestamp ? /* @__PURE__ */ new Map() : void 0;
   const dirWatchers = /* @__PURE__ */ new Map();
   const toCanonicalName = createGetCanonicalFileName(useCaseSensitiveFileNames2);
   return nonPollingWatchFile;
   function nonPollingWatchFile(fileName, callback, _pollingInterval, fallbackOptions) {
     const filePath = toCanonicalName(fileName);
-    fileWatcherCallbacks.add(filePath, callback);
+    if (fileWatcherCallbacks.add(filePath, callback).length === 1 && fileTimestamps) {
+      fileTimestamps.set(filePath, getModifiedTime3(fileName) || missingFileModifiedTime);
+    }
     const dirPath = getDirectoryPath(filePath) || ".";
     const watcher = dirWatchers.get(dirPath) || createDirectoryWatcher(getDirectoryPath(fileName) || ".", dirPath, fallbackOptions);
     watcher.referenceCount++;
@@ -7715,14 +7718,31 @@ function createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFi
     const watcher = fsWatch(
       dirName,
       1 /* Directory */,
-      (_eventName, relativeFileName, modifiedTime) => {
+      (eventName, relativeFileName) => {
         if (!isString(relativeFileName))
           return;
         const fileName = getNormalizedAbsolutePath(relativeFileName, dirName);
-        const callbacks = fileName && fileWatcherCallbacks.get(toCanonicalName(fileName));
+        const filePath = toCanonicalName(fileName);
+        const callbacks = fileName && fileWatcherCallbacks.get(filePath);
         if (callbacks) {
+          let currentModifiedTime;
+          let eventKind = 1 /* Changed */;
+          if (fileTimestamps) {
+            const existingTime = fileTimestamps.get(filePath);
+            if (eventName === "change") {
+              currentModifiedTime = getModifiedTime3(fileName) || missingFileModifiedTime;
+              if (currentModifiedTime.getTime() === existingTime.getTime())
+                return;
+            }
+            currentModifiedTime || (currentModifiedTime = getModifiedTime3(fileName) || missingFileModifiedTime);
+            fileTimestamps.set(filePath, currentModifiedTime);
+            if (existingTime === missingFileModifiedTime)
+              eventKind = 0 /* Created */;
+            else if (currentModifiedTime === missingFileModifiedTime)
+              eventKind = 2 /* Deleted */;
+          }
           for (const fileCallback of callbacks) {
-            fileCallback(fileName, 1 /* Changed */, modifiedTime);
+            fileCallback(fileName, eventKind, currentModifiedTime);
           }
         }
       },
@@ -8121,7 +8141,7 @@ function createSystemWatchFunctions({
         );
       case 5 /* UseFsEventsOnParentDirectory */:
         if (!nonPollingWatchFile) {
-          nonPollingWatchFile = createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames2);
+          nonPollingWatchFile = createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames2, getModifiedTime3, fsWatchWithTimestamp);
         }
         return nonPollingWatchFile(fileName, callback, pollingInterval, getFallbackOptions(options));
       default:
@@ -8296,7 +8316,7 @@ function createSystemWatchFunctions({
         return watchPresentFileSystemEntryWithFsWatchFile();
       }
       try {
-        const presentWatcher = (!fsWatchWithTimestamp ? fsWatchWorker : fsWatchWorkerHandlingTimestamp)(
+        const presentWatcher = (entryKind === 1 /* Directory */ || !fsWatchWithTimestamp ? fsWatchWorker : fsWatchWorkerHandlingTimestamp)(
           fileOrDirectory,
           recursive,
           inodeWatching ? callbackChangingToMissingFileSystemEntry : callback
@@ -47606,13 +47626,21 @@ function getLocalModuleSpecifier(moduleFileName, info, compilerOptions, host, im
     }
     const nearestTargetPackageJson = getNearestAncestorDirectoryWithPackageJson(host, getDirectoryPath(modulePath));
     const nearestSourcePackageJson = getNearestAncestorDirectoryWithPackageJson(host, sourceDirectory);
-    if (nearestSourcePackageJson !== nearestTargetPackageJson) {
+    const ignoreCase = !hostUsesCaseSensitiveFileNames(host);
+    if (!packageJsonPathsAreEqual(nearestTargetPackageJson, nearestSourcePackageJson, ignoreCase)) {
       return maybeNonRelative;
     }
     return relativePath;
   }
   return isPathRelativeToParent(maybeNonRelative) || countPathComponents(relativePath) < countPathComponents(maybeNonRelative) ? relativePath : maybeNonRelative;
 }
+function packageJsonPathsAreEqual(a, b, ignoreCase) {
+  if (a === b)
+    return true;
+  if (a === void 0 || b === void 0)
+    return false;
+  return comparePaths(a, b, ignoreCase) === 0 /* EqualTo */;
+}
 function countPathComponents(path) {
   let count = 0;
   for (let i = startsWith(path, "./") ? 2 : 0; i < path.length; i++) {
@@ -52740,15 +52768,19 @@ function createTypeChecker(host) {
       return true;
     }
   }
-  function isEntityNameVisible(entityName, enclosingDeclaration) {
+  function getMeaningOfEntityNameReference(entityName) {
     let meaning;
     if (entityName.parent.kind === 186 /* TypeQuery */ || entityName.parent.kind === 233 /* ExpressionWithTypeArguments */ && !isPartOfTypeNode(entityName.parent) || entityName.parent.kind === 167 /* ComputedPropertyName */) {
       meaning = 111551 /* Value */ | 1048576 /* ExportValue */;
-    } else if (entityName.kind === 166 /* QualifiedName */ || entityName.kind === 211 /* PropertyAccessExpression */ || entityName.parent.kind === 271 /* ImportEqualsDeclaration */) {
+    } else if (entityName.kind === 166 /* QualifiedName */ || entityName.kind === 211 /* PropertyAccessExpression */ || entityName.parent.kind === 271 /* ImportEqualsDeclaration */ || entityName.parent.kind === 166 /* QualifiedName */ && entityName.parent.left === entityName || entityName.parent.kind === 211 /* PropertyAccessExpression */ && entityName.parent.expression === entityName || entityName.parent.kind === 212 /* ElementAccessExpression */ && entityName.parent.expression === entityName) {
       meaning = 1920 /* Namespace */;
     } else {
       meaning = 788968 /* Type */;
     }
+    return meaning;
+  }
+  function isEntityNameVisible(entityName, enclosingDeclaration) {
+    const meaning = getMeaningOfEntityNameReference(entityName);
     const firstIdentifier = getFirstIdentifier(entityName);
     const symbol = resolveName(
       enclosingDeclaration,
@@ -54809,9 +54841,10 @@ function createTypeChecker(host) {
         introducesError = true;
         return { introducesError, node };
       }
+      const meaning = getMeaningOfEntityNameReference(node);
       const sym = resolveEntityName(
         leftmost,
-        -1 /* All */,
+        meaning,
         /*ignoreErrors*/
         true,
         /*dontResolveAlias*/
@@ -54821,13 +54854,13 @@ function createTypeChecker(host) {
         if (isSymbolAccessible(
           sym,
           context.enclosingDeclaration,
-          -1 /* All */,
+          meaning,
           /*shouldComputeAliasesToMakeVisible*/
           false
         ).accessibility !== 0 /* Accessible */) {
           introducesError = true;
         } else {
-          context.tracker.trackSymbol(sym, context.enclosingDeclaration, -1 /* All */);
+          context.tracker.trackSymbol(sym, context.enclosingDeclaration, meaning);
           includePrivateSymbol == null ? void 0 : includePrivateSymbol(sym);
         }
         if (isIdentifier(node)) {
@@ -62734,6 +62767,9 @@ function createTypeChecker(host) {
         } else if (every(typeSet, (t) => !!(t.flags & 1048576 /* Union */ && (t.types[0].flags & 65536 /* Null */ || t.types[1].flags & 65536 /* Null */)))) {
           removeFromEach(typeSet, 65536 /* Null */);
           result = getUnionType([getIntersectionType(typeSet), nullType], 1 /* Literal */, aliasSymbol, aliasTypeArguments);
+        } else if (typeSet.length >= 4) {
+          const middle = Math.floor(typeSet.length / 2);
+          result = getIntersectionType([getIntersectionType(typeSet.slice(0, middle)), getIntersectionType(typeSet.slice(middle))], aliasSymbol, aliasTypeArguments);
         } else {
           if (!checkCrossProductUnion(typeSet)) {
             return errorType;
@@ -160728,10 +160764,7 @@ function getContextualType(previousToken, position, sourceFile, checker) {
       return isJsxExpression(parent2) && !isJsxElement(parent2.parent) && !isJsxFragment(parent2.parent) ? checker.getContextualTypeForJsxAttribute(parent2.parent) : void 0;
     default:
       const argInfo = ts_SignatureHelp_exports.getArgumentInfoForCompletions(previousToken, position, sourceFile, checker);
-      return argInfo ? (
-        // At `,`, treat this as the next argument after the comma.
-        checker.getContextualTypeForArgumentAtIndex(argInfo.invocation, argInfo.argumentIndex + (previousToken.kind === 28 /* CommaToken */ ? 1 : 0))
-      ) : isEqualityOperatorKind(previousToken.kind) && isBinaryExpression(parent2) && isEqualityOperatorKind(parent2.operatorToken.kind) ? (
+      return argInfo ? checker.getContextualTypeForArgumentAtIndex(argInfo.invocation, argInfo.argumentIndex) : isEqualityOperatorKind(previousToken.kind) && isBinaryExpression(parent2) && isEqualityOperatorKind(parent2.operatorToken.kind) ? (
         // completion at `x ===/**/` should be for the right side
         checker.getTypeAtLocation(parent2.left)
       ) : checker.getContextualType(previousToken, 4 /* Completions */) || checker.getContextualType(previousToken);
@@ -169099,12 +169132,7 @@ function getArgumentOrParameterListInfo(node, position, sourceFile, checker) {
   if (!info)
     return void 0;
   const { list, argumentIndex } = info;
-  const argumentCount = getArgumentCount(
-    list,
-    /*ignoreTrailingComma*/
-    isInString(sourceFile, position, node),
-    checker
-  );
+  const argumentCount = getArgumentCount(checker, list);
   if (argumentIndex !== 0) {
     Debug.assertLessThan(argumentIndex, argumentCount);
   }
@@ -169116,7 +169144,7 @@ function getArgumentOrParameterListAndIndex(node, sourceFile, checker) {
     return { list: getChildListThatStartsWithOpenerToken(node.parent, node, sourceFile), argumentIndex: 0 };
   } else {
     const list = findContainingList(node);
-    return list && { list, argumentIndex: getArgumentIndex(list, node, checker) };
+    return list && { list, argumentIndex: getArgumentIndex(checker, list, node) };
   }
 }
 function getImmediatelyContainingArgumentInfo(node, position, sourceFile, checker) {
@@ -169246,24 +169274,6 @@ function chooseBetterSymbol(s) {
     return isFunctionTypeNode(d) ? (_a = tryCast(d.parent, canHaveSymbol)) == null ? void 0 : _a.symbol : void 0;
   }) || s : s;
 }
-function getArgumentIndex(argumentsList, node, checker) {
-  const args = argumentsList.getChildren();
-  let argumentIndex = 0;
-  for (let pos = 0; pos < length(args); pos++) {
-    const child = args[pos];
-    if (child === node) {
-      break;
-    }
-    if (isSpreadElement(child)) {
-      argumentIndex = argumentIndex + getSpreadElementCount(child, checker) + (pos > 0 ? pos : 0);
-    } else {
-      if (child.kind !== 28 /* CommaToken */) {
-        argumentIndex++;
-      }
-    }
-  }
-  return argumentIndex;
-}
 function getSpreadElementCount(node, checker) {
   const spreadType = checker.getTypeAtLocation(node.expression);
   if (checker.isTupleType(spreadType)) {
@@ -169276,19 +169286,48 @@ function getSpreadElementCount(node, checker) {
   }
   return 0;
 }
-function getArgumentCount(argumentsList, ignoreTrailingComma, checker) {
-  const listChildren = argumentsList.getChildren();
-  let argumentCount = 0;
-  for (const child of listChildren) {
+function getArgumentIndex(checker, argumentsList, node) {
+  return getArgumentIndexOrCount(checker, argumentsList, node);
+}
+function getArgumentCount(checker, argumentsList) {
+  return getArgumentIndexOrCount(
+    checker,
+    argumentsList,
+    /*node*/
+    void 0
+  );
+}
+function getArgumentIndexOrCount(checker, argumentsList, node) {
+  const args = argumentsList.getChildren();
+  let argumentIndex = 0;
+  let skipComma = false;
+  for (const child of args) {
+    if (node && child === node) {
+      if (!skipComma && child.kind === 28 /* CommaToken */) {
+        argumentIndex++;
+      }
+      return argumentIndex;
+    }
     if (isSpreadElement(child)) {
-      argumentCount = argumentCount + getSpreadElementCount(child, checker);
+      argumentIndex += getSpreadElementCount(child, checker);
+      skipComma = true;
+      continue;
     }
+    if (child.kind !== 28 /* CommaToken */) {
+      argumentIndex++;
+      skipComma = true;
+      continue;
+    }
+    if (skipComma) {
+      skipComma = false;
+      continue;
+    }
+    argumentIndex++;
   }
-  argumentCount = argumentCount + countWhere(listChildren, (arg) => arg.kind !== 28 /* CommaToken */);
-  if (!ignoreTrailingComma && listChildren.length > 0 && last(listChildren).kind === 28 /* CommaToken */) {
-    argumentCount++;
+  if (node) {
+    return argumentIndex;
   }
-  return argumentCount;
+  return args.length && last(args).kind === 28 /* CommaToken */ ? argumentIndex + 1 : argumentIndex;
 }
 function getArgumentIndexForTemplatePiece(spanIndex, node, position, sourceFile) {
   Debug.assert(position >= node.getStart(), "Assumed 'position' could not occur before node.");
@@ -181088,7 +181127,16 @@ function createWatchFactoryHostUsingWatchEvents(service, canUseWatchEvents) {
       recursive ? watchedDirectoriesRecursive : watchedDirectories,
       path,
       callback,
-      (id) => ({ eventName: CreateDirectoryWatcherEvent, data: { id, path, recursive: !!recursive } })
+      (id) => ({
+        eventName: CreateDirectoryWatcherEvent,
+        data: {
+          id,
+          path,
+          recursive: !!recursive,
+          // Special case node_modules as we watch it for changes to closed script infos as well
+          ignoreUpdate: !path.endsWith("/node_modules") ? true : void 0
+        }
+      })
     );
   }
   function getOrCreateFileWatcher({ pathToId, idToCallbacks }, path, callback, event) {
@@ -181115,24 +181163,28 @@ function createWatchFactoryHostUsingWatchEvents(service, canUseWatchEvents) {
       }
     };
   }
-  function onWatchChange({ id, path, eventType }) {
-    onFileWatcherCallback(id, path, eventType);
-    onDirectoryWatcherCallback(watchedDirectories, id, path, eventType);
-    onDirectoryWatcherCallback(watchedDirectoriesRecursive, id, path, eventType);
+  function onWatchChange(args) {
+    if (isArray(args))
+      args.forEach(onWatchChangeRequestArgs);
+    else
+      onWatchChangeRequestArgs(args);
   }
-  function onFileWatcherCallback(id, eventPath, eventType) {
-    var _a;
-    (_a = watchedFiles.idToCallbacks.get(id)) == null ? void 0 : _a.forEach((callback) => {
-      const eventKind = eventType === "create" ? 0 /* Created */ : eventType === "delete" ? 2 /* Deleted */ : 1 /* Changed */;
-      callback(eventPath, eventKind);
-    });
+  function onWatchChangeRequestArgs({ id, created, deleted, updated }) {
+    onWatchEventType(id, created, 0 /* Created */);
+    onWatchEventType(id, deleted, 2 /* Deleted */);
+    onWatchEventType(id, updated, 1 /* Changed */);
   }
-  function onDirectoryWatcherCallback({ idToCallbacks }, id, eventPath, eventType) {
-    var _a;
-    if (eventType === "update")
+  function onWatchEventType(id, paths, eventKind) {
+    if (!(paths == null ? void 0 : paths.length))
       return;
-    (_a = idToCallbacks.get(id)) == null ? void 0 : _a.forEach((callback) => {
-      callback(eventPath);
+    forEachCallback(watchedFiles, id, paths, (callback, eventPath) => callback(eventPath, eventKind));
+    forEachCallback(watchedDirectories, id, paths, (callback, eventPath) => callback(eventPath));
+    forEachCallback(watchedDirectoriesRecursive, id, paths, (callback, eventPath) => callback(eventPath));
+  }
+  function forEachCallback(hostWatcherMap, id, eventPaths, cb) {
+    var _a;
+    (_a = hostWatcherMap.idToCallbacks.get(id)) == null ? void 0 : _a.forEach((callback) => {
+      eventPaths.forEach((eventPath) => cb(callback, normalizeSlashes(eventPath)));
     });
   }
 }
diff --git a/lib/typescript.d.ts b/lib/typescript.d.ts
index a131733463740..ae8aa63c572e0 100644
--- a/lib/typescript.d.ts
+++ b/lib/typescript.d.ts
@@ -1510,12 +1510,13 @@ declare namespace ts {
             }
             interface WatchChangeRequest extends Request {
                 command: CommandTypes.WatchChange;
-                arguments: WatchChangeRequestArgs;
+                arguments: WatchChangeRequestArgs | readonly WatchChangeRequestArgs[];
             }
             interface WatchChangeRequestArgs {
                 id: number;
-                path: string;
-                eventType: "create" | "delete" | "update";
+                created?: string[];
+                deleted?: string[];
+                updated?: string[];
             }
             /**
              * Request to obtain the list of files that should be regenerated if target file is recompiled.
@@ -2452,6 +2453,7 @@ declare namespace ts {
                 readonly id: number;
                 readonly path: string;
                 readonly recursive: boolean;
+                readonly ignoreUpdate?: boolean;
             }
             type CloseFileWatcherEventName = "closeFileWatcher";
             interface CloseFileWatcherEvent extends Event {
diff --git a/lib/typescript.js b/lib/typescript.js
index 7014c9a443241..018350e49dbc2 100644
--- a/lib/typescript.js
+++ b/lib/typescript.js
@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.4";
-      version = "5.4.3";
+      version = "5.4.4";
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -5423,14 +5423,17 @@ ${lanes.join("\n")}
       pollingIntervalQueue(pollingInterval).pollScheduled = host.setTimeout(pollingInterval === 250 /* Low */ ? pollLowPollingIntervalQueue : pollPollingIntervalQueue, pollingInterval, pollingInterval === 250 /* Low */ ? "pollLowPollingIntervalQueue" : "pollPollingIntervalQueue", pollingIntervalQueue(pollingInterval));
     }
   }
-  function createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames2) {
+  function createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames2, getModifiedTime3, fsWatchWithTimestamp) {
     const fileWatcherCallbacks = createMultiMap();
+    const fileTimestamps = fsWatchWithTimestamp ? /* @__PURE__ */ new Map() : void 0;
     const dirWatchers = /* @__PURE__ */ new Map();
     const toCanonicalName = createGetCanonicalFileName(useCaseSensitiveFileNames2);
     return nonPollingWatchFile;
     function nonPollingWatchFile(fileName, callback, _pollingInterval, fallbackOptions) {
       const filePath = toCanonicalName(fileName);
-      fileWatcherCallbacks.add(filePath, callback);
+      if (fileWatcherCallbacks.add(filePath, callback).length === 1 && fileTimestamps) {
+        fileTimestamps.set(filePath, getModifiedTime3(fileName) || missingFileModifiedTime);
+      }
       const dirPath = getDirectoryPath(filePath) || ".";
       const watcher = dirWatchers.get(dirPath) || createDirectoryWatcher(getDirectoryPath(fileName) || ".", dirPath, fallbackOptions);
       watcher.referenceCount++;
@@ -5450,14 +5453,31 @@ ${lanes.join("\n")}
       const watcher = fsWatch(
         dirName,
         1 /* Directory */,
-        (_eventName, relativeFileName, modifiedTime) => {
+        (eventName, relativeFileName) => {
           if (!isString(relativeFileName))
             return;
           const fileName = getNormalizedAbsolutePath(relativeFileName, dirName);
-          const callbacks = fileName && fileWatcherCallbacks.get(toCanonicalName(fileName));
+          const filePath = toCanonicalName(fileName);
+          const callbacks = fileName && fileWatcherCallbacks.get(filePath);
           if (callbacks) {
+            let currentModifiedTime;
+            let eventKind = 1 /* Changed */;
+            if (fileTimestamps) {
+              const existingTime = fileTimestamps.get(filePath);
+              if (eventName === "change") {
+                currentModifiedTime = getModifiedTime3(fileName) || missingFileModifiedTime;
+                if (currentModifiedTime.getTime() === existingTime.getTime())
+                  return;
+              }
+              currentModifiedTime || (currentModifiedTime = getModifiedTime3(fileName) || missingFileModifiedTime);
+              fileTimestamps.set(filePath, currentModifiedTime);
+              if (existingTime === missingFileModifiedTime)
+                eventKind = 0 /* Created */;
+              else if (currentModifiedTime === missingFileModifiedTime)
+                eventKind = 2 /* Deleted */;
+            }
             for (const fileCallback of callbacks) {
-              fileCallback(fileName, 1 /* Changed */, modifiedTime);
+              fileCallback(fileName, eventKind, currentModifiedTime);
             }
           }
         },
@@ -5849,7 +5869,7 @@ ${lanes.join("\n")}
           );
         case 5 /* UseFsEventsOnParentDirectory */:
           if (!nonPollingWatchFile) {
-            nonPollingWatchFile = createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames2);
+            nonPollingWatchFile = createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames2, getModifiedTime3, fsWatchWithTimestamp);
           }
           return nonPollingWatchFile(fileName, callback, pollingInterval, getFallbackOptions(options));
         default:
@@ -6024,7 +6044,7 @@ ${lanes.join("\n")}
           return watchPresentFileSystemEntryWithFsWatchFile();
         }
         try {
-          const presentWatcher = (!fsWatchWithTimestamp ? fsWatchWorker : fsWatchWorkerHandlingTimestamp)(
+          const presentWatcher = (entryKind === 1 /* Directory */ || !fsWatchWithTimestamp ? fsWatchWorker : fsWatchWorkerHandlingTimestamp)(
             fileOrDirectory,
             recursive,
             inodeWatching ? callbackChangingToMissingFileSystemEntry : callback
@@ -45450,13 +45470,21 @@ ${lanes.join("\n")}
       }
       const nearestTargetPackageJson = getNearestAncestorDirectoryWithPackageJson(host, getDirectoryPath(modulePath));
       const nearestSourcePackageJson = getNearestAncestorDirectoryWithPackageJson(host, sourceDirectory);
-      if (nearestSourcePackageJson !== nearestTargetPackageJson) {
+      const ignoreCase = !hostUsesCaseSensitiveFileNames(host);
+      if (!packageJsonPathsAreEqual(nearestTargetPackageJson, nearestSourcePackageJson, ignoreCase)) {
         return maybeNonRelative;
       }
       return relativePath;
     }
     return isPathRelativeToParent(maybeNonRelative) || countPathComponents(relativePath) < countPathComponents(maybeNonRelative) ? relativePath : maybeNonRelative;
   }
+  function packageJsonPathsAreEqual(a, b, ignoreCase) {
+    if (a === b)
+      return true;
+    if (a === void 0 || b === void 0)
+      return false;
+    return comparePaths(a, b, ignoreCase) === 0 /* EqualTo */;
+  }
   function countPathComponents(path) {
     let count = 0;
     for (let i = startsWith(path, "./") ? 2 : 0; i < path.length; i++) {
@@ -50495,15 +50523,19 @@ ${lanes.join("\n")}
         return true;
       }
     }
-    function isEntityNameVisible(entityName, enclosingDeclaration) {
+    function getMeaningOfEntityNameReference(entityName) {
       let meaning;
       if (entityName.parent.kind === 186 /* TypeQuery */ || entityName.parent.kind === 233 /* ExpressionWithTypeArguments */ && !isPartOfTypeNode(entityName.parent) || entityName.parent.kind === 167 /* ComputedPropertyName */) {
         meaning = 111551 /* Value */ | 1048576 /* ExportValue */;
-      } else if (entityName.kind === 166 /* QualifiedName */ || entityName.kind === 211 /* PropertyAccessExpression */ || entityName.parent.kind === 271 /* ImportEqualsDeclaration */) {
+      } else if (entityName.kind === 166 /* QualifiedName */ || entityName.kind === 211 /* PropertyAccessExpression */ || entityName.parent.kind === 271 /* ImportEqualsDeclaration */ || entityName.parent.kind === 166 /* QualifiedName */ && entityName.parent.left === entityName || entityName.parent.kind === 211 /* PropertyAccessExpression */ && entityName.parent.expression === entityName || entityName.parent.kind === 212 /* ElementAccessExpression */ && entityName.parent.expression === entityName) {
         meaning = 1920 /* Namespace */;
       } else {
         meaning = 788968 /* Type */;
       }
+      return meaning;
+    }
+    function isEntityNameVisible(entityName, enclosingDeclaration) {
+      const meaning = getMeaningOfEntityNameReference(entityName);
       const firstIdentifier = getFirstIdentifier(entityName);
       const symbol = resolveName(
         enclosingDeclaration,
@@ -52564,9 +52596,10 @@ ${lanes.join("\n")}
           introducesError = true;
           return { introducesError, node };
         }
+        const meaning = getMeaningOfEntityNameReference(node);
         const sym = resolveEntityName(
           leftmost,
-          -1 /* All */,
+          meaning,
           /*ignoreErrors*/
           true,
           /*dontResolveAlias*/
@@ -52576,13 +52609,13 @@ ${lanes.join("\n")}
           if (isSymbolAccessible(
             sym,
             context.enclosingDeclaration,
-            -1 /* All */,
+            meaning,
             /*shouldComputeAliasesToMakeVisible*/
             false
           ).accessibility !== 0 /* Accessible */) {
             introducesError = true;
           } else {
-            context.tracker.trackSymbol(sym, context.enclosingDeclaration, -1 /* All */);
+            context.tracker.trackSymbol(sym, context.enclosingDeclaration, meaning);
             includePrivateSymbol == null ? void 0 : includePrivateSymbol(sym);
           }
           if (isIdentifier(node)) {
@@ -60489,6 +60522,9 @@ ${lanes.join("\n")}
           } else if (every(typeSet, (t) => !!(t.flags & 1048576 /* Union */ && (t.types[0].flags & 65536 /* Null */ || t.types[1].flags & 65536 /* Null */)))) {
             removeFromEach(typeSet, 65536 /* Null */);
             result = getUnionType([getIntersectionType(typeSet), nullType], 1 /* Literal */, aliasSymbol, aliasTypeArguments);
+          } else if (typeSet.length >= 4) {
+            const middle = Math.floor(typeSet.length / 2);
+            result = getIntersectionType([getIntersectionType(typeSet.slice(0, middle)), getIntersectionType(typeSet.slice(middle))], aliasSymbol, aliasTypeArguments);
           } else {
             if (!checkCrossProductUnion(typeSet)) {
               return errorType;
@@ -159942,10 +159978,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         return isJsxExpression(parent2) && !isJsxElement(parent2.parent) && !isJsxFragment(parent2.parent) ? checker.getContextualTypeForJsxAttribute(parent2.parent) : void 0;
       default:
         const argInfo = ts_SignatureHelp_exports.getArgumentInfoForCompletions(previousToken, position, sourceFile, checker);
-        return argInfo ? (
-          // At `,`, treat this as the next argument after the comma.
-          checker.getContextualTypeForArgumentAtIndex(argInfo.invocation, argInfo.argumentIndex + (previousToken.kind === 28 /* CommaToken */ ? 1 : 0))
-        ) : isEqualityOperatorKind(previousToken.kind) && isBinaryExpression(parent2) && isEqualityOperatorKind(parent2.operatorToken.kind) ? (
+        return argInfo ? checker.getContextualTypeForArgumentAtIndex(argInfo.invocation, argInfo.argumentIndex) : isEqualityOperatorKind(previousToken.kind) && isBinaryExpression(parent2) && isEqualityOperatorKind(parent2.operatorToken.kind) ? (
           // completion at `x ===/**/` should be for the right side
           checker.getTypeAtLocation(parent2.left)
         ) : checker.getContextualType(previousToken, 4 /* Completions */) || checker.getContextualType(previousToken);
@@ -168509,12 +168542,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     if (!info)
       return void 0;
     const { list, argumentIndex } = info;
-    const argumentCount = getArgumentCount(
-      list,
-      /*ignoreTrailingComma*/
-      isInString(sourceFile, position, node),
-      checker
-    );
+    const argumentCount = getArgumentCount(checker, list);
     if (argumentIndex !== 0) {
       Debug.assertLessThan(argumentIndex, argumentCount);
     }
@@ -168526,7 +168554,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       return { list: getChildListThatStartsWithOpenerToken(node.parent, node, sourceFile), argumentIndex: 0 };
     } else {
       const list = findContainingList(node);
-      return list && { list, argumentIndex: getArgumentIndex(list, node, checker) };
+      return list && { list, argumentIndex: getArgumentIndex(checker, list, node) };
     }
   }
   function getImmediatelyContainingArgumentInfo(node, position, sourceFile, checker) {
@@ -168656,24 +168684,6 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       return isFunctionTypeNode(d) ? (_a = tryCast(d.parent, canHaveSymbol)) == null ? void 0 : _a.symbol : void 0;
     }) || s : s;
   }
-  function getArgumentIndex(argumentsList, node, checker) {
-    const args = argumentsList.getChildren();
-    let argumentIndex = 0;
-    for (let pos = 0; pos < length(args); pos++) {
-      const child = args[pos];
-      if (child === node) {
-        break;
-      }
-      if (isSpreadElement(child)) {
-        argumentIndex = argumentIndex + getSpreadElementCount(child, checker) + (pos > 0 ? pos : 0);
-      } else {
-        if (child.kind !== 28 /* CommaToken */) {
-          argumentIndex++;
-        }
-      }
-    }
-    return argumentIndex;
-  }
   function getSpreadElementCount(node, checker) {
     const spreadType = checker.getTypeAtLocation(node.expression);
     if (checker.isTupleType(spreadType)) {
@@ -168686,19 +168696,48 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     }
     return 0;
   }
-  function getArgumentCount(argumentsList, ignoreTrailingComma, checker) {
-    const listChildren = argumentsList.getChildren();
-    let argumentCount = 0;
-    for (const child of listChildren) {
+  function getArgumentIndex(checker, argumentsList, node) {
+    return getArgumentIndexOrCount(checker, argumentsList, node);
+  }
+  function getArgumentCount(checker, argumentsList) {
+    return getArgumentIndexOrCount(
+      checker,
+      argumentsList,
+      /*node*/
+      void 0
+    );
+  }
+  function getArgumentIndexOrCount(checker, argumentsList, node) {
+    const args = argumentsList.getChildren();
+    let argumentIndex = 0;
+    let skipComma = false;
+    for (const child of args) {
+      if (node && child === node) {
+        if (!skipComma && child.kind === 28 /* CommaToken */) {
+          argumentIndex++;
+        }
+        return argumentIndex;
+      }
       if (isSpreadElement(child)) {
-        argumentCount = argumentCount + getSpreadElementCount(child, checker);
+        argumentIndex += getSpreadElementCount(child, checker);
+        skipComma = true;
+        continue;
+      }
+      if (child.kind !== 28 /* CommaToken */) {
+        argumentIndex++;
+        skipComma = true;
+        continue;
+      }
+      if (skipComma) {
+        skipComma = false;
+        continue;
       }
+      argumentIndex++;
     }
-    argumentCount = argumentCount + countWhere(listChildren, (arg) => arg.kind !== 28 /* CommaToken */);
-    if (!ignoreTrailingComma && listChildren.length > 0 && last(listChildren).kind === 28 /* CommaToken */) {
-      argumentCount++;
+    if (node) {
+      return argumentIndex;
     }
-    return argumentCount;
+    return args.length && last(args).kind === 28 /* CommaToken */ ? argumentIndex + 1 : argumentIndex;
   }
   function getArgumentIndexForTemplatePiece(spanIndex, node, position, sourceFile) {
     Debug.assert(position >= node.getStart(), "Assumed 'position' could not occur before node.");
@@ -178286,7 +178325,16 @@ ${options.prefix}` : "\n" : options.prefix
         recursive ? watchedDirectoriesRecursive : watchedDirectories,
         path,
         callback,
-        (id) => ({ eventName: CreateDirectoryWatcherEvent, data: { id, path, recursive: !!recursive } })
+        (id) => ({
+          eventName: CreateDirectoryWatcherEvent,
+          data: {
+            id,
+            path,
+            recursive: !!recursive,
+            // Special case node_modules as we watch it for changes to closed script infos as well
+            ignoreUpdate: !path.endsWith("/node_modules") ? true : void 0
+          }
+        })
       );
     }
     function getOrCreateFileWatcher({ pathToId, idToCallbacks }, path, callback, event) {
@@ -178313,24 +178361,28 @@ ${options.prefix}` : "\n" : options.prefix
         }
       };
     }
-    function onWatchChange({ id, path, eventType }) {
-      onFileWatcherCallback(id, path, eventType);
-      onDirectoryWatcherCallback(watchedDirectories, id, path, eventType);
-      onDirectoryWatcherCallback(watchedDirectoriesRecursive, id, path, eventType);
+    function onWatchChange(args) {
+      if (isArray(args))
+        args.forEach(onWatchChangeRequestArgs);
+      else
+        onWatchChangeRequestArgs(args);
     }
-    function onFileWatcherCallback(id, eventPath, eventType) {
-      var _a;
-      (_a = watchedFiles.idToCallbacks.get(id)) == null ? void 0 : _a.forEach((callback) => {
-        const eventKind = eventType === "create" ? 0 /* Created */ : eventType === "delete" ? 2 /* Deleted */ : 1 /* Changed */;
-        callback(eventPath, eventKind);
-      });
+    function onWatchChangeRequestArgs({ id, created, deleted, updated }) {
+      onWatchEventType(id, created, 0 /* Created */);
+      onWatchEventType(id, deleted, 2 /* Deleted */);
+      onWatchEventType(id, updated, 1 /* Changed */);
     }
-    function onDirectoryWatcherCallback({ idToCallbacks }, id, eventPath, eventType) {
-      var _a;
-      if (eventType === "update")
+    function onWatchEventType(id, paths, eventKind) {
+      if (!(paths == null ? void 0 : paths.length))
         return;
-      (_a = idToCallbacks.get(id)) == null ? void 0 : _a.forEach((callback) => {
-        callback(eventPath);
+      forEachCallback(watchedFiles, id, paths, (callback, eventPath) => callback(eventPath, eventKind));
+      forEachCallback(watchedDirectories, id, paths, (callback, eventPath) => callback(eventPath));
+      forEachCallback(watchedDirectoriesRecursive, id, paths, (callback, eventPath) => callback(eventPath));
+    }
+    function forEachCallback(hostWatcherMap, id, eventPaths, cb) {
+      var _a;
+      (_a = hostWatcherMap.idToCallbacks.get(id)) == null ? void 0 : _a.forEach((callback) => {
+        eventPaths.forEach((eventPath) => cb(callback, normalizeSlashes(eventPath)));
       });
     }
   }
diff --git a/lib/typingsInstaller.js b/lib/typingsInstaller.js
index b629c7681e98a..9c8eb8b080270 100644
--- a/lib/typingsInstaller.js
+++ b/lib/typingsInstaller.js
@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.4";
-var version = "5.4.3";
+var version = "5.4.4";
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -3560,14 +3560,17 @@ function createDynamicPriorityPollingWatchFile(host) {
     pollingIntervalQueue(pollingInterval).pollScheduled = host.setTimeout(pollingInterval === 250 /* Low */ ? pollLowPollingIntervalQueue : pollPollingIntervalQueue, pollingInterval, pollingInterval === 250 /* Low */ ? "pollLowPollingIntervalQueue" : "pollPollingIntervalQueue", pollingIntervalQueue(pollingInterval));
   }
 }
-function createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames2) {
+function createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames2, getModifiedTime2, fsWatchWithTimestamp) {
   const fileWatcherCallbacks = createMultiMap();
+  const fileTimestamps = fsWatchWithTimestamp ? /* @__PURE__ */ new Map() : void 0;
   const dirWatchers = /* @__PURE__ */ new Map();
   const toCanonicalName = createGetCanonicalFileName(useCaseSensitiveFileNames2);
   return nonPollingWatchFile;
   function nonPollingWatchFile(fileName, callback, _pollingInterval, fallbackOptions) {
     const filePath = toCanonicalName(fileName);
-    fileWatcherCallbacks.add(filePath, callback);
+    if (fileWatcherCallbacks.add(filePath, callback).length === 1 && fileTimestamps) {
+      fileTimestamps.set(filePath, getModifiedTime2(fileName) || missingFileModifiedTime);
+    }
     const dirPath = getDirectoryPath(filePath) || ".";
     const watcher = dirWatchers.get(dirPath) || createDirectoryWatcher(getDirectoryPath(fileName) || ".", dirPath, fallbackOptions);
     watcher.referenceCount++;
@@ -3587,14 +3590,31 @@ function createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFi
     const watcher = fsWatch(
       dirName,
       1 /* Directory */,
-      (_eventName, relativeFileName, modifiedTime) => {
+      (eventName, relativeFileName) => {
         if (!isString(relativeFileName))
           return;
         const fileName = getNormalizedAbsolutePath(relativeFileName, dirName);
-        const callbacks = fileName && fileWatcherCallbacks.get(toCanonicalName(fileName));
+        const filePath = toCanonicalName(fileName);
+        const callbacks = fileName && fileWatcherCallbacks.get(filePath);
         if (callbacks) {
+          let currentModifiedTime;
+          let eventKind = 1 /* Changed */;
+          if (fileTimestamps) {
+            const existingTime = fileTimestamps.get(filePath);
+            if (eventName === "change") {
+              currentModifiedTime = getModifiedTime2(fileName) || missingFileModifiedTime;
+              if (currentModifiedTime.getTime() === existingTime.getTime())
+                return;
+            }
+            currentModifiedTime || (currentModifiedTime = getModifiedTime2(fileName) || missingFileModifiedTime);
+            fileTimestamps.set(filePath, currentModifiedTime);
+            if (existingTime === missingFileModifiedTime)
+              eventKind = 0 /* Created */;
+            else if (currentModifiedTime === missingFileModifiedTime)
+              eventKind = 2 /* Deleted */;
+          }
           for (const fileCallback of callbacks) {
-            fileCallback(fileName, 1 /* Changed */, modifiedTime);
+            fileCallback(fileName, eventKind, currentModifiedTime);
           }
         }
       },
@@ -3985,7 +4005,7 @@ function createSystemWatchFunctions({
         );
       case 5 /* UseFsEventsOnParentDirectory */:
         if (!nonPollingWatchFile) {
-          nonPollingWatchFile = createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames2);
+          nonPollingWatchFile = createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames2, getModifiedTime2, fsWatchWithTimestamp);
         }
         return nonPollingWatchFile(fileName, callback, pollingInterval, getFallbackOptions(options));
       default:
@@ -4160,7 +4180,7 @@ function createSystemWatchFunctions({
         return watchPresentFileSystemEntryWithFsWatchFile();
       }
       try {
-        const presentWatcher = (!fsWatchWithTimestamp ? fsWatchWorker : fsWatchWorkerHandlingTimestamp)(
+        const presentWatcher = (entryKind === 1 /* Directory */ || !fsWatchWithTimestamp ? fsWatchWorker : fsWatchWorkerHandlingTimestamp)(
           fileOrDirectory,
           recursive,
           inodeWatching ? callbackChangingToMissingFileSystemEntry : callback
diff --git a/package-lock.json b/package-lock.json
index 0f3b38bbadadb..81ae0832de0a4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "typescript",
-    "version": "5.4.3",
+    "version": "5.4.4",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "typescript",
-            "version": "5.4.3",
+            "version": "5.4.4",
             "license": "Apache-2.0",
             "bin": {
                 "tsc": "bin/tsc",
diff --git a/package.json b/package.json
index f6b9ceca6dc33..96a0b9aefca81 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.4.3",
+    "version": "5.4.4",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
diff --git a/src/compiler/corePublic.ts b/src/compiler/corePublic.ts
index 6684032a0969a..cea0a82974f1c 100644
--- a/src/compiler/corePublic.ts
+++ b/src/compiler/corePublic.ts
@@ -4,7 +4,7 @@ export const versionMajorMinor = "5.4";
 // The following is baselined as a literal template type without intervention
 /** The version of the TypeScript compiler release */
 // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-export const version = "5.4.3" as string;
+export const version = "5.4.4" as string;
 
 /**
  * Type of objects whose values are all of the same type.

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://github.com/microsoft/TypeScript/compare/v5.4.3...v5.4.4.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://github.com/microsoft/TypeScript/compare/v5.4.3...v5.4.4.patch" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://github.com/microsoft/TypeScript/compare/v5.4.3...v5.4.4.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://github.com/microsoft/TypeScript/compare/v5.4.3...v5.4.4.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>