Merge from vscode a5cf1da01d5db3d2557132be8d30f89c38019f6c (#8525)

* Merge from vscode a5cf1da01d5db3d2557132be8d30f89c38019f6c

* remove files we don't want

* fix hygiene

* update distro

* update distro

* fix hygiene

* fix strict nulls

* distro

* distro

* fix tests

* fix tests

* add another edit

* fix viewlet icon

* fix azure dialog

* fix some padding

* fix more padding issues

extensions/vscode-colorize-tests/package.json

@@ -5,14 +5,22 @@
 	"publisher": "vscode",
 	"license": "MIT",
 	"private": true,
+	"activationEvents": [
+		"onLanguage:json"
+	],
+	"main": "./out/colorizerTestMain",
+	"enableProposedApi": true,
 	"engines": {
 		"vscode": "*"
 	},
 	"scripts": {
 		"vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:vscode-colorize-tests ./tsconfig.json"
 	},
+	"dependencies": {
+		"jsonc-parser": "2.2.0"
+	},
 	"devDependencies": {
-		"@types/node": "^10.14.8",
+		"@types/node": "^12.11.7",
 		"mocha-junit-reporter": "^1.17.0",
 		"mocha-multi-reporters": "^1.1.7",
 		"vscode": "1.1.5"