From d5800630832668bc0667d2c1d6b30d3c6cf7a34a Mon Sep 17 00:00:00 2001
From: Zhengbo Li <zhengbli@microsoft.com>
Date: Sun, 3 May 2015 15:31:07 -0700
Subject: [PATCH] Fix host formatting configuration issues

---
 src/server/editorServices.ts | 3 ++-
 src/server/session.ts        | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
index 9ed31c91968..fc9f13a0533 100644
--- a/src/server/editorServices.ts
+++ b/src/server/editorServices.ts
@@ -424,7 +424,7 @@ module ts.server {
         
         getFormatCodeOptions(file?: string) {
             if (file) {
-                var info = this.filenameToScriptInfo[file];                
+                var info = this.filenameToScriptInfo[file];
                 if (info) {
                     return info.formatCodeOptions;
                 }
@@ -750,6 +750,7 @@ module ts.server {
                 if (content !== undefined) {
                     var indentSize: number;
                     info = new ScriptInfo(this.host, fileName, content, openedByClient);
+                    info.setFormatOptions(this.getFormatCodeOptions());
                     this.filenameToScriptInfo[fileName] = info;
                     if (!info.isOpen) {
                         info.fileWatcher = this.host.watchFile(fileName, _ => { this.watchedFileChanged(fileName); });
diff --git a/src/server/session.ts b/src/server/session.ts
index 52d33234636..18a47201366 100644
--- a/src/server/session.ts
+++ b/src/server/session.ts
@@ -519,7 +519,7 @@ module ts.server {
                                 IndentSize: formatOptions.IndentSize,
                                 TabSize: formatOptions.TabSize,
                                 NewLineCharacter: "\n",
-                                ConvertTabsToSpaces: true,
+                                ConvertTabsToSpaces: formatOptions.ConvertTabsToSpaces,
                             };
                             var indentPosition =
                                 compilerService.languageService.getIndentationAtPosition(file, position, editorOptions);