Merge from master

src/vs/platform/contextkey/test/common/contextkey.test.ts

@@ -2,8 +2,6 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-'use strict';
-
 import * as assert from 'assert';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 
@@ -16,7 +14,7 @@ function createContext(ctx: any) {
 }
 
 suite('ContextKeyExpr', () => {
-	test('ContextKeyExpr.equals', function () {
+	test('ContextKeyExpr.equals', () => {
 		let a = ContextKeyExpr.and(
 			ContextKeyExpr.has('a1'),
 			ContextKeyExpr.and(ContextKeyExpr.has('and.a')),
@@ -57,7 +55,7 @@ suite('ContextKeyExpr', () => {
 		assert(a.equals(b), 'expressions should be equal');
 	});
 
-	test('normalize', function () {
+	test('normalize', () => {
 		let key1IsTrue = ContextKeyExpr.equals('key1', true);
 		let key1IsNotFalse = ContextKeyExpr.notEquals('key1', false);
 		let key1IsFalse = ContextKeyExpr.equals('key1', false);
@@ -69,7 +67,7 @@ suite('ContextKeyExpr', () => {
 		assert.ok(key1IsNotTrue.normalize().equals(ContextKeyExpr.not('key1')));
 	});
 
-	test('evaluate', function () {
+	test('evaluate', () => {
 		/* tslint:disable:triple-equals */
 		let context = createContext({
 			'a': true,