Skip to content

Commit 8cd272d

Browse files
TyriarTyriar
authored
Merge branch 'main' into tyriar/159182
2 parents 816cd66 + 1723a56 commit 8cd272d

File tree

51 files changed

+833
-200
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+833
-200
lines changed

‎extensions/cpp/language-configuration.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
{ "open": "(", "close": ")" },
1515
{ "open": "'", "close": "'", "notIn": ["string", "comment"] },
1616
{ "open": "\"", "close": "\"", "notIn": ["string"] }
17+
{ "open": "/*", "close": "*/", "notIn": ["string", "comment"] },
1718
],
1819
"surroundingPairs": [
1920
["{", "}"],

‎extensions/ini/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
{
2828
"id": "properties",
2929
"extensions": [
30+
".conf",
3031
".properties",
3132
".cfg",
32-
".conf",
3333
".directory",
3434
".gitattributes",
3535
".gitconfig",

‎extensions/json/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@
6161
"filenames": [
6262
"babel.config.json",
6363
".babelrc.json",
64-
".ember-cli"
64+
".ember-cli",
65+
"typedoc.json"
6566
],
6667
"configuration": "./language-configuration.json"
6768
}

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,11 @@ const inheritIconFromLanguage = {
4747
"postcss": 'css',
4848
"django-html": 'html',
4949
"blade": 'php'
50-
}
50+
};
51+
52+
const ignoreExtAssociation = {
53+
"properties": true
54+
};
5155

5256
const FROM_DISK = true; // set to true to take content from a repo checked out next to the vscode repo
5357

@@ -399,7 +403,7 @@ exports.update = function () {
399403
if (!nonBuiltInLanguages[lang] && !inheritIconFromLanguage[lang]) {
400404
for (let i2 = 0; i2 < exts.length; i2++) {
401405
// remove the extension association, unless it is different from the preferred
402-
if (ext2Def[exts[i2]] === preferredDef) {
406+
if (ext2Def[exts[i2]] === preferredDef || ignoreExtAssociation[exts[i2]]) {
403407
delete ext2Def[exts[i2]];
404408
}
405409
}

‎extensions/theme-seti/cgmanifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"git": {
77
"name": "seti-ui",
88
"repositoryUrl": "https://github.com/jesseweed/seti-ui",
9-
"commitHash": "2d10473b7575ec00c47eda751ea9caeec6b0b606"
9+
"commitHash": "fd20793e5a75b350eab8d489165fb9b420df3f62"
1010
}
1111
},
1212
"version": "0.1.0"

‎extensions/theme-seti/icons/seti.woff

0 Bytes
Binary file not shown.

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

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1575,8 +1575,6 @@
15751575
"cfm": "_coldfusion",
15761576
"litcoffee": "_coffee",
15771577
"config": "_config",
1578-
"cfg": "_config",
1579-
"conf": "_config",
15801578
"cr": "_crystal",
15811579
"ecr": "_crystal_embedded",
15821580
"slang": "_crystal_embedded",
@@ -1731,7 +1729,6 @@
17311729
"webp": "_image",
17321730
"sublime-project": "_sublime",
17331731
"sublime-workspace": "_sublime",
1734-
"fish": "_shell",
17351732
"mov": "_video",
17361733
"ogv": "_video",
17371734
"webm": "_video",
@@ -1774,7 +1771,6 @@
17741771
"direnv": "_config",
17751772
"env": "_config",
17761773
"static": "_config",
1777-
"editorconfig": "_config",
17781774
"slugignore": "_config",
17791775
"tmp": "_clock_1",
17801776
"htaccess": "_config",
@@ -1835,14 +1831,19 @@
18351831
"yarn.lock": "_yarn",
18361832
"webpack.config.js": "_webpack",
18371833
"webpack.config.cjs": "_webpack",
1834+
"webpack.config.ts": "_webpack",
18381835
"webpack.config.build.js": "_webpack",
18391836
"webpack.config.build.cjs": "_webpack",
1837+
"webpack.config.build.ts": "_webpack",
18401838
"webpack.common.js": "_webpack",
18411839
"webpack.common.cjs": "_webpack",
1840+
"webpack.common.ts": "_webpack",
18421841
"webpack.dev.js": "_webpack",
18431842
"webpack.dev.cjs": "_webpack",
1843+
"webpack.dev.ts": "_webpack",
18441844
"webpack.prod.js": "_webpack",
18451845
"webpack.prod.cjs": "_webpack",
1846+
"webpack.prod.ts": "_webpack",
18461847
"license": "_license",
18471848
"licence": "_license",
18481849
"license.txt": "_license",
@@ -1887,7 +1888,7 @@
18871888
"groovy": "_grails",
18881889
"handlebars": "_mustache",
18891890
"html": "_html_3",
1890-
"properties": "_java",
1891+
"properties": "_config",
18911892
"java": "_java",
18921893
"javascriptreact": "_react",
18931894
"javascript": "_javascript",
@@ -1976,8 +1977,6 @@
19761977
"cfm": "_coldfusion_light",
19771978
"litcoffee": "_coffee_light",
19781979
"config": "_config_light",
1979-
"cfg": "_config_light",
1980-
"conf": "_config_light",
19811980
"cr": "_crystal_light",
19821981
"ecr": "_crystal_embedded_light",
19831982
"slang": "_crystal_embedded_light",
@@ -2132,7 +2131,6 @@
21322131
"webp": "_image_light",
21332132
"sublime-project": "_sublime_light",
21342133
"sublime-workspace": "_sublime_light",
2135-
"fish": "_shell_light",
21362134
"mov": "_video_light",
21372135
"ogv": "_video_light",
21382136
"webm": "_video_light",
@@ -2175,7 +2173,6 @@
21752173
"direnv": "_config_light",
21762174
"env": "_config_light",
21772175
"static": "_config_light",
2178-
"editorconfig": "_config_light",
21792176
"slugignore": "_config_light",
21802177
"tmp": "_clock_1_light",
21812178
"htaccess": "_config_light",
@@ -2206,7 +2203,7 @@
22062203
"groovy": "_grails_light",
22072204
"handlebars": "_mustache_light",
22082205
"html": "_html_3_light",
2209-
"properties": "_java_light",
2206+
"properties": "_config_light",
22102207
"java": "_java_light",
22112208
"javascriptreact": "_react_light",
22122209
"javascript": "_javascript_light",
@@ -2314,14 +2311,19 @@
23142311
"yarn.lock": "_yarn_light",
23152312
"webpack.config.js": "_webpack_light",
23162313
"webpack.config.cjs": "_webpack_light",
2314+
"webpack.config.ts": "_webpack_light",
23172315
"webpack.config.build.js": "_webpack_light",
23182316
"webpack.config.build.cjs": "_webpack_light",
2317+
"webpack.config.build.ts": "_webpack_light",
23192318
"webpack.common.js": "_webpack_light",
23202319
"webpack.common.cjs": "_webpack_light",
2320+
"webpack.common.ts": "_webpack_light",
23212321
"webpack.dev.js": "_webpack_light",
23222322
"webpack.dev.cjs": "_webpack_light",
2323+
"webpack.dev.ts": "_webpack_light",
23232324
"webpack.prod.js": "_webpack_light",
23242325
"webpack.prod.cjs": "_webpack_light",
2326+
"webpack.prod.ts": "_webpack_light",
23252327
"license": "_license_light",
23262328
"licence": "_license_light",
23272329
"license.txt": "_license_light",
@@ -2344,5 +2346,5 @@
23442346
"npm-debug.log": "_npm_ignored_light"
23452347
}
23462348
},
2347-
"version": "https://github.com/jesseweed/seti-ui/commit/2d10473b7575ec00c47eda751ea9caeec6b0b606"
2349+
"version": "https://github.com/jesseweed/seti-ui/commit/fd20793e5a75b350eab8d489165fb9b420df3f62"
23482350
}

