Skip to content

Commit 313203e

Browse files
alexdimaalexdima
committed
Merge remote-tracking branch 'origin/main' into pr/matthewjamesadam/159226
2 parents 1643a42 + 9b4be06 commit 313203e

File tree

408 files changed

+21344
-3926
lines changed

Some content is hidden

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

408 files changed

+21344
-3926
lines changed

‎.eslintrc.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -487,6 +487,14 @@
487487
{
488488
"when": "hasBrowser",
489489
"pattern": "vs/workbench/workbench.web.main"
490+
},
491+
{
492+
"when": "hasBrowser",
493+
"pattern": "vs/workbench/~"
494+
},
495+
{
496+
"when": "hasBrowser",
497+
"pattern": "vs/workbench/services/*/~"
490498
}
491499
]
492500
},

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ yarn-error.log
1515
vscode.lsif
1616
vscode.db
1717
/.profile-oss
18+
/cli/target

‎.vscode/notebooks/endgame.github-issues

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{
88
"kind": 2,
99
"language": "github-issues",
10-
"value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-js-debug repo:microsoft/vscode-remote-release repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-remotehub repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-unpkg\n\n$MILESTONE=milestone:\"August 2022\""
10+
"value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-js-debug repo:microsoft/vscode-remote-release repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-remotehub repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-unpkg\n\n$MILESTONE=milestone:\"September 2022\""
1111
},
1212
{
1313
"kind": 1,

‎.vscode/notebooks/my-endgame.github-issues

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{
88
"kind": 2,
99
"language": "github-issues",
10-
"value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-js-debug repo:microsoft/vscode-remote-release repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remotehub repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal\r\n\r\n$MILESTONE=milestone:\"August 2022\"\r\n\r\n$MINE=assignee:@me"
10+
"value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-js-debug repo:microsoft/vscode-remote-release repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remotehub repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal\n\n$MILESTONE=milestone:\"September 2022\"\n\n$MINE=assignee:@me"
1111
},
1212
{
1313
"kind": 1,

‎.vscode/settings.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
".build": true,
77
".profile-oss": true,
88
"**/.DS_Store": true,
9+
"cli/target": true,
910
"build/**/*.js": {
1011
"when": "$(basename).ts"
1112
}
@@ -86,6 +87,11 @@
8687
"editor.defaultFormatter": "vscode.typescript-language-features",
8788
"editor.formatOnSave": true
8889
},
90+
"[rust]": {
91+
"editor.defaultFormatter": "rust-lang.rust-analyzer",
92+
"editor.formatOnSave": true,
93+
"editor.insertSpaces": true
94+
},
8995
"typescript.tsc.autoDetect": "off",
9096
"testing.autoRun.mode": "rerun",
9197
"conventionalCommits.scopes": [

‎build/azure-pipelines/darwin/helper-plugin-entitlements.plist

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>com.apple.security.cs.allow-jit</key>
6+
<true/>
7+
<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
8+
<true/>
9+
<key>com.apple.security.cs.allow-dyld-environment-variables</key>
10+
<true/>
11+
<key>com.apple.security.cs.disable-library-validation</key>
12+
<true/>
13+
</dict>
14+
</plist>

‎build/darwin/sign.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ async function main() {
2626
const helperAppBaseName = product.nameShort;
2727
const gpuHelperAppName = helperAppBaseName + ' Helper (GPU).app';
2828
const rendererHelperAppName = helperAppBaseName + ' Helper (Renderer).app';
29+
const pluginHelperAppName = helperAppBaseName + ' Helper (Plugin).app';
2930
const infoPlistPath = path.resolve(appRoot, appName, 'Contents', 'Info.plist');
3031
const defaultOpts = {
3132
app: path.join(appRoot, appName),
@@ -45,7 +46,8 @@ async function main() {
4546
// TODO(deepak1556): Incorrectly declared type in electron-osx-sign
4647
ignore: (filePath) => {
4748
return filePath.includes(gpuHelperAppName) ||
48-
filePath.includes(rendererHelperAppName);
49+
filePath.includes(rendererHelperAppName) ||
50+
filePath.includes(pluginHelperAppName);
4951
}
5052
};
5153
const gpuHelperOpts = {
@@ -60,6 +62,12 @@ async function main() {
6062
entitlements: path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-renderer-entitlements.plist'),
6163
'entitlements-inherit': path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-renderer-entitlements.plist'),
6264
};
65+
const pluginHelperOpts = {
66+
...defaultOpts,
67+
app: path.join(appFrameworkPath, pluginHelperAppName),
68+
entitlements: path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-plugin-entitlements.plist'),
69+
'entitlements-inherit': path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-plugin-entitlements.plist'),
70+
};
6371
// Only overwrite plist entries for x64 and arm64 builds,
6472
// universal will get its copy from the x64 build.
6573
if (arch !== 'universal') {
@@ -87,6 +95,7 @@ async function main() {
8795
}
8896
await codesign.signAsync(gpuHelperOpts);
8997
await codesign.signAsync(rendererHelperOpts);
98+
await codesign.signAsync(pluginHelperOpts);
9099
await codesign.signAsync(appOpts);
91100
}
92101
if (require.main === module) {

‎build/darwin/sign.ts

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ async function main(): Promise<void> {
2929
const helperAppBaseName = product.nameShort;
3030
const gpuHelperAppName = helperAppBaseName + ' Helper (GPU).app';
3131
const rendererHelperAppName = helperAppBaseName + ' Helper (Renderer).app';
32+
const pluginHelperAppName = helperAppBaseName + ' Helper (Plugin).app';
3233
const infoPlistPath = path.resolve(appRoot, appName, 'Contents', 'Info.plist');
3334

3435
const defaultOpts: codesign.SignOptions = {
@@ -50,7 +51,8 @@ async function main(): Promise<void> {
5051
// TODO(deepak1556): Incorrectly declared type in electron-osx-sign
5152
ignore: (filePath: string) => {
5253
return filePath.includes(gpuHelperAppName) ||
53-
filePath.includes(rendererHelperAppName);
54+
filePath.includes(rendererHelperAppName) ||
55+
filePath.includes(pluginHelperAppName);
5456
}
5557
};
5658

@@ -68,6 +70,13 @@ async function main(): Promise<void> {
6870
'entitlements-inherit': path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-renderer-entitlements.plist'),
6971
};
7072

73+
const pluginHelperOpts: codesign.SignOptions = {
74+
...defaultOpts,
75+
app: path.join(appFrameworkPath, pluginHelperAppName),
76+
entitlements: path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-plugin-entitlements.plist'),
77+
'entitlements-inherit': path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-plugin-entitlements.plist'),
78+
};
79+
7180
// Only overwrite plist entries for x64 and arm64 builds,
7281
// universal will get its copy from the x64 build.
7382
if (arch !== 'universal') {
@@ -96,6 +105,7 @@ async function main(): Promise<void> {
96105

97106
await codesign.signAsync(gpuHelperOpts);
98107
await codesign.signAsync(rendererHelperOpts);
108+
await codesign.signAsync(pluginHelperOpts);
99109
await codesign.signAsync(appOpts as any);
100110
}
101111

‎build/filters.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ module.exports.all = [
2222
'scripts/**/*',
2323
'src/**/*',
2424
'test/**/*',
25+
'!cli/**/*',
2526
'!out*/**',
2627
'!test/**/out/**',
2728
'!**/node_modules/**',

‎build/hygiene.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ const vfs = require('vinyl-fs');
1010
const path = require('path');
1111
const fs = require('fs');
1212
const pall = require('p-all');
13+
1314
const { all, copyrightFilter, unicodeFilter, indentationFilter, tsFormattingFilter, eslintFilter } = require('./filters');
1415

1516
const copyrightHeaderLines = [
@@ -291,7 +292,7 @@ if (require.main === module) {
291292
.then(
292293
(vinyls) =>
293294
new Promise((c, e) =>
294-
hygiene(es.readArray(vinyls))
295+
hygiene(es.readArray(vinyls).pipe(filter(all)))
295296
.on('end', () => c())
296297
.on('error', e)
297298
)

0 commit comments

Comments
 (0)