提交 aa61be47 编写于 作者: B Benjamin Pasero

💄 code

上级 a94b8a73
......@@ -13,7 +13,7 @@ import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { IEditorProgressService, LongRunningOperation } from 'vs/platform/progress/common/progress';
import { IEditorGroupView, DEFAULT_EDITOR_MIN_DIMENSIONS, DEFAULT_EDITOR_MAX_DIMENSIONS } from 'vs/workbench/browser/parts/editor/editor';
import { Event, Emitter } from 'vs/base/common/event';
import { Emitter } from 'vs/base/common/event';
import { IVisibleEditor } from 'vs/workbench/services/editor/common/editorService';
import { assertIsDefined } from 'vs/base/common/types';
......@@ -29,11 +29,11 @@ export class EditorControl extends Disposable {
get maximumWidth() { return this._activeControl ? this._activeControl.maximumWidth : DEFAULT_EDITOR_MAX_DIMENSIONS.width; }
get maximumHeight() { return this._activeControl ? this._activeControl.maximumHeight : DEFAULT_EDITOR_MAX_DIMENSIONS.height; }
private readonly _onDidFocus: Emitter<void> = this._register(new Emitter<void>());
readonly onDidFocus: Event<void> = this._onDidFocus.event;
private readonly _onDidFocus = this._register(new Emitter<void>());
readonly onDidFocus = this._onDidFocus.event;
private _onDidSizeConstraintsChange = this._register(new Emitter<{ width: number; height: number; } | undefined>());
get onDidSizeConstraintsChange(): Event<{ width: number; height: number; } | undefined> { return this._onDidSizeConstraintsChange.event; }
readonly onDidSizeConstraintsChange = this._onDidSizeConstraintsChange.event;
private _activeControl: BaseEditor | null = null;
private controls: BaseEditor[] = [];
......
......@@ -48,7 +48,7 @@ class GridWidgetView<T extends IView> implements IView {
get maximumHeight(): number { return this.gridWidget ? this.gridWidget.maximumHeight : Number.POSITIVE_INFINITY; }
private _onDidChange = new Relay<{ width: number; height: number; } | undefined>();
readonly onDidChange: Event<{ width: number; height: number; } | undefined> = this._onDidChange.event;
readonly onDidChange = this._onDidChange.event;
private _gridWidget: Grid<T> | undefined;
......@@ -111,6 +111,7 @@ export class EditorPart extends Part implements IEditorGroupsService, IEditorGro
readonly onDidMoveGroup = this._onDidMoveGroup.event;
private readonly onDidSetGridWidget = this._register(new Emitter<{ width: number; height: number; } | undefined>());
private readonly _onDidSizeConstraintsChange = this._register(new Relay<{ width: number; height: number; } | undefined>());
readonly onDidSizeConstraintsChange = Event.any(this.onDidSetGridWidget.event, this._onDidSizeConstraintsChange.event);
......
......@@ -23,7 +23,7 @@ export class EditorPickerEntry extends QuickOpenEntryGroup {
constructor(
private editor: IEditorInput,
private _group: IEditorGroup,
public readonly group: IEditorGroup,
@IModeService private readonly modeService: IModeService,
@IModelService private readonly modelService: IModelService
) {
......@@ -33,7 +33,7 @@ export class EditorPickerEntry extends QuickOpenEntryGroup {
getLabelOptions(): IIconLabelValueOptions {
return {
extraClasses: getIconClasses(this.modelService, this.modeService, this.getResource()),
italic: !this._group.isPinned(this.editor)
italic: !this.group.isPinned(this.editor)
};
}
......@@ -45,10 +45,6 @@ export class EditorPickerEntry extends QuickOpenEntryGroup {
return this.editor.isDirty() && !this.editor.isSaving() ? 'codicon codicon-circle-filled' : '';
}
get group(): IEditorGroup {
return this._group;
}
getResource() {
return toResource(this.editor, { supportSideBySide: SideBySideEditor.MASTER });
}
......@@ -70,7 +66,7 @@ export class EditorPickerEntry extends QuickOpenEntryGroup {
}
private runOpen(context: IEntryRunContext): boolean {
this._group.openEditor(this.editor);
this.group.openEditor(this.editor);
return true;
}
......
......@@ -180,6 +180,7 @@ interface StateDelta {
}
class State {
private _selectionStatus: string | undefined;
get selectionStatus(): string | undefined { return this._selectionStatus; }
......
......@@ -5,7 +5,7 @@
import { Widget } from 'vs/base/browser/ui/widget';
import { IOverlayWidget, ICodeEditor, IOverlayWidgetPosition, OverlayWidgetPositionPreference } from 'vs/editor/browser/editorBrowser';
import { Event, Emitter } from 'vs/base/common/event';
import { Emitter } from 'vs/base/common/event';
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
import { IThemeService } from 'vs/platform/theme/common/themeService';
import { $, append, clearNode } from 'vs/base/browser/dom';
......@@ -23,8 +23,8 @@ import { IFileService } from 'vs/platform/files/common/files';
export class FloatingClickWidget extends Widget implements IOverlayWidget {
private readonly _onClick: Emitter<void> = this._register(new Emitter<void>());
readonly onClick: Event<void> = this._onClick.event;
private readonly _onClick = this._register(new Emitter<void>());
readonly onClick = this._onClick.event;
private _domNode: HTMLElement;
......
......@@ -55,6 +55,7 @@ export class SideBySideEditor extends BaseEditor {
private dimension: DOM.Dimension = new DOM.Dimension(0, 0);
private onDidCreateEditors = this._register(new Emitter<{ width: number; height: number; } | undefined>());
private _onDidSizeConstraintsChange = this._register(new Relay<{ width: number; height: number; } | undefined>());
readonly onDidSizeConstraintsChange = Event.any(this.onDidCreateEditors.event, this._onDidSizeConstraintsChange.event);
......
......@@ -121,14 +121,10 @@ export class ConfigureNotificationAction extends Action {
constructor(
id: string,
label: string,
private readonly _configurationActions: ReadonlyArray<IAction>
public readonly configurationActions: ReadonlyArray<IAction>
) {
super(id, label, 'codicon-gear');
}
get configurationActions(): ReadonlyArray<IAction> {
return this._configurationActions;
}
}
export class CopyNotificationMessageAction extends Action {
......
......@@ -9,7 +9,7 @@ import { Themable, NOTIFICATIONS_BORDER, NOTIFICATIONS_CENTER_HEADER_FOREGROUND,
import { IThemeService, registerThemingParticipant, ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
import { INotificationsModel, INotificationChangeEvent, NotificationChangeType } from 'vs/workbench/common/notifications';
import { IWorkbenchLayoutService, Parts } from 'vs/workbench/services/layout/browser/layoutService';
import { Event, Emitter } from 'vs/base/common/event';
import { Emitter } from 'vs/base/common/event';
import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
import { NotificationsCenterVisibleContext } from 'vs/workbench/browser/parts/notifications/notificationsCommands';
import { NotificationsList } from 'vs/workbench/browser/parts/notifications/notificationsList';
......@@ -28,8 +28,8 @@ export class NotificationsCenter extends Themable {
private static readonly MAX_DIMENSIONS = new Dimension(450, 400);
private readonly _onDidChangeVisibility: Emitter<void> = this._register(new Emitter<void>());
readonly onDidChangeVisibility: Event<void> = this._onDidChangeVisibility.event;
private readonly _onDidChangeVisibility = this._register(new Emitter<void>());
readonly onDidChangeVisibility = this._onDidChangeVisibility.event;
private notificationsCenterContainer: HTMLElement | undefined;
private notificationsCenterHeader: HTMLElement | undefined;
......
......@@ -71,7 +71,7 @@ export class SidebarPart extends CompositePart<Viewlet> implements IViewletServi
get onDidViewletRegister(): Event<ViewletDescriptor> { return <Event<ViewletDescriptor>>this.viewletRegistry.onDidRegister; }
private _onDidViewletDeregister = this._register(new Emitter<ViewletDescriptor>());
readonly onDidViewletDeregister: Event<ViewletDescriptor> = this._onDidViewletDeregister.event;
readonly onDidViewletDeregister = this._onDidViewletDeregister.event;
get onDidViewletOpen(): Event<IViewlet> { return Event.map(this.onDidCompositeOpen.event, compositeEvent => <IViewlet>compositeEvent.composite); }
get onDidViewletClose(): Event<IViewlet> { return this.onDidCompositeClose.event as Event<IViewlet>; }
......
......@@ -30,7 +30,7 @@ import { CustomMenubarControl } from 'vs/workbench/browser/parts/titlebar/menuba
import { IInstantiationService, optional } from 'vs/platform/instantiation/common/instantiation';
import { template } from 'vs/base/common/labels';
import { ILabelService } from 'vs/platform/label/common/label';
import { Event, Emitter } from 'vs/base/common/event';
import { Emitter } from 'vs/base/common/event';
import { IStorageService } from 'vs/platform/storage/common/storage';
import { Parts, IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
import { RunOnceScheduler } from 'vs/base/common/async';
......@@ -64,7 +64,7 @@ export class TitlebarPart extends Part implements ITitleService {
//#endregion
private _onMenubarVisibilityChange = this._register(new Emitter<boolean>());
readonly onMenubarVisibilityChange: Event<boolean> = this._onMenubarVisibilityChange.event;
readonly onMenubarVisibilityChange = this._onMenubarVisibilityChange.event;
_serviceBrand: undefined;
......
......@@ -397,6 +397,9 @@ export interface IEditorGroup {
*/
readonly label: string;
/**
* A human readable label for the group to be used by screen readers.
*/
readonly ariaLabel: string;
/**
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册