Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] main from microsoft:main #357

Merged
merged 3 commits into from
Dec 14, 2024
Merged

[pull] main from microsoft:main #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1dc517c
Fix: When no results in search editor it throws an error (#235031)
janajar Dec 14, 2024
7606e11
fix #235878 (#236129)
sandy081 Dec 14, 2024
6fb1f6f
fix #168779 (#236125)
sandy081 Dec 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/vs/platform/extensionManagement/common/extensionManagement.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { Platform } from '../../../base/common/platform.js';
import { URI } from '../../../base/common/uri.js';
import { localize2 } from '../../../nls.js';
import { ExtensionType, IExtension, IExtensionManifest, TargetPlatform } from '../../extensions/common/extensions.js';
import { IFileService } from '../../files/common/files.js';
import { FileOperationError, FileOperationResult, IFileService, IFileStat } from '../../files/common/files.js';
import { createDecorator } from '../../instantiation/common/instantiation.js';

export const EXTENSION_IDENTIFIER_PATTERN = '^([a-z0-9A-Z][a-z0-9-A-Z]*)\\.([a-z0-9A-Z][a-z0-9-A-Z]*)$';
Expand Down Expand Up @@ -640,7 +640,15 @@ export interface IAllowedExtensionsService {
}

export async function computeSize(location: URI, fileService: IFileService): Promise<number> {
const stat = await fileService.resolve(location);
let stat: IFileStat;
try {
stat = await fileService.resolve(location);
} catch (e) {
if ((<FileOperationError>e).fileOperationResult === FileOperationResult.FILE_NOT_FOUND) {
return 0;
}
throw e;
}
if (stat.children) {
const sizes = await Promise.all(stat.children.map(c => computeSize(c.resource, fileService)));
return sizes.reduce((r, s) => r + s, 0);
Expand Down
16 changes: 9 additions & 7 deletions src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1157,12 +1157,14 @@ class AdditionalDetailsWidget extends Disposable {
$('div.more-info-entry-name', undefined, localize('id', "Identifier")),
$('code', undefined, extension.identifier.id)
));
append(installInfo,
$('.more-info-entry', undefined,
$('div.more-info-entry-name', undefined, localize('Version', "Version")),
$('code', undefined, extension.manifest.version)
)
);
if (extension.type !== ExtensionType.System) {
append(installInfo,
$('.more-info-entry', undefined,
$('div.more-info-entry-name', undefined, localize('Version', "Version")),
$('code', undefined, extension.manifest.version)
)
);
}
if (extension.installedTimestamp) {
append(installInfo,
$('.more-info-entry', undefined,
Expand All @@ -1171,7 +1173,7 @@ class AdditionalDetailsWidget extends Disposable {
)
);
}
if (extension.source !== 'gallery') {
if (!extension.isBuiltin && extension.source !== 'gallery') {
const element = $('div', undefined, extension.source === 'vsix' ? localize('vsix', "VSIX") : localize('other', "Local"));
append(installInfo,
$('.more-info-entry', undefined,
Expand Down
1 change: 1 addition & 0 deletions src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,7 @@ export class SearchEditor extends AbstractTextCodeEditor<SearchEditorViewState>
if (!matchRanges) { return; }

const matchRange = (reverse ? findPrevRange : findNextRange)(matchRanges, currentPosition);
if (!matchRange) { return; }

this.searchResultEditor.setSelection(matchRange);
this.searchResultEditor.revealLineInCenterIfOutsideViewport(matchRange.startLineNumber);
Expand Down
20 changes: 16 additions & 4 deletions src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import { IUserDataSyncService, IAuthenticationProvider, isAuthenticationProvider, IUserDataAutoSyncService, IUserDataSyncStoreManagementService, SyncStatus, IUserDataSyncEnablementService, IUserDataSyncResource, IResourcePreview, USER_DATA_SYNC_SCHEME, USER_DATA_SYNC_LOG_ID, } from '../../../../platform/userDataSync/common/userDataSync.js';
import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
import { IUserDataSyncWorkbenchService, IUserDataSyncAccount, AccountStatus, CONTEXT_SYNC_ENABLEMENT, CONTEXT_SYNC_STATE, CONTEXT_ACCOUNT_STATE, SHOW_SYNC_LOG_COMMAND_ID, CONTEXT_ENABLE_ACTIVITY_VIEWS, SYNC_VIEW_CONTAINER_ID, SYNC_TITLE, SYNC_CONFLICTS_VIEW_ID, CONTEXT_ENABLE_SYNC_CONFLICTS_VIEW, CONTEXT_HAS_CONFLICTS, IUserDataSyncConflictsView } from '../common/userDataSync.js';
import { IUserDataSyncWorkbenchService, IUserDataSyncAccount, AccountStatus, CONTEXT_SYNC_ENABLEMENT, CONTEXT_SYNC_STATE, CONTEXT_ACCOUNT_STATE, SHOW_SYNC_LOG_COMMAND_ID, CONTEXT_ENABLE_ACTIVITY_VIEWS, SYNC_VIEW_CONTAINER_ID, SYNC_TITLE, SYNC_CONFLICTS_VIEW_ID, CONTEXT_ENABLE_SYNC_CONFLICTS_VIEW, CONTEXT_HAS_CONFLICTS, IUserDataSyncConflictsView, getSyncAreaLabel } from '../common/userDataSync.js';
import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
import { Emitter, Event } from '../../../../base/common/event.js';
import { getCurrentAuthenticationSessionInfo } from '../../authentication/browser/authenticationService.js';
Expand Down Expand Up @@ -403,9 +403,21 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat
}

private async handleConflictsWhileTurningOn(token: CancellationToken): Promise<void> {
const conflicts = this.userDataSyncService.conflicts;
const andSeparator = localize('and', ' and ');
let conflictsText = '';
for (let i = 0; i < conflicts.length; i++) {
if (i === conflicts.length - 1 && i !== 0) {
conflictsText += andSeparator;
} else if (i !== 0) {
conflictsText += ', ';
}
conflictsText += getSyncAreaLabel(conflicts[i].syncResource);
}
const singleConflictResource = conflicts.length === 1 ? getSyncAreaLabel(conflicts[0].syncResource) : undefined;
await this.dialogService.prompt({
type: Severity.Warning,
message: localize('conflicts detected', "Conflicts Detected"),
message: localize('conflicts detected', "Conflicts Detected in {0}", conflictsText),
detail: localize('resolve', "Please resolve conflicts to turn on..."),
buttons: [
{
Expand All @@ -417,11 +429,11 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat
}
},
{
label: localize({ key: 'replace local', comment: ['&& denotes a mnemonic'] }, "Replace &&Local"),
label: singleConflictResource ? localize({ key: 'replace local single', comment: ['&& denotes a mnemonic'] }, "Accept &&Remote {0}", singleConflictResource) : localize({ key: 'replace local', comment: ['&& denotes a mnemonic'] }, "Accept &&Remote"),
run: async () => this.replace(true)
},
{
label: localize({ key: 'replace remote', comment: ['&& denotes a mnemonic'] }, "Replace &&Remote"),
label: singleConflictResource ? localize({ key: 'replace remote single', comment: ['&& denotes a mnemonic'] }, "Accept &&Local {0}", singleConflictResource) : localize({ key: 'replace remote', comment: ['&& denotes a mnemonic'] }, "Accept &&Local"),
run: () => this.replace(false)
},
],
Expand Down
Loading