Skip to content

Commit fc4e65a

Browse files
author
Aiday Marlen Kyzy
authored
Merge branch 'main' into aiday/stickyScrollTesting
2 parents af08b4f + 3b47ac4 commit fc4e65a

File tree

97 files changed

+1567
-478
lines changed

Some content is hidden

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

97 files changed

+1567
-478
lines changed

‎.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/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([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/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 };

‎cglicenses.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,4 +201,21 @@
201201
"SOFTWARE"
202202
]
203203
}
204+
{
205+
// Reason: This product includes AVC coding technology. MPEG LA LLC requires this notice.
206+
"name": "H.264/AVC Video Standard",
207+
"fullLicenseText": [
208+
"This product is licensed under the AVC patent portfolio license for the personal",
209+
"and non-commercial use of a consumer to (i) encode video in compliance with the AVC standard (\"AVC VIDEO\")",
210+
"and/or (ii) decode AVC video that was encoded by a consumer",
211+
"engaged in a personal and non-commercial activity and/or was obtained from a video provider",
212+
"licensed to provide AVC video. No license is granted or shall be implied for any other use.",
213+
"Additional information may be obtained from MPEG LA LLC. See http://www.MPEGLA.COM.",
214+
"",
215+
"For clarification purposes, this notice does not limit or inhibit the use of the product",
216+
"for normal business uses that are personal to that business which do not include",
217+
"(i) redistribution of the product to third parties, or",
218+
"(ii) creation of content with AVC Standard compliant technologies for distribution to third parties."
219+
]
220+
}
204221
]

‎cgmanifest.json

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,19 @@
4242
"isOnlyProductionDependency": true,
4343
"version": "102.0.5005.167"
4444
},
45+
{
46+
"component": {
47+
"type": "git",
48+
"git": {
49+
"name": "ffmpeg",
50+
"repositoryUrl": "https://chromium.googlesource.com/chromium/third_party/ffmpeg",
51+
"commitHash": "5cd95cdf972ad92c38a4ea2d059ac9d6167302ca"
52+
}
53+
},
54+
"isOnlyProductionDependency": true,
55+
"license": "LGPL-2.1+",
56+
"version": "4.4.git"
57+
},
4558
{
4659
"component": {
4760
"type": "git",
@@ -60,12 +73,12 @@
6073
"git": {
6174
"name": "electron",
6275
"repositoryUrl": "https://github.com/electron/electron",
63-
"commitHash": "a5cafd174d2027529d0b251e5b8e58da2b364e5b"
76+
"commitHash": "b05ccd812e3bb3de5b1546a313e298961653e942"
6477
}
6578
},
6679
"isOnlyProductionDependency": true,
6780
"license": "MIT",
68-
"version": "19.0.11"
81+
"version": "19.0.12"
6982
},
7083
{
7184
"component": {

‎extensions/markdown-language-features/server/src/protocol.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export const fs_readFile = new RequestType<{ uri: string }, number[], any>('mark
1414
export const fs_readDirectory = new RequestType<{ uri: string }, [string, { isDirectory: boolean }][], any>('markdown/fs/readDirectory');
1515
export const fs_stat = new RequestType<{ uri: string }, { isDirectory: boolean } | undefined, any>('markdown/fs/stat');
1616

17-
export const fs_watcher_create = new RequestType<{ id: number; uri: string; options: md.FileWatcherOptions }, void, any>('markdown/fs/watcher/create');
17+
export const fs_watcher_create = new RequestType<{ id: number; uri: string; options: md.FileWatcherOptions; watchParentDirs: boolean }, void, any>('markdown/fs/watcher/create');
1818
export const fs_watcher_delete = new RequestType<{ id: number }, void, any>('markdown/fs/watcher/delete');
1919

2020
export const findMarkdownFilesInWorkspace = new RequestType<{}, string[], any>('markdown/findMarkdownFilesInWorkspace');

‎extensions/markdown-language-features/server/src/workspace.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ export class VsCodeClientWorkspace implements md.IWorkspaceWithWatching {
236236
id,
237237
uri: resource.toString(),
238238
options,
239+
watchParentDirs: true,
239240
});
240241

241242
return {

0 commit comments

Comments
 (0)