Reduce usage of asWinJsPromise

src/vs/workbench/api/node/extHostComments.ts

@@ -5,7 +5,7 @@
 
 'use strict';
 
-import { asWinJsPromise } from 'vs/base/common/async';
+import { asThenable } from 'vs/base/common/async';
 import { URI, UriComponents } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as modes from 'vs/editor/common/modes';
@@ -15,6 +15,7 @@ import * as vscode from 'vscode';
 import { ExtHostCommentsShape, IMainContext, MainContext, MainThreadCommentsShape } from './extHost.protocol';
 import { CommandsConverter } from './extHostCommands';
 import { IRange } from 'vs/editor/common/core/range';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 export class ExtHostComments implements ExtHostCommentsShape {
 	private static handlePool = 0;
@@ -72,9 +73,9 @@ export class ExtHostComments implements ExtHostCommentsShape {
 			return TPromise.as(null);
 		}
 
-		return asWinJsPromise(token => {
+		return asThenable(() => {
 			let provider = this._documentProviders.get(handle);
-			return provider.createNewCommentThread(data.document, ran, text, token);
+			return provider.createNewCommentThread(data.document, ran, text, CancellationToken.None);
 		}).then(commentThread => commentThread ? convertToCommentThread(commentThread, this._commandsConverter) : null);
 	}
 
@@ -86,9 +87,9 @@ export class ExtHostComments implements ExtHostCommentsShape {
 			return TPromise.as(null);
 		}
 
-		return asWinJsPromise(token => {
+		return asThenable(() => {
 			let provider = this._documentProviders.get(handle);
-			return provider.replyToCommentThread(data.document, ran, convertFromCommentThread(thread), text, token);
+			return provider.replyToCommentThread(data.document, ran, convertFromCommentThread(thread), text, CancellationToken.None);
 		}).then(commentThread => commentThread ? convertToCommentThread(commentThread, this._commandsConverter) : null);
 	}
 
@@ -98,9 +99,9 @@ export class ExtHostComments implements ExtHostCommentsShape {
 			return TPromise.as(null);
 		}
 
-		return asWinJsPromise(token => {
+		return asThenable(() => {
 			let provider = this._documentProviders.get(handle);
-			return provider.provideDocumentComments(data.document, token);
+			return provider.provideDocumentComments(data.document, CancellationToken.None);
 		})
 			.then(commentInfo => commentInfo ? convertCommentInfo(handle, commentInfo, this._commandsConverter) : null);
 	}
@@ -111,8 +112,8 @@ export class ExtHostComments implements ExtHostCommentsShape {
 			return TPromise.as(null);
 		}
 
-		return asWinJsPromise(token => {
-			return provider.provideWorkspaceComments(token);
+		return asThenable(() => {
+			return provider.provideWorkspaceComments(CancellationToken.None);
 		}).then(comments =>
 			comments.map(x => convertToCommentThread(x, this._commandsConverter)
 			));