Skip to content

Commit 34b20f9

Browse files
TyriarTyriar
committed
Merge branch 'master' into tyriar/link_providers
2 parents 439489f + e16aead commit 34b20f9

151 files changed

Lines changed: 1589 additions & 1437 deletions

File tree

Some content is hidden

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

‎.eslintrc.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,8 @@
519519
"**/vs/workbench/services/**/common/**",
520520
"**/vs/workbench/api/**/common/**",
521521
"vscode-textmate",
522-
"vscode-oniguruma"
522+
"vscode-oniguruma",
523+
"iconv-lite-umd"
523524
]
524525
},
525526
{

‎.github/commands.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,19 @@
221221
"addLabel": "*caused-by-extension",
222222
"comment": "It looks like this is caused by the C++ extension. Please file it with the repository [here](https://github.com/Microsoft/vscode-cpptools). Make sure to check their issue reporting template and provide them relevant information such as the extension version you're using. See also our [issue reporting](https://aka.ms/vscodeissuereporting) guidelines for more information.\n\nHappy Coding!"
223223
},
224+
{
225+
"type": "comment",
226+
"name": "extCpp",
227+
"allowUsers": [
228+
"cleidigh",
229+
"usernamehw",
230+
"gjsjohnmurray",
231+
"IllusionMH"
232+
],
233+
"action": "close",
234+
"addLabel": "*caused-by-extension",
235+
"comment": "It looks like this is caused by the C++ extension. Please file it with the repository [here](https://github.com/Microsoft/vscode-cpptools). Make sure to check their issue reporting template and provide them relevant information such as the extension version you're using. See also our [issue reporting](https://aka.ms/vscodeissuereporting) guidelines for more information.\n\nHappy Coding!"
236+
},
224237
{
225238
"type": "comment",
226239
"name": "extTS",

‎.github/workflows/on-open.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,14 @@ jobs:
4848
mustNotMatch: "^We have written the needed data into your clipboard because it was too large to send\\. Please paste\\.$"
4949
comment: "It looks like you're using the VS Code Issue Reporter but did not paste the text generated into the created issue. We've closed this issue, please open a new one containing the text we placed in your clipboard.\n\nHappy Coding!"
5050

51+
- name: Run Clipboard Labeler (Chinese)
52+
uses: ./actions/regex-labeler
53+
with:
54+
appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
55+
label: "invalid"
56+
mustNotMatch: "^所需的数据太大，无法直接发送。我们已经将其写入剪贴板，请粘贴。$"
57+
comment: "看起来您正在使用 VS Code 问题报告程序，但是没有将生成的文本粘贴到创建的问题中。我们将关闭这个问题，请使用剪贴板中的内容创建一个新的问题。\n\n祝您使用愉快！"
58+
5159
# source of truth in ./english-please.yml
5260
- name: Run English Please
5361
uses: ./actions/english-please

‎.yarnrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
disturl "https://atom.io/download/electron"
2-
target "7.3.1"
2+
target "8.3.3"
33
runtime "electron"

‎build/lib/i18n.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1175,9 +1175,10 @@ function createIslFile(originalFilePath, messages, language, innoSetup) {
11751175
});
11761176
const basename = path.basename(originalFilePath);
11771177
const filePath = `${basename}.${language.id}.isl`;
1178+
const encoded = iconv.encode(Buffer.from(content.join('\r\n'), 'utf8').toString(), innoSetup.codePage);
11781179
return new File({
11791180
path: filePath,
1180-
contents: iconv.encode(Buffer.from(content.join('\r\n'), 'utf8').toString(), innoSetup.codePage)
1181+
contents: Buffer.from(encoded),
11811182
});
11821183
}
11831184
function encodeEntities(value) {

‎build/lib/i18n.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1339,10 +1339,11 @@ function createIslFile(originalFilePath: string, messages: Map<string>, language
13391339

13401340
const basename = path.basename(originalFilePath);
13411341
const filePath = `${basename}.${language.id}.isl`;
1342+
const encoded = iconv.encode(Buffer.from(content.join('\r\n'), 'utf8').toString(), innoSetup.codePage);
13421343

13431344
return new File({
13441345
path: filePath,
1345-
contents: iconv.encode(Buffer.from(content.join('\r\n'), 'utf8').toString(), innoSetup.codePage)
1346+
contents: Buffer.from(encoded),
13461347
});
13471348
}
13481349

‎build/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"gulp-bom": "^1.0.0",
3939
"gulp-sourcemaps": "^1.11.0",
4040
"gulp-uglify": "^3.0.0",
41-
"iconv-lite-umd": "0.6.2",
41+
"iconv-lite-umd": "0.6.3",
4242
"mime": "^1.3.4",
4343
"minimatch": "3.0.4",
4444
"minimist": "^1.2.3",

‎build/yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1415,10 +1415,10 @@ http-signature@~1.2.0:
14151415
jsprim "^1.2.2"
14161416
sshpk "^1.7.0"
14171417

1418-
iconv-lite-umd@0.6.2:
1419-
version "0.6.2"
1420-
resolved "https://registry.yarnpkg.com/iconv-lite-umd/-/iconv-lite-umd-0.6.2.tgz#6410d3dc1bf5b0e0863f833d67e8168fcd52d47c"
1421-
integrity sha512-KOOIU5p4j/NOXybhgOF7ZMRMQ7+iOWwnr1+DSQaPCzCRfR1+vMzvEmjmrmUZ59kHkhcqZW7eABTa/axpc3i81w==
1418+
iconv-lite-umd@0.6.3:
1419+
version "0.6.3"
1420+
resolved "https://registry.yarnpkg.com/iconv-lite-umd/-/iconv-lite-umd-0.6.3.tgz#61307cab8ac29939992d0724d3ab8799467f0e97"
1421+
integrity sha512-fQ/8XE8reiCZ6t+SX4tX6/tQdV4tThJZv5qtMe5Sk+IWsExz0S2Zd+GiBS5IEPgDxnsmiJSpH67+qzN3FT4lKw==
14221422

14231423
ignore@^5.1.1:
14241424
version "5.1.2"

‎cgmanifest.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"git": {
77
"name": "chromium",
88
"repositoryUrl": "https://chromium.googlesource.com/chromium/src",
9-
"commitHash": "e4745133a1d3745f066e068b8033c6a269b59caf"
9+
"commitHash": "052d3b44972e6d94ef40054d46c150b7cdd7a5d8"
1010
}
1111
},
1212
"licenseDetail": [
@@ -40,32 +40,32 @@
4040
"SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
4141
],
4242
"isOnlyProductionDependency": true,
43-
"version": "78.0.3904.130"
43+
"version": "80.0.3987.165"
4444
},
4545
{
4646
"component": {
4747
"type": "git",
4848
"git": {
4949
"name": "nodejs",
5050
"repositoryUrl": "https://github.com/nodejs/node",
51-
"commitHash": "787378879acfb212ed4ff824bf9f767a24a5cb43a"
51+
"commitHash": "42cce5a9d0fd905bf4ad7a2528c36572dfb8b5ad"
5252
}
5353
},
5454
"isOnlyProductionDependency": true,
55-
"version": "12.8.1"
55+
"version": "12.13.0"
5656
},
5757
{
5858
"component": {
5959
"type": "git",
6060
"git": {
6161
"name": "electron",
6262
"repositoryUrl": "https://github.com/electron/electron",
63-
"commitHash": "bc8fc0d406d32e4c02f3ec9f161deaacbe4f5989"
63+
"commitHash": "87fd06bc96bce8f46ca05b8315657fd230bcac85"
6464
}
6565
},
6666
"isOnlyProductionDependency": true,
6767
"license": "MIT",
68-
"version": "7.3.1"
68+
"version": "8.3.3"
6969
},
7070
{
7171
"component": {

‎extensions/css-language-features/client/src/customData.ts‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,17 +76,13 @@ function getCustomDataPathsInAllWorkspaces(): string[] {
7676

7777
function getCustomDataPathsFromAllExtensions(): string[] {
7878
const dataPaths: string[] = [];
79-
8079
for (const extension of extensions.all) {
81-
const contributes = extension.packageJSON && extension.packageJSON.contributes;
82-
83-
if (contributes && contributes.css && contributes.css.customData && Array.isArray(contributes.css.customData)) {
84-
const relativePaths: string[] = contributes.css.customData;
85-
relativePaths.forEach(rp => {
80+
const customData = extension.packageJSON?.contributes?.css?.customData;
81+
if (Array.isArray(customData)) {
82+
for (const rp of customData) {
8683
dataPaths.push(joinPath(extension.extensionUri, rp).toString());
87-
});
84+
}
8885
}
8986
}
90-
9187
return dataPaths;
9288
}

0 commit comments

Comments
 (0)