mergeMapLikes: Improve type (microsoft#22237)

Andy · web-flow · commit 03ba8a0852b5 · 2018-03-01T07:35:42.000-08:00
* mergeMapLikes: Improve type

* Make source Partial&lt;T&gt;

* T extends object

* Update api baseline
diff --git a/src/server/utilities.ts b/src/server/utilities.ts
@@ -83,7 +83,7 @@ namespace ts.server {
         };
     }
 
-    export function mergeMapLikes(target: MapLike<any>, source: MapLike<any>): void {
+    export function mergeMapLikes<T extends object>(target: T, source: Partial<T>): void {
         for (const key in source) {
             if (hasProperty(source, key)) {
                 target[key] = source[key];
diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -4966,7 +4966,7 @@ declare namespace ts.server {
         function ThrowProjectDoesNotContainDocument(fileName: string, project: Project): never;
     }
     function getDefaultFormatCodeSettings(host: ServerHost): FormatCodeSettings;
-    function mergeMapLikes(target: MapLike<any>, source: MapLike<any>): void;
+    function mergeMapLikes<T extends object>(target: T, source: Partial<T>): void;
     type NormalizedPath = string & {
         __normalizedPathTag: any;
     };

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ namespace ts.server {`
`83`	`83`	`};`
`84`	`84`	`}`
`85`	`85`
`86`		`- export function mergeMapLikes(target: MapLike<any>, source: MapLike<any>): void {`
	`86`	`+ export function mergeMapLikes<T extends object>(target: T, source: Partial<T>): void {`
`87`	`87`	`for (const key in source) {`
`88`	`88`	`if (hasProperty(source, key)) {`
`89`	`89`	`target[key] = source[key];`
Original file line number	Diff line number	Diff line change
`@@ -4966,7 +4966,7 @@ declare namespace ts.server {`
`4966`	`4966`	`function ThrowProjectDoesNotContainDocument(fileName: string, project: Project): never;`
`4967`	`4967`	`}`
`4968`	`4968`	`function getDefaultFormatCodeSettings(host: ServerHost): FormatCodeSettings;`
`4969`		`- function mergeMapLikes(target: MapLike<any>, source: MapLike<any>): void;`
	`4969`	`+ function mergeMapLikes<T extends object>(target: T, source: Partial<T>): void;`
`4970`	`4970`	`type NormalizedPath = string & {`
`4971`	`4971`	`__normalizedPathTag: any;`
`4972`	`4972`	`};`