Skip to content

Commit 324bfb7

Browse files
dmitrivMSdmitrivMS
authored
Merge branch 'main' into copilot/sign-macos-binaries
2 parents ff2da8a + a61aec9 commit 324bfb7

File tree

32 files changed

+505
-470
lines changed

32 files changed

+505
-470
lines changed

‎.vscode/settings.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"scripts/test-integration.bat": true,
88
"scripts/test-integration.sh": true,
99
},
10+
"chat.viewSessions.enabled": true,
1011

1112
// --- Editor ---
1213
"editor.insertSpaces": false,

‎extensions/extension-editing/src/extensionLinter.ts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const dataUrlsNotValid = l10n.t("Data URLs are not a valid image source.");
3333
const relativeUrlRequiresHttpsRepository = l10n.t("Relative image URLs require a repository with HTTPS protocol to be specified in the package.json.");
3434
const relativeBadgeUrlRequiresHttpsRepository = l10n.t("Relative badge URLs require a repository with HTTPS protocol to be specified in this package.json.");
3535
const apiProposalNotListed = l10n.t("This proposal cannot be used because for this extension the product defines a fixed set of API proposals. You can test your extension but before publishing you MUST reach out to the VS Code team.");
36-
const bumpEngineForImplicitActivationEvents = l10n.t("This activation event can be removed for extensions targeting engine version ^1.75.0 as VS Code will generate these automatically from your package.json contribution declarations.");
36+
3737
const starActivation = l10n.t("Using '*' activation is usually a bad idea as it impacts performance.");
3838
const parsingErrorHeader = l10n.t("Error parsing the when-clause:");
3939

