From 09caaa3775c132183f1737599af1695045aed576 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Tue, 16 Jan 2018 11:38:42 -0800 Subject: [PATCH] Fix the api test failures --- src/compiler/sys.ts | 1 + src/server/editorServices.ts | 4 ---- tests/baselines/reference/api/tsserverlibrary.d.ts | 8 +------- tests/baselines/reference/api/typescript.d.ts | 5 ----- 4 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts index 6428036a17e..1702911d77e 100644 --- a/src/compiler/sys.ts +++ b/src/compiler/sys.ts @@ -24,6 +24,7 @@ namespace ts { export type FileWatcherCallback = (fileName: string, eventKind: FileWatcherEventKind) => void; export type DirectoryWatcherCallback = (fileName: string) => void; + /*@internal*/ export interface WatchedFile { readonly fileName: string; readonly callback: FileWatcherCallback; diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts index 43cb678d743..e6153d91069 100644 --- a/src/server/editorServices.ts +++ b/src/server/editorServices.ts @@ -321,10 +321,6 @@ namespace ts.server { typesMapLocation?: string; } - export type WatchFile = (host: ServerHost, file: string, cb: FileWatcherCallback, pollingInterval: number | undefined, watchType: WatchType, project?: Project) => FileWatcher; - export type WatchFilePath = (host: ServerHost, file: string, cb: FilePathWatcherCallback, pollingInterval: number | undefined, path: Path, watchType: WatchType, project?: Project) => FileWatcher; - export type WatchDirectory = (host: ServerHost, directory: string, cb: DirectoryWatcherCallback, flags: WatchDirectoryFlags, watchType: WatchType, project?: Project) => FileWatcher; - function getDetailWatchInfo(watchType: WatchType, project: Project | undefined) { return `Project: ${project ? project.getProjectName() : ""} WatchType: ${watchType}`; } diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts index 942ca44a782..ba551acf3e6 100644 --- a/tests/baselines/reference/api/tsserverlibrary.d.ts +++ b/tests/baselines/reference/api/tsserverlibrary.d.ts @@ -2824,11 +2824,6 @@ declare namespace ts { } type FileWatcherCallback = (fileName: string, eventKind: FileWatcherEventKind) => void; type DirectoryWatcherCallback = (fileName: string) => void; - interface WatchedFile { - fileName: string; - callback: FileWatcherCallback; - mtime?: Date; - } /** * Partial interface of the System thats needed to support the caching of directory structure */ @@ -7765,7 +7760,6 @@ declare namespace ts.server { /** Tracks projects that we have already sent telemetry for. */ private readonly seenProjects; constructor(opts: ProjectServiceOptions); - private createWatcherLog(watchType, project); toPath(fileName: string): Path; private loadTypesMap(); updateTypingsForProject(response: SetTypings | InvalidateCachedTypings | PackageInstalledResponse): void; @@ -7792,7 +7786,7 @@ declare namespace ts.server { private findContainingExternalProject(fileName); getFormatCodeOptions(file?: NormalizedPath): FormatCodeSettings; private updateProjectGraphs(projects); - private onSourceFileChanged(fileName, eventKind); + private onSourceFileChanged(fileName, eventKind, path); private handleDeletedFile(info); private onConfigChangedForConfiguredProject(project, eventKind); /** diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts index d5259f39f7f..efde52f5f7b 100644 --- a/tests/baselines/reference/api/typescript.d.ts +++ b/tests/baselines/reference/api/typescript.d.ts @@ -2824,11 +2824,6 @@ declare namespace ts { } type FileWatcherCallback = (fileName: string, eventKind: FileWatcherEventKind) => void; type DirectoryWatcherCallback = (fileName: string) => void; - interface WatchedFile { - fileName: string; - callback: FileWatcherCallback; - mtime?: Date; - } /** * Partial interface of the System thats needed to support the caching of directory structure */