From 52d3961c2b96276244449032a9276194a2177f01 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Mon, 1 Oct 2018 18:40:18 -0700
Subject: [PATCH] Update more extensions to use shared config

---
 extensions/debug-auto-launch/src/extension.ts  |  2 +-
 extensions/debug-auto-launch/tsconfig.json     |  8 +-------
 extensions/grunt/tsconfig.json                 | 13 ++-----------
 extensions/gulp/tsconfig.json                  | 13 ++-----------
 extensions/merge-conflict/tsconfig.json        | 16 +++-------------
 extensions/php-language-features/tsconfig.json | 13 ++-----------
 extensions/python/src/pythonMain.ts            |  2 +-
 extensions/python/tsconfig.json                |  9 ++-------
 extensions/vscode-colorize-tests/tsconfig.json | 12 ++----------
 9 files changed, 16 insertions(+), 72 deletions(-)

diff --git a/extensions/debug-auto-launch/src/extension.ts b/extensions/debug-auto-launch/src/extension.ts
index 3f101d071bffe..1c6458bafea08 100644
--- a/extensions/debug-auto-launch/src/extension.ts
+++ b/extensions/debug-auto-launch/src/extension.ts
@@ -39,7 +39,7 @@ export function deactivate(): void {
 }
 
 
-function toggleAutoAttachSetting(context: vscode.ExtensionContext) {
+function toggleAutoAttachSetting() {
 
 	const conf = vscode.workspace.getConfiguration(DEBUG_SETTINGS);
 	if (conf) {
diff --git a/extensions/debug-auto-launch/tsconfig.json b/extensions/debug-auto-launch/tsconfig.json
index 2a5517b554375..f9b780a0e1cf3 100644
--- a/extensions/debug-auto-launch/tsconfig.json
+++ b/extensions/debug-auto-launch/tsconfig.json
@@ -1,13 +1,7 @@
 {
+	"extends": "../shared.tsconfig.json",
 	"compilerOptions": {
-		"target": "es5",
-		"module": "commonjs",
 		"outDir": "./out",
-		"lib": [
-			"es2015"
-		],
-		"strict": true,
-		"noUnusedLocals": true,
 		"downlevelIteration": true
 	},
 	"include": [
diff --git a/extensions/grunt/tsconfig.json b/extensions/grunt/tsconfig.json
index 51007d3cc8420..296ddb38fcb30 100644
--- a/extensions/grunt/tsconfig.json
+++ b/extensions/grunt/tsconfig.json
@@ -1,16 +1,7 @@
 {
+	"extends": "../shared.tsconfig.json",
 	"compilerOptions": {
-		"target": "es6",
-		"module": "commonjs",
-		"lib": [
-			"es2016"
-		],
-		"outDir": "./out",
-		"noImplicitAny": true,
-		"noImplicitReturns": true,
-		"noUnusedLocals": true,
-		"noUnusedParameters": true,
-		"strict": true
+		"outDir": "./out"
 	},
 	"include": [
 		"src/**/*"
diff --git a/extensions/gulp/tsconfig.json b/extensions/gulp/tsconfig.json
index 51007d3cc8420..296ddb38fcb30 100644
--- a/extensions/gulp/tsconfig.json
+++ b/extensions/gulp/tsconfig.json
@@ -1,16 +1,7 @@
 {
+	"extends": "../shared.tsconfig.json",
 	"compilerOptions": {
-		"target": "es6",
-		"module": "commonjs",
-		"lib": [
-			"es2016"
-		],
-		"outDir": "./out",
-		"noImplicitAny": true,
-		"noImplicitReturns": true,
-		"noUnusedLocals": true,
-		"noUnusedParameters": true,
-		"strict": true
+		"outDir": "./out"
 	},
 	"include": [
 		"src/**/*"
diff --git a/extensions/merge-conflict/tsconfig.json b/extensions/merge-conflict/tsconfig.json
index 545f2260b61e4..296ddb38fcb30 100644
--- a/extensions/merge-conflict/tsconfig.json
+++ b/extensions/merge-conflict/tsconfig.json
@@ -1,19 +1,9 @@
 {
+	"extends": "../shared.tsconfig.json",
 	"compilerOptions": {
-		"target": "es6",
-		"lib": [
-			"es2016"
-		],
-		"module": "commonjs",
-		"outDir": "./out",
-		"noImplicitAny": true,
-		"noImplicitReturns": true,
-		"noUnusedLocals": true,
-		"noUnusedParameters": true,
-		"strict": true,
-		"experimentalDecorators": true
+		"outDir": "./out"
 	},
 	"include": [
 		"src/**/*"
 	]
-}
+}
\ No newline at end of file
diff --git a/extensions/php-language-features/tsconfig.json b/extensions/php-language-features/tsconfig.json
index 7e9b0d127b409..296ddb38fcb30 100644
--- a/extensions/php-language-features/tsconfig.json
+++ b/extensions/php-language-features/tsconfig.json
@@ -1,16 +1,7 @@
 {
+	"extends": "../shared.tsconfig.json",
 	"compilerOptions": {
-		"target": "es5",
-		"lib": [
-			"es2015"
-		],
-		"module": "commonjs",
-		"outDir": "./out",
-		"noImplicitAny": true,
-		"noImplicitReturns": true,
-		"noUnusedLocals": true,
-		"noUnusedParameters": true,
-		"strict": true
+		"outDir": "./out"
 	},
 	"include": [
 		"src/**/*"
diff --git a/extensions/python/src/pythonMain.ts b/extensions/python/src/pythonMain.ts
index b96d2a461489b..61a73618f7992 100644
--- a/extensions/python/src/pythonMain.ts
+++ b/extensions/python/src/pythonMain.ts
@@ -5,7 +5,7 @@
 'use strict';
 import { ExtensionContext, languages, IndentAction } from 'vscode';
 
-export function activate(context: ExtensionContext): any {
+export function activate(_context: ExtensionContext): any {
 	languages.setLanguageConfiguration('python', {
 		onEnterRules: [
 			{
diff --git a/extensions/python/tsconfig.json b/extensions/python/tsconfig.json
index b16347a7524fa..296ddb38fcb30 100644
--- a/extensions/python/tsconfig.json
+++ b/extensions/python/tsconfig.json
@@ -1,12 +1,7 @@
 {
+	"extends": "../shared.tsconfig.json",
 	"compilerOptions": {
-		"target": "es5",
-		"lib": [
-			"es2015"
-		],
-		"module": "commonjs",
-		"outDir": "./out",
-		"strict": true
+		"outDir": "./out"
 	},
 	"include": [
 		"src/**/*"
diff --git a/extensions/vscode-colorize-tests/tsconfig.json b/extensions/vscode-colorize-tests/tsconfig.json
index e20c62568a81e..296ddb38fcb30 100644
--- a/extensions/vscode-colorize-tests/tsconfig.json
+++ b/extensions/vscode-colorize-tests/tsconfig.json
@@ -1,15 +1,7 @@
 {
+	"extends": "../shared.tsconfig.json",
 	"compilerOptions": {
-		"module": "commonjs",
-		"target": "ES5",
-		"outDir": "out",
-		"lib": [
-			"es2015"
-		],
-		"sourceMap": true,
-		"strict": true,
-		"noUnusedLocals": true,
-		"noUnusedParameters": true
+		"outDir": "./out"
 	},
 	"include": [
 		"src/**/*"