From f2cad8be4022be8c878732574b94e41c748791e7 Mon Sep 17 00:00:00 2001
From: SaschaNaz <saschanaz@outlook.com>
Date: Thu, 10 Dec 2015 23:05:45 +0900
Subject: [PATCH] getCurrentLeadingTrivia

---
 src/services/formatting/formatting.ts        |  2 +-
 src/services/formatting/formattingScanner.ts | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/services/formatting/formatting.ts b/src/services/formatting/formatting.ts
index 0e1931f9ee8..6efa918d30c 100644
--- a/src/services/formatting/formatting.ts
+++ b/src/services/formatting/formatting.ts
@@ -342,7 +342,7 @@ namespace ts.formatting {
         }
 
         if (!formattingScanner.isOnToken()) {
-            let leadingTrivia = formattingScanner.readTokenInfo(undefined).leadingTrivia;
+            let leadingTrivia = formattingScanner.getCurrentLeadingTrivia();
             if (leadingTrivia) {
                 processTrivia(leadingTrivia, enclosingNode, enclosingNode, undefined);
                 trimTrailingWhitespacesForRemainingRange();
diff --git a/src/services/formatting/formattingScanner.ts b/src/services/formatting/formattingScanner.ts
index 58e2f304482..5d215788d4f 100644
--- a/src/services/formatting/formattingScanner.ts
+++ b/src/services/formatting/formattingScanner.ts
@@ -15,6 +15,7 @@ namespace ts.formatting {
         advance(): void;
         isOnToken(): boolean;
         readTokenInfo(n: Node): TokenInfo;
+        getCurrentLeadingTrivia(): TextRangeWithKind[];
         lastTrailingTriviaWasNewLine(): boolean;
         close(): void;
     }
@@ -43,9 +44,10 @@ namespace ts.formatting {
         let lastTokenInfo: TokenInfo;
 
         return {
-            advance: advance,
-            readTokenInfo: readTokenInfo,
-            isOnToken: isOnToken,
+            advance,
+            readTokenInfo,
+            isOnToken,
+            getCurrentLeadingTrivia: () => leadingTrivia,
             lastTrailingTriviaWasNewLine: () => wasNewLine,
             close: () => {
                 Debug.assert(scanner !== undefined);
@@ -156,7 +158,7 @@ namespace ts.formatting {
             if (!isOnToken()) {
                 // scanner is not on the token (either advance was not called yet or scanner is already past the end position)
                 return {
-                    leadingTrivia: leadingTrivia,
+                    leadingTrivia,
                     trailingTrivia: undefined,
                     token: undefined
                 };