From 75d5bc4085eca4600b5ea5f992387a20ae36d656 Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Mon, 17 Dec 2018 09:58:42 +0100 Subject: [PATCH] rename IDataSource --- src/vs/base/browser/ui/tree/asyncDataTree.ts | 4 ++-- src/vs/base/browser/ui/tree/tree.ts | 2 +- src/vs/base/test/browser/ui/tree/asyncDataTree.test.ts | 4 ++-- src/vs/editor/contrib/referenceSearch/referencesTree.ts | 4 ++-- src/vs/editor/contrib/referenceSearch/referencesWidget.ts | 4 ++-- src/vs/platform/list/browser/listService.ts | 4 ++-- src/vs/workbench/parts/debug/browser/loadedScriptsView.ts | 4 ++-- .../workbench/parts/debug/electron-browser/callStackView.ts | 4 ++-- src/vs/workbench/parts/debug/electron-browser/debugHover.ts | 4 ++-- src/vs/workbench/parts/debug/electron-browser/repl.ts | 4 ++-- .../workbench/parts/debug/electron-browser/variablesView.ts | 4 ++-- .../parts/debug/electron-browser/watchExpressionsView.ts | 4 ++-- 12 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/vs/base/browser/ui/tree/asyncDataTree.ts b/src/vs/base/browser/ui/tree/asyncDataTree.ts index d547ef616c4..e25ee221eb3 100644 --- a/src/vs/base/browser/ui/tree/asyncDataTree.ts +++ b/src/vs/base/browser/ui/tree/asyncDataTree.ts @@ -6,7 +6,7 @@ import { ComposedTreeDelegate, IAbstractTreeOptions } from 'vs/base/browser/ui/tree/abstractTree'; import { ObjectTree, IObjectTreeOptions } from 'vs/base/browser/ui/tree/objectTree'; import { IListVirtualDelegate, IIdentityProvider } from 'vs/base/browser/ui/list/list'; -import { ITreeElement, ITreeNode, ITreeRenderer, ITreeEvent, ITreeMouseEvent, ITreeContextMenuEvent, ITreeSorter, ICollapseStateChangeEvent, IDataSource } from 'vs/base/browser/ui/tree/tree'; +import { ITreeElement, ITreeNode, ITreeRenderer, ITreeEvent, ITreeMouseEvent, ITreeContextMenuEvent, ITreeSorter, ICollapseStateChangeEvent, IAsyncDataSource } from 'vs/base/browser/ui/tree/tree'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { Emitter, Event } from 'vs/base/common/event'; import { timeout, always } from 'vs/base/common/async'; @@ -204,7 +204,7 @@ export class AsyncDataTree, TFilterData = void> imple container: HTMLElement, delegate: IListVirtualDelegate, renderers: ITreeRenderer[], - private dataSource: IDataSource, + private dataSource: IAsyncDataSource, options?: IAsyncDataTreeOptions ) { this.identityProvider = options && options.identityProvider; diff --git a/src/vs/base/browser/ui/tree/tree.ts b/src/vs/base/browser/ui/tree/tree.ts index f8c1a90e121..5ef79f41aed 100644 --- a/src/vs/base/browser/ui/tree/tree.ts +++ b/src/vs/base/browser/ui/tree/tree.ts @@ -145,7 +145,7 @@ export interface ITreeNavigator { next(): T | null; } -export interface IDataSource> { +export interface IAsyncDataSource> { hasChildren(element: T | null): boolean; getChildren(element: T | null): Promise; } diff --git a/src/vs/base/test/browser/ui/tree/asyncDataTree.test.ts b/src/vs/base/test/browser/ui/tree/asyncDataTree.test.ts index ba9e451f281..3c3a6119a16 100644 --- a/src/vs/base/test/browser/ui/tree/asyncDataTree.test.ts +++ b/src/vs/base/test/browser/ui/tree/asyncDataTree.test.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as assert from 'assert'; -import { ITreeNode, ITreeRenderer, IDataSource } from 'vs/base/browser/ui/tree/tree'; +import { ITreeNode, ITreeRenderer, IAsyncDataSource } from 'vs/base/browser/ui/tree/tree'; import { AsyncDataTree } from 'vs/base/browser/ui/tree/asyncDataTree'; import { IListVirtualDelegate, IIdentityProvider } from 'vs/base/browser/ui/list/list'; import { hasClass } from 'vs/base/browser/dom'; @@ -51,7 +51,7 @@ suite('AsyncDataTree', function () { } }; - const dataSource = new class implements IDataSource { + const dataSource = new class implements IAsyncDataSource { hasChildren(element: Element | null): boolean { return !element || (element.children && element.children.length > 0); } diff --git a/src/vs/editor/contrib/referenceSearch/referencesTree.ts b/src/vs/editor/contrib/referenceSearch/referencesTree.ts index 847a6637c1f..b52a1640090 100644 --- a/src/vs/editor/contrib/referenceSearch/referencesTree.ts +++ b/src/vs/editor/contrib/referenceSearch/referencesTree.ts @@ -6,7 +6,7 @@ import { ReferencesModel, FileReferences, OneReference } from './referencesModel'; import { ITextModelService } from 'vs/editor/common/services/resolverService'; -import { ITreeRenderer, ITreeNode, IDataSource } from 'vs/base/browser/ui/tree/tree'; +import { ITreeRenderer, ITreeNode, IAsyncDataSource } from 'vs/base/browser/ui/tree/tree'; import { IconLabel } from 'vs/base/browser/ui/iconLabel/iconLabel'; import { CountBadge } from 'vs/base/browser/ui/countBadge/countBadge'; import { ILabelService } from 'vs/platform/label/common/label'; @@ -26,7 +26,7 @@ import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list'; export type TreeElement = FileReferences | OneReference; -export class DataSource implements IDataSource { +export class DataSource implements IAsyncDataSource { root: ReferencesModel | FileReferences; diff --git a/src/vs/editor/contrib/referenceSearch/referencesWidget.ts b/src/vs/editor/contrib/referenceSearch/referencesWidget.ts index 64c8a226873..fbc07d6ae7f 100644 --- a/src/vs/editor/contrib/referenceSearch/referencesWidget.ts +++ b/src/vs/editor/contrib/referenceSearch/referencesWidget.ts @@ -31,7 +31,7 @@ import { activeContrastBorder, contrastBorder, registerColor } from 'vs/platform import { ITheme, IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService'; import { PeekViewWidget } from './peekViewWidget'; import { FileReferences, OneReference, ReferencesModel } from './referencesModel'; -import { ITreeRenderer, IDataSource } from 'vs/base/browser/ui/tree/tree'; +import { ITreeRenderer, IAsyncDataSource } from 'vs/base/browser/ui/tree/tree'; import { IAsyncDataTreeOptions } from 'vs/base/browser/ui/tree/asyncDataTree'; import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list'; @@ -359,7 +359,7 @@ export class ReferenceWidget extends PeekViewWidget { this._treeDataSource = this._instantiationService.createInstance(DataSource); - this._tree = this._instantiationService.createInstance, ITreeRenderer[], IDataSource, IAsyncDataTreeOptions, WorkbenchAsyncDataTree>( + this._tree = this._instantiationService.createInstance, ITreeRenderer[], IAsyncDataSource, IAsyncDataTreeOptions, WorkbenchAsyncDataTree>( WorkbenchAsyncDataTree, this._treeContainer, new Delegate(), diff --git a/src/vs/platform/list/browser/listService.ts b/src/vs/platform/list/browser/listService.ts index 2bd4512c1d9..7ba2538bf83 100644 --- a/src/vs/platform/list/browser/listService.ts +++ b/src/vs/platform/list/browser/listService.ts @@ -32,7 +32,7 @@ import { attachInputBoxStyler, attachListStyler, computeStyles, defaultListStyle import { IThemeService } from 'vs/platform/theme/common/themeService'; import { InputFocusedContextKey } from 'vs/platform/workbench/common/contextkeys'; import { ObjectTree, IObjectTreeOptions } from 'vs/base/browser/ui/tree/objectTree'; -import { ITreeEvent, ITreeRenderer, IDataSource } from 'vs/base/browser/ui/tree/tree'; +import { ITreeEvent, ITreeRenderer, IAsyncDataSource } from 'vs/base/browser/ui/tree/tree'; import { AsyncDataTree, IAsyncDataTreeOptions } from 'vs/base/browser/ui/tree/asyncDataTree'; export type ListWidget = List | PagedList | ITree | ObjectTree | AsyncDataTree; @@ -969,7 +969,7 @@ export class WorkbenchAsyncDataTree, TFilterData = vo container: HTMLElement, delegate: IListVirtualDelegate, renderers: ITreeRenderer[], - dataSource: IDataSource, + dataSource: IAsyncDataSource, options: IAsyncDataTreeOptions, @IContextKeyService contextKeyService: IContextKeyService, @IListService listService: IListService, diff --git a/src/vs/workbench/parts/debug/browser/loadedScriptsView.ts b/src/vs/workbench/parts/debug/browser/loadedScriptsView.ts index 47b1c507f55..96f50cdecc8 100644 --- a/src/vs/workbench/parts/debug/browser/loadedScriptsView.ts +++ b/src/vs/workbench/parts/debug/browser/loadedScriptsView.ts @@ -26,7 +26,7 @@ import { RunOnceScheduler } from 'vs/base/common/async'; import { ResourceLabel, IResourceLabel, IResourceLabelOptions } from 'vs/workbench/browser/labels'; import { FileKind } from 'vs/platform/files/common/files'; import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list'; -import { ITreeRenderer, ITreeNode, ITreeFilter, TreeVisibility, TreeFilterResult, IDataSource } from 'vs/base/browser/ui/tree/tree'; +import { ITreeRenderer, ITreeNode, ITreeFilter, TreeVisibility, TreeFilterResult, IAsyncDataSource } from 'vs/base/browser/ui/tree/tree'; import { IAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { WorkbenchAsyncDataTree, IListService, TreeResourceNavigator2 } from 'vs/platform/list/browser/listService'; @@ -535,7 +535,7 @@ class LoadedScriptsDelegate implements IListVirtualDelegate { } } -class LoadedScriptsDataSource implements IDataSource { +class LoadedScriptsDataSource implements IAsyncDataSource { constructor(private root: LoadedScriptsItem) { } diff --git a/src/vs/workbench/parts/debug/electron-browser/callStackView.ts b/src/vs/workbench/parts/debug/electron-browser/callStackView.ts index 4385bca3f04..abdac7a42be 100644 --- a/src/vs/workbench/parts/debug/electron-browser/callStackView.ts +++ b/src/vs/workbench/parts/debug/electron-browser/callStackView.ts @@ -27,7 +27,7 @@ import { DebugSession } from 'vs/workbench/parts/debug/electron-browser/debugSes import { IAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget'; import { fillInContextMenuActions } from 'vs/platform/actions/browser/menuItemActionItem'; import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list'; -import { ITreeRenderer, ITreeNode, ITreeContextMenuEvent, IDataSource } from 'vs/base/browser/ui/tree/tree'; +import { ITreeRenderer, ITreeNode, ITreeContextMenuEvent, IAsyncDataSource } from 'vs/base/browser/ui/tree/tree'; import { TreeResourceNavigator2, WorkbenchAsyncDataTree, IListService } from 'vs/platform/list/browser/listService'; import { IThemeService } from 'vs/platform/theme/common/themeService'; @@ -571,7 +571,7 @@ class CallStackDelegate implements IListVirtualDelegate { } } -class CallStackDataSource implements IDataSource { +class CallStackDataSource implements IAsyncDataSource { deemphasizedStackFramesToShow: IStackFrame[]; constructor(private debugService: IDebugService) { } diff --git a/src/vs/workbench/parts/debug/electron-browser/debugHover.ts b/src/vs/workbench/parts/debug/electron-browser/debugHover.ts index 0157ef9a95f..116b865ead2 100644 --- a/src/vs/workbench/parts/debug/electron-browser/debugHover.ts +++ b/src/vs/workbench/parts/debug/electron-browser/debugHover.ts @@ -32,7 +32,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { coalesce } from 'vs/base/common/arrays'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; -import { IDataSource } from 'vs/base/browser/ui/tree/tree'; +import { IAsyncDataSource } from 'vs/base/browser/ui/tree/tree'; const $ = dom.$; const MAX_TREE_HEIGHT = 324; @@ -291,7 +291,7 @@ class DebugHoverAccessibilityProvider implements IAccessibilityProvider { +class DebugHoverDataSource implements IAsyncDataSource { expression: IExpression; diff --git a/src/vs/workbench/parts/debug/electron-browser/repl.ts b/src/vs/workbench/parts/debug/electron-browser/repl.ts index d342bf55aee..0932dc1bff7 100644 --- a/src/vs/workbench/parts/debug/electron-browser/repl.ts +++ b/src/vs/workbench/parts/debug/electron-browser/repl.ts @@ -51,7 +51,7 @@ import { IAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget'; import { Variable, Expression, SimpleReplElement, RawObjectReplElement } from 'vs/workbench/parts/debug/common/debugModel'; import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list'; import { VariablesRenderer } from 'vs/workbench/parts/debug/electron-browser/variablesView'; -import { ITreeRenderer, ITreeNode, ITreeContextMenuEvent, IDataSource } from 'vs/base/browser/ui/tree/tree'; +import { ITreeRenderer, ITreeNode, ITreeContextMenuEvent, IAsyncDataSource } from 'vs/base/browser/ui/tree/tree'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { renderExpressionValue } from 'vs/workbench/parts/debug/browser/baseDebugView'; import { handleANSIOutput } from 'vs/workbench/parts/debug/browser/debugANSIHandling'; @@ -751,7 +751,7 @@ class ReplDelegate implements IListVirtualDelegate { } -class ReplDataSource implements IDataSource { +class ReplDataSource implements IAsyncDataSource { input: IDebugSession; hasChildren(element: IReplElement | null): boolean { diff --git a/src/vs/workbench/parts/debug/electron-browser/variablesView.ts b/src/vs/workbench/parts/debug/electron-browser/variablesView.ts index 5679a39e946..1c234db02b5 100644 --- a/src/vs/workbench/parts/debug/electron-browser/variablesView.ts +++ b/src/vs/workbench/parts/debug/electron-browser/variablesView.ts @@ -21,7 +21,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur import { IViewletPanelOptions, ViewletPanel } from 'vs/workbench/browser/parts/views/panelViewlet'; import { IAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget'; import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list'; -import { ITreeRenderer, ITreeNode, ITreeMouseEvent, ITreeContextMenuEvent, IDataSource } from 'vs/base/browser/ui/tree/tree'; +import { ITreeRenderer, ITreeNode, ITreeMouseEvent, ITreeContextMenuEvent, IAsyncDataSource } from 'vs/base/browser/ui/tree/tree'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { Emitter } from 'vs/base/common/event'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; @@ -149,7 +149,7 @@ export class VariablesView extends ViewletPanel { } } -export class VariablesDataSource implements IDataSource { +export class VariablesDataSource implements IAsyncDataSource { constructor(private debugService: IDebugService) { } diff --git a/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.ts b/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.ts index e20047369dc..759fa41a422 100644 --- a/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.ts +++ b/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.ts @@ -26,7 +26,7 @@ import { VariablesRenderer, variableSetEmitter } from 'vs/workbench/parts/debug/ import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { WorkbenchAsyncDataTree, IListService } from 'vs/platform/list/browser/listService'; import { IThemeService } from 'vs/platform/theme/common/themeService'; -import { IDataSource, ITreeMouseEvent, ITreeContextMenuEvent } from 'vs/base/browser/ui/tree/tree'; +import { IAsyncDataSource, ITreeMouseEvent, ITreeContextMenuEvent } from 'vs/base/browser/ui/tree/tree'; const MAX_VALUE_RENDER_LENGTH_IN_VIEWLET = 1024; @@ -186,7 +186,7 @@ class WatchExpressionsDelegate implements IListVirtualDelegate { } } -class WatchExpressionsDataSource implements IDataSource { +class WatchExpressionsDataSource implements IAsyncDataSource { constructor(private debugService: IDebugService) { } -- GitLab