From df59d9f5b956d2ed2aa36e4d2c081f6567143b54 Mon Sep 17 00:00:00 2001
From: kimu_shu <alfvegardrisc@gmail.com>
Date: Sat, 1 Jul 2017 12:23:19 +0900
Subject: [PATCH 1/2] Accept PromiseLike object

---
 types/promise.prototype.finally/index.d.ts                      | 2 +-
 .../promise.prototype.finally-tests.ts                          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/promise.prototype.finally/index.d.ts b/types/promise.prototype.finally/index.d.ts
index 9df993ce93..cc50669344 100644
--- a/types/promise.prototype.finally/index.d.ts
+++ b/types/promise.prototype.finally/index.d.ts
@@ -5,7 +5,7 @@
 
 declare global {
     interface Promise<T> {
-        finally<U>(onFinally?: () => U | Promise<U>): Promise<T>;
+        finally<U>(onFinally?: () => U | PromiseLike<U>): Promise<T>;
     }
 }
 
diff --git a/types/promise.prototype.finally/promise.prototype.finally-tests.ts b/types/promise.prototype.finally/promise.prototype.finally-tests.ts
index b7f5848606..b28a64b10d 100644
--- a/types/promise.prototype.finally/promise.prototype.finally-tests.ts
+++ b/types/promise.prototype.finally/promise.prototype.finally-tests.ts
@@ -7,6 +7,7 @@ var promise = new Promise<Boolean>((resolve, reject) => {
 });
 
 promise.finally(() => {});
+promise.finally(() => <PromiseLike<void>>Promise.resolve());
 promise.then(() => {}, () => {}).finally(() => {});
 promise.catch(() => {}).finally(() => {});
 

From fb96955d50672f3639e151ff36e87a37e2e774e3 Mon Sep 17 00:00:00 2001
From: kimu_shu <alfvegardrisc@gmail.com>
Date: Sat, 1 Jul 2017 12:34:00 +0900
Subject: [PATCH 2/2] Add tslint.json and fix lint errors

---
 types/promise.prototype.finally/index.d.ts                  | 2 +-
 .../promise.prototype.finally-tests.ts                      | 6 +++---
 types/promise.prototype.finally/tslint.json                 | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 types/promise.prototype.finally/tslint.json

diff --git a/types/promise.prototype.finally/index.d.ts b/types/promise.prototype.finally/index.d.ts
index cc50669344..5c4581ba46 100644
--- a/types/promise.prototype.finally/index.d.ts
+++ b/types/promise.prototype.finally/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for promise.prototype.finally v2.0.1
+// Type definitions for promise.prototype.finally 2.0
 // Project: https://github.com/matthew-andrews/Promise.prototype.finally
 // Definitions by: Slava Shpitalny <https://github.com/slavik57>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/promise.prototype.finally/promise.prototype.finally-tests.ts b/types/promise.prototype.finally/promise.prototype.finally-tests.ts
index b28a64b10d..2fa7c96512 100644
--- a/types/promise.prototype.finally/promise.prototype.finally-tests.ts
+++ b/types/promise.prototype.finally/promise.prototype.finally-tests.ts
@@ -2,14 +2,14 @@ import promiseFinally = require('promise.prototype.finally');
 
 promiseFinally.shim();
 
-var promise = new Promise<Boolean>((resolve, reject) => {
+let promise = new Promise<boolean>((resolve, reject) => {
 	resolve(true);
 });
 
 promise.finally(() => {});
-promise.finally(() => <PromiseLike<void>>Promise.resolve());
+promise.finally(() => <PromiseLike<void>> Promise.resolve());
 promise.then(() => {}, () => {}).finally(() => {});
 promise.catch(() => {}).finally(() => {});
 
-var allPromise = Promise.all([promise]);
+let allPromise = Promise.all([promise]);
 allPromise.finally(() => {});
diff --git a/types/promise.prototype.finally/tslint.json b/types/promise.prototype.finally/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/promise.prototype.finally/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }