From a759f9f0b526c42f9b92d1ec99ccb61a38c7470c Mon Sep 17 00:00:00 2001
From: Arthur Ozga <t-arthoz@microsoft.com>
Date: Mon, 3 Aug 2015 13:38:45 -0700
Subject: [PATCH] added helper

---
 src/compiler/core.ts      | 4 ++--
 src/compiler/utilities.ts | 8 ++++++++
 src/services/services.ts  | 9 +--------
 src/services/shims.ts     | 6 +-----
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index ec171d4aee2..8cca7b1f4f6 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -794,7 +794,7 @@ namespace ts {
             if (!expression) {
                 let verboseDebugString = "";
                 if (verboseDebugInfo) {
-                    verboseDebugString = "\r\nVerbose Debug Information: " + verboseDebugInfo();
+                    verboseDebugString = getNewLineOrDefault() + "Verbose Debug Information: " + verboseDebugInfo();
                 }
 
                 throw new Error("Debug Failure. False expression: " + (message || "") + verboseDebugString);
@@ -805,4 +805,4 @@ namespace ts {
             Debug.assert(false, message);
         }
     }
-}
+}
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 312a3666757..88a5322977d 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -2092,6 +2092,14 @@ 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 8e670268498..bf777a9d653 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -1560,13 +1560,6 @@ namespace ts {
 
     /// Language Service
 
-    interface FormattingOptions {
-        useTabs: boolean;
-        spacesPerTab: number;
-        indentSpaces: number;
-        newLineCharacter: string;
-    }
-
     // Information about a specific host file.
     interface HostFileInformation {
         hostFileName: string;
@@ -2535,7 +2528,7 @@ namespace ts {
                 getCancellationToken: () => cancellationToken,
                 getCanonicalFileName,
                 useCaseSensitiveFileNames: () => useCaseSensitivefileNames,
-                getNewLine: () => host.getNewLine ? host.getNewLine() : "\r\n",
+                getNewLine: () => getNewLineOrDefault(host.getNewLine),
                 getDefaultLibFileName: (options) => host.getDefaultLibFileName(options),
                 writeFile: (fileName, data, writeByteOrderMark) => { },
                 getCurrentDirectory: () => host.getCurrentDirectory()
diff --git a/src/services/shims.ts b/src/services/shims.ts
index ae853e1c72a..42247c31ece 100644
--- a/src/services/shims.ts
+++ b/src/services/shims.ts
@@ -529,7 +529,7 @@ namespace ts {
         }
 
         private realizeDiagnostics(diagnostics: Diagnostic[]): { message: string; start: number; length: number; category: string; }[]{
-            var newLine = this.getNewLine();
+            var newLine = getNewLineOrDefault(this.host.getNewLine);
             return ts.realizeDiagnostics(diagnostics, newLine);
         }
 
@@ -571,10 +571,6 @@ namespace ts {
                 });
         }
 
-        private getNewLine(): string {
-            return this.host.getNewLine ? this.host.getNewLine() : "\r\n";
-        }
-
         public getSyntacticDiagnostics(fileName: string): string {
             return this.forwardJSONCall(
                 "getSyntacticDiagnostics('" + fileName + "')",