fixes #66878

microsoft · Jan 23, 2019 · f620b3d · f620b3d
1 parent fd8dd51
commit f620b3d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 15 deletions.
diff --git a/src/vs/base/browser/dom.ts b/src/vs/base/browser/dom.ts
@@ -1167,8 +1167,3 @@ export function animate(fn: () => void): IDisposable {
  let stepDisposable = scheduleAtNextAnimationFrame(step);
  return toDisposable(() => stepDisposable.dispose());
 }
-
-export function timeout(fn: () => void, millis: number): IDisposable {
- const timer = setTimeout(fn, millis);
- return toDisposable(() => clearTimeout(timer));
-}
diff --git a/src/vs/base/browser/ui/list/listView.ts b/src/vs/base/browser/ui/list/listView.ts
@@ -21,6 +21,7 @@ import { memoize } from 'vs/base/common/decorators';
 import { Range, IRange } from 'vs/base/common/range';
 import { equals, distinct } from 'vs/base/common/arrays';
 import { DataTransfers, StaticDND, IDragAndDropData } from 'vs/base/browser/dnd';
+import { disposableTimeout } from 'vs/base/common/async';
 
 function canUseTranslate3d(): boolean {
  if (browser.isFirefox) {
@@ -731,7 +732,7 @@ export class ListView<T> implements ISpliceable<T>, IDisposable {
 
  private onDragLeave(): void {
  this.onDragLeaveTimeout.dispose();
- this.onDragLeaveTimeout = DOM.timeout(() => this.clearDragOverFeedback(), 100);
+ this.onDragLeaveTimeout = disposableTimeout(() => this.clearDragOverFeedback(), 100);
  }
 
  private onDrop(event: IListDragEvent<T>): void {
@@ -777,7 +778,7 @@ export class ListView<T> implements ISpliceable<T>, IDisposable {
  }
 
  this.dragOverAnimationStopDisposable.dispose();
- this.dragOverAnimationStopDisposable = DOM.timeout(() => {
+ this.dragOverAnimationStopDisposable = disposableTimeout(() => {
  if (this.dragOverAnimationDisposable) {
  this.dragOverAnimationDisposable.dispose();
  this.dragOverAnimationDisposable = undefined;

diff --git a/src/vs/base/browser/ui/tree/abstractTree.ts b/src/vs/base/browser/ui/tree/abstractTree.ts
@@ -7,7 +7,7 @@ import 'vs/css!./media/tree';
 import { IDisposable, dispose, Disposable, toDisposable } from 'vs/base/common/lifecycle';
 import { IListOptions, List, IListStyles, mightProducePrintableCharacter } from 'vs/base/browser/ui/list/listWidget';
 import { IListVirtualDelegate, IListRenderer, IListMouseEvent, IListEvent, IListContextMenuEvent, IListDragAndDrop, IListDragOverReaction, IKeyboardNavigationLabelProvider } from 'vs/base/browser/ui/list/list';
-import { append, $, toggleClass, timeout, getDomNodePagePosition, removeClass, addClass } from 'vs/base/browser/dom';
+import { append, $, toggleClass, getDomNodePagePosition, removeClass, addClass } from 'vs/base/browser/dom';
 import { Event, Relay, Emitter } from 'vs/base/common/event';
 import { StandardKeyboardEvent, IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { KeyCode } from 'vs/base/common/keyCodes';
@@ -20,6 +20,7 @@ import { domEvent } from 'vs/base/browser/event';
 import { fuzzyScore, FuzzyScore } from 'vs/base/common/filters';
 import { getVisibleState, isFilterResult } from 'vs/base/browser/ui/tree/indexTreeModel';
 import { localize } from 'vs/nls';
+import { disposableTimeout } from 'vs/base/common/async';
 
 function asTreeDragAndDropData<T, TFilterData>(data: IDragAndDropData): IDragAndDropData {
  if (data instanceof ElementsDragAndDropData) {
@@ -69,7 +70,7 @@ class TreeNodeListDragAndDrop<T, TFilterData, TRef> implements IListDragAndDrop<
  }
 
  if (didChangeAutoExpandNode && typeof result !== 'boolean' && result.autoExpand) {
- this.autoExpandDisposable = timeout(() => {
+ this.autoExpandDisposable = disposableTimeout(() => {
  const model = this.modelProvider();
  const ref = model.getNodeLocation(targetNode);
 

diff --git a/src/vs/base/common/async.ts b/src/vs/base/common/async.ts
@@ -6,7 +6,7 @@
 import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
 import * as errors from 'vs/base/common/errors';
 import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
+import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { URI } from 'vs/base/common/uri';
 
 export function isThenable<T>(obj: any): obj is Promise<T> {
@@ -320,11 +320,7 @@ export function timeout(millis: number, token?: CancellationToken): CancelablePr
 
 export function disposableTimeout(handler: () => void, timeout = 0): IDisposable {
  const timer = setTimeout(handler, timeout);
- return {
- dispose() {
- clearTimeout(timer);
- }
- };
+ return toDisposable(() => clearTimeout(timer));
 }
 
 /**