From 0c95b0db43aeecf58c7874ef6b0eb46f411a4d62 Mon Sep 17 00:00:00 2001
From: SaschaNaz <saschanaz@outlook.com>
Date: Fri, 10 Apr 2015 23:00:50 +0900
Subject: [PATCH 1/2] formattingOnChainedCallbacks

---
 .../fourslash/formattingOnChainedCallbacks.ts | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 tests/cases/fourslash/formattingOnChainedCallbacks.ts

diff --git a/tests/cases/fourslash/formattingOnChainedCallbacks.ts b/tests/cases/fourslash/formattingOnChainedCallbacks.ts
new file mode 100644
index 00000000000..da660476771
--- /dev/null
+++ b/tests/cases/fourslash/formattingOnChainedCallbacks.ts
@@ -0,0 +1,34 @@
+////Promise
+////    .resolve()
+////    .then(() => {/*1*/""/*2*/
+////}).then(() => {/*3*/
+////})/*semi1*//*semi2*/
+
+////function foo() {
+////    return Promise.resolve()
+////        .then(function () {
+////        ""/*a*/
+////    })/*b*/
+////}
+
+goTo.marker('1');
+edit.insertLine('');
+goTo.marker('2');
+verify.currentLineContentIs('        ""');
+goTo.marker('3');
+edit.insertLine('');
+verify.currentLineContentIs('    }).then(() => {');
+
+goTo.marker("semi1");
+edit.insert(';');
+verify.currentLineContentIs('    });');
+goTo.marker("semi2");
+edit.insert(';');
+verify.currentLineContentIs('    });;');
+
+goTo.marker('a');
+edit.insert(';');
+verify.currentLineContentIs('            "";');
+goTo.marker('b');
+edit.insert(';');
+verify.currentLineContentIs('        });');
\ No newline at end of file

From 5543f646a07e8d4cd2d6199f40a123eaf757008b Mon Sep 17 00:00:00 2001
From: SaschaNaz <saschanaz@outlook.com>
Date: Sat, 11 Apr 2015 12:11:28 +0900
Subject: [PATCH 2/2] formattingOnChainedCallbacks (passing)

---
 .../fourslash/formattingOnChainedCallbacks.ts | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/tests/cases/fourslash/formattingOnChainedCallbacks.ts b/tests/cases/fourslash/formattingOnChainedCallbacks.ts
index da660476771..0d72364d506 100644
--- a/tests/cases/fourslash/formattingOnChainedCallbacks.ts
+++ b/tests/cases/fourslash/formattingOnChainedCallbacks.ts
@@ -1,8 +1,10 @@
-////Promise
+/// <reference path='fourslash.ts' />
+
+////Promise
 ////    .resolve()
 ////    .then(() => {/*1*/""/*2*/
-////}).then(() => {/*3*/
-////})/*semi1*//*semi2*/
+////}).then(() => {/*3*//*4*/
+////})/*semi1*/ /*semi2*/
 
 ////function foo() {
 ////    return Promise.resolve()
@@ -14,14 +16,17 @@
 goTo.marker('1');
 edit.insertLine('');
 goTo.marker('2');
-verify.currentLineContentIs('        ""');
-goTo.marker('3');
+// Expected, with bug 1888: verify.currentLineContentIs('        ""');
+verify.currentLineContentIs('    ""'); 
+goTo.marker('4');
 edit.insertLine('');
+goTo.marker('3');
 verify.currentLineContentIs('    }).then(() => {');
 
 goTo.marker("semi1");
 edit.insert(';');
-verify.currentLineContentIs('    });');
+// Expected, with bug 1888: verify.currentLineContentIs('    });');
+verify.currentLineContentIs('}); ');
 goTo.marker("semi2");
 edit.insert(';');
 verify.currentLineContentIs('    });;');
@@ -31,4 +36,5 @@ edit.insert(';');
 verify.currentLineContentIs('            "";');
 goTo.marker('b');
 edit.insert(';');
-verify.currentLineContentIs('        });');
\ No newline at end of file
+// Expected, with bug 1888: verify.currentLineContentIs('        });');
+verify.currentLineContentIs('    });');
\ No newline at end of file