From f3b1e94d6879f6ddb810aee53eb8007f9cc187f2 Mon Sep 17 00:00:00 2001
From: Jed Mao <jed.hunsaker@gmail.com>
Date: Sat, 25 Oct 2014 01:27:02 -0500
Subject: [PATCH] Introduce .editorconfig file

---
 .editorconfig | 16 ++++++++++
 package.json  | 88 +++++++++++++++++++++++++--------------------------
 2 files changed, 60 insertions(+), 44 deletions(-)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000000..0879f3c6c7d
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,16 @@
+# http://editorconfig.org
+
+# top-most EditorConfig file
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.json]
+indent_size = 2
+
+[*.yml]
+indent_size = 2
diff --git a/package.json b/package.json
index 00752302254..535a666a4f9 100644
--- a/package.json
+++ b/package.json
@@ -1,46 +1,46 @@
 {
-	"name": "typescript",
-	"author": "Microsoft Corp.",
-	"homepage": "http://typescriptlang.org/",
-	"version": "1.3.0",
-	"licenses": [
-		{
-			"type": "Apache License 2.0", 
-			"url": "https://github.com/Microsoft/TypeScript/blob/master/LICENSE.txt"
-		}
-	],
-	"description": "TypeScript is a language for application scale JavaScript development",
-	"keywords": [
-		"TypeScript", 
-		"Microsoft", 
-		"compiler", 
-		"language", 
-		"javascript"
-	],
-	"bugs": {
-		"url" : "https://github.com/Microsoft/TypeScript/issues"
-	},
-	"repository" : { 
-		"type" : "git",	
-		"url" : "https://github.com/Microsoft/TypeScript.git"  
-	},
-	"preferGlobal" : true,
-	"main" : "./bin/tsc.js",
-	"bin" : { 
-		"tsc" : "./bin/tsc" 
-	},
-	"engines" : { 
-		"node" : ">=0.8.0" 
-	},
-	"devDependencies": {
-		"jake" : "latest",
-		"mocha" : "latest",
-		"chai" : "latest",
-		"browserify" : "latest",
-		"istanbul": "latest",
-		"codeclimate-test-reporter": "latest"
-	},
-	"scripts": {
-		"test": "jake generate-code-coverage"
-	}
+  "name": "typescript",
+  "author": "Microsoft Corp.",
+  "homepage": "http://typescriptlang.org/",
+  "version": "1.3.0",
+  "licenses": [
+    {
+      "type": "Apache License 2.0",
+      "url": "https://github.com/Microsoft/TypeScript/blob/master/LICENSE.txt"
+    }
+  ],
+  "description": "TypeScript is a language for application scale JavaScript development",
+  "keywords": [
+    "TypeScript",
+    "Microsoft",
+    "compiler",
+    "language",
+    "javascript"
+  ],
+  "bugs": {
+    "url": "https://github.com/Microsoft/TypeScript/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/Microsoft/TypeScript.git"
+  },
+  "preferGlobal": true,
+  "main": "./bin/tsc.js",
+  "bin": {
+    "tsc": "./bin/tsc"
+  },
+  "engines": {
+    "node": ">=0.8.0"
+  },
+  "devDependencies": {
+    "browserify": "latest",
+    "chai": "latest",
+    "codeclimate-test-reporter": "latest",
+    "istanbul": "latest",
+    "jake": "latest",
+    "mocha": "latest"
+  },
+  "scripts": {
+    "test": "jake generate-code-coverage"
+  }
 }