‎extensions/typescript-language-features/package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,10 @@
139139
{
140140
"fileMatch": "jsconfig.*.json",
141141
"url": "./schemas/jsconfig.schema.json"
142+
},
143+
{
144+
"fileMatch": "typedoc.json",
145+
"url": "https://typedoc.org/schema.json"
142146
}
143147
],
144148
"configuration": {

‎package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,13 @@
8686
"vscode-proxy-agent": "^0.12.0",
8787
"vscode-regexpp": "^3.1.0",
8888
"vscode-textmate": "7.0.1",
89-
"xterm": "5.1.0-beta.1",
89+
"xterm": "5.1.0-beta.10",
9090
"xterm-addon-canvas": "0.3.0-beta.1",
9191
"xterm-addon-search": "0.11.0-beta.1",
92-
"xterm-addon-serialize": "0.9.0-beta.1",
92+
"xterm-addon-serialize": "0.9.0-beta.2",
9393
"xterm-addon-unicode11": "0.5.0-beta.1",
94-
"xterm-addon-webgl": "0.14.0-beta.2",
95-
"xterm-headless": "5.1.0-beta.1",
94+
"xterm-addon-webgl": "0.14.0-beta.8",
95+
"xterm-headless": "5.1.0-beta.10",
9696
"yauzl": "^2.9.2",
9797
"yazl": "^2.4.3"
9898
},

‎remote/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
"vscode-proxy-agent": "^0.12.0",
2525
"vscode-regexpp": "^3.1.0",
2626
"vscode-textmate": "7.0.1",
27-
"xterm": "5.1.0-beta.1",
27+
"xterm": "5.1.0-beta.10",
2828
"xterm-addon-canvas": "0.3.0-beta.1",
2929
"xterm-addon-search": "0.11.0-beta.1",
30-
"xterm-addon-serialize": "0.9.0-beta.1",
30+
"xterm-addon-serialize": "0.9.0-beta.2",
3131
"xterm-addon-unicode11": "0.5.0-beta.1",
32-
"xterm-addon-webgl": "0.14.0-beta.2",
33-
"xterm-headless": "5.1.0-beta.1",
32+
"xterm-addon-webgl": "0.14.0-beta.8",
33+
"xterm-headless": "5.1.0-beta.10",
3434
"yauzl": "^2.9.2",
3535
"yazl": "^2.4.3"
3636
},

0 commit comments

Comments
 (0)