@@ -162,13 +162,12 @@ export class ExtensionLinter {
162162
if (activationEventsNode?.type === 'array' && activationEventsNode.children) {
163163
for (const activationEventNode of activationEventsNode.children) {
164164
const activationEvent = getNodeValue(activationEventNode);
165-
const isImplicitActivationSupported = info.engineVersion && info.engineVersion?.majorBase >= 1 && info.engineVersion?.minorBase >= 75;
165+
const isImplicitActivationSupported = info.engineVersion && (info.engineVersion.majorBase > 1 || (info.engineVersion.majorBase === 1 && info.engineVersion.minorBase >= 75));
166166
// Redundant Implicit Activation
167-
if (info.implicitActivationEvents?.has(activationEvent) && redundantImplicitActivationEventPrefixes.some((prefix) => activationEvent.startsWith(prefix))) {
167+
if (isImplicitActivationSupported && info.implicitActivationEvents?.has(activationEvent) && redundantImplicitActivationEventPrefixes.some((prefix) => activationEvent.startsWith(prefix))) {
168168
const start = document.positionAt(activationEventNode.offset);
169169
const end = document.positionAt(activationEventNode.offset + activationEventNode.length);
170-
const message = isImplicitActivationSupported ? redundantImplicitActivationEvent : bumpEngineForImplicitActivationEvents;
171-
diagnostics.push(new Diagnostic(new Range(start, end), message, isImplicitActivationSupported ? DiagnosticSeverity.Warning : DiagnosticSeverity.Information));
170+
diagnostics.push(new Diagnostic(new Range(start, end), redundantImplicitActivationEvent, DiagnosticSeverity.Warning));
172171
}
173172

174173
// Reserved Implicit Activation

‎extensions/git/src/repository.ts‎

Lines changed: 17 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1928,36 +1928,26 @@ export class Repository implements Disposable {
19281928

19291929
try {
19301930
// Copy files
1931-
let copiedFiles = 0;
1932-
const results = await window.withProgress({
1933-
location: ProgressLocation.Notification,
1934-
title: l10n.t('Copying additional files to the worktree'),
1935-
cancellable: false
1936-
}, async (progress) => {
1937-
const limiter = new Limiter<void>(10);
1938-
const files = Array.from(ignoredFiles);
1939-
1940-
return Promise.allSettled(files.map(sourceFile =>
1941-
limiter.queue(async () => {
1942-
const targetFile = path.join(worktreePath, relativePath(this.root, sourceFile));
1943-
await fsPromises.mkdir(path.dirname(targetFile), { recursive: true });
1944-
await fsPromises.cp(sourceFile, targetFile, {
1945-
force: true,
1946-
recursive: false,
1947-
verbatimSymlinks: true
1948-
});
1949-
1950-
copiedFiles++;
1951-
progress.report({
1952-
increment: 100 / ignoredFiles.size,
1953-
message: l10n.t('({0}/{1})', copiedFiles, ignoredFiles.size)
1954-
});
1955-
})
1956-
));
1957-
});
1931+
const startTime = Date.now();
1932+
const limiter = new Limiter<void>(15);
1933+
const files = Array.from(ignoredFiles);
1934+
1935+
const results = await Promise.allSettled(files.map(sourceFile =>
1936+
limiter.queue(async () => {
1937+
const targetFile = path.join(worktreePath, relativePath(this.root, sourceFile));
1938+
await fsPromises.mkdir(path.dirname(targetFile), { recursive: true });
1939+
await fsPromises.cp(sourceFile, targetFile, {
1940+
force: true,
1941+
mode: fs.constants.COPYFILE_FICLONE,
1942+
recursive: false,
1943+
verbatimSymlinks: true
1944+
});
1945+
})
1946+
));
19581947

19591948
// Log any failed operations
19601949
const failedOperations = results.filter(r => r.status === 'rejected');
1950+
this.logger.info(`[Repository][_copyWorktreeIncludeFiles] Copied ${files.length - failedOperations.length} files to worktree. Failed to copy ${failedOperations.length} files. [${Date.now() - startTime}ms]`);
19611951

19621952
if (failedOperations.length > 0) {
19631953
window.showWarningMessage(l10n.t('Failed to copy {0} files to the worktree.', failedOperations.length));

‎package-lock.json‎

Lines changed: 48 additions & 48 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "code-oss-dev",
33
"version": "1.109.0",
4-
"distro": "f44449f84806363760ce8bb8dbe85cd8207498ff",
4+
"distro": "b90415e4e25274537a83463c7af88fca7e9528a7",
55
"author": {
66
"name": "Microsoft Corporation"
77
},
@@ -91,16 +91,16 @@
9191
"@vscode/windows-mutex": "^0.5.0",
9292
"@vscode/windows-process-tree": "^0.6.0",
9393
"@vscode/windows-registry": "^1.1.0",
94-
"@xterm/addon-clipboard": "^0.3.0-beta.101",
95-
"@xterm/addon-image": "^0.10.0-beta.101",
96-
"@xterm/addon-ligatures": "^0.11.0-beta.101",
97-
"@xterm/addon-progress": "^0.3.0-beta.101",
98-
"@xterm/addon-search": "^0.17.0-beta.101",
99-
"@xterm/addon-serialize": "^0.15.0-beta.101",
100-
"@xterm/addon-unicode11": "^0.10.0-beta.101",
101-
"@xterm/addon-webgl": "^0.20.0-beta.100",
102-
"@xterm/headless": "^6.1.0-beta.101",
103-
"@xterm/xterm": "^6.1.0-beta.101",
94+
"@xterm/addon-clipboard": "^0.3.0-beta.102",
95+
"@xterm/addon-image": "^0.10.0-beta.102",
96+
"@xterm/addon-ligatures": "^0.11.0-beta.102",
97+
"@xterm/addon-progress": "^0.3.0-beta.102",
98+
"@xterm/addon-search": "^0.17.0-beta.102",
99+
"@xterm/addon-serialize": "^0.15.0-beta.102",
100+
"@xterm/addon-unicode11": "^0.10.0-beta.102",
101+
"@xterm/addon-webgl": "^0.20.0-beta.101",
102+
"@xterm/headless": "^6.1.0-beta.102",
103+
"@xterm/xterm": "^6.1.0-beta.102",
104104
"http-proxy-agent": "^7.0.0",
105105
"https-proxy-agent": "^7.0.2",
106106
"jschardet": "3.1.4",

0 commit comments

Comments
 (0)