development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-13 21:55:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

review implicit public fields (#172833)

Browse source 
review implicit public fields #166603
This commit is contained in:
Sandeep Somavarapu 2023-01-30 20:13:51 +01:00 committed by GitHub
parent adcaa9a390
commit 67e936ac69
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 22 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/vs/platform/userDataProfile/test/common/userDataProfileStorageService.test.ts
View file

@ -31,7 +31,7 @@ export class TestUserDataProfileStorageService extends AbstractUserDataProfileSt
readonly onDidChange = Event.None;
private databases = new Map<string, InMemoryStorageDatabase>();
async createStorageDatabase(profile: IUserDataProfile): Promise<InMemoryStorageDatabase> {
protected async createStorageDatabase(profile: IUserDataProfile): Promise<InMemoryStorageDatabase> {
let database = this.databases.get(profile.id);
if (!database) {
this.databases.set(profile.id, database = new TestStorageDatabase());
@ -39,6 +39,10 @@ export class TestUserDataProfileStorageService extends AbstractUserDataProfileSt
return database;
}
setupStorageDatabase(profile: IUserDataProfile): Promise<InMemoryStorageDatabase> {
return this.createStorageDatabase(profile);
}
protected override async closeAndDispose(): Promise<void> { }
}
@ -51,7 +55,7 @@ suite('ProfileStorageService', () => {
setup(async () => {
testObject = disposables.add(new TestUserDataProfileStorageService(new InMemoryStorageService()));
storage = new Storage(await testObject.createStorageDatabase(profile));
storage = new Storage(await testObject.setupStorageDatabase(profile));
await storage.init();
});

2
src/vs/platform/userDataSync/common/keybindingsSync.ts
View file

@ -351,7 +351,7 @@ export class KeybindingsInitializer extends AbstractInitializer {
super(SyncResource.Keybindings, userDataProfilesService, environmentService, logService, fileService, storageService, uriIdentityService);
}
async doInitialize(remoteUserData: IRemoteUserData): Promise<void> {
protected async doInitialize(remoteUserData: IRemoteUserData): Promise<void> {
const keybindingsContent = remoteUserData.syncData ? this.getKeybindingsContentFromSyncContent(remoteUserData.syncData.content) : null;
if (!keybindingsContent) {
this.logService.info('Skipping initializing keybindings because remote keybindings does not exist.');

2
src/vs/platform/userDataSync/common/settingsSync.ts
View file

@ -354,7 +354,7 @@ export class SettingsInitializer extends AbstractInitializer {
super(SyncResource.Settings, userDataProfilesService, environmentService, logService, fileService, storageService, uriIdentityService);
}
async doInitialize(remoteUserData: IRemoteUserData): Promise<void> {
protected async doInitialize(remoteUserData: IRemoteUserData): Promise<void> {
const settingsSyncContent = remoteUserData.syncData ? this.parseSettingsSyncContent(remoteUserData.syncData.content) : null;
if (!settingsSyncContent) {
this.logService.info('Skipping initializing settings because remote settings does not exist.');

2
src/vs/platform/userDataSync/common/snippetsSync.ts
View file

@ -515,7 +515,7 @@ export class SnippetsInitializer extends AbstractInitializer {
super(SyncResource.Snippets, userDataProfilesService, environmentService, logService, fileService, storageService, uriIdentityService);
}
async doInitialize(remoteUserData: IRemoteUserData): Promise<void> {
protected async doInitialize(remoteUserData: IRemoteUserData): Promise<void> {
const remoteSnippets: IStringDictionary<string> | null = remoteUserData.syncData ? JSON.parse(remoteUserData.syncData.content) : null;
if (!remoteSnippets) {
this.logService.info('Skipping initializing snippets because remote snippets does not exist.');

2
src/vs/platform/userDataSync/common/tasksSync.ts
View file

@ -260,7 +260,7 @@ export class TasksInitializer extends AbstractInitializer {
super(SyncResource.Tasks, userDataProfilesService, environmentService, logService, fileService, storageService, uriIdentityService);
}
async doInitialize(remoteUserData: IRemoteUserData): Promise<void> {
protected async doInitialize(remoteUserData: IRemoteUserData): Promise<void> {
const tasksContent = remoteUserData.syncData ? getTasksContentFromSyncContent(remoteUserData.syncData.content, this.logService) : null;
if (!tasksContent) {
this.logService.info('Skipping initializing tasks because remote tasks does not exist.');

41
src/vs/platform/userDataSync/test/common/synchronizer.test.ts
View file

@ -161,8 +161,8 @@ class TestSynchroniser extends AbstractSynchroniser {
super.stop();
}
override async triggerLocalChange(): Promise<void> {
super.triggerLocalChange();
testTriggerLocalChange(): void {
this.triggerLocalChange();
}
onDidTriggerLocalChangeCall: Emitter<void> = this._register(new Emitter<void>());
@ -462,7 +462,7 @@ suite('TestSynchronizer - Auto Sync', () => {
server.reset();
const promise = Event.toPromise(testObject.onDidTriggerLocalChangeCall.event);
await testObject.triggerLocalChange();
testObject.testTriggerLocalChange();
await promise;
assert.deepStrictEqual(server.requests, []);
@ -613,39 +613,6 @@ suite('TestSynchronizer - Manual Sync', () => {
assert.strictEqual((await client.instantiationService.get(IFileService).readFile(testObject.localResource)).value.toString(), expectedContent);
}));
test('preview -> accept', () => runWithFakedTimers<void>({ useFakeTimers: true }, async () => {
const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, { syncResource: SyncResource.Settings, profile: client.instantiationService.get(IUserDataProfilesService).defaultProfile }, undefined));
testObject.syncResult = { hasConflicts: false, hasError: false };
testObject.syncBarrier.open();
let preview = await testObject.preview(await client.getResourceManifest(), {});
preview = await testObject.accept(preview!.resourcePreviews[0].previewResource);
assert.deepStrictEqual(testObject.status, SyncStatus.Syncing);
assertPreviews(preview!.resourcePreviews, [testObject.localResource]);
assertConflicts(testObject.conflicts.conflicts, []);
}));
test('preview -> accept -> apply', () => runWithFakedTimers<void>({ useFakeTimers: true }, async () => {
const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, { syncResource: SyncResource.Settings, profile: client.instantiationService.get(IUserDataProfilesService).defaultProfile }, undefined));
testObject.syncResult = { hasConflicts: false, hasError: false };
testObject.syncBarrier.open();
await testObject.sync(await client.getResourceManifest());
const manifest = await client.getResourceManifest();
const expectedContent = manifest![testObject.resource];
let preview = await testObject.preview(await client.getResourceManifest(), {});
preview = await testObject.accept(preview!.resourcePreviews[0].previewResource);
preview = await testObject.apply(false);
assert.deepStrictEqual(testObject.status, SyncStatus.Idle);
assert.strictEqual(preview, null);
assertConflicts(testObject.conflicts.conflicts, []);
assert.strictEqual((await testObject.getRemoteUserData(null)).syncData?.content, expectedContent);
assert.strictEqual((await client.instantiationService.get(IFileService).readFile(testObject.localResource)).value.toString(), expectedContent);
}));
test('preivew -> merge -> discard', () => runWithFakedTimers<void>({ useFakeTimers: true }, async () => {
const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, { syncResource: SyncResource.Settings, profile: client.instantiationService.get(IUserDataProfilesService).defaultProfile }, undefined));
testObject.syncResult = { hasConflicts: false, hasError: false };
@ -883,7 +850,7 @@ suite('TestSynchronizer - Manual Sync', () => {
assert.strictEqual((await client.instantiationService.get(IFileService).readFile(testObject.localResource)).value.toString(), expectedContent);
}));
test('conflicts: preview -> accept', () => runWithFakedTimers<void>({ useFakeTimers: true }, async () => {
test('conflicts: preview -> accept 2', () => runWithFakedTimers<void>({ useFakeTimers: true }, async () => {
const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, { syncResource: SyncResource.Settings, profile: client.instantiationService.get(IUserDataProfilesService).defaultProfile }, undefined));
testObject.syncResult = { hasConflicts: true, hasError: false };
testObject.syncBarrier.open();

10
src/vs/workbench/browser/parts/panel/panelPart.ts
View file

@ -144,8 +144,8 @@ export abstract class BasePanelPart extends CompositePart<PaneComposite> impleme
@IExtensionService private readonly extensionService: IExtensionService,
private readonly partId: Parts.PANEL_PART | Parts.AUXILIARYBAR_PART,
activePanelSettingsKey: string,
protected readonly pinnedPanelsKey: string,
protected readonly placeholdeViewContainersKey: string,
private readonly pinnedPanelsKey: string,
private readonly placeholdeViewContainersKey: string,
panelRegistryId: string,
private readonly backgroundColor: string,
private readonly viewContainerLocation: ViewContainerLocation,
@ -914,8 +914,6 @@ export abstract class BasePanelPart extends CompositePart<PaneComposite> impleme
export class PanelPart extends BasePanelPart {
static readonly activePanelSettingsKey = 'workbench.panelpart.activepanelid';
static readonly pinnedPanelsKey = 'workbench.panel.pinnedPanels';
static readonly placeholdeViewContainersKey = 'workbench.panel.placeholderPanels';
constructor(
@INotificationService notificationService: INotificationService,
@ -946,8 +944,8 @@ export class PanelPart extends BasePanelPart {
extensionService,
Parts.PANEL_PART,
PanelPart.activePanelSettingsKey,
PanelPart.pinnedPanelsKey,
PanelPart.placeholdeViewContainersKey,
'workbench.panel.pinnedPanels',
'workbench.panel.placeholderPanels',
PaneCompositeExtensions.Panels,
PANEL_BACKGROUND,
ViewContainerLocation.Panel,

2
src/vs/workbench/browser/parts/views/viewPaneContainer.ts
View file

@ -732,7 +732,7 @@ export class ViewPaneContainer extends Component implements IViewPaneContainer {
return sizes;
}
override saveState(): void {
protected override saveState(): void {
this.panes.forEach((view) => view.saveState());
this.storageService.store(this.visibleViewsStorageId, this.length, StorageScope.WORKSPACE, StorageTarget.USER);
}

1
src/vs/workbench/common/views.ts
View file

@ -886,7 +886,6 @@ export interface IViewPaneContainer {
getActionsContext(): unknown;
getView(viewId: string): IView | undefined;
toggleViewVisibility(viewId: string): void;
saveState(): void;
}
export interface IViewBadge {

6
src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
View file

@ -878,7 +878,7 @@ export class UpdateAction extends AbstractUpdateAction {
constructor(
private readonly verbose: boolean,
@IExtensionsWorkbenchService override readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
@IExtensionsWorkbenchService extensionsWorkbenchService: IExtensionsWorkbenchService,
@IInstantiationService protected readonly instantiationService: IInstantiationService,
) {
super(`extensions.update`, localize('update', "Update"), extensionsWorkbenchService);
@ -912,7 +912,7 @@ export class UpdateAction extends AbstractUpdateAction {
export class SkipUpdateAction extends AbstractUpdateAction {
constructor(
@IExtensionsWorkbenchService override readonly extensionsWorkbenchService: IExtensionsWorkbenchService
@IExtensionsWorkbenchService extensionsWorkbenchService: IExtensionsWorkbenchService
) {
super(`extensions.ignoreUpdates`, localize('ignoreUpdates', "Ignore Updates"), extensionsWorkbenchService);
}
@ -1000,7 +1000,7 @@ export class ExtensionActionWithDropdownActionViewItem extends ActionWithDropdow
this.updateClass();
}
override updateClass(): void {
protected override updateClass(): void {
super.updateClass();
if (this.element && this.dropdownMenuActionViewItem && this.dropdownMenuActionViewItem.element) {
this.element.classList.toggle('empty', (<ActionWithDropDownAction>this._action).menuActions.length === 0);