chore(vscode): update to 1.55.2

lib/vscode/extensions/theme-seti/.vscodeignore

@@ -1,3 +1,4 @@
 build/**
 cgmanifest.json
 icons/preview.html
+CONTRIBUTING.md

lib/vscode/extensions/theme-seti/CONTRIBUTING.md

@@ -0,0 +1,32 @@
+# theme-seti
+
+This is an icon theme that uses the icons from [`seti-ui`](https://github.com/jesseweed/seti-ui).
+
+## Updating icons
+
+There is script that can be used to update icons, [./build/update-icon-theme.js](build/update-icon-theme.js).
+
+To run this script, run `npm run update` from the `theme-seti` directory.
+
+This can be run in one of two ways: looking at a local copy of `seti-ui` for icons, or getting them straight from GitHub.
+
+If you want to run it from a local copy of `seti-ui`, first clone [`seti-ui`](https://github.com/jesseweed/seti-ui) to the folder next to your `vscode` repo (from the `theme-seti` directory, `../../`).
+Then, inside the `set-ui` directory, run `npm install` followed by `npm run prepublishOnly`. This will generate updated icons.
+
+If you want to download the icons straight from GitHub, change the `FROM_DISK` variable to `false` inside of `update-icon-theme.js`.
+
+### Languages not shipped with `vscode`
+
+Languages that are not shipped with `vscode` must be added to the `nonBuiltInLanguages` object inside of `update-icon-theme.js`.
+
+These should match [the file mapping in `seti-ui`](https://github.com/jesseweed/seti-ui/blob/master/styles/components/icons/mapping.less).
+
+Please try and keep this list in alphabetical order! Thank you.
+
+## Previewing icons
+
+There is a [`./icons/preview.html`](./icons/preview.html) file that can be opened to see all of the icons included in the theme.
+Note that to view this, it needs to be hosted by a web server.
+
+When updating icons, it is always a good idea to make sure that they work properly by looking at this page.
+When submitting a PR that updates these icons, a screenshot of the preview page should accompany it.

lib/vscode/extensions/theme-seti/README.md

@@ -0,0 +1,32 @@
+# theme-seti
+
+This is an icon theme that uses the icons from [`seti-ui`](https://github.com/jesseweed/seti-ui).
+
+## Updating icons
+
+There is script that can be used to update icons, [./build/update-icon-theme.js](build/update-icon-theme.js).
+
+To run this script, run `npm run update` from the `theme-seti` directory.
+
+This can be run in one of two ways: looking at a local copy of `seti-ui` for icons, or getting them straight from GitHub.
+
+If you want to run it from a local copy of `seti-ui`, first clone [`seti-ui`](https://github.com/jesseweed/seti-ui) to the folder next to your `vscode` repo (from the `theme-seti` directory, `../../`).
+Then, inside the `set-ui` directory, run `npm install` followed by `npm run prepublishOnly`. This will generate updated icons.
+
+If you want to download the icons straight from GitHub, change the `FROM_DISK` variable to `false` inside of `update-icon-theme.js`.
+
+### Languages not shipped with `vscode`
+
+Languages that are not shipped with `vscode` must be added to the `nonBuiltInLanguages` object inside of `update-icon-theme.js`.
+
+These should match [the file mapping in `seti-ui`](https://github.com/jesseweed/seti-ui/blob/master/styles/components/icons/mapping.less).
+
+Please try and keep this list in alphabetical order! Thank you.
+
+## Previewing icons
+
+There is a [`./icons/preview.html`](./icons/preview.html) file that can be opened to see all of the icons included in the theme.
+Note that to view this, it needs to be hosted by a web server.
+
+When updating icons, it is always a good idea to make sure that they work properly by looking at this page.
+When submitting a PR that updates these icons, a screenshot of the preview page should accompany it.

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

@@ -11,29 +11,31 @@ let https = require('https');
 let url = require('url');
 
 // list of languagesId not shipped with VSCode. The information is used to associate an icon with a language association
+// Please try and keep this list in alphabetical order! Thank you.
 let nonBuiltInLanguages = { // { fileNames, extensions  }
-	"r": { extensions: ['r', 'rhistory', 'rprofile', 'rt'] },
 	"argdown": { extensions: ['ad', 'adown', 'argdown', 'argdn'] },
-	"elm": { extensions: ['elm'] },
-	"ocaml": { extensions: ['ml', 'mli'] },
-	"nunjucks": { extensions: ['nunjucks', 'nunjs', 'nunj', 'nj', 'njk', 'tmpl', 'tpl'] },
-	"mustache": { extensions: ['mustache', 'mst', 'mu', 'stache'] },
-	"erb": { extensions: ['erb', 'rhtml', 'html.erb'] },
-	"terraform": { extensions: ['tf', 'tfvars', 'hcl'] },
-	"vue": { extensions: ['vue'] },
-	"sass": { extensions: ['sass'] },
-	"puppet": { extensions: ['puppet'] },
-	"kotlin": { extensions: ['kt'] },
-	"jinja": { extensions: ['jinja'] },
-	"haxe": { extensions: ['hx'] },
-	"haskell": { extensions: ['hs'] },
-	"gradle": { extensions: ['gradle'] },
 	"elixir": { extensions: ['ex'] },
-	"haml": { extensions: ['haml'] },
-	"stylus": { extensions: ['styl'] },
-	"vala": { extensions: ['vala'] },
+	"elm": { extensions: ['elm'] },
+	"erb": { extensions: ['erb', 'rhtml', 'html.erb'] },
 	"github-issues": { extensions: ['github-issues'] },
-	"todo": { fileNames: ['todo'] }
+	"gradle": { extensions: ['gradle'] },
+	"godot": { extensions: ['gd', 'godot', 'tres', 'tscn'] },
+	"haml": { extensions: ['haml'] },
+	"haskell": { extensions: ['hs'] },
+	"haxe": { extensions: ['hx'] },
+	"jinja": { extensions: ['jinja'] },
+	"kotlin": { extensions: ['kt'] },
+	"mustache": { extensions: ['mustache', 'mst', 'mu', 'stache'] },
+	"nunjucks": { extensions: ['nunjucks', 'nunjs', 'nunj', 'nj', 'njk', 'tmpl', 'tpl'] },
+	"ocaml": { extensions: ['ml', 'mli', 'mll', 'mly', 'eliom', 'eliomi'] },
+	"puppet": { extensions: ['puppet'] },
+	"r": { extensions: ['r', 'rhistory', 'rprofile', 'rt'] },
+	"sass": { extensions: ['sass'] },
+	"stylus": { extensions: ['styl'] },
+	"terraform": { extensions: ['tf', 'tfvars', 'hcl'] },
+	"todo": { fileNames: ['todo'] },
+	"vala": { extensions: ['vala'] },
+	"vue": { extensions: ['vue'] }
 };
 
 // list of languagesId that inherit the icon from another language
@@ -180,6 +182,16 @@ function darkenColor(color) {
 	return res;
 }
 
+function mergeMapping(to, from, property) {
+	if (from[property]) {
+		if (to[property]) {
+			to[property].push(...from[property]);
+		} else {
+			to[property] = from[property];
+		}
+	}
+}
+
 function getLanguageMappings() {
 	let langMappings = {};
 	let allExtensions = fs.readdirSync('..');
@@ -202,7 +214,22 @@ function getLanguageMappings() {
 						if (Array.isArray(filenames)) {
 							mapping.fileNames = filenames.map(function (f) { return f.toLowerCase(); });
 						}
-						langMappings[languageId] = mapping;
+						let existing = langMappings[languageId];
+
+						if (existing) {
+							// multiple contributions to the same language
+							// give preference to the contribution wth the configuration
+							if (languages[k].configuration) {
+								mergeMapping(mapping, existing, 'extensions');
+								mergeMapping(mapping, existing, 'fileNames');
+								langMappings[languageId] = mapping;
+							} else {
+								mergeMapping(existing, mapping, 'extensions');
+								mergeMapping(existing, mapping, 'fileNames');
+							}
+						} else {
+							langMappings[languageId] = mapping;
+						}
 					}
 				}
 			}
@@ -214,6 +241,8 @@ function getLanguageMappings() {
 	return langMappings;
 }
 
+
+
 exports.copyFont = function () {
 	return downloadBinary(font, './icons/seti.woff');
 };

lib/vscode/extensions/theme-seti/cgmanifest.json

@@ -6,7 +6,7 @@
 				"git": {
 					"name": "seti-ui",
 					"repositoryUrl": "https://github.com/jesseweed/seti-ui",
-					"commitHash": "9c1c29d6e9358f9ae99bd3a4bf0d2fa804dca686"
+					"commitHash": "4c16086852e7559cc23f63c45cce00c983ce36db"
 				}
 			},
 			"version": "0.1.0"