development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-30 13:43:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

support IResolveContentOptions#position, #41985

Browse source
This commit is contained in:
Johannes Rieken 2018-04-12 15:14:40 +02:00
parent bb588d678d
commit da9720b39b
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/vs/workbench/services/files/electron-browser/remoteFileService.ts
View file

@ -254,7 +254,9 @@ export class RemoteFileService extends FileService {
}
};
return toDecodeStream(createReadableOfProvider(provider, resource), decodeStreamOpts).then(data => {
const readable = createReadableOfProvider(provider, resource, options.position || 0);
return toDecodeStream(readable, decodeStreamOpts).then(data => {
if (options.acceptTextOnly && data.detected.seemsBinary) {
return TPromise.wrapError<IStreamContent>(new FileOperationError(

14
src/vs/workbench/services/files/electron-browser/streams.ts
View file

@ -66,17 +66,17 @@ function createWritable(provider: IReadWriteProvider, resource: URI): Writable {
};
}
export function createReadableOfProvider(provider: IFileSystemProvider, resource: URI): Readable {
export function createReadableOfProvider(provider: IFileSystemProvider, resource: URI, position: number): Readable {
switch (provider._type) {
case 'simple': return createSimpleReadable(provider, resource);
case 'chunked': return createReadable(provider, resource);
case 'simple': return createSimpleReadable(provider, resource, position);
case 'chunked': return createReadable(provider, resource, position);
}
}
function createReadable(provider: IReadWriteProvider, resource: URI): Readable {
function createReadable(provider: IReadWriteProvider, resource: URI, position: number): Readable {
return new class extends Readable {
_fd: number;
_pos: number = 0;
_pos: number = position;
_reading: boolean = false;
constructor(opts?) {
super(opts);
@ -117,7 +117,7 @@ function createReadable(provider: IReadWriteProvider, resource: URI): Readable {
};
}
function createSimpleReadable(provider: ISimpleReadWriteProvider, resource: URI): Readable {
function createSimpleReadable(provider: ISimpleReadWriteProvider, resource: URI, position: number): Readable {
return new class extends Readable {
_readOperation: Thenable<any>;
_read(size?: number): void {
@ -125,7 +125,7 @@ function createSimpleReadable(provider: ISimpleReadWriteProvider, resource: URI)
return;
}
this._readOperation = provider.readFile(resource).then(data => {
this.push(data);
this.push(data.slice(position));
this.push(null);
}, err => {
this.emit('error', err);