Merge from vscode 70dc55955d586ebd427658b43cdb344f2047f9c2 (#6789)

This commit is contained in:
Anthony Dresser
2019-08-16 21:47:46 -07:00
committed by GitHub
parent fb26126bcb
commit 41d8663b09
79 changed files with 1815 additions and 572 deletions

View File

@@ -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: