From 1d426ba8920bbc7796ce4e4b4bc87a96031fa046 Mon Sep 17 00:00:00 2001
From: Dirk Baeumer <dirkb@microsoft.com>
Date: Fri, 8 May 2015 11:40:03 +0200
Subject: [PATCH 1/2] Format on type deletes valid range

---
 src/server/session.ts | 41 +++++++++++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/src/server/session.ts b/src/server/session.ts
index baf0a085ad4a9..3ea37906aa90d 100644
--- a/src/server/session.ts
+++ b/src/server/session.ts
@@ -21,6 +21,21 @@ module ts.server {
         }  
         return spaceCache[n];
     }
+    
+    export function generateIndentString(n: number, editorOptions: EditorOptions): string {
+        if (editorOptions.ConvertTabsToSpaces) {
+            return generateSpaces(n);
+        } else {
+            var result = "";
+            for (var i = 0; i < Math.floor(n / editorOptions.TabSize); i++) {
+                result += "\t";
+            }
+            for (var i = 0; i < n % editorOptions.TabSize; i++) {
+                result += " ";
+            }
+            return result;
+        }
+    }
 
     interface FileStart {
         file: string;
@@ -541,31 +556,29 @@ module ts.server {
                             var editorOptions: ts.EditorOptions = {
                                 IndentSize: formatOptions.IndentSize,
                                 TabSize: formatOptions.TabSize,
-                                NewLineCharacter: "\n",
+                                NewLineCharacter: formatOptions.NewLineCharacter,
                                 ConvertTabsToSpaces: formatOptions.ConvertTabsToSpaces,
                             };
-                            var indentPosition =
-                                compilerService.languageService.getIndentationAtPosition(file, position, editorOptions);
+                            var preferredIndent = compilerService.languageService.getIndentationAtPosition(file, position, editorOptions);
+                            var hasIndent = 0;
                             for (var i = 0, len = lineText.length; i < len; i++) {
                                 if (lineText.charAt(i) == " ") {
-                                    indentPosition--;
+                                    hasIndent++;
                                 }
                                 else if (lineText.charAt(i) == "\t") {
-                                    indentPosition -= editorOptions.IndentSize;
+                                    hasIndent += editorOptions.TabSize;
                                 }
                                 else {
                                     break;
                                 }
                             }
-                            if (indentPosition > 0) {
-                                var spaces = generateSpaces(indentPosition);
-                                edits.push({ span: ts.createTextSpanFromBounds(position, position), newText: spaces });
-                            }
-                            else if (indentPosition < 0) {
-                                edits.push({
-                                    span: ts.createTextSpanFromBounds(position, position - indentPosition),
-                                    newText: ""
-                                });
+                            // i points to the first non whitespace character
+                            if (preferredIndent !== hasIndent) {
+                                var firstNoWhiteSpacePosition = lineInfo.offset + i;
+                                edits.push({ 
+                                    span: ts.createTextSpanFromBounds(lineInfo.offset, firstNoWhiteSpacePosition), 
+                                    newText: generateIndentString(preferredIndent, editorOptions)
+                                });                                
                             }
                         }
                     }

From 50238888d40f7bbdd5c81393b3c508407b5186a4 Mon Sep 17 00:00:00 2001
From: Dirk Baeumer <dirkb@microsoft.com>
Date: Fri, 8 May 2015 12:02:15 +0200
Subject: [PATCH 2/2] System#write implementaiton for node should honor written
 bytes

---
 src/compiler/sys.ts | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
index f9daf52c5f28d..d969f7fb10613 100644
--- a/src/compiler/sys.ts
+++ b/src/compiler/sys.ts
@@ -29,6 +29,9 @@ module ts {
     declare var process: any;
     declare var global: any;
     declare var __filename: string;
+    declare var Buffer: {
+         new (str: string, encoding ?: string): any;
+    }
 
     declare class Enumerator {
         public atEnd(): boolean;
@@ -252,8 +255,15 @@ module ts {
                 newLine: _os.EOL,
                 useCaseSensitiveFileNames: useCaseSensitiveFileNames,
                 write(s: string): void {
+                    var buffer = new Buffer(s, 'utf8');
+                    var offset: number = 0;
+                    var toWrite: number = buffer.length
+                    var written = 0;
                     // 1 is a standard descriptor for stdout
-                    _fs.writeSync(1, s);
+                   while ((written = _fs.writeSync(1, buffer, offset, toWrite)) < toWrite) {
+                       offset += written;
+                       toWrite -= written; 
+                   }
                 },
                 readFile,
                 writeFile,