From 03ba8a0852b5b038d2377d53e9a2e12c860f5a79 Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Thu, 1 Mar 2018 07:35:42 -0800
Subject: [PATCH] mergeMapLikes: Improve type (#22237)

* mergeMapLikes: Improve type

* Make source Partial<T>

* T extends object

* Update api baseline
---
 src/server/utilities.ts                            | 2 +-
 tests/baselines/reference/api/tsserverlibrary.d.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/server/utilities.ts b/src/server/utilities.ts
index a086d95f910..2b38de6fa55 100644
--- 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
index 43ebec6ad24..c04a26b117c 100644
--- 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;
     };