diff --git a/src/vs/base/browser/ui/actionbar/actionViewItems.ts b/src/vs/base/browser/ui/actionbar/actionViewItems.ts index 02e9bc99513..a4a8f5204a3 100644 --- a/src/vs/base/browser/ui/actionbar/actionViewItems.ts +++ b/src/vs/base/browser/ui/actionbar/actionViewItems.ts @@ -334,13 +334,13 @@ export class ActionViewItem extends BaseActionViewItem { } } - override updateLabel(): void { + protected override updateLabel(): void { if (this.options.label && this.label) { this.label.textContent = this.action.label; } } - override getTooltip() { + protected override getTooltip() { let title: string | null = null; if (this.action.tooltip) { @@ -356,7 +356,7 @@ export class ActionViewItem extends BaseActionViewItem { return title ?? undefined; } - override updateClass(): void { + protected override updateClass(): void { if (this.cssClass && this.label) { this.label.classList.remove(...this.cssClass.split(' ')); } @@ -377,7 +377,7 @@ export class ActionViewItem extends BaseActionViewItem { } } - override updateEnabled(): void { + protected override updateEnabled(): void { if (this.action.enabled) { if (this.label) { this.label.removeAttribute('aria-disabled'); @@ -395,14 +395,14 @@ export class ActionViewItem extends BaseActionViewItem { } } - override updateAriaLabel(): void { + protected override updateAriaLabel(): void { if (this.label) { const title = this.getTooltip() ?? ''; this.label.setAttribute('aria-label', title); } } - override updateChecked(): void { + protected override updateChecked(): void { if (this.label) { if (this.action.checked) { this.label.classList.add('checked'); diff --git a/src/vs/base/browser/ui/dropdown/dropdownActionViewItem.ts b/src/vs/base/browser/ui/dropdown/dropdownActionViewItem.ts index 75d35b2b4d7..c23cbd44b04 100644 --- a/src/vs/base/browser/ui/dropdown/dropdownActionViewItem.ts +++ b/src/vs/base/browser/ui/dropdown/dropdownActionViewItem.ts @@ -131,7 +131,7 @@ export class DropdownMenuActionViewItem extends BaseActionViewItem { this.updateEnabled(); } - override getTooltip(): string | undefined { + protected override getTooltip(): string | undefined { let title: string | null = null; if (this.action.tooltip) { @@ -233,5 +233,3 @@ export class ActionWithDropdownActionViewItem extends ActionViewItem { this.dropdownMenuActionViewItem?.setFocusable(focusable); } } - - diff --git a/src/vs/base/browser/ui/menu/menu.ts b/src/vs/base/browser/ui/menu/menu.ts index fed53f99926..322ac1f3c63 100644 --- a/src/vs/base/browser/ui/menu/menu.ts +++ b/src/vs/base/browser/ui/menu/menu.ts @@ -564,7 +564,7 @@ class BaseMenuActionViewItem extends BaseActionViewItem { } } - override updateLabel(): void { + protected override updateLabel(): void { if (!this.label) { return; } @@ -615,11 +615,11 @@ class BaseMenuActionViewItem extends BaseActionViewItem { } } - override updateTooltip(): void { + protected override updateTooltip(): void { // menus should function like native menus and they do not have tooltips } - override updateClass(): void { + protected override updateClass(): void { if (this.cssClass && this.item) { this.item.classList.remove(...this.cssClass.split(' ')); } @@ -635,7 +635,7 @@ class BaseMenuActionViewItem extends BaseActionViewItem { } } - override updateEnabled(): void { + protected override updateEnabled(): void { if (this.action.enabled) { if (this.element) { this.element.classList.remove('disabled'); @@ -660,7 +660,7 @@ class BaseMenuActionViewItem extends BaseActionViewItem { } } - override updateChecked(): void { + protected override updateChecked(): void { if (!this.item) { return; } @@ -805,7 +805,7 @@ class SubmenuMenuActionViewItem extends BaseMenuActionViewItem { })); } - override updateEnabled(): void { + protected override updateEnabled(): void { // override on submenu entry // native menus do not observe enablement on sumbenus // we mimic that behavior diff --git a/src/vs/base/browser/ui/toggle/toggle.ts b/src/vs/base/browser/ui/toggle/toggle.ts index 06b5cf0fe14..b422d5a6d75 100644 --- a/src/vs/base/browser/ui/toggle/toggle.ts +++ b/src/vs/base/browser/ui/toggle/toggle.ts @@ -59,7 +59,7 @@ export class ToggleActionViewItem extends BaseActionViewItem { this.element.appendChild(this.toggle.domNode); } - override updateEnabled(): void { + protected override updateEnabled(): void { if (this.toggle) { if (this.isEnabled()) { this.toggle.enable(); @@ -69,7 +69,7 @@ export class ToggleActionViewItem extends BaseActionViewItem { } } - override updateChecked(): void { + protected override updateChecked(): void { this.toggle.checked = !!this._action.checked; } diff --git a/src/vs/editor/contrib/gotoError/browser/gotoErrorWidget.ts b/src/vs/editor/contrib/gotoError/browser/gotoErrorWidget.ts index 3094d31f515..c44bae5cb13 100644 --- a/src/vs/editor/contrib/gotoError/browser/gotoErrorWidget.ts +++ b/src/vs/editor/contrib/gotoError/browser/gotoErrorWidget.ts @@ -382,7 +382,7 @@ export class MarkerNavigationWidget extends PeekViewWidget { this._container.style.height = `${heightInPixel}px`; } - public override _onWidth(widthInPixel: number): void { + protected override _onWidth(widthInPixel: number): void { this._message.layout(this._heightInPixel, widthInPixel); } diff --git a/src/vs/editor/contrib/gotoSymbol/browser/goToCommands.ts b/src/vs/editor/contrib/gotoSymbol/browser/goToCommands.ts index ce1754d2940..37338ef5d16 100644 --- a/src/vs/editor/contrib/gotoSymbol/browser/goToCommands.ts +++ b/src/vs/editor/contrib/gotoSymbol/browser/goToCommands.ts @@ -816,7 +816,7 @@ CommandsRegistry.registerCommand({ return editor.invokeWithinContext(accessor => { const command = new class extends GenericGoToLocationAction { - override _getNoResultFoundMessage(info: IWordAtPosition | null) { + protected override _getNoResultFoundMessage(info: IWordAtPosition | null) { return noResultsMessage || super._getNoResultFoundMessage(info); } }({ diff --git a/src/vs/editor/contrib/linesOperations/browser/linesOperations.ts b/src/vs/editor/contrib/linesOperations/browser/linesOperations.ts index ce0ebbc54af..9c3591ef71a 100644 --- a/src/vs/editor/contrib/linesOperations/browser/linesOperations.ts +++ b/src/vs/editor/contrib/linesOperations/browser/linesOperations.ts @@ -660,7 +660,7 @@ export class DeleteAllLeftAction extends AbstractDeleteAllToBoundaryAction { }); } - _getEndCursorState(primaryCursor: Range, rangesToDelete: Range[]): Selection[] { + protected _getEndCursorState(primaryCursor: Range, rangesToDelete: Range[]): Selection[] { let endPrimaryCursor: Selection | null = null; const endCursorState: Selection[] = []; let deletedLines = 0; @@ -690,7 +690,7 @@ export class DeleteAllLeftAction extends AbstractDeleteAllToBoundaryAction { return endCursorState; } - _getRangesToDelete(editor: IActiveCodeEditor): Range[] { + protected _getRangesToDelete(editor: IActiveCodeEditor): Range[] { const selections = editor.getSelections(); if (selections === null) { return []; @@ -738,7 +738,7 @@ export class DeleteAllRightAction extends AbstractDeleteAllToBoundaryAction { }); } - _getEndCursorState(primaryCursor: Range, rangesToDelete: Range[]): Selection[] { + protected _getEndCursorState(primaryCursor: Range, rangesToDelete: Range[]): Selection[] { let endPrimaryCursor: Selection | null = null; const endCursorState: Selection[] = []; for (let i = 0, len = rangesToDelete.length, offset = 0; i < len; i++) { @@ -759,7 +759,7 @@ export class DeleteAllRightAction extends AbstractDeleteAllToBoundaryAction { return endCursorState; } - _getRangesToDelete(editor: IActiveCodeEditor): Range[] { + protected _getRangesToDelete(editor: IActiveCodeEditor): Range[] { const model = editor.getModel(); if (model === null) { return []; diff --git a/src/vs/editor/contrib/suggest/browser/suggestWidgetStatus.ts b/src/vs/editor/contrib/suggest/browser/suggestWidgetStatus.ts index 7608bd71d3c..c1e7893b326 100644 --- a/src/vs/editor/contrib/suggest/browser/suggestWidgetStatus.ts +++ b/src/vs/editor/contrib/suggest/browser/suggestWidgetStatus.ts @@ -17,7 +17,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti class StatusBarViewItem extends MenuEntryActionViewItem { - override updateLabel() { + protected override updateLabel() { const kb = this._keybindingService.lookupKeybinding(this._action.id, this._contextKeyService); if (!kb) { return super.updateLabel(); diff --git a/src/vs/platform/actions/browser/menuEntryActionViewItem.ts b/src/vs/platform/actions/browser/menuEntryActionViewItem.ts index bac16a59fc4..5e63989a9ae 100644 --- a/src/vs/platform/actions/browser/menuEntryActionViewItem.ts +++ b/src/vs/platform/actions/browser/menuEntryActionViewItem.ts @@ -195,13 +195,13 @@ export class MenuEntryActionViewItem extends ActionViewItem { })); } - override updateLabel(): void { + protected override updateLabel(): void { if (this.options.label && this.label) { this.label.textContent = this._commandAction.label; } } - override getTooltip() { + protected override getTooltip() { const keybinding = this._keybindingService.lookupKeybinding(this._commandAction.id, this._contextKeyService); const keybindingLabel = keybinding && keybinding.getLabel(); @@ -222,7 +222,7 @@ export class MenuEntryActionViewItem extends ActionViewItem { return title; } - override updateClass(): void { + protected override updateClass(): void { if (this.options.icon) { if (this._commandAction !== this._menuItemAction) { if (this._menuItemAction.alt) { @@ -382,7 +382,7 @@ export class DropdownWithDefaultActionViewItem extends BaseActionViewItem { this._defaultAction.dispose(); this._defaultAction = this._instaService.createInstance(MenuEntryActionViewItem, lastAction, { keybinding: this._getDefaultActionKeybindingLabel(lastAction) }); this._defaultAction.actionRunner = new class extends ActionRunner { - override async runAction(action: IAction, context?: unknown): Promise { + protected override async runAction(action: IAction, context?: unknown): Promise { await action.run(undefined); } }(); diff --git a/src/vs/platform/userDataSync/common/globalStateSync.ts b/src/vs/platform/userDataSync/common/globalStateSync.ts index ba15b967540..03ac74ee019 100644 --- a/src/vs/platform/userDataSync/common/globalStateSync.ts +++ b/src/vs/platform/userDataSync/common/globalStateSync.ts @@ -408,7 +408,7 @@ export class GlobalStateInitializer extends AbstractInitializer { super(SyncResource.GlobalState, userDataProfilesService, environmentService, logService, fileService, storageService, uriIdentityService); } - async doInitialize(remoteUserData: IRemoteUserData): Promise { + protected async doInitialize(remoteUserData: IRemoteUserData): Promise { const remoteGlobalState: IGlobalState = remoteUserData.syncData ? JSON.parse(remoteUserData.syncData.content) : null; if (!remoteGlobalState) { this.logService.info('Skipping initializing global state because remote global state does not exist.'); @@ -506,4 +506,3 @@ export class UserDataSyncStoreTypeSynchronizer { } } - diff --git a/src/vs/workbench/api/worker/extHostExtensionService.ts b/src/vs/workbench/api/worker/extHostExtensionService.ts index 28b24d42950..65417c948d3 100644 --- a/src/vs/workbench/api/worker/extHostExtensionService.ts +++ b/src/vs/workbench/api/worker/extHostExtensionService.ts @@ -15,7 +15,7 @@ import { ExtHostConsoleForwarder } from 'vs/workbench/api/worker/extHostConsoleF class WorkerRequireInterceptor extends RequireInterceptor { - _installInterceptor() { } + protected _installInterceptor() { } getModule(request: string, parent: URI): undefined | any { for (const alternativeModuleName of this._alternatives) { diff --git a/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.ts b/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.ts index 28894f417fe..4f4e5b1c52a 100644 --- a/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.ts +++ b/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.ts @@ -352,7 +352,7 @@ export class BreadcrumbsFilePicker extends BreadcrumbsPicker { super(parent, resource, instantiationService, themeService, configService); } - _createTree(container: HTMLElement) { + protected _createTree(container: HTMLElement) { // tree icon theme specials this._treeContainer.classList.add('file-icon-themable-tree'); @@ -388,7 +388,7 @@ export class BreadcrumbsFilePicker extends BreadcrumbsPicker { }); } - async _setInput(element: FileElement | OutlineElement2): Promise { + protected async _setInput(element: FileElement | OutlineElement2): Promise { const { uri, kind } = (element as FileElement); let input: IWorkspace | URI; if (kind === FileKind.ROOT_FOLDER) { @@ -420,7 +420,7 @@ export class BreadcrumbsFilePicker extends BreadcrumbsPicker { return Disposable.None; } - async _revealElement(element: IFileStat | IWorkspaceFolder, options: IEditorOptions, sideBySide: boolean): Promise { + protected async _revealElement(element: IFileStat | IWorkspaceFolder, options: IEditorOptions, sideBySide: boolean): Promise { if (!isWorkspaceFolder(element) && element.isFile) { this._onWillPickElement.fire(); await this._editorService.openEditor({ resource: element.resource, options }, sideBySide ? SIDE_GROUP : undefined); @@ -502,7 +502,7 @@ export class BreadcrumbsOutlinePicker extends BreadcrumbsPicker { return outline.preview(element); } - async _revealElement(element: any, options: IEditorOptions, sideBySide: boolean): Promise { + protected async _revealElement(element: any, options: IEditorOptions, sideBySide: boolean): Promise { this._onWillPickElement.fire(); const outline: IOutline = this._tree.getInput(); await outline.reveal(element, options, sideBySide); diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts index 7d6ef04d365..81a67f48202 100644 --- a/src/vs/workbench/browser/parts/editor/editorPart.ts +++ b/src/vs/workbench/browser/parts/editor/editorPart.ts @@ -842,7 +842,7 @@ export class EditorPart extends Part implements IEditorGroupsService, IEditorGro this.centeredLayoutWidget.styles(separatorBorderStyle); } - override createContentArea(parent: HTMLElement, options?: IEditorPartCreationOptions): HTMLElement { + protected override createContentArea(parent: HTMLElement, options?: IEditorPartCreationOptions): HTMLElement { // Container this.element = parent; diff --git a/src/vs/workbench/browser/parts/editor/textDiffEditor.ts b/src/vs/workbench/browser/parts/editor/textDiffEditor.ts index f0a9e78c2c8..bdd0964760c 100644 --- a/src/vs/workbench/browser/parts/editor/textDiffEditor.ts +++ b/src/vs/workbench/browser/parts/editor/textDiffEditor.ts @@ -79,7 +79,7 @@ export class TextDiffEditor extends AbstractTextEditor imp return localize('textDiffEditor', "Text Diff Editor"); } - override createEditorControl(parent: HTMLElement, configuration: ICodeEditorOptions): void { + protected override createEditorControl(parent: HTMLElement, configuration: ICodeEditorOptions): void { this.diffEditorControl = this._register(this.instantiationService.createInstance(DiffEditorWidget, parent, configuration, {})); } diff --git a/src/vs/workbench/browser/parts/titlebar/commandCenterControl.ts b/src/vs/workbench/browser/parts/titlebar/commandCenterControl.ts index 0069c440c84..82d9a3dd1d6 100644 --- a/src/vs/workbench/browser/parts/titlebar/commandCenterControl.ts +++ b/src/vs/workbench/browser/parts/titlebar/commandCenterControl.ts @@ -98,7 +98,7 @@ export class CommandCenterControl { return label; } - override getTooltip() { + protected override getTooltip() { // tooltip: full windowTitle const kb = keybindingService.lookupKeybinding(action.id)?.getLabel(); diff --git a/src/vs/workbench/browser/parts/views/treeView.ts b/src/vs/workbench/browser/parts/views/treeView.ts index 9c2758f630d..5f328015235 100644 --- a/src/vs/workbench/browser/parts/views/treeView.ts +++ b/src/vs/workbench/browser/parts/views/treeView.ts @@ -127,7 +127,7 @@ export class TreeViewPane extends ViewPane { return ((this.treeView.dataProvider === undefined) || !!this.treeView.dataProvider.isTreeEmpty) && (this.treeView.message === undefined); } - override layoutBody(height: number, width: number): void { + protected override layoutBody(height: number, width: number): void { super.layoutBody(height, width); this.layoutTreeView(height, width); } @@ -1377,7 +1377,7 @@ class MultipleSelectionActionRunner extends ActionRunner { })); } - override async runAction(action: IAction, context: TreeViewItemHandleArg | TreeViewPaneHandleArg): Promise { + protected override async runAction(action: IAction, context: TreeViewItemHandleArg | TreeViewPaneHandleArg): Promise { const selection = this.getSelectedResources(); let selectionHandleArgs: TreeViewItemHandleArg[] | undefined = undefined; let actionInSelected: boolean = false; diff --git a/src/vs/workbench/browser/parts/views/viewsViewlet.ts b/src/vs/workbench/browser/parts/views/viewsViewlet.ts index b99ea671d92..c53f2171cbe 100644 --- a/src/vs/workbench/browser/parts/views/viewsViewlet.ts +++ b/src/vs/workbench/browser/parts/views/viewsViewlet.ts @@ -123,7 +123,7 @@ export abstract class FilterViewPaneContainer extends ViewPaneContainer { return views; } - override onDidAddViewDescriptors(added: IAddedViewDescriptorRef[]): ViewPane[] { + protected override onDidAddViewDescriptors(added: IAddedViewDescriptorRef[]): ViewPane[] { const panes: ViewPane[] = super.onDidAddViewDescriptors(added); for (let i = 0; i < added.length; i++) { if (this.constantViewDescriptors.has(added[i].viewDescriptor.id)) { diff --git a/src/vs/workbench/contrib/comments/browser/commentsView.ts b/src/vs/workbench/contrib/comments/browser/commentsView.ts index 858a940e5ce..64a7d652660 100644 --- a/src/vs/workbench/contrib/comments/browser/commentsView.ts +++ b/src/vs/workbench/contrib/comments/browser/commentsView.ts @@ -152,7 +152,7 @@ export class CommentsPanel extends FilterViewPane implements ICommentsView { this.filterWidget.checkMoreFilters(!this.filters.showResolved || !this.filters.showUnresolved); } - public override renderBody(container: HTMLElement): void { + protected override renderBody(container: HTMLElement): void { super.renderBody(container); container.classList.add('comments-panel'); @@ -242,7 +242,7 @@ export class CommentsPanel extends FilterViewPane implements ICommentsView { return !!this.tree; } - public override layoutBodyContent(height: number = this.currentHeight, width: number = this.currentWidth): void { + protected override layoutBodyContent(height: number = this.currentHeight, width: number = this.currentWidth): void { if (this.messageBoxContainer) { this.messageBoxContainer.style.height = `${height}px`; } diff --git a/src/vs/workbench/contrib/comments/browser/reactionsAction.ts b/src/vs/workbench/contrib/comments/browser/reactionsAction.ts index 692b5d24037..92c2f251400 100644 --- a/src/vs/workbench/contrib/comments/browser/reactionsAction.ts +++ b/src/vs/workbench/contrib/comments/browser/reactionsAction.ts @@ -32,7 +32,7 @@ export class ReactionActionViewItem extends ActionViewItem { constructor(action: ReactionAction) { super(null, action, {}); } - override updateLabel(): void { + protected override updateLabel(): void { if (!this.label) { return; } diff --git a/src/vs/workbench/contrib/interactive/browser/interactiveEditor.ts b/src/vs/workbench/contrib/interactive/browser/interactiveEditor.ts index c2476414c5b..86efcc7fdc3 100644 --- a/src/vs/workbench/contrib/interactive/browser/interactiveEditor.ts +++ b/src/vs/workbench/contrib/interactive/browser/interactiveEditor.ts @@ -258,7 +258,7 @@ export class InteractiveEditor extends EditorPane { this.#styleElement.textContent = styleSheets.join('\n'); } - override saveState(): void { + protected override saveState(): void { this.#saveEditorViewState(this.input); super.saveState(); } diff --git a/src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts b/src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts index 0f065457db4..081e766a199 100644 --- a/src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts +++ b/src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts @@ -261,7 +261,7 @@ class ToggleMultilineActionViewItem extends ActionViewItem { this.updateExpandedAttribute(); } - override updateClass(): void { + protected override updateClass(): void { super.updateClass(); this.updateExpandedAttribute(); } diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.ts b/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.ts index 877498df2b0..59d525ee6a0 100644 --- a/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.ts +++ b/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.ts @@ -144,7 +144,7 @@ class NotebookFindFilterActionViewItem extends DropdownMenuActionViewItem { } - override updateChecked(): void { + protected override updateChecked(): void { this.element!.classList.toggle('checked', this._action.checked); } } @@ -225,7 +225,7 @@ class NotebookFindInput extends FindInput { this.applyStyles(); } - override applyStyles(): void { + protected override applyStyles(): void { super.applyStyles(); this._filterButtonContainer.style.borderColor = this._filterChecked && this.inputActiveOptionBorder ? this.inputActiveOptionBorder.toString() : ''; diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget.ts b/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget.ts index 912f7c62ca5..d422ae6e7eb 100644 --- a/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget.ts +++ b/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget.ts @@ -337,7 +337,7 @@ class NotebookFindWidget extends SimpleFindReplaceWidget implements INotebookEdi } } - override _updateMatchesCount(): void { + protected override _updateMatchesCount(): void { if (!this._findModel || !this._findModel.findMatches) { return; } diff --git a/src/vs/workbench/contrib/notebook/browser/notebookEditor.ts b/src/vs/workbench/contrib/notebook/browser/notebookEditor.ts index 0cdecde7cf3..6ae8211fc6b 100644 --- a/src/vs/workbench/contrib/notebook/browser/notebookEditor.ts +++ b/src/vs/workbench/contrib/notebook/browser/notebookEditor.ts @@ -133,7 +133,7 @@ export class NotebookEditor extends EditorPane implements INotebookEditorPane { return this._widget.value; } - override setEditorVisible(visible: boolean, group: IEditorGroup | undefined): void { + protected override setEditorVisible(visible: boolean, group: IEditorGroup | undefined): void { super.setEditorVisible(visible, group); if (group) { this._groupListener.clear(); diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellActionView.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellActionView.ts index 1808c007e8f..38e1424f5f3 100644 --- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellActionView.ts +++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellActionView.ts @@ -9,7 +9,7 @@ import { MenuEntryActionViewItem } from 'vs/platform/actions/browser/menuEntryAc export class CodiconActionViewItem extends MenuEntryActionViewItem { - override updateLabel(): void { + protected override updateLabel(): void { if (this.options.label && this.label) { DOM.reset(this.label, ...renderLabelWithIcons(this._commandAction.label ?? '')); } @@ -27,7 +27,7 @@ export class ActionViewWithLabel extends MenuEntryActionViewItem { this.updateLabel(); } - override updateLabel() { + protected override updateLabel() { if (this._actionLabel) { this._actionLabel.classList.add('notebook-label'); this._actionLabel.innerText = this._action.label; diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellDnd.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellDnd.ts index 007ed9dc801..48c05152124 100644 --- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellDnd.ts +++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellDnd.ts @@ -37,7 +37,7 @@ export class CellDragAndDropPart extends CellContentPart { super(); } - override didRenderCell(element: ICellViewModel): void { + protected override didRenderCell(element: ICellViewModel): void { this.update(element); } diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellToolbars.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellToolbars.ts index e7abd51b699..a0f00a2f217 100644 --- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellToolbars.ts +++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellToolbars.ts @@ -76,7 +76,7 @@ export class BetweenCellToolbar extends CellOverlayPart { return betweenCellToolbar; } - override didRenderCell(element: ICellViewModel): void { + protected override didRenderCell(element: ICellViewModel): void { const betweenCellToolbar = this._initialize(); betweenCellToolbar.context = { ui: true, diff --git a/src/vs/workbench/contrib/preferences/browser/keybindingsEditor.ts b/src/vs/workbench/contrib/preferences/browser/keybindingsEditor.ts index 9305e26ac56..a3a1187e91d 100644 --- a/src/vs/workbench/contrib/preferences/browser/keybindingsEditor.ts +++ b/src/vs/workbench/contrib/preferences/browser/keybindingsEditor.ts @@ -131,7 +131,7 @@ export class KeybindingsEditor extends EditorPane implements IKeybindingsEditorP this.sortByPrecedenceAction.checked = false; } - createEditor(parent: HTMLElement): void { + protected createEditor(parent: HTMLElement): void { const keybindingsEditorElement = DOM.append(parent, $('div', { class: 'keybindings-editor' })); this.createAriaLabelElement(keybindingsEditorElement); diff --git a/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts b/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts index 819f4d87672..b0bc4bbf0d8 100644 --- a/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts +++ b/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts @@ -305,7 +305,7 @@ class DirtyDiffWidget extends PeekViewWidget { this._disposables.add(this.diffEditor); } - override _onWidth(width: number): void { + protected override _onWidth(width: number): void { if (typeof this.height === 'undefined') { return; } diff --git a/src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts b/src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts index a187de8b635..9dbee9c59fb 100644 --- a/src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts +++ b/src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts @@ -124,7 +124,7 @@ export class SearchEditor extends AbstractTextCodeEditor this.searchModel = this._register(this.instantiationService.createInstance(SearchModel)); } - override createEditor(parent: HTMLElement) { + protected override createEditor(parent: HTMLElement) { DOM.append(parent, this.container); this.queryEditorContainer = DOM.append(this.container, DOM.$('.query-container')); const searchResultContainer = DOM.append(this.container, DOM.$('.search-results')); diff --git a/src/vs/workbench/services/languageDetection/browser/languageDetectionWorkerServiceImpl.ts b/src/vs/workbench/services/languageDetection/browser/languageDetectionWorkerServiceImpl.ts index ee459b1eaf6..82873d08916 100644 --- a/src/vs/workbench/services/languageDetection/browser/languageDetectionWorkerServiceImpl.ts +++ b/src/vs/workbench/services/languageDetection/browser/languageDetectionWorkerServiceImpl.ts @@ -261,7 +261,7 @@ export class LanguageDetectionWorkerClient extends EditorWorkerClient { return undefined; } - override async _getProxy(): Promise { + protected override async _getProxy(): Promise { return (await this._getOrCreateLanguageDetectionWorker()).getProxyObject(); } diff --git a/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts b/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts index e9a8f68117e..0dc7a0735fd 100644 --- a/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts +++ b/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts @@ -33,7 +33,7 @@ class ResourceModelCollection extends ReferenceCollection { + protected createReferencedObject(key: string): Promise { return this.doCreateReferencedObject(key); } @@ -100,7 +100,7 @@ class ResourceModelCollection extends ReferenceCollection): void { + protected destroyReferencedObject(key: string, modelPromise: Promise): void { // untitled and inMemory are bound to a different lifecycle const resource = URI.parse(key);