Merge from master

extensions/json-language-features/server/src/utils/runner.ts

@@ -2,7 +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 { CancellationToken, ResponseError, ErrorCodes } from 'vscode-languageserver';
 
@@ -19,7 +18,7 @@ export function formatError(message: string, err: any): string {
 }
 
 export function runSafeAsync<T>(func: () => Thenable<T>, errorVal: T, errorMessage: string, token: CancellationToken): Thenable<T | ResponseError<any>> {
-	return new Promise<T | ResponseError<any>>((resolve, reject) => {
+	return new Promise<T | ResponseError<any>>((resolve) => {
 		setImmediate(() => {
 			if (token.isCancellationRequested) {
 				resolve(cancelValue());
@@ -40,7 +39,7 @@ export function runSafeAsync<T>(func: () => Thenable<T>, errorVal: T, errorMessa
 }
 
 export function runSafe<T, E>(func: () => T, errorVal: T, errorMessage: string, token: CancellationToken): Thenable<T | ResponseError<E>> {
-	return new Promise<T | ResponseError<E>>((resolve, reject) => {
+	return new Promise<T | ResponseError<E>>((resolve) => {
 		setImmediate(() => {
 			if (token.isCancellationRequested) {
 				resolve(cancelValue());

extensions/json-language-features/server/src/utils/strings.ts

@@ -2,7 +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';
 
 export function startsWith(haystack: string, needle: string): boolean {
 	if (haystack.length < needle.length) {