Merge branch 'master' of https://github.com/nojvek/vscode into nojvek-master

.gitignore

@@ -10,4 +10,5 @@ out-editor-min/
 out-monaco-editor-core/
 out-vscode/
 out-vscode-min/
-build/node_modules
+build/node_modules
+coverage/

.travis.yml

@@ -45,5 +45,8 @@ script:
   - gulp electron
   - gulp compile
   - gulp optimize-vscode
-  - ./scripts/test.sh
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./scripts/test.sh --coverage; else ./scripts/test.sh; fi
   - ./scripts/test-integration.sh
+
+after_success:
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then node_modules/.bin/coveralls < .build/coverage/lcov.info; fi

README.md

@@ -1,6 +1,8 @@
 # Visual Studio Code - Open Source
 
-[![Build Status](https://travis-ci.org/Microsoft/vscode.svg?branch=master)](https://travis-ci.org/Microsoft/vscode) [![Build status](https://ci.appveyor.com/api/projects/status/vuhlhg80tj3e2a0l?svg=true)](https://ci.appveyor.com/project/VSCode/vscode)
+[![Build Status](https://travis-ci.org/Microsoft/vscode.svg?branch=master)](https://travis-ci.org/Microsoft/vscode)
+[![Build status](https://ci.appveyor.com/api/projects/status/vuhlhg80tj3e2a0l?svg=true)](https://ci.appveyor.com/project/VSCode/vscode)
+[![Coverage Status](https://img.shields.io/coveralls/Microsoft/vscode/master.svg)](https://coveralls.io/github/Microsoft/vscode?branch=master)
 
 [VS Code](https://code.visualstudio.com) is a new type of tool that combines the simplicity of
 a code editor with what developers need for their core edit-build-debug cycle. Code

package.json

@@ -38,6 +38,7 @@
     "azure-storage": "^0.3.1",
     "clean-css": "3.4.6",
     "clone": "^1.0.2",
+    "coveralls": "^2.11.11",
     "cson-parser": "^1.3.3",
     "debounce": "^1.0.0",
     "documentdb": "^1.5.1",

test/all.js

@@ -107,8 +107,8 @@ function main() {
 			var collector = new istanbul.Collector();
 			collector.add(global.__coverage__);
 
-			var reporter = new istanbul.Reporter(null, path.join(path.dirname(path.dirname(__dirname)), 'Code-Coverage'));
-			reporter.add('html');
+			var reporter = new istanbul.Reporter(null, path.join(path.dirname(__dirname), '.build', 'coverage'));
+			reporter.addAll(['lcov', 'html']);
 			reporter.write(collector, true, function () {});
 		});
 	}