Large Refactorings Pane Composite Parts (#133485)

* add auxiliary bar

* enabled DnD

* part of merge

* rename functions in IViewletService
prep-work for unifying services

* make auxiliarybarservice extends Ipanelservice

* rename functions in IPanelService
prep-work for unifying services

* introduce basic experimental setting

* everything is IPaneCompositeService

* panecompositeservice

* fix tests

* rename to panecompositepartservice

* rename parts class

* remove activitybarservice

* remove unnecessary service files
This commit is contained in:
SteVen Batten
2021-09-21 09:44:43 -07:00
committed by GitHub
parent 873ac56c38
commit d4c222488d
69 changed files with 1278 additions and 762 deletions

View File

@@ -9,13 +9,13 @@ import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/
import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
import { IUpdateService } from 'vs/platform/update/common/update';
import { ILifecycleService, LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { Barrier } from 'vs/base/common/async';
import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
import { ViewContainerLocation } from 'vs/workbench/common/views';
/* __GDPR__FRAGMENT__
"IMemoryInfo" : {
@@ -468,8 +468,7 @@ export abstract class AbstractTimerService implements ITimerService {
@IWorkspaceContextService private readonly _contextService: IWorkspaceContextService,
@IExtensionService private readonly _extensionService: IExtensionService,
@IUpdateService private readonly _updateService: IUpdateService,
@IViewletService private readonly _viewletService: IViewletService,
@IPanelService private readonly _panelService: IPanelService,
@IPaneCompositePartService private readonly _paneCompositeService: IPaneCompositePartService,
@IEditorService private readonly _editorService: IEditorService,
@IAccessibilityService private readonly _accessibilityService: IAccessibilityService,
@ITelemetryService private readonly _telemetryService: ITelemetryService,
@@ -553,8 +552,8 @@ export abstract class AbstractTimerService implements ITimerService {
const initialStartup = this._isInitialStartup();
const startMark = initialStartup ? 'code/didStartMain' : 'code/willOpenNewWindow';
const activeViewlet = this._viewletService.getActiveViewlet();
const activePanel = this._panelService.getActivePanel();
const activeViewlet = this._paneCompositeService.getActivePaneComposite(ViewContainerLocation.Sidebar);
const activePanel = this._paneCompositeService.getActivePaneComposite(ViewContainerLocation.Panel);
const info: Writeable<IStartupMetrics> = {
version: 2,
ellapsed: this._marks.getDuration(startMark, 'code/didStartWorkbench'),

View File

@@ -9,8 +9,6 @@ import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace
import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
import { IUpdateService } from 'vs/platform/update/common/update';
import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
import { IStartupMetrics, AbstractTimerService, Writeable, ITimerService } from 'vs/workbench/services/timer/browser/timerService';
@@ -20,6 +18,7 @@ import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
import { IProductService } from 'vs/platform/product/common/productService';
import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
export class TimerService extends AbstractTimerService {
@@ -30,8 +29,7 @@ export class TimerService extends AbstractTimerService {
@IWorkspaceContextService contextService: IWorkspaceContextService,
@IExtensionService extensionService: IExtensionService,
@IUpdateService updateService: IUpdateService,
@IViewletService viewletService: IViewletService,
@IPanelService panelService: IPanelService,
@IPaneCompositePartService paneCompositeService: IPaneCompositePartService,
@IEditorService editorService: IEditorService,
@IAccessibilityService accessibilityService: IAccessibilityService,
@ITelemetryService telemetryService: ITelemetryService,
@@ -39,7 +37,7 @@ export class TimerService extends AbstractTimerService {
@IProductService private readonly _productService: IProductService,
@IStorageService private readonly _storageService: IStorageService
) {
super(lifecycleService, contextService, extensionService, updateService, viewletService, panelService, editorService, accessibilityService, telemetryService, layoutService);
super(lifecycleService, contextService, extensionService, updateService, paneCompositeService, editorService, accessibilityService, telemetryService, layoutService);
this.setPerformanceMarks('main', _environmentService.configuration.perfMarks);
}