Skip to content

Commit 0d950ab

Browse files
TyriarTyriar
authored
Merge branch 'main' into support-other-terminals-cwd-sequence
2 parents b20d9c4 + 20c950a commit 0d950ab

File tree

436 files changed

+8211
-3478
lines changed

Some content is hidden

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

436 files changed

+8211
-3478
lines changed

‎.github/workflows/on-label.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ jobs:
7171
if: contains(github.event.issue.labels.*.name, 'testplan-item') || contains(github.event.issue.labels.*.name, 'invalid-testplan-item')
7272
uses: ./actions/test-plan-item-validator
7373
with:
74-
appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
74+
token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
75+
refLabel: on-testplan
7576
label: testplan-item
7677
invalidLabel: invalid-testplan-item
7778
comment: Invalid test plan item. See errors below and the [test plan item spec](https://github.com/microsoft/vscode/wiki/Writing-Test-Plan-Items) for more information. This comment will go away when the issues are resolved.

‎.github/workflows/on-open.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,3 +62,13 @@ jobs:
6262
needsMoreInfoLabel: "info-needed"
6363
translatorRequestedLabelPrefix: "translation-required-"
6464
translatorRequestedLabelColor: "c29cff"
65+
# source of truth in ./test-plan-item-validator.yml
66+
- name: Run Test Plan Item Validator
67+
uses: ./actions/test-plan-item-validator
68+
with:
69+
token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
70+
refLabel: on-testplan
71+
label: testplan-item
72+
invalidLabel: invalid-testplan-item
73+
comment: Invalid test plan item. See errors below and the [test plan item spec](https://github.com/microsoft/vscode/wiki/Writing-Test-Plan-Items) for more information. This comment will go away when the issues are resolved.
74+

‎.github/workflows/test-plan-item-validator.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
issues:
44
types: [edited]
55

6-
# also edit in ./on-label.yml
6+
# also edit in ./on-label.yml and ./on-open.yml
77
jobs:
88
main:
99
runs-on: ubuntu-latest
@@ -22,7 +22,8 @@ jobs:
2222
if: contains(github.event.issue.labels.*.name, 'testplan-item') || contains(github.event.issue.labels.*.name, 'invalid-testplan-item')
2323
uses: ./actions/test-plan-item-validator
2424
with:
25+
token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
26+
refLabel: on-testplan
2527
label: testplan-item
26-
appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
2728
invalidLabel: invalid-testplan-item
2829
comment: Invalid test plan item. See errors below and the [test plan item spec](https://github.com/microsoft/vscode/wiki/Writing-Test-Plan-Items) for more information. This comment will go away when the issues are resolved.

‎.vscode/launch.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
]
2525
},
2626
{
27-
"type": "pwa-chrome",
27+
"type": "chrome",
2828
"request": "attach",
2929
"name": "Attach to Shared Process",
3030
"timeout": 30000,
@@ -202,7 +202,7 @@
202202
}
203203
},
204204
{
205-
"type": "pwa-chrome",
205+
"type": "chrome",
206206
"request": "attach",
207207
"name": "Attach to VS Code",
208208
"browserAttachLocation": "workspace",
@@ -216,7 +216,7 @@
216216
"perScriptSourcemaps": "yes"
217217
},
218218
{
219-
"type": "pwa-chrome",
219+
"type": "chrome",
220220
"request": "launch",
221221
"name": "Launch VS Code Internal",
222222
"windows": {
@@ -258,7 +258,7 @@
258258
}
259259
},
260260
{
261-
"type": "pwa-node",
261+
"type": "node",
262262
"request": "launch",
263263
"name": "VS Code Server (Web)",
264264
"runtimeExecutable": "${workspaceFolder}/scripts/code-server.sh",
@@ -274,7 +274,7 @@
274274
}
275275
},
276276
{
277-
"type": "pwa-node",
277+
"type": "node",
278278
"request": "launch",
279279
"name": "Main Process",
280280
"attachSimplePort": 5875,
@@ -295,7 +295,7 @@
295295
}
296296
},
297297
{
298-
"type": "pwa-chrome",
298+
"type": "chrome",
299299
"request": "launch",
300300
"outFiles": [],
301301
"perScriptSourcemaps": "yes",
@@ -308,7 +308,7 @@
308308
}
309309
},
310310
{
311-
"type": "pwa-msedge",
311+
"type": "msedge",
312312
"request": "launch",
313313
"outFiles": [],
314314
"perScriptSourcemaps": "yes",
@@ -403,7 +403,7 @@
403403
}
404404
},
405405
{
406-
"type": "pwa-node",
406+
"type": "node",
407407
"request": "launch",
408408
"name": "Run Unit Tests",
409409
"program": "${workspaceFolder}/test/unit/electron/index.js",
@@ -433,7 +433,7 @@
433433
}
434434
},
435435
{
436-
"type": "pwa-node",
436+
"type": "node",
437437
"request": "launch",
438438
"name": "Run Unit Tests For Current File",
439439
"program": "${workspaceFolder}/test/unit/electron/index.js",

‎.yarnrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
disturl "https://electronjs.org/headers"
2-
target "19.0.11"
2+
target "19.0.12"
33
runtime "electron"
44
build_from_source "true"

‎build/azure-pipelines/win32/product-build-win32.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ steps:
156156
$ErrorActionPreference = "Stop"
157157
exec { node build\lib\policies }
158158
displayName: Generate Group Policy definitions
159+
retryCountOnTaskFailure: 3
159160
160161
- ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
161162
- powershell: |

‎build/gulpfile.vscode.js

Lines changed: 12 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
'use strict';
77

88
const gulp = require('gulp');
9+
const merge = require('gulp-merge-json');
910
const fs = require('fs');
1011
const os = require('os');
1112
const cp = require('child_process');
@@ -393,6 +394,8 @@ BUILD_TARGETS.forEach(buildTarget => {
393394
}
394395
});
395396

