Merge branch 'master' of https://github.com/Microsoft/vscode

src/tsconfig.strictNullChecks.json

@@ -133,6 +133,7 @@
 		"./vs/base/test/common/filters.perf.test.ts",
 		"./vs/base/test/common/filters.test.ts",
 		"./vs/base/test/common/hash.test.ts",
+		"./vs/base/test/common/history.test.ts",
 		"./vs/base/test/common/json.test.ts",
 		"./vs/base/test/common/jsonEdit.test.ts",
 		"./vs/base/test/common/jsonFormatter.test.ts",

src/vs/base/test/common/history.test.ts

@@ -113,8 +113,8 @@ suite('History Navigator', () => {
 		assert.equal(testObject.current(), undefined);
 	});
 
-	function toArray(historyNavigator: HistoryNavigator<string>): string[] {
-		let result: string[] = [];
+	function toArray(historyNavigator: HistoryNavigator<string>): Array<string | null> {
+		let result: Array<string | null> = [];
 		historyNavigator.first();
 		if (historyNavigator.current()) {
 			do {