From e9fa806c9ffd61569b9e081d4ab578f2ba3ea747 Mon Sep 17 00:00:00 2001
From: Arthur Ozga <t-arthoz@microsoft.com>
Date: Fri, 7 Aug 2015 14:01:07 -0700
Subject: [PATCH] move helper and add capture of this

---
 src/compiler/utilities.ts | 8 --------
 src/services/services.ts  | 2 +-
 src/services/utilities.ts | 8 ++++++++
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 88a5322977d..312a3666757 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -2092,14 +2092,6 @@ namespace ts {
         }
         return carriageReturnLineFeed;
     }
-    
-    /**
-     * The default is CRLF.
-     */   
-    export function getNewLineOrDefault(getNewLine?: () => string): string {
-        return getNewLine ? getNewLine() : carriageReturnLineFeed;
-        var x: number;
-    }
 }
 
 namespace ts {
diff --git a/src/services/services.ts b/src/services/services.ts
index bf777a9d653..6fe45a775ca 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -2528,7 +2528,7 @@ namespace ts {
                 getCancellationToken: () => cancellationToken,
                 getCanonicalFileName,
                 useCaseSensitiveFileNames: () => useCaseSensitivefileNames,
-                getNewLine: () => getNewLineOrDefault(host.getNewLine),
+                getNewLine: () => host.getNewLine ? host.getNewLine() : carriageReturnLineFeed,
                 getDefaultLibFileName: (options) => host.getDefaultLibFileName(options),
                 writeFile: (fileName, data, writeByteOrderMark) => { },
                 getCurrentDirectory: () => host.getCurrentDirectory()
diff --git a/src/services/utilities.ts b/src/services/utilities.ts
index 5f8859c815e..a1548fc3dd4 100644
--- a/src/services/utilities.ts
+++ b/src/services/utilities.ts
@@ -625,6 +625,14 @@ namespace ts {
         return displayPart(text, SymbolDisplayPartKind.text);
     }
 
+    const carriageReturnLineFeed = "\r\n";
+    /**
+     * The default is CRLF.
+     */
+    export function getNewLineOrDefaultFromHost(host: LanguageServiceHost) {
+        return host.getNewLine ? host.getNewLine() : carriageReturnLineFeed;
+    }
+
     export function lineBreakPart() {
         return displayPart("\n", SymbolDisplayPartKind.lineBreak);
     }