diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 814b943d510a7af3863594136ea6de1d5f6a04a9..b3c9c2c575918919c608f71cf37e962687e4ce4c 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -415,9 +415,9 @@
       "resolved": "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.21.0.tgz"
     },
     "vscode-ripgrep": {
-      "version": "0.0.12",
-      "from": "vscode-ripgrep@0.0.12",
-      "resolved": "https://registry.npmjs.org/vscode-ripgrep/-/vscode-ripgrep-0.0.12.tgz"
+      "version": "0.0.15",
+      "from": "vscode-ripgrep@0.0.15",
+      "resolved": "https://registry.npmjs.org/vscode-ripgrep/-/vscode-ripgrep-0.0.15.tgz"
     },
     "vscode-textmate": {
       "version": "3.1.5",
diff --git a/package.json b/package.json
index a1f6517d4d4415233ff343503065bc279ef53131..813a5a96b417e3be6b8c50e9c728ac6055dbf57f 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "semver": "4.3.6",
     "v8-profiler": "jrieken/v8-profiler#vscode",
     "vscode-debugprotocol": "1.21.0",
-    "vscode-ripgrep": "0.0.12",
+    "vscode-ripgrep": "0.0.15",
     "vscode-textmate": "^3.1.5",
     "winreg": "1.2.0",
     "xterm": "Tyriar/xterm.js#vscode-release/1.15",
diff --git a/src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts b/src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts
index 2f3f19064e92c4f4d23b9e66ad152a18495ad51a..e95e8930f8c1deb528009a1c739e0ee77fbfbdda 100644
--- a/src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts
+++ b/src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts
@@ -3,265 +3,265 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-// 'use strict';
-
-// import path = require('path');
-// import assert = require('assert');
-
-// import { TPromise } from 'vs/base/common/winjs.base';
-// import { FileWalker } from 'vs/workbench/services/search/node/fileSearch';
-// import { ISerializedFileMatch, IRawSearch, IFolderSearch } from 'vs/workbench/services/search/node/search';
-// import { Engine as TextSearchEngine } from 'vs/workbench/services/search/node/textSearch';
-// import { RipgrepEngine } from 'vs/workbench/services/search/node/ripgrepTextSearch';
-// import { TextSearchWorkerProvider } from 'vs/workbench/services/search/node/textSearchWorkerProvider';
-
-// function countAll(matches: ISerializedFileMatch[]): number {
-// 	return matches.reduce((acc, m) => acc + m.numMatches, 0);
-// }
-
-// const TEST_ROOT_FOLDER = path.normalize(require.toUrl('./fixtures'));
-// function rootFolderQueries(): IFolderSearch[] {
-// 	return [
-// 		{ folder: TEST_ROOT_FOLDER }
-// 	];
-// }
-
-// const textSearchWorkerProvider = new TextSearchWorkerProvider();
-
-// function doLegacySearchTest(config: IRawSearch, expectedResultCount: number | Function): TPromise<void> {
-// 	return new TPromise<void>((resolve, reject) => {
-// 		let engine = new TextSearchEngine(config, new FileWalker(config), textSearchWorkerProvider);
-
-// 		let c = 0;
-// 		engine.search((result) => {
-// 			if (result) {
-// 				c += countAll(result);
-// 			}
-// 		}, () => { }, (error) => {
-// 			try {
-// 				assert.ok(!error);
-// 				if (typeof expectedResultCount === 'function') {
-// 					assert(expectedResultCount(c));
-// 				} else {
-// 					assert.equal(c, expectedResultCount);
-// 				}
-// 			} catch (e) {
-// 				reject(e);
-// 			}
-
-// 			resolve(undefined);
-// 		});
-// 	});
-// }
-
-// function doRipgrepSearchTest(config: IRawSearch, expectedResultCount: number): TPromise<void> {
-// 	return new TPromise<void>((resolve, reject) => {
-// 		let engine = new RipgrepEngine(config);
-
-// 		let c = 0;
-// 		engine.search((result) => {
-// 			if (result) {
-// 				c += result.numMatches;
-// 			}
-// 		}, () => { }, (error) => {
-// 			try {
-// 				assert.ok(!error);
-// 				if (typeof expectedResultCount === 'function') {
-// 					assert(expectedResultCount(c));
-// 				} else {
-// 					assert.equal(c, expectedResultCount);
-// 				}
-// 			} catch (e) {
-// 				reject(e);
-// 			}
-
-// 			resolve(undefined);
-// 		});
-// 	});
-// }
-
-// function doSearchTest(config: IRawSearch, expectedResultCount: number, done) {
-// 	return doLegacySearchTest(config, expectedResultCount)
-// 		.then(() => doRipgrepSearchTest(config, expectedResultCount))
-// 		.then(done, done);
-// }
-
-// suite('Search-integration', () => {
-// 	test('Text: GameOfLife', function (done: () => void) {
-// 		this.timeout(1000 * 60); // increase timeout for this one test
-
-// 		let config = {
-// 			folderQueries: rootFolderQueries(),
-// 			filePattern: '*.js',
-// 			contentPattern: { pattern: 'GameOfLife', modifiers: 'i' },
-// 		};
-
-// 		doSearchTest(config, 4, done);
-// 	});
-
-// 	test('Text: GameOfLife (RegExp)', function (done: () => void) {
-// 		this.timeout(1000 * 60); // increase timeout for this one test
-
-// 		let config = {
-// 			folderQueries: rootFolderQueries(),
-// 			filePattern: '*.js',
-// 			contentPattern: { pattern: 'Game.?fL\\w?fe', isRegExp: true }
-// 		};
-
-// 		doSearchTest(config, 4, done);
-// 	});
-
-// 	test('Text: GameOfLife (RegExp to EOL)', function (done: () => void) {
-// 		this.timeout(1000 * 60); // increase timeout for this one test
-
-// 		let config = {
-// 			folderQueries: rootFolderQueries(),
-// 			filePattern: '*.js',
-// 			contentPattern: { pattern: 'GameOfLife.*', isRegExp: true }
-// 		};
-
-// 		doSearchTest(config, 4, done);
-// 	});
-
-// 	test('Text: GameOfLife (Word Match, Case Sensitive)', function (done: () => void) {
-// 		this.timeout(1000 * 60); // increase timeout for this one test
-
-// 		let config = {
-// 			folderQueries: rootFolderQueries(),
-// 			filePattern: '*.js',
-// 			contentPattern: { pattern: 'GameOfLife', isWordMatch: true, isCaseSensitive: true }
-// 		};
-
-// 		doSearchTest(config, 4, done);
-// 	});
-
-// 	test('Text: GameOfLife (Word Match, Spaces)', function (done: () => void) {
-// 		this.timeout(1000 * 60); // increase timeout for this one test
-
-// 		let config = {
-// 			folderQueries: rootFolderQueries(),
-// 			filePattern: '*.js',
-// 			contentPattern: { pattern: ' GameOfLife ', isWordMatch: true }
-// 		};
-
-// 		doSearchTest(config, 1, done);
-// 	});
-
-// 	test('Text: GameOfLife (Word Match, Punctuation and Spaces)', function (done: () => void) {
-// 		this.timeout(1000 * 60); // increase timeout for this one test
-
-// 		let config = {
-// 			folderQueries: rootFolderQueries(),
-// 			filePattern: '*.js',
-// 			contentPattern: { pattern: ', as =', isWordMatch: true }
-// 		};
-
-// 		doSearchTest(config, 1, done);
-// 	});
-
-// 	test('Text: Helvetica (UTF 16)', function (done: () => void) {
-// 		this.timeout(1000 * 60); // increase timeout for this one test
-
-// 		let config = {
-// 			folderQueries: rootFolderQueries(),
-// 			filePattern: '*.css',
-// 			contentPattern: { pattern: 'Helvetica', modifiers: 'i' }
-// 		};
-
-// 		doSearchTest(config, 3, done);
-// 	});
-
-// 	test('Text: e', function (done: () => void) {
-// 		this.timeout(1000 * 60); // increase timeout for this one test
-
-// 		let config = {
-// 			folderQueries: rootFolderQueries(),
-// 			filePattern: '*.*',
-// 			contentPattern: { pattern: 'e', modifiers: 'i' }
-// 		};
-
-// 		doSearchTest(config, 776, done);
-// 	});
-
-// 	test('Text: e (with excludes)', function (done: () => void) {
-// 		this.timeout(1000 * 60); // increase timeout for this one test
-
-// 		let config: any = {
-// 			folderQueries: rootFolderQueries(),
-// 			filePattern: '*.*',
-// 			contentPattern: { pattern: 'e', modifiers: 'i' },
-// 			excludePattern: { '**/examples': true }
-// 		};
-
-// 		doSearchTest(config, 394, done);
-// 	});
-
-// 	test('Text: e (with includes)', function (done: () => void) {
-// 		this.timeout(1000 * 60); // increase timeout for this one test
-
-// 		let config: any = {
-// 			folderQueries: rootFolderQueries(),
-// 			filePattern: '*.*',
-// 			contentPattern: { pattern: 'e', modifiers: 'i' },
-// 			includePattern: { '**/examples/**': true }
-// 		};
-
-// 		doSearchTest(config, 382, done);
-// 	});
-
-// 	test('Text: e (with includes and exclude)', function (done: () => void) {
-// 		this.timeout(1000 * 60); // increase timeout for this one test
-
-// 		let config: any = {
-// 			folderQueries: rootFolderQueries(),
-// 			filePattern: '*.*',
-// 			contentPattern: { pattern: 'e', modifiers: 'i' },
-// 			includePattern: { '**/examples/**': true },
-// 			excludePattern: { '**/examples/small.js': true }
-// 		};
-
-// 		doSearchTest(config, 361, done);
-// 	});
-
-// 	test('Text: a (capped)', function (done: () => void) {
-// 		this.timeout(1000 * 60); // increase timeout for this one test
-
-// 		const maxResults = 520;
-// 		let config = {
-// 			folderQueries: rootFolderQueries(),
-// 			filePattern: '*.*',
-// 			contentPattern: { pattern: 'a', modifiers: 'i' },
-// 			maxResults
-// 		};
-
-// 		// (Legacy) search can go over the maxResults because it doesn't trim the results from its worker processes to the exact max size.
-// 		// But the worst-case scenario should be 2*max-1
-// 		return doLegacySearchTest(config, count => count < maxResults * 2)
-// 			.then(() => doRipgrepSearchTest(config, maxResults))
-// 			.then(done, done);
-// 	});
-
-// 	test('Text: a (no results)', function (done: () => void) {
-// 		this.timeout(1000 * 60); // increase timeout for this one test
-
-// 		let config = {
-// 			folderQueries: rootFolderQueries(),
-// 			filePattern: '*.*',
-// 			contentPattern: { pattern: 'ahsogehtdas', modifiers: 'i' }
-// 		};
-
-// 		doSearchTest(config, 0, done);
-// 	});
-
-// 	test('Text: -size', function (done: () => void) {
-// 		this.timeout(1000 * 60); // increase timeout for this one test
-
-// 		let config = {
-// 			folderQueries: rootFolderQueries(),
-// 			filePattern: '*.css',
-// 			contentPattern: { pattern: '-size', modifiers: 'i' }
-// 		};
-
-// 		doSearchTest(config, 9, done);
-// 	});
-// });
\ No newline at end of file
+'use strict';
+
+import path = require('path');
+import assert = require('assert');
+
+import { TPromise } from 'vs/base/common/winjs.base';
+import { FileWalker } from 'vs/workbench/services/search/node/fileSearch';
+import { ISerializedFileMatch, IRawSearch, IFolderSearch } from 'vs/workbench/services/search/node/search';
+import { Engine as TextSearchEngine } from 'vs/workbench/services/search/node/textSearch';
+import { RipgrepEngine } from 'vs/workbench/services/search/node/ripgrepTextSearch';
+import { TextSearchWorkerProvider } from 'vs/workbench/services/search/node/textSearchWorkerProvider';
+
+function countAll(matches: ISerializedFileMatch[]): number {
+	return matches.reduce((acc, m) => acc + m.numMatches, 0);
+}
+
+const TEST_ROOT_FOLDER = path.normalize(require.toUrl('./fixtures'));
+function rootFolderQueries(): IFolderSearch[] {
+	return [
+		{ folder: TEST_ROOT_FOLDER }
+	];
+}
+
+const textSearchWorkerProvider = new TextSearchWorkerProvider();
+
+function doLegacySearchTest(config: IRawSearch, expectedResultCount: number | Function): TPromise<void> {
+	return new TPromise<void>((resolve, reject) => {
+		let engine = new TextSearchEngine(config, new FileWalker(config), textSearchWorkerProvider);
+
+		let c = 0;
+		engine.search((result) => {
+			if (result) {
+				c += countAll(result);
+			}
+		}, () => { }, (error) => {
+			try {
+				assert.ok(!error);
+				if (typeof expectedResultCount === 'function') {
+					assert(expectedResultCount(c));
+				} else {
+					assert.equal(c, expectedResultCount);
+				}
+			} catch (e) {
+				reject(e);
+			}
+
+			resolve(undefined);
+		});
+	});
+}
+
+function doRipgrepSearchTest(config: IRawSearch, expectedResultCount: number): TPromise<void> {
+	return new TPromise<void>((resolve, reject) => {
+		let engine = new RipgrepEngine(config);
+
+		let c = 0;
+		engine.search((result) => {
+			if (result) {
+				c += result.numMatches;
+			}
+		}, () => { }, (error) => {
+			try {
+				assert.ok(!error);
+				if (typeof expectedResultCount === 'function') {
+					assert(expectedResultCount(c));
+				} else {
+					assert.equal(c, expectedResultCount);
+				}
+			} catch (e) {
+				reject(e);
+			}
+
+			resolve(undefined);
+		});
+	});
+}
+
+function doSearchTest(config: IRawSearch, expectedResultCount: number, done) {
+	return doLegacySearchTest(config, expectedResultCount)
+		.then(() => doRipgrepSearchTest(config, expectedResultCount))
+		.then(done, done);
+}
+
+suite('Search-integration', () => {
+	test('Text: GameOfLife', function (done: () => void) {
+		this.timeout(1000 * 60); // increase timeout for this one test
+
+		let config = {
+			folderQueries: rootFolderQueries(),
+			filePattern: '*.js',
+			contentPattern: { pattern: 'GameOfLife', modifiers: 'i' },
+		};
+
+		doSearchTest(config, 4, done);
+	});
+
+	test('Text: GameOfLife (RegExp)', function (done: () => void) {
+		this.timeout(1000 * 60); // increase timeout for this one test
+
+		let config = {
+			folderQueries: rootFolderQueries(),
+			filePattern: '*.js',
+			contentPattern: { pattern: 'Game.?fL\\w?fe', isRegExp: true }
+		};
+
+		doSearchTest(config, 4, done);
+	});
+
+	test('Text: GameOfLife (RegExp to EOL)', function (done: () => void) {
+		this.timeout(1000 * 60); // increase timeout for this one test
+
+		let config = {
+			folderQueries: rootFolderQueries(),
+			filePattern: '*.js',
+			contentPattern: { pattern: 'GameOfLife.*', isRegExp: true }
+		};
+
+		doSearchTest(config, 4, done);
+	});
+
+	test('Text: GameOfLife (Word Match, Case Sensitive)', function (done: () => void) {
+		this.timeout(1000 * 60); // increase timeout for this one test
+
+		let config = {
+			folderQueries: rootFolderQueries(),
+			filePattern: '*.js',
+			contentPattern: { pattern: 'GameOfLife', isWordMatch: true, isCaseSensitive: true }
+		};
+
+		doSearchTest(config, 4, done);
+	});
+
+	test('Text: GameOfLife (Word Match, Spaces)', function (done: () => void) {
+		this.timeout(1000 * 60); // increase timeout for this one test
+
+		let config = {
+			folderQueries: rootFolderQueries(),
+			filePattern: '*.js',
+			contentPattern: { pattern: ' GameOfLife ', isWordMatch: true }
+		};
+
+		doSearchTest(config, 1, done);
+	});
+
+	test('Text: GameOfLife (Word Match, Punctuation and Spaces)', function (done: () => void) {
+		this.timeout(1000 * 60); // increase timeout for this one test
+
+		let config = {
+			folderQueries: rootFolderQueries(),
+			filePattern: '*.js',
+			contentPattern: { pattern: ', as =', isWordMatch: true }
+		};
+
+		doSearchTest(config, 1, done);
+	});
+
+	test('Text: Helvetica (UTF 16)', function (done: () => void) {
+		this.timeout(1000 * 60); // increase timeout for this one test
+
+		let config = {
+			folderQueries: rootFolderQueries(),
+			filePattern: '*.css',
+			contentPattern: { pattern: 'Helvetica', modifiers: 'i' }
+		};
+
+		doSearchTest(config, 3, done);
+	});
+
+	test('Text: e', function (done: () => void) {
+		this.timeout(1000 * 60); // increase timeout for this one test
+
+		let config = {
+			folderQueries: rootFolderQueries(),
+			filePattern: '*.*',
+			contentPattern: { pattern: 'e', modifiers: 'i' }
+		};
+
+		doSearchTest(config, 776, done);
+	});
+
+	test('Text: e (with excludes)', function (done: () => void) {
+		this.timeout(1000 * 60); // increase timeout for this one test
+
+		let config: any = {
+			folderQueries: rootFolderQueries(),
+			filePattern: '*.*',
+			contentPattern: { pattern: 'e', modifiers: 'i' },
+			excludePattern: { '**/examples': true }
+		};
+
+		doSearchTest(config, 394, done);
+	});
+
+	test('Text: e (with includes)', function (done: () => void) {
+		this.timeout(1000 * 60); // increase timeout for this one test
+
+		let config: any = {
+			folderQueries: rootFolderQueries(),
+			filePattern: '*.*',
+			contentPattern: { pattern: 'e', modifiers: 'i' },
+			includePattern: { '**/examples/**': true }
+		};
+
+		doSearchTest(config, 382, done);
+	});
+
+	test('Text: e (with includes and exclude)', function (done: () => void) {
+		this.timeout(1000 * 60); // increase timeout for this one test
+
+		let config: any = {
+			folderQueries: rootFolderQueries(),
+			filePattern: '*.*',
+			contentPattern: { pattern: 'e', modifiers: 'i' },
+			includePattern: { '**/examples/**': true },
+			excludePattern: { '**/examples/small.js': true }
+		};
+
+		doSearchTest(config, 361, done);
+	});
+
+	test('Text: a (capped)', function (done: () => void) {
+		this.timeout(1000 * 60); // increase timeout for this one test
+
+		const maxResults = 520;
+		let config = {
+			folderQueries: rootFolderQueries(),
+			filePattern: '*.*',
+			contentPattern: { pattern: 'a', modifiers: 'i' },
+			maxResults
+		};
+
+		// (Legacy) search can go over the maxResults because it doesn't trim the results from its worker processes to the exact max size.
+		// But the worst-case scenario should be 2*max-1
+		return doLegacySearchTest(config, count => count < maxResults * 2)
+			.then(() => doRipgrepSearchTest(config, maxResults))
+			.then(done, done);
+	});
+
+	test('Text: a (no results)', function (done: () => void) {
+		this.timeout(1000 * 60); // increase timeout for this one test
+
+		let config = {
+			folderQueries: rootFolderQueries(),
+			filePattern: '*.*',
+			contentPattern: { pattern: 'ahsogehtdas', modifiers: 'i' }
+		};
+
+		doSearchTest(config, 0, done);
+	});
+
+	test('Text: -size', function (done: () => void) {
+		this.timeout(1000 * 60); // increase timeout for this one test
+
+		let config = {
+			folderQueries: rootFolderQueries(),
+			filePattern: '*.css',
+			contentPattern: { pattern: '-size', modifiers: 'i' }
+		};
+
+		doSearchTest(config, 9, done);
+	});
+});
\ No newline at end of file