From b368ea76fb91c017961597c32bc9a03a45d586a8 Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Fri, 12 Oct 2018 12:38:31 +0200 Subject: [PATCH] list: renames --- src/vs/base/browser/ui/list/list.ts | 9 ++++----- src/vs/base/browser/ui/list/listPaging.ts | 8 ++++---- src/vs/base/browser/ui/list/listView.ts | 8 ++++---- src/vs/base/browser/ui/list/listWidget.ts | 12 ++++++------ src/vs/base/browser/ui/list/rowCache.ts | 4 ++-- src/vs/base/browser/ui/selectBox/selectBoxCustom.ts | 6 +++--- src/vs/base/browser/ui/tree/abstractTree.ts | 10 +++++----- src/vs/base/browser/ui/tree/dataTree.ts | 4 ++-- src/vs/base/browser/ui/tree/tree.ts | 4 ++-- src/vs/base/test/browser/ui/list/listView.test.ts | 6 +++--- src/vs/editor/contrib/suggest/suggestWidget.ts | 6 +++--- src/vs/platform/list/browser/listService.ts | 10 +++++----- .../parts/notifications/notificationsViewer.ts | 6 +++--- .../browser/parts/quickinput/quickInputList.ts | 6 +++--- .../workbench/parts/debug/browser/breakpointsView.ts | 12 ++++++------ .../extensions/electron-browser/extensionsList.ts | 4 ++-- .../electron-browser/runtimeExtensionsEditor.ts | 6 +++--- .../files/electron-browser/views/openEditorsView.ts | 8 ++++---- .../markers/electron-browser/markersTreeViewer.ts | 4 ++-- .../parts/preferences/browser/keybindingsEditor.ts | 8 ++++---- .../parts/scm/electron-browser/scmViewlet.ts | 12 ++++++------ 21 files changed, 76 insertions(+), 77 deletions(-) diff --git a/src/vs/base/browser/ui/list/list.ts b/src/vs/base/browser/ui/list/list.ts index add0f168293..b9815b6ef0b 100644 --- a/src/vs/base/browser/ui/list/list.ts +++ b/src/vs/base/browser/ui/list/list.ts @@ -5,17 +5,16 @@ import { GestureEvent } from 'vs/base/browser/touch'; -export interface IVirtualDelegate { +export interface IListVirtualDelegate { getHeight(element: T): number; getTemplateId(element: T): string; } -// TODO@joao rename to IListRenderer -export interface IRenderer { +export interface IListRenderer { templateId: string; renderTemplate(container: HTMLElement): TTemplateData; - renderElement(element: TElement, index: number, templateData: TTemplateData): void; - disposeElement(element: TElement, index: number, templateData: TTemplateData): void; + renderElement(element: T, index: number, templateData: TTemplateData): void; + disposeElement(element: T, index: number, templateData: TTemplateData): void; disposeTemplate(templateData: TTemplateData): void; } diff --git a/src/vs/base/browser/ui/list/listPaging.ts b/src/vs/base/browser/ui/list/listPaging.ts index 14bf8b9404c..1317c4f5b43 100644 --- a/src/vs/base/browser/ui/list/listPaging.ts +++ b/src/vs/base/browser/ui/list/listPaging.ts @@ -6,13 +6,13 @@ import 'vs/css!./list'; import { IDisposable } from 'vs/base/common/lifecycle'; import { range } from 'vs/base/common/arrays'; -import { IVirtualDelegate, IRenderer, IListEvent, IListContextMenuEvent } from './list'; +import { IListVirtualDelegate, IListRenderer, IListEvent, IListContextMenuEvent } from './list'; import { List, IListStyles, IListOptions } from './listWidget'; import { IPagedModel } from 'vs/base/common/paging'; import { Event, mapEvent } from 'vs/base/common/event'; import { CancellationTokenSource } from 'vs/base/common/cancellation'; -export interface IPagedRenderer extends IRenderer { +export interface IPagedRenderer extends IListRenderer { renderPlaceholder(index: number, templateData: TTemplateData): void; } @@ -21,7 +21,7 @@ export interface ITemplateData { disposable: IDisposable; } -class PagedRenderer implements IRenderer> { +class PagedRenderer implements IListRenderer> { get templateId(): string { return this.renderer.templateId; } @@ -71,7 +71,7 @@ export class PagedList implements IDisposable { constructor( container: HTMLElement, - virtualDelegate: IVirtualDelegate, + virtualDelegate: IListVirtualDelegate, renderers: IPagedRenderer[], options: IListOptions = {} ) { diff --git a/src/vs/base/browser/ui/list/listView.ts b/src/vs/base/browser/ui/list/listView.ts index eb310e11352..61b6d478b26 100644 --- a/src/vs/base/browser/ui/list/listView.ts +++ b/src/vs/base/browser/ui/list/listView.ts @@ -12,7 +12,7 @@ import { domEvent } from 'vs/base/browser/event'; import { ScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement'; import { ScrollEvent, ScrollbarVisibility } from 'vs/base/common/scrollable'; import { RangeMap, shift } from './rangeMap'; -import { IVirtualDelegate, IRenderer, IListMouseEvent, IListTouchEvent, IListGestureEvent } from './list'; +import { IListVirtualDelegate, IListRenderer, IListMouseEvent, IListTouchEvent, IListGestureEvent } from './list'; import { RowCache, IRow } from './rowCache'; import { isWindows } from 'vs/base/common/platform'; import * as browser from 'vs/base/browser/browser'; @@ -60,7 +60,7 @@ export class ListView implements ISpliceable, IDisposable { private itemId: number; private rangeMap: RangeMap; private cache: RowCache; - private renderers = new Map>(); + private renderers = new Map>(); private lastRenderTop: number; private lastRenderHeight: number; private _domNode: HTMLElement; @@ -78,8 +78,8 @@ export class ListView implements ISpliceable, IDisposable { constructor( container: HTMLElement, - private virtualDelegate: IVirtualDelegate, - renderers: IRenderer[], + private virtualDelegate: IListVirtualDelegate, + renderers: IListRenderer[], options: IListViewOptions = DefaultOptions ) { this.items = []; diff --git a/src/vs/base/browser/ui/list/listWidget.ts b/src/vs/base/browser/ui/list/listWidget.ts index 47631a32dac..13e8c75126e 100644 --- a/src/vs/base/browser/ui/list/listWidget.ts +++ b/src/vs/base/browser/ui/list/listWidget.ts @@ -16,7 +16,7 @@ import { KeyCode } from 'vs/base/common/keyCodes'; import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent'; import { Event, Emitter, EventBufferer, chain, mapEvent, anyEvent } from 'vs/base/common/event'; import { domEvent } from 'vs/base/browser/event'; -import { IVirtualDelegate, IRenderer, IListEvent, IListContextMenuEvent, IListMouseEvent, IListTouchEvent, IListGestureEvent } from './list'; +import { IListVirtualDelegate, IListRenderer, IListEvent, IListContextMenuEvent, IListMouseEvent, IListTouchEvent, IListGestureEvent } from './list'; import { ListView, IListViewOptions } from './listView'; import { Color } from 'vs/base/common/color'; import { mixin } from 'vs/base/common/objects'; @@ -41,7 +41,7 @@ interface IRenderedContainer { index: number; } -class TraitRenderer implements IRenderer +class TraitRenderer implements IListRenderer { private renderedElements: IRenderedContainer[] = []; @@ -807,11 +807,11 @@ function relativeComplement(one: number[], other: number[]): number[] { const numericSort = (a: number, b: number) => a - b; -class PipelineRenderer implements IRenderer { +class PipelineRenderer implements IListRenderer { constructor( private _templateId: string, - private renderers: IRenderer[] + private renderers: IListRenderer[] ) { } get templateId(): string { @@ -903,8 +903,8 @@ export class List implements ISpliceable, IDisposable { constructor( container: HTMLElement, - virtualDelegate: IVirtualDelegate, - renderers: IRenderer[], + virtualDelegate: IListVirtualDelegate, + renderers: IListRenderer[], options: IListOptions = DefaultOptions ) { this.focus = new FocusTrait(i => this.getElementDomId(i)); diff --git a/src/vs/base/browser/ui/list/rowCache.ts b/src/vs/base/browser/ui/list/rowCache.ts index e35a0a5e1ca..756b1f9a678 100644 --- a/src/vs/base/browser/ui/list/rowCache.ts +++ b/src/vs/base/browser/ui/list/rowCache.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IRenderer } from './list'; +import { IListRenderer } from './list'; import { IDisposable } from 'vs/base/common/lifecycle'; import { $, removeClass } from 'vs/base/browser/dom'; @@ -25,7 +25,7 @@ export class RowCache implements IDisposable { private cache = new Map(); - constructor(private renderers: Map>) { } + constructor(private renderers: Map>) { } /** * Returns a row either by creating a new one or reusing diff --git a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts index fe455555e10..8a56e2dcb60 100644 --- a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts +++ b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts @@ -14,7 +14,7 @@ import * as dom from 'vs/base/browser/dom'; import * as arrays from 'vs/base/common/arrays'; import { IContextViewProvider, AnchorPosition } from 'vs/base/browser/ui/contextview/contextview'; import { List } from 'vs/base/browser/ui/list/listWidget'; -import { IVirtualDelegate, IRenderer, IListEvent } from 'vs/base/browser/ui/list/list'; +import { IListVirtualDelegate, IListRenderer, IListEvent } from 'vs/base/browser/ui/list/list'; import { domEvent } from 'vs/base/browser/event'; import { ScrollbarVisibility } from 'vs/base/common/scrollable'; import { ISelectBoxDelegate, ISelectBoxOptions, ISelectBoxStyles, ISelectData } from 'vs/base/browser/ui/selectBox/selectBox'; @@ -38,7 +38,7 @@ interface ISelectListTemplateData { disposables: IDisposable[]; } -class SelectListRenderer implements IRenderer { +class SelectListRenderer implements IListRenderer { get templateId(): string { return SELECT_OPTION_ENTRY_TEMPLATE_ID; } @@ -90,7 +90,7 @@ class SelectListRenderer implements IRenderer { +export class SelectBoxList implements ISelectBoxDelegate, IListVirtualDelegate { private static readonly DEFAULT_DROPDOWN_MINIMUM_BOTTOM_MARGIN = 32; private static readonly DEFAULT_DROPDOWN_MINIMUM_TOP_MARGIN = 2; diff --git a/src/vs/base/browser/ui/tree/abstractTree.ts b/src/vs/base/browser/ui/tree/abstractTree.ts index dd577c948ed..b41038a342d 100644 --- a/src/vs/base/browser/ui/tree/abstractTree.ts +++ b/src/vs/base/browser/ui/tree/abstractTree.ts @@ -6,7 +6,7 @@ import 'vs/css!./tree'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { IListOptions, List, IIdentityProvider, IMultipleSelectionController, IListStyles } from 'vs/base/browser/ui/list/listWidget'; -import { IVirtualDelegate, IRenderer, IListMouseEvent, IListEvent, IListContextMenuEvent } from 'vs/base/browser/ui/list/list'; +import { IListVirtualDelegate, IListRenderer, IListMouseEvent, IListEvent, IListContextMenuEvent } from 'vs/base/browser/ui/list/list'; import { append, $ } from 'vs/base/browser/dom'; import { Event, Relay, chain } from 'vs/base/common/event'; import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent'; @@ -45,9 +45,9 @@ export function createComposedTreeListOptions(optio }; } -export class ComposedTreeDelegate implements IVirtualDelegate { +export class ComposedTreeDelegate implements IListVirtualDelegate { - constructor(private delegate: IVirtualDelegate) { } + constructor(private delegate: IListVirtualDelegate) { } getHeight(element: N): number { return this.delegate.getHeight(element.element); @@ -71,7 +71,7 @@ function renderDefaultTwistie(node: ITreeNode, twistie: HTMLElement): } } -class TreeRenderer implements IRenderer, ITreeListTemplateData> { +class TreeRenderer implements IListRenderer, ITreeListTemplateData> { readonly templateId: string; private renderedElements = new Map>(); @@ -182,7 +182,7 @@ export abstract class AbstractTree implements IDisposable constructor( container: HTMLElement, - delegate: IVirtualDelegate, + delegate: IListVirtualDelegate, renderers: ITreeRenderer[], options?: ITreeOptions ) { diff --git a/src/vs/base/browser/ui/tree/dataTree.ts b/src/vs/base/browser/ui/tree/dataTree.ts index 741eb39633d..e19800f7aa8 100644 --- a/src/vs/base/browser/ui/tree/dataTree.ts +++ b/src/vs/base/browser/ui/tree/dataTree.ts @@ -5,7 +5,7 @@ import { ITreeOptions, ComposedTreeDelegate, createComposedTreeListOptions } from 'vs/base/browser/ui/tree/abstractTree'; import { ObjectTree } from 'vs/base/browser/ui/tree/objectTree'; -import { IVirtualDelegate } from 'vs/base/browser/ui/list/list'; +import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list'; import { ITreeElement, ITreeNode, ITreeRenderer } from 'vs/base/browser/ui/tree/tree'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { Emitter, Event } from 'vs/base/common/event'; @@ -107,7 +107,7 @@ export class DataTree, TFilterData = void> implements constructor( container: HTMLElement, - delegate: IVirtualDelegate, + delegate: IListVirtualDelegate, renderers: ITreeRenderer[], private dataSource: IDataSource, options?: ITreeOptions diff --git a/src/vs/base/browser/ui/tree/tree.ts b/src/vs/base/browser/ui/tree/tree.ts index a0b2b5deed0..566ba1343b7 100644 --- a/src/vs/base/browser/ui/tree/tree.ts +++ b/src/vs/base/browser/ui/tree/tree.ts @@ -5,7 +5,7 @@ import { Event } from 'vs/base/common/event'; import { Iterator } from 'vs/base/common/iterator'; -import { IRenderer } from 'vs/base/browser/ui/list/list'; +import { IListRenderer } from 'vs/base/browser/ui/list/list'; export const enum TreeVisibility { Hidden, @@ -67,7 +67,7 @@ export interface ITreeModel { getLastElementAncestor(location: TRef): T | null; } -export interface ITreeRenderer extends IRenderer, TTemplateData> { +export interface ITreeRenderer extends IListRenderer, TTemplateData> { renderTwistie?(element: T, twistieElement: HTMLElement): boolean; onDidChangeTwistieState?: Event; } \ No newline at end of file diff --git a/src/vs/base/test/browser/ui/list/listView.test.ts b/src/vs/base/test/browser/ui/list/listView.test.ts index 2dc54b4253f..997b336f3cb 100644 --- a/src/vs/base/test/browser/ui/list/listView.test.ts +++ b/src/vs/base/test/browser/ui/list/listView.test.ts @@ -5,7 +5,7 @@ import * as assert from 'assert'; import { ListView } from 'vs/base/browser/ui/list/listView'; -import { IVirtualDelegate, IRenderer } from 'vs/base/browser/ui/list/list'; +import { IListVirtualDelegate, IListRenderer } from 'vs/base/browser/ui/list/list'; import { range } from 'vs/base/common/arrays'; suite('ListView', function () { @@ -14,14 +14,14 @@ suite('ListView', function () { element.style.height = '200px'; element.style.width = '200px'; - const delegate: IVirtualDelegate = { + const delegate: IListVirtualDelegate = { getHeight() { return 20; }, getTemplateId() { return 'template'; } }; let templatesCount = 0; - const renderer: IRenderer = { + const renderer: IListRenderer = { templateId: 'template', renderTemplate() { templatesCount++; }, renderElement() { }, diff --git a/src/vs/editor/contrib/suggest/suggestWidget.ts b/src/vs/editor/contrib/suggest/suggestWidget.ts index 803d95a7a58..f83520d2286 100644 --- a/src/vs/editor/contrib/suggest/suggestWidget.ts +++ b/src/vs/editor/contrib/suggest/suggestWidget.ts @@ -12,7 +12,7 @@ import { onUnexpectedError } from 'vs/base/common/errors'; import { IDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle'; import { addClass, append, $, hide, removeClass, show, toggleClass, getDomNodePagePosition, hasClass } from 'vs/base/browser/dom'; import { HighlightedLabel } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel'; -import { IVirtualDelegate, IListEvent, IRenderer } from 'vs/base/browser/ui/list/list'; +import { IListVirtualDelegate, IListEvent, IListRenderer } from 'vs/base/browser/ui/list/list'; import { List } from 'vs/base/browser/ui/list/listWidget'; import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; @@ -73,7 +73,7 @@ function canExpandCompletionItem(item: ICompletionItem) { return (suggestion.detail && suggestion.detail !== suggestion.label); } -class Renderer implements IRenderer { +class Renderer implements IListRenderer { constructor( private widget: SuggestWidget, @@ -351,7 +351,7 @@ export interface ISelectedSuggestion { model: CompletionModel; } -export class SuggestWidget implements IContentWidget, IVirtualDelegate, IDisposable { +export class SuggestWidget implements IContentWidget, IListVirtualDelegate, IDisposable { private static readonly ID: string = 'editor.widget.suggestWidget'; diff --git a/src/vs/platform/list/browser/listService.ts b/src/vs/platform/list/browser/listService.ts index cd66bf3e9d9..003dba14a2e 100644 --- a/src/vs/platform/list/browser/listService.ts +++ b/src/vs/platform/list/browser/listService.ts @@ -6,7 +6,7 @@ import { addClass, addStandardDisposableListener, createStyleSheet, getTotalHeight, removeClass } from 'vs/base/browser/dom'; import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent'; import { IInputOptions, InputBox } from 'vs/base/browser/ui/inputbox/inputBox'; -import { IListMouseEvent, IListTouchEvent, IRenderer, IVirtualDelegate } from 'vs/base/browser/ui/list/list'; +import { IListMouseEvent, IListTouchEvent, IListRenderer, IListVirtualDelegate } from 'vs/base/browser/ui/list/list'; import { IPagedRenderer, PagedList } from 'vs/base/browser/ui/list/listPaging'; import { DefaultStyleController, IListOptions, IMultipleSelectionController, IOpenController, isSelectionRangeChangeEvent, isSelectionSingleChangeEvent, List } from 'vs/base/browser/ui/list/listWidget'; import { canceled, onUnexpectedError } from 'vs/base/common/errors'; @@ -213,8 +213,8 @@ export class WorkbenchList extends List { constructor( container: HTMLElement, - delegate: IVirtualDelegate, - renderers: IRenderer[], + delegate: IListVirtualDelegate, + renderers: IListRenderer[], options: IListOptions, @IContextKeyService contextKeyService: IContextKeyService, @IListService listService: IListService, @@ -288,7 +288,7 @@ export class WorkbenchPagedList extends PagedList { constructor( container: HTMLElement, - delegate: IVirtualDelegate, + delegate: IListVirtualDelegate, renderers: IPagedRenderer[], options: IListOptions, @IContextKeyService contextKeyService: IContextKeyService, @@ -893,7 +893,7 @@ export class WorkbenchObjectTree, TFilterData = void> constructor( container: HTMLElement, - delegate: IVirtualDelegate, + delegate: IListVirtualDelegate, renderers: ITreeRenderer[], options: ITreeOptions2, @IContextKeyService contextKeyService: IContextKeyService, diff --git a/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts b/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts index fa575fceb27..c7ae08eb60d 100644 --- a/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts +++ b/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IVirtualDelegate, IRenderer } from 'vs/base/browser/ui/list/list'; +import { IListVirtualDelegate, IListRenderer } from 'vs/base/browser/ui/list/list'; import { clearNode, addClass, removeClass, toggleClass, addDisposableListener, EventType, EventHelper } from 'vs/base/browser/dom'; import { IOpenerService } from 'vs/platform/opener/common/opener'; import { URI } from 'vs/base/common/uri'; @@ -24,7 +24,7 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar'; import { Severity } from 'vs/platform/notification/common/notification'; -export class NotificationsListDelegate implements IVirtualDelegate { +export class NotificationsListDelegate implements IListVirtualDelegate { private static readonly ROW_HEIGHT = 42; private static readonly LINE_HEIGHT = 22; @@ -177,7 +177,7 @@ class NotificationMessageRenderer { } } -export class NotificationRenderer implements IRenderer { +export class NotificationRenderer implements IListRenderer { static readonly TEMPLATE_ID = 'notification'; diff --git a/src/vs/workbench/browser/parts/quickinput/quickInputList.ts b/src/vs/workbench/browser/parts/quickinput/quickInputList.ts index 10d7747b4cc..21eef9b5085 100644 --- a/src/vs/workbench/browser/parts/quickinput/quickInputList.ts +++ b/src/vs/workbench/browser/parts/quickinput/quickInputList.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import 'vs/css!./quickInput'; -import { IVirtualDelegate, IRenderer } from 'vs/base/browser/ui/list/list'; +import { IListVirtualDelegate, IListRenderer } from 'vs/base/browser/ui/list/list'; import * as dom from 'vs/base/browser/dom'; import { dispose, IDisposable } from 'vs/base/common/lifecycle'; import { WorkbenchList } from 'vs/platform/list/browser/listService'; @@ -83,7 +83,7 @@ interface IListElementTemplateData { toDisposeTemplate: IDisposable[]; } -class ListElementRenderer implements IRenderer { +class ListElementRenderer implements IListRenderer { static readonly ID = 'listelement'; @@ -198,7 +198,7 @@ class ListElementRenderer implements IRenderer { +class ListElementDelegate implements IListVirtualDelegate { getHeight(element: ListElement): number { return element.saneDetail ? 44 : 22; diff --git a/src/vs/workbench/parts/debug/browser/breakpointsView.ts b/src/vs/workbench/parts/debug/browser/breakpointsView.ts index dbe14c463ff..1c31a5d2403 100644 --- a/src/vs/workbench/parts/debug/browser/breakpointsView.ts +++ b/src/vs/workbench/parts/debug/browser/breakpointsView.ts @@ -18,7 +18,7 @@ import { Constants } from 'vs/editor/common/core/uint'; import { dispose, IDisposable } from 'vs/base/common/lifecycle'; import { TPromise } from 'vs/base/common/winjs.base'; import { Separator } from 'vs/base/browser/ui/actionbar/actionbar'; -import { IVirtualDelegate, IListContextMenuEvent, IRenderer } from 'vs/base/browser/ui/list/list'; +import { IListVirtualDelegate, IListContextMenuEvent, IListRenderer } from 'vs/base/browser/ui/list/list'; import { IEditor } from 'vs/workbench/common/editor'; import { InputBox } from 'vs/base/browser/ui/inputbox/inputBox'; import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent'; @@ -236,7 +236,7 @@ export class BreakpointsView extends ViewletPanel { } } -class BreakpointsDelegate implements IVirtualDelegate { +class BreakpointsDelegate implements IListVirtualDelegate { constructor(private debugService: IDebugService) { // noop @@ -292,7 +292,7 @@ interface IInputTemplateData { toDispose: IDisposable[]; } -class BreakpointsRenderer implements IRenderer { +class BreakpointsRenderer implements IListRenderer { constructor( @IDebugService private debugService: IDebugService, @@ -361,7 +361,7 @@ class BreakpointsRenderer implements IRenderer { +class ExceptionBreakpointsRenderer implements IListRenderer { constructor( private debugService: IDebugService @@ -409,7 +409,7 @@ class ExceptionBreakpointsRenderer implements IRenderer { +class FunctionBreakpointsRenderer implements IListRenderer { constructor( @IDebugService private debugService: IDebugService @@ -468,7 +468,7 @@ class FunctionBreakpointsRenderer implements IRenderer { +class FunctionBreakpointInputRenderer implements IListRenderer { constructor( private debugService: IDebugService, diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsList.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsList.ts index 5ded3ba53d7..e21bcb21873 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/extensionsList.ts +++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsList.ts @@ -9,7 +9,7 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { Action } from 'vs/base/common/actions'; import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { IVirtualDelegate } from 'vs/base/browser/ui/list/list'; +import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list'; import { IPagedRenderer } from 'vs/base/browser/ui/list/listPaging'; import { once } from 'vs/base/common/event'; import { domEvent } from 'vs/base/browser/event'; @@ -36,7 +36,7 @@ export interface ITemplateData { extensionDisposables: IDisposable[]; } -export class Delegate implements IVirtualDelegate { +export class Delegate implements IListVirtualDelegate { getHeight() { return 62; } getTemplateId() { return 'extension'; } } diff --git a/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts b/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts index e34883ba455..fe8c8f5d469 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts +++ b/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts @@ -16,7 +16,7 @@ import { IExtensionsWorkbenchService, IExtension } from 'vs/workbench/parts/exte import { IThemeService } from 'vs/platform/theme/common/themeService'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IExtensionService, IExtensionDescription, IExtensionsStatus, IExtensionHostProfile } from 'vs/workbench/services/extensions/common/extensions'; -import { IVirtualDelegate, IRenderer } from 'vs/base/browser/ui/list/list'; +import { IListVirtualDelegate, IListRenderer } from 'vs/base/browser/ui/list/list'; import { WorkbenchList } from 'vs/platform/list/browser/listService'; import { append, $, addClass, toggleClass, Dimension } from 'vs/base/browser/dom'; import { ActionBar, Separator } from 'vs/base/browser/ui/actionbar/actionbar'; @@ -230,7 +230,7 @@ export class RuntimeExtensionsEditor extends BaseEditor { const TEMPLATE_ID = 'runtimeExtensionElementTemplate'; - const delegate = new class implements IVirtualDelegate{ + const delegate = new class implements IListVirtualDelegate{ getHeight(element: IRuntimeExtension): number { return 62; } @@ -257,7 +257,7 @@ export class RuntimeExtensionsEditor extends BaseEditor { elementDisposables: IDisposable[]; } - const renderer: IRenderer = { + const renderer: IListRenderer = { templateId: TEMPLATE_ID, renderTemplate: (root: HTMLElement): IRuntimeExtensionTemplateData => { const element = append(root, $('.extension')); diff --git a/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts b/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts index 3f5eb10bacb..b6a1ed7cd8b 100644 --- a/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts +++ b/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts @@ -25,7 +25,7 @@ import { attachStylerCallback } from 'vs/platform/theme/common/styler'; import { IThemeService } from 'vs/platform/theme/common/themeService'; import { badgeBackground, badgeForeground, contrastBorder } from 'vs/platform/theme/common/colorRegistry'; import { WorkbenchList } from 'vs/platform/list/browser/listService'; -import { IVirtualDelegate, IRenderer, IListContextMenuEvent } from 'vs/base/browser/ui/list/list'; +import { IListVirtualDelegate, IListRenderer, IListContextMenuEvent } from 'vs/base/browser/ui/list/list'; import { EditorLabel } from 'vs/workbench/browser/labels'; import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar'; import { TPromise } from 'vs/base/common/winjs.base'; @@ -499,7 +499,7 @@ class OpenEditorActionRunner extends ActionRunner { } } -class OpenEditorsDelegate implements IVirtualDelegate { +class OpenEditorsDelegate implements IListVirtualDelegate { public static readonly ITEM_HEIGHT = 22; @@ -542,7 +542,7 @@ function dropOnEditorSupported(e: DragEvent): boolean { } } -class EditorGroupRenderer implements IRenderer { +class EditorGroupRenderer implements IListRenderer { static readonly ID = 'editorgroup'; private transfer = LocalSelectionTransfer.getInstance(); @@ -615,7 +615,7 @@ class EditorGroupRenderer implements IRenderer { +class OpenEditorRenderer implements IListRenderer { static readonly ID = 'openeditor'; private transfer = LocalSelectionTransfer.getInstance(); diff --git a/src/vs/workbench/parts/markers/electron-browser/markersTreeViewer.ts b/src/vs/workbench/parts/markers/electron-browser/markersTreeViewer.ts index e21f5a96a63..04195ef23de 100644 --- a/src/vs/workbench/parts/markers/electron-browser/markersTreeViewer.ts +++ b/src/vs/workbench/parts/markers/electron-browser/markersTreeViewer.ts @@ -21,7 +21,7 @@ import { ActionBar, IActionItemProvider } from 'vs/base/browser/ui/actionbar/act import { QuickFixAction } from 'vs/workbench/parts/markers/electron-browser/markersPanelActions'; import { ILabelService } from 'vs/platform/label/common/label'; import { dirname } from 'vs/base/common/resources'; -import { IVirtualDelegate } from 'vs/base/browser/ui/list/list'; +import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list'; import { ITreeFilter, TreeVisibility, TreeFilterResult, ITreeRenderer, ITreeNode } from 'vs/base/browser/ui/tree/tree'; import { FilterOptions } from 'vs/workbench/parts/markers/electron-browser/markersFilterOptions'; import { IMatch } from 'vs/base/common/filters'; @@ -78,7 +78,7 @@ const enum TemplateId { RelatedInformation = 'ri' } -export class VirtualDelegate implements IVirtualDelegate { +export class VirtualDelegate implements IListVirtualDelegate { getHeight(): number { return 22; diff --git a/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts b/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts index 65964459198..6b5d4a5410b 100644 --- a/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts +++ b/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts @@ -31,7 +31,7 @@ import { import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { IKeybindingEditingService } from 'vs/workbench/services/keybinding/common/keybindingEditing'; import { List } from 'vs/base/browser/ui/list/listWidget'; -import { IVirtualDelegate, IRenderer, IListContextMenuEvent, IListEvent } from 'vs/base/browser/ui/list/list'; +import { IListVirtualDelegate, IListRenderer, IListContextMenuEvent, IListEvent } from 'vs/base/browser/ui/list/list'; import { IThemeService, registerThemingParticipant, ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService'; import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey'; import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent'; @@ -653,7 +653,7 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor } } -class Delegate implements IVirtualDelegate { +class Delegate implements IListVirtualDelegate { getHeight(element: IListEntry) { if (element.templateId === KEYBINDING_ENTRY_TEMPLATE_ID) { @@ -686,7 +686,7 @@ interface KeybindingItemTemplate { when: WhenColumn; } -class KeybindingHeaderRenderer implements IRenderer { +class KeybindingHeaderRenderer implements IListRenderer { get templateId(): string { return KEYBINDING_HEADER_TEMPLATE_ID; } @@ -713,7 +713,7 @@ class KeybindingHeaderRenderer implements IRenderer { } } -class KeybindingItemRenderer implements IRenderer { +class KeybindingItemRenderer implements IListRenderer { get templateId(): string { return KEYBINDING_ENTRY_TEMPLATE_ID; } diff --git a/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts b/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts index 6ba2dc7f90b..796594713fc 100644 --- a/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts +++ b/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts @@ -14,7 +14,7 @@ import { PanelViewlet, ViewletPanel, IViewletPanelOptions } from 'vs/workbench/b import { append, $, addClass, toggleClass, trackFocus, Dimension, addDisposableListener } from 'vs/base/browser/dom'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { List } from 'vs/base/browser/ui/list/listWidget'; -import { IVirtualDelegate, IRenderer, IListContextMenuEvent, IListEvent } from 'vs/base/browser/ui/list/list'; +import { IListVirtualDelegate, IListRenderer, IListContextMenuEvent, IListEvent } from 'vs/base/browser/ui/list/list'; import { VIEWLET_ID, VIEW_CONTAINER } from 'vs/workbench/parts/scm/common/scm'; import { FileLabel } from 'vs/workbench/browser/labels'; import { CountBadge } from 'vs/base/browser/ui/countBadge/countBadge'; @@ -70,7 +70,7 @@ export interface IViewModel { hide(repository: ISCMRepository): void; } -class ProvidersListDelegate implements IVirtualDelegate { +class ProvidersListDelegate implements IListVirtualDelegate { getHeight(element: ISCMRepository): number { return 22; @@ -119,7 +119,7 @@ interface RepositoryTemplateData { templateDisposable: IDisposable; } -class ProviderRenderer implements IRenderer { +class ProviderRenderer implements IListRenderer { readonly templateId = 'provider'; @@ -368,7 +368,7 @@ interface ResourceGroupTemplate { dispose: () => void; } -class ResourceGroupRenderer implements IRenderer { +class ResourceGroupRenderer implements IListRenderer { static TEMPLATE_ID = 'resource group'; get templateId(): string { return ResourceGroupRenderer.TEMPLATE_ID; } @@ -477,7 +477,7 @@ class MultipleSelectionActionRunner extends ActionRunner { } } -class ResourceRenderer implements IRenderer { +class ResourceRenderer implements IListRenderer { static TEMPLATE_ID = 'resource'; get templateId(): string { return ResourceRenderer.TEMPLATE_ID; } @@ -570,7 +570,7 @@ class ResourceRenderer implements IRenderer { } } -class ProviderListDelegate implements IVirtualDelegate { +class ProviderListDelegate implements IListVirtualDelegate { getHeight() { return 22; }