Merge from vscode 7653d836944892f83ce9e1f95c1204bafa1aec31

This commit is contained in:
ADS Merger
2020-05-08 03:58:34 +00:00
parent dac1970c43
commit fa62ec1f34
209 changed files with 5131 additions and 2480 deletions

View File

@@ -10,8 +10,8 @@ let fs = require('fs');
let https = require('https');
let url = require('url');
// list of languagesIs not shipped with VSCode. The information is used to associate an icon with a language association
let nonBuiltInLanguages = { // { fileNames, extensions }
// list of languagesId not shipped with VSCode. The information is used to associate an icon with a language association
let nonBuiltInLanguages = { // { fileNames, extensions }
"r": { extensions: ['r', 'rhistory', 'rprofile', 'rt'] },
"argdown": { extensions: ['ad', 'adown', 'argdown', 'argdn'] },
"elm": { extensions: ['elm'] },
@@ -32,10 +32,16 @@ let nonBuiltInLanguages = { // { fileNames, extensions }
"haml": { extensions: ['haml'] },
"stylus": { extensions: ['styl'] },
"vala": { extensions: ['vala'] },
"todo": { fileNames: ['todo'] },
"jsonc": { extensions: ['json'] }
"todo": { fileNames: ['todo'] }
};
// list of languagesId that inherit the icon from another language
let inheritIconFromLanguage = {
"jsonc": 'json',
"postcss": 'css',
"django-html": 'html'
}
let FROM_DISK = true; // set to true to take content from a repo checked out next to the vscode repo
let font, fontMappingsFile, fileAssociationFile, colorsFile;
@@ -358,6 +364,16 @@ exports.update = function () {
}
}
}
for (let lang in inheritIconFromLanguage) {
let superLang = inheritIconFromLanguage[lang];
let def = lang2Def[superLang];
if (def) {
lang2Def[lang] = def;
} else {
console.log('skipping icon def for ' + lang + ': no icon for ' + superLang + ' defined');
}
}
return download(colorsFile).then(function (content) {