more cancellation token, #47475

microsoft · Apr 9, 2018 · 2afd736 · 2afd736
1 parent efcca1c
commit 2afd736
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts
@@ -232,7 +232,9 @@ declare module 'vscode' {
 
 		readonly onDidChange?: Event<FileChange[]>;
 
-		stat(resource: Uri): Thenable<FileStat>;
+		stat(resource: Uri, token: CancellationToken): Thenable<FileStat>;
+
+		readdir(resource: Uri, token: CancellationToken): Thenable<[Uri, FileStat][]>;
 
 		readFile(resource: Uri, token: CancellationToken): Thenable<Uint8Array>;
 
@@ -246,9 +248,6 @@ declare module 'vscode' {
 		// helps with performance bigly
 		// copy?(from: Uri, to: Uri): Thenable<void>;
 
-
-		readdir(resource: Uri): Thenable<[Uri, FileStat][]>;
-
 		// todo@remote
 		// ? useTrash, expose trash
 		delete(resource: Uri, options: { recursive?: boolean; }): Thenable<void>;

diff --git a/src/vs/workbench/api/node/extHostFileSystem.ts b/src/vs/workbench/api/node/extHostFileSystem.ts
@@ -168,10 +168,10 @@ export class ExtHostFileSystem implements ExtHostFileSystemShape {
 	}
 
 	$stat(handle: number, resource: UriComponents): TPromise<IStat, any> {
-		return asWinJsPromise(token => this._fsProvider.get(handle).stat(URI.revive(resource)));
+		return asWinJsPromise(token => this._fsProvider.get(handle).stat(URI.revive(resource), token));
 	}
 	$readdir(handle: number, resource: UriComponents): TPromise<[UriComponents, IStat][], any> {
-		return asWinJsPromise(token => this._fsProvider.get(handle).readdir(URI.revive(resource)));
+		return asWinJsPromise(token => this._fsProvider.get(handle).readdir(URI.revive(resource), token));
 	}
 	$readFile(handle: number, resource: UriComponents): TPromise<string> {
 		return asWinJsPromise(token => {