Merge from vscode 70dc55955d586ebd427658b43cdb344f2047f9c2 (#6789)

extensions/theme-seti/build/update-icon-theme.js

@@ -32,7 +32,8 @@ let nonBuiltInLanguages = { // { fileNames, extensions }
 	"haml": { extensions: ['haml'] },
 	"stylus": { extensions: ['styl'] },
 	"vala": { extensions: ['vala'] },
-	"todo": { fileNames: ['todo'] }
+	"todo": { fileNames: ['todo'] },
+	"jsonc": { extensions: ['json'] }
 };
 
 let FROM_DISK = true; // set to true to take content from a repo checked out next to the vscode repo
@@ -109,7 +110,7 @@ function downloadBinary(source, dest) {
 	return new Promise((c, e) => {
 		https.get(source, function (response) {
 			switch (response.statusCode) {
-				case 200:
+				case 200: {
 					let file = fs.createWriteStream(dest);
 					response.on('data', function (chunk) {
 						file.write(chunk);
@@ -121,6 +122,7 @@ function downloadBinary(source, dest) {
 						e(err.message);
 					});
 					break;
+				}
 				case 301:
 				case 302:
 				case 303:

extensions/theme-seti/cgmanifest.json

@@ -6,7 +6,7 @@
 				"git": {
 					"name": "seti-ui",
 					"repositoryUrl": "https://github.com/jesseweed/seti-ui",
-					"commitHash": "904c16acced1134a81b31d71d60293288c31334b"
+					"commitHash": "85a222708824c6f19bbecbec71633d2c97077dad"
 				}
 			},
 			"version": "0.1.0"

extensions/theme-seti/icons/vs-seti-icon-theme.json

@@ -1580,6 +1580,7 @@
 		"version.md": "_clock",
 		"version": "_clock",
 		"mvnw": "_maven",
+		"tsconfig.json": "_tsconfig",
 		"swagger.json": "_json_1",
 		"swagger.yml": "_json_1",
 		"swagger.yaml": "_json_1",
@@ -1589,6 +1590,8 @@
 		"docker-healthcheck": "_docker_2",
 		"docker-compose.yml": "_docker_3",
 		"docker-compose.yaml": "_docker_3",
+		"docker-compose.override.yml": "_docker_3",
+		"docker-compose.override.yaml": "_docker_3",
 		"firebase.json": "_firebase",
 		"geckodriver": "_firefox",
 		"gruntfile.js": "_grunt",
@@ -1968,6 +1971,7 @@
 			"version.md": "_clock_light",
 			"version": "_clock_light",
 			"mvnw": "_maven_light",
+			"tsconfig.json": "_tsconfig_light",
 			"swagger.json": "_json_1_light",
 			"swagger.yml": "_json_1_light",
 			"swagger.yaml": "_json_1_light",
@@ -1977,6 +1981,8 @@
 			"docker-healthcheck": "_docker_2_light",
 			"docker-compose.yml": "_docker_3_light",
 			"docker-compose.yaml": "_docker_3_light",
+			"docker-compose.override.yml": "_docker_3_light",
+			"docker-compose.override.yaml": "_docker_3_light",
 			"firebase.json": "_firebase_light",
 			"geckodriver": "_firefox_light",
 			"gruntfile.js": "_grunt_light",
@@ -2011,5 +2017,5 @@
 			"Schema Compare": "scmp"
 		}
 	},
-	"version": "https://github.com/jesseweed/seti-ui/commit/904c16acced1134a81b31d71d60293288c31334b"
-}
+	"version": "https://github.com/jesseweed/seti-ui/commit/85a222708824c6f19bbecbec71633d2c97077dad"
+}