Skip to content

Commit f620b3d

Browse files
joaomorenojoaomoreno
committed
1 parent fd8dd51 commit f620b3d

4 files changed

Lines changed: 8 additions & 15 deletions

File tree

‎src/vs/base/browser/dom.ts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1167,8 +1167,3 @@ export function animate(fn: () => void): IDisposable {
11671167
let stepDisposable = scheduleAtNextAnimationFrame(step);
11681168
return toDisposable(() => stepDisposable.dispose());
11691169
}
1170-
1171-
export function timeout(fn: () => void, millis: number): IDisposable {
1172-
const timer = setTimeout(fn, millis);
1173-
return toDisposable(() => clearTimeout(timer));
1174-
}

‎src/vs/base/browser/ui/list/listView.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import { memoize } from 'vs/base/common/decorators';
2121
import { Range, IRange } from 'vs/base/common/range';
2222
import { equals, distinct } from 'vs/base/common/arrays';
2323
import { DataTransfers, StaticDND, IDragAndDropData } from 'vs/base/browser/dnd';
24+
import { disposableTimeout } from 'vs/base/common/async';
2425

2526
function canUseTranslate3d(): boolean {
2627
if (browser.isFirefox) {
@@ -731,7 +732,7 @@ export class ListView<T> implements ISpliceable<T>, IDisposable {
731732

732733
private onDragLeave(): void {
733734
this.onDragLeaveTimeout.dispose();
734-
this.onDragLeaveTimeout = DOM.timeout(() => this.clearDragOverFeedback(), 100);
735+
this.onDragLeaveTimeout = disposableTimeout(() => this.clearDragOverFeedback(), 100);
735736
}
736737

737738
private onDrop(event: IListDragEvent<T>): void {
@@ -777,7 +778,7 @@ export class ListView<T> implements ISpliceable<T>, IDisposable {
777778
}
778779

779780
this.dragOverAnimationStopDisposable.dispose();
780-
this.dragOverAnimationStopDisposable = DOM.timeout(() => {
781+
this.dragOverAnimationStopDisposable = disposableTimeout(() => {
781782
if (this.dragOverAnimationDisposable) {
782783
this.dragOverAnimationDisposable.dispose();
783784
this.dragOverAnimationDisposable = undefined;

‎src/vs/base/browser/ui/tree/abstractTree.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import 'vs/css!./media/tree';
77
import { IDisposable, dispose, Disposable, toDisposable } from 'vs/base/common/lifecycle';
88
import { IListOptions, List, IListStyles, mightProducePrintableCharacter } from 'vs/base/browser/ui/list/listWidget';
99
import { IListVirtualDelegate, IListRenderer, IListMouseEvent, IListEvent, IListContextMenuEvent, IListDragAndDrop, IListDragOverReaction, IKeyboardNavigationLabelProvider } from 'vs/base/browser/ui/list/list';
10-
import { append, $, toggleClass, timeout, getDomNodePagePosition, removeClass, addClass } from 'vs/base/browser/dom';
10+
import { append, $, toggleClass, getDomNodePagePosition, removeClass, addClass } from 'vs/base/browser/dom';
1111
import { Event, Relay, Emitter } from 'vs/base/common/event';
1212
import { StandardKeyboardEvent, IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
1313
import { KeyCode } from 'vs/base/common/keyCodes';
@@ -20,6 +20,7 @@ import { domEvent } from 'vs/base/browser/event';
2020
import { fuzzyScore, FuzzyScore } from 'vs/base/common/filters';
2121
import { getVisibleState, isFilterResult } from 'vs/base/browser/ui/tree/indexTreeModel';
2222
import { localize } from 'vs/nls';
23+
import { disposableTimeout } from 'vs/base/common/async';
2324

2425
function asTreeDragAndDropData<T, TFilterData>(data: IDragAndDropData): IDragAndDropData {
2526
if (data instanceof ElementsDragAndDropData) {
@@ -69,7 +70,7 @@ class TreeNodeListDragAndDrop<T, TFilterData, TRef> implements IListDragAndDrop<
6970
}
7071

7172
if (didChangeAutoExpandNode && typeof result !== 'boolean' && result.autoExpand) {
72-
this.autoExpandDisposable = timeout(() => {
73+
this.autoExpandDisposable = disposableTimeout(() => {
7374
const model = this.modelProvider();
7475
const ref = model.getNodeLocation(targetNode);
7576

‎src/vs/base/common/async.ts‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
77
import * as errors from 'vs/base/common/errors';
88
import { Emitter, Event } from 'vs/base/common/event';
9-
import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
9+
import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
1010
import { URI } from 'vs/base/common/uri';
1111

1212
export function isThenable<T>(obj: any): obj is Promise<T> {
@@ -320,11 +320,7 @@ export function timeout(millis: number, token?: CancellationToken): CancelablePr
320320

321321
export function disposableTimeout(handler: () => void, timeout = 0): IDisposable {
322322
const timer = setTimeout(handler, timeout);
323-
return {
324-
dispose() {
325-
clearTimeout(timer);
326-
}
327-
};
323+
return toDisposable(() => clearTimeout(timer));
328324
}
329325

330326
/**

0 commit comments

Comments
 (0)