Skip to content

Commit 2e4f378

Browse files
sheetalkamatsheetalkamat
committed
More logs in tsc.js
1 parent 8c5ad24 commit 2e4f378

3 files changed

Lines changed: 21 additions & 20 deletions

File tree

‎src/compiler/watch.ts‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -531,13 +531,13 @@ namespace ts {
531531
const watchLogLevel = trace ? compilerOptions.extendedDiagnostics ? WatchLogLevel.Verbose :
532532
compilerOptions.diagnostis ? WatchLogLevel.TriggerOnly : WatchLogLevel.None : WatchLogLevel.None;
533533
const writeLog: (s: string) => void = watchLogLevel !== WatchLogLevel.None ? trace : noop;
534-
const { watchFile, watchFilePath, watchDirectory: watchDirectoryWorker } = getWatchFactory(watchLogLevel, writeLog);
534+
const { watchFile, watchFilePath, watchDirectory } = getWatchFactory<string>(watchLogLevel, writeLog);
535535

536536
const getCanonicalFileName = createGetCanonicalFileName(useCaseSensitiveFileNames);
537537

538538
writeLog(`Current directory: ${currentDirectory} CaseSensitiveFileNames: ${useCaseSensitiveFileNames}`);
539539
if (configFileName) {
540-
watchFile(host, configFileName, scheduleProgramReload, PollingInterval.High);
540+
watchFile(host, configFileName, scheduleProgramReload, PollingInterval.High, "Config file");
541541
}
542542

543543
const compilerHost: CompilerHost & ResolutionCacheHost = {
@@ -563,8 +563,8 @@ namespace ts {
563563
// Members for ResolutionCacheHost
564564
toPath,
565565
getCompilationSettings: () => compilerOptions,
566-
watchDirectoryOfFailedLookupLocation: watchDirectory,
567-
watchTypeRootsDirectory: watchDirectory,
566+
watchDirectoryOfFailedLookupLocation: (dir, cb, flags) => watchDirectory(host, dir, cb, flags, "Failed Lookup Locations"),
567+
watchTypeRootsDirectory: (dir, cb, flags) => watchDirectory(host, dir, cb, flags, "Type roots"),
568568
getCachedDirectoryStructureHost: () => cachedDirectoryStructureHost,
569569
onInvalidatedResolution: scheduleProgramUpdate,
570570
onChangedAutomaticTypeDirectiveNames: () => {
@@ -724,7 +724,7 @@ namespace ts {
724724
(hostSourceFile as FilePresentOnHost).sourceFile = sourceFile;
725725
sourceFile.version = hostSourceFile.version.toString();
726726
if (!(hostSourceFile as FilePresentOnHost).fileWatcher) {
727-
(hostSourceFile as FilePresentOnHost).fileWatcher = watchFilePath(host, fileName, onSourceFileChange, PollingInterval.Low, path);
727+
(hostSourceFile as FilePresentOnHost).fileWatcher = watchFilePath(host, fileName, onSourceFileChange, PollingInterval.Low, path, "Source file");
728728
}
729729
}
730730
else {
@@ -738,7 +738,7 @@ namespace ts {
738738
else {
739739
if (sourceFile) {
740740
sourceFile.version = initialVersion.toString();
741-
const fileWatcher = watchFilePath(host, fileName, onSourceFileChange, PollingInterval.Low, path);
741+
const fileWatcher = watchFilePath(host, fileName, onSourceFileChange, PollingInterval.Low, path, "Source file");
742742
sourceFilesCache.set(path, { sourceFile, version: initialVersion, fileWatcher });
743743
}
744744
else {
@@ -823,6 +823,7 @@ namespace ts {
823823
if (timerToUpdateProgram) {
824824
host.clearTimeout(timerToUpdateProgram);
825825
}
826+
writeLog("Scheduling update");
826827
timerToUpdateProgram = host.setTimeout(updateProgram, 250);
827828
}
828829

@@ -848,6 +849,7 @@ namespace ts {
848849
}
849850

850851
function reloadFileNamesFromConfigFile() {
852+
writeLog("Reloading new file names and options");
851853
const result = getFileNamesFromConfigSpecs(configFileSpecs, getDirectoryPath(configFileName), compilerOptions, parseConfigFileHost);
852854
if (result.fileNames.length) {
853855
configFileParsingDiagnostics = filter(configFileParsingDiagnostics, error => !isErrorNoInputFiles(error));
@@ -909,12 +911,8 @@ namespace ts {
909911
}
910912
}
911913

912-
function watchDirectory(directory: string, cb: DirectoryWatcherCallback, flags: WatchDirectoryFlags) {
913-
return watchDirectoryWorker(host, directory, cb, flags);
914-
}
915-
916914
function watchMissingFilePath(missingFilePath: Path) {
917-
return watchFilePath(host, missingFilePath, onMissingFileChange, PollingInterval.Medium, missingFilePath);
915+
return watchFilePath(host, missingFilePath, onMissingFileChange, PollingInterval.Medium, missingFilePath, "Missing file");
918916
}
919917

920918
function onMissingFileChange(fileName: string, eventKind: FileWatcherEventKind, missingFilePath: Path) {
@@ -947,6 +945,7 @@ namespace ts {
947945

948946
function watchWildcardDirectory(directory: string, flags: WatchDirectoryFlags) {
949947
return watchDirectory(
948+
host,
950949
directory,
951950
fileOrDirectory => {
952951
Debug.assert(!!configFileName);
@@ -974,7 +973,8 @@ namespace ts {
974973
scheduleProgramUpdate();
975974
}
976975
},
977-
flags
976+
flags,
977+
"Wild card directories"
978978
);
979979
}
980980

‎src/compiler/watchUtilities.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -352,11 +352,11 @@ namespace ts {
352352
watchDirectory: WatchDirectory<X, Y>;
353353
}
354354

355-
export function getWatchFactory<X = undefined, Y = undefined>(watchLogLevel: WatchLogLevel, log: (s: string) => void, getDetailWatchInfo?: GetDetailWatchInfo<X, Y>): WatchFactory<X, Y> {
355+
export function getWatchFactory<X, Y = undefined>(watchLogLevel: WatchLogLevel, log: (s: string) => void, getDetailWatchInfo?: GetDetailWatchInfo<X, Y>): WatchFactory<X, Y> {
356356
return getWatchFactoryWith(watchLogLevel, log, getDetailWatchInfo, watchFile, watchDirectory);
357357
}
358358

359-
function getWatchFactoryWith<X = undefined, Y = undefined>(watchLogLevel: WatchLogLevel, log: (s: string) => void, getDetailWatchInfo: GetDetailWatchInfo<X, Y> | undefined,
359+
function getWatchFactoryWith<X, Y = undefined>(watchLogLevel: WatchLogLevel, log: (s: string) => void, getDetailWatchInfo: GetDetailWatchInfo<X, Y> | undefined,
360360
watchFile: (host: WatchFileHost, file: string, callback: FileWatcherCallback, watchPriority: PollingInterval) => FileWatcher,
361361
watchDirectory: (host: WatchDirectoryHost, directory: string, callback: DirectoryWatcherCallback, flags: WatchDirectoryFlags) => FileWatcher): WatchFactory<X, Y> {
362362
const createFileWatcher: CreateFileWatcher<WatchFileHost, PollingInterval, FileWatcherEventKind, undefined, X, Y> = getCreateFileWatcher(watchLogLevel, watchFile);
@@ -422,8 +422,8 @@ namespace ts {
422422
}, flags);
423423
}
424424

425-
function getWatchInfo<T, X, Y>(file: string, flags: T, detailInfo1: X | undefined, detailInfo2: Y | undefined, getDetailWatchInfo: GetDetailWatchInfo<X, Y> | undefined) {
426-
return `WatchInfo: ${file} ${flags} ${getDetailWatchInfo ? getDetailWatchInfo(detailInfo1, detailInfo2) : ""}`;
425+
function getWatchInfo<T, X, Y>(file: string, flags: T, detailInfo1: X, detailInfo2: Y | undefined, getDetailWatchInfo: GetDetailWatchInfo<X, Y> | undefined) {
426+
return `WatchInfo: ${file} ${flags} ${getDetailWatchInfo ? getDetailWatchInfo(detailInfo1, detailInfo2) : detailInfo1}`;
427427
}
428428

429429
export function closeFileWatcherOf<T extends { watcher: FileWatcher; }>(objWithWatcher: T) {

‎src/harness/unittests/tscWatchMode.ts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2235,16 +2235,17 @@ declare module "fs" {
22352235
"CreatingProgramWith::\n",
22362236
" roots: [\"f.ts\"]\n",
22372237
" options: {\"extendedDiagnostics\":true}\n",
2238-
"FileWatcher:: Added:: WatchInfo: f.ts 250 \n",
2239-
"FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 250 \n"
2238+
"FileWatcher:: Added:: WatchInfo: f.ts 250 Source file\n",
2239+
"FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 250 Source file\n"
22402240
]);
22412241

22422242
file.content = "//";
22432243
host.reloadFS(files);
22442244
host.runQueuedTimeoutCallbacks();
22452245
checkOutputErrorsIncremental(host, emptyArray, disableConsoleClear, options.extendedDiagnostics && [
2246-
"FileWatcher:: Triggered with /f.ts1:: WatchInfo: f.ts 250 \n",
2247-
"Elapsed:: 0ms FileWatcher:: Triggered with /f.ts1:: WatchInfo: f.ts 250 \n"
2246+
"FileWatcher:: Triggered with /f.ts1:: WatchInfo: f.ts 250 Source file\n",
2247+
"Scheduling update\n",
2248+
"Elapsed:: 0ms FileWatcher:: Triggered with /f.ts1:: WatchInfo: f.ts 250 Source file\n"
22482249
], options.extendedDiagnostics && [
22492250
"Synchronizing program\n",
22502251
"CreatingProgramWith::\n",

0 commit comments

Comments
 (0)