Fix the api test failures

sheetalkamat · sheetalkamat · commit 09caaa3775c1 · 2018-01-17T12:59:10.000-08:00
diff --git 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
@@ -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
@@ -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
@@ -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
      */

Original file line number	Diff line number	Diff line change
`@@ -321,10 +321,6 @@ namespace ts.server {`
`321`	`321`	`typesMapLocation?: string;`
`322`	`322`	`}`
`323`	`323`
`324`		`- export type WatchFile = (host: ServerHost, file: string, cb: FileWatcherCallback, pollingInterval: number \| undefined, watchType: WatchType, project?: Project) => FileWatcher;`
`325`		`- export type WatchFilePath = (host: ServerHost, file: string, cb: FilePathWatcherCallback, pollingInterval: number \| undefined, path: Path, watchType: WatchType, project?: Project) => FileWatcher;`
`326`		`- export type WatchDirectory = (host: ServerHost, directory: string, cb: DirectoryWatcherCallback, flags: WatchDirectoryFlags, watchType: WatchType, project?: Project) => FileWatcher;`
`327`		`-`
`328`	`324`	`function getDetailWatchInfo(watchType: WatchType, project: Project \| undefined) {`
`329`	`325`	return `Project: ${project ? project.getProjectName() : ""} WatchType: ${watchType}`;
`330`	`326`	`}`