debt - use TimeoutTimer instead of TPromise.timeout

jrieken · jrieken · commit 8a0e53a63b69 · 2018-07-04T12:12:57.000+02:00
diff --git a/src/vs/editor/contrib/colorPicker/colorDetector.ts b/src/vs/editor/contrib/colorPicker/colorDetector.ts
@@ -17,6 +17,7 @@ import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService
 import { getColors, IColorData } from 'vs/editor/contrib/colorPicker/color';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
+import { TimeoutTimer } from 'vs/base/common/async';
 
 const MAX_DECORATORS = 500;
 
@@ -29,7 +30,7 @@ export class ColorDetector implements IEditorContribution {
 	private _globalToDispose: IDisposable[] = [];
 	private _localToDispose: IDisposable[] = [];
 	private _computePromise: TPromise<void>;
-	private _timeoutPromise: TPromise<void>;
+	private _timeoutTimer: TimeoutTimer;
 
 	private _decorationsIds: string[] = [];
 	private _colorDatas = new Map<string, IColorData>();
@@ -61,7 +62,7 @@ export class ColorDetector implements IEditorContribution {
 			}
 		}));
 
-		this._timeoutPromise = null;
+		this._timeoutTimer = null;
 		this._computePromise = null;
 		this._isEnabled = this.isEnabled();
 		this.onModelChanged();
@@ -115,12 +116,12 @@ export class ColorDetector implements IEditorContribution {
 		}
 
 		this._localToDispose.push(this._editor.onDidChangeModelContent((e) => {
-			if (!this._timeoutPromise) {
-				this._timeoutPromise = TPromise.timeout(ColorDetector.RECOMPUTE_TIME);
-				this._timeoutPromise.then(() => {
-					this._timeoutPromise = null;
+			if (!this._timeoutTimer) {
+				this._timeoutTimer = new TimeoutTimer();
+				this._timeoutTimer.cancelAndSet(() => {
+					this._timeoutTimer = null;
 					this.beginCompute();
-				});
+				}, ColorDetector.RECOMPUTE_TIME);
 			}
 		}));
 		this.beginCompute();
@@ -135,9 +136,9 @@ export class ColorDetector implements IEditorContribution {
 	}
 
 	private stop(): void {
-		if (this._timeoutPromise) {
-			this._timeoutPromise.cancel();
-			this._timeoutPromise = null;
+		if (this._timeoutTimer) {
+			this._timeoutTimer.cancel();
+			this._timeoutTimer = null;
 		}
 		if (this._computePromise) {
 			this._computePromise.cancel();
