From 5cb13f390967ea50f92894149713d14321c31984 Mon Sep 17 00:00:00 2001
From: falsandtru <falsandtru@users.noreply.github.com>
Date: Sat, 23 Jan 2016 19:08:32 +0900
Subject: [PATCH 1/2] Remove `clear` method in `WeakSet` and `WeakMap`

---
 src/lib/es6.d.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/lib/es6.d.ts b/src/lib/es6.d.ts
index 44e5e49f984..f5d6b06bc47 100644
--- a/src/lib/es6.d.ts
+++ b/src/lib/es6.d.ts
@@ -819,7 +819,6 @@ interface MapConstructor {
 declare var Map: MapConstructor;
 
 interface WeakMap<K, V> {
-    clear(): void;
     delete(key: K): boolean;
     get(key: K): V;
     has(key: K): boolean;
@@ -859,7 +858,6 @@ declare var Set: SetConstructor;
 
 interface WeakSet<T> {
     add(value: T): WeakSet<T>;
-    clear(): void;
     delete(value: T): boolean;
     has(value: T): boolean;
     [Symbol.toStringTag]: "WeakSet";

From 700af6a2ce24f7351f6aad68870a8371e6a4d258 Mon Sep 17 00:00:00 2001
From: Paul van Brenk <paul.van.brenk@microsoft.com>
Date: Sun, 24 Jan 2016 16:08:45 -0800
Subject: [PATCH 2/2] Fix up todo in jsdoccomment template code.

---
 src/services/services.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/services/services.ts b/src/services/services.ts
index 0fae1c0aa45..28f7f848835 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -7179,8 +7179,7 @@ namespace ts {
 
             const indentationStr = sourceFile.text.substr(lineStart, posLineAndChar.character);
 
-            // TODO: call a helper method instead once PR #4133 gets merged in.
-            const newLine = host.getNewLine ? host.getNewLine() : "\r\n";
+            const newLine = getNewLineOrDefaultFromHost(host);
 
             let docParams = "";
             for (let i = 0, numParams = parameters.length; i < numParams; i++) {