397+
// #region nls
398+
396399
const innoSetupConfig = {
397400
'zh-cn': { codePage: 'CP936', defaultInfo: { name: 'Simplified Chinese', id: '$0804', } },
398401
'zh-tw': { codePage: 'CP950', defaultInfo: { name: 'Traditional Chinese', id: '$0404' } },
@@ -408,60 +411,30 @@ const innoSetupConfig = {
408411
'tr': { codePage: 'CP1254' }
409412
};
410413

411-
// Transifex Localizations
412-
413-
const apiHostname = process.env.TRANSIFEX_API_URL;
414-
const apiName = process.env.TRANSIFEX_API_NAME;
415-
const apiToken = process.env.TRANSIFEX_API_TOKEN;
416-
417-
gulp.task(task.define(
418-
'vscode-translations-push',
419-
task.series(
420-
compileBuildTask,
421-
compileExtensionsBuildTask,
422-
optimizeVSCodeTask,
423-
function () {
424-
const pathToMetadata = './out-vscode/nls.metadata.json';
425-
const pathToExtensions = '.build/extensions/*';
426-
const pathToSetup = 'build/win32/**/{Default.isl,messages.en.isl}';
427-
428-
return es.merge(
429-
gulp.src(pathToMetadata).pipe(i18n.createXlfFilesForCoreBundle()),
430-
gulp.src(pathToSetup).pipe(i18n.createXlfFilesForIsl()),
431-
gulp.src(pathToExtensions).pipe(i18n.createXlfFilesForExtensions())
432-
).pipe(i18n.findObsoleteResources(apiHostname, apiName, apiToken)
433-
).pipe(i18n.pushXlfFiles(apiHostname, apiName, apiToken));
434-
}
435-
)
436-
));
437-
438414
gulp.task(task.define(
439415
'vscode-translations-export',
440416
task.series(
441-
compileBuildTask,
417+
core,
442418
compileExtensionsBuildTask,
443-
optimizeVSCodeTask,
444419
function () {
445420
const pathToMetadata = './out-vscode/nls.metadata.json';
421+
const pathToRehWebMetadata = './out-vscode-reh-web/nls.metadata.json';
446422
const pathToExtensions = '.build/extensions/*';
447423
const pathToSetup = 'build/win32/i18n/messages.en.isl';
448424

449425
return es.merge(
450-
gulp.src(pathToMetadata).pipe(i18n.createXlfFilesForCoreBundle()),
426+
gulp.src([pathToMetadata, pathToRehWebMetadata]).pipe(merge({
427+
fileName: 'nls.metadata.json',
428+
jsonSpace: '',
429+
concatArrays: true
430+
})).pipe(i18n.createXlfFilesForCoreBundle()),
451431
gulp.src(pathToSetup).pipe(i18n.createXlfFilesForIsl()),
452432
gulp.src(pathToExtensions).pipe(i18n.createXlfFilesForExtensions())
453433
).pipe(vfs.dest('../vscode-translations-export'));
454434
}
455435
)
456436
));
457437

458-
gulp.task('vscode-translations-pull', function () {
459-
return es.merge([...i18n.defaultLanguages, ...i18n.extraLanguages].map(language => {
460-
const includeDefault = !!innoSetupConfig[language.id].defaultInfo;
461-
return i18n.pullSetupXlfFiles(apiHostname, apiName, apiToken, language, includeDefault).pipe(vfs.dest(`../vscode-translations-import/${language.id}/setup`));
462-
}));
463-
});
464-
465438
gulp.task('vscode-translations-import', function () {
466439
const options = minimist(process.argv.slice(2), {
467440
string: 'location',
@@ -476,3 +449,5 @@ gulp.task('vscode-translations-import', function () {
476449
.pipe(vfs.dest(`./build/win32/i18n`));
477450
}));
478451
});
452+
453+
// #endregion

‎build/gulpfile.vscode.linux.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ const util = require('./lib/util');
1515
const task = require('./lib/task');
1616
const packageJson = require('../package.json');
1717
const product = require('../product.json');
18-
const rpmDependenciesGenerator = require('./linux/rpm/dependencies-generator');
19-
const debianDependenciesGenerator = require('./linux/debian/dependencies-generator');
18+
const dependenciesGenerator = require('./linux/dependencies-generator');
2019
const sysrootInstaller = require('./linux/debian/install-sysroot');
2120
const debianRecommendedDependencies = require('./linux/debian/dep-lists').recommendedDeps;
2221
const path = require('path');
@@ -25,6 +24,9 @@ const commit = util.getVersion(root);
2524

2625
const linuxPackageRevision = Math.floor(new Date().getTime() / 1000);
2726

27+
/**
28+
* @param {string} arch
29+
*/
2830
function getDebPackageArch(arch) {
2931
return { x64: 'amd64', armhf: 'armhf', arm64: 'arm64' }[arch];
3032
}
@@ -80,7 +82,7 @@ function prepareDebPackage(arch) {
8082
async function () {
8183
const that = this;
8284
const sysroot = await sysrootInstaller.getSysroot(debArch);
83-
const dependencies = debianDependenciesGenerator.getDependencies(binaryDir, product.applicationName, debArch, sysroot);
85+
const dependencies = dependenciesGenerator.getDependencies('deb', binaryDir, product.applicationName, debArch, sysroot);
8486
gulp.src('resources/linux/debian/control.template', { base: '.' })
8587
.pipe(replace('@@NAME@@', product.applicationName))
8688
.pipe(replace('@@VERSION@@', packageJson.version + '-' + linuxPackageRevision))
@@ -183,7 +185,7 @@ function prepareRpmPackage(arch) {
183185
const code = gulp.src(binaryDir + '/**/*', { base: binaryDir })
184186
.pipe(rename(function (p) { p.dirname = 'BUILD/usr/share/' + product.applicationName + '/' + p.dirname; }));
185187

186-
const dependencies = rpmDependenciesGenerator.getDependencies(binaryDir, product.applicationName, rpmArch);
188+
const dependencies = dependenciesGenerator.getDependencies('rpm', binaryDir, product.applicationName, rpmArch);
187189
const spec = gulp.src('resources/linux/rpm/code.spec.template', { base: '.' })
188190
.pipe(replace('@@NAME@@', product.applicationName))
189191
.pipe(replace('@@NAME_LONG@@', product.nameLong))

‎build/lib/i18n.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ function processNlsFiles(opts) {
491491
});
492492
}
493493
exports.processNlsFiles = processNlsFiles;
494-
const editorProject = 'vscode-editor', workbenchProject = 'vscode-workbench', extensionsProject = 'vscode-extensions', setupProject = 'vscode-setup';
494+
const editorProject = 'vscode-editor', workbenchProject = 'vscode-workbench', extensionsProject = 'vscode-extensions', setupProject = 'vscode-setup', serverProject = 'vscode-server';
495495
function getResource(sourceFile) {
496496
let resource;
497497
if (/^vs\/platform/.test(sourceFile)) {
@@ -509,6 +509,9 @@ function getResource(sourceFile) {
509509
else if (/^vs\/code/.test(sourceFile)) {
510510
return { name: 'vs/code', project: workbenchProject };
511511
}
512+
else if (/^vs\/server/.test(sourceFile)) {
513+
return { name: 'vs/server', project: serverProject };
514+
}
512515
else if (/^vs\/workbench\/contrib/.test(sourceFile)) {
513516
resource = sourceFile.split('/', 4).join('/');
514517
return { name: resource, project: workbenchProject };

‎build/lib/i18n.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,8 @@ export function processNlsFiles(opts: { fileHeader: string; languages: Language[
611611
const editorProject: string = 'vscode-editor',
612612
workbenchProject: string = 'vscode-workbench',
613613
extensionsProject: string = 'vscode-extensions',
614-
setupProject: string = 'vscode-setup';
614+
setupProject: string = 'vscode-setup',
615+
serverProject: string = 'vscode-server';
615616

616617
export function getResource(sourceFile: string): Resource {
617618
let resource: string;
@@ -626,6 +627,8 @@ export function getResource(sourceFile: string): Resource {
626627
return { name: 'vs/base', project: editorProject };
627628
} else if (/^vs\/code/.test(sourceFile)) {
628629
return { name: 'vs/code', project: workbenchProject };
630+
} else if (/^vs\/server/.test(sourceFile)) {
631+
return { name: 'vs/server', project: serverProject };
629632
} else if (/^vs\/workbench\/contrib/.test(sourceFile)) {
630633
resource = sourceFile.split('/', 4).join('/');
631634
return { name: resource, project: workbenchProject };

0 commit comments

Comments
 (0)