Skip to content

Commit b91293e

Browse files
author
Benjamin Pasero
committed
files2 - remove resolveStreamContent()
1 parent 3963322 commit b91293e

12 files changed

Lines changed: 18 additions & 152 deletions

File tree

‎src/vs/platform/files/common/files.ts‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,6 @@ export interface IFileService {
106106
*/
107107
resolveContent(resource: URI, options?: IReadTextFileOptions): Promise<IContent>;
108108

109-
/**
110-
* @deprecated use readFileStream() instead.
111-
*/
112-
resolveStreamContent(resource: URI, options?: IReadTextFileOptions): Promise<IStreamContent>;
113-
114109
/**
115110
* Read the contents of the provided resource unbuffered.
116111
*/
@@ -1210,6 +1205,4 @@ export interface ILegacyFileService extends IDisposable {
12101205
registerProvider(scheme: string, provider: IFileSystemProvider): IDisposable;
12111206

12121207
resolveContent(resource: URI, options?: IReadTextFileOptions): Promise<IContent>;
1213-
1214-
resolveStreamContent(resource: URI, options?: IReadTextFileOptions): Promise<IStreamContent>;
12151208
}

‎src/vs/workbench/browser/nodeless.main.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { RemoteAuthorityResolverService } from 'vs/platform/remote/browser/remot
1919
import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver';
2020
import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
2121
import { IFileService } from 'vs/platform/files/common/files';
22-
import { FileService3 } from 'vs/workbench/services/files2/browser/fileService2';
22+
import { FileService2 } from 'vs/workbench/services/files2/common/fileService2';
2323
import { Schemas } from 'vs/base/common/network';
2424

2525
class CodeRendererMain extends Disposable {
@@ -78,7 +78,7 @@ class CodeRendererMain extends Disposable {
7878
serviceCollection.set(IRemoteAgentService, remoteAgentService);
7979

8080
// Files
81-
const fileService = this._register(new FileService3(logService));
81+
const fileService = this._register(new FileService2(logService));
8282
serviceCollection.set(IFileService, fileService);
8383

8484
const connection = remoteAgentService.getConnection();

‎src/vs/workbench/contrib/files/common/files.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ export class FileOnDiskContentProvider implements ITextModelContentProvider {
176176
private resolveEditorModel(resource: URI, createAsNeeded: boolean = true): Promise<ITextModel | null> {
177177
const savedFileResource = toLocalResource(resource, this.environmentService.configuration.remoteAuthority);
178178

179-
return this.textFileService.legacyRead(savedFileResource).then(content => {
179+
return this.textFileService.read(savedFileResource).then(content => {
180180
let codeEditorModel = this.modelService.getModel(resource);
181181
if (codeEditorModel) {
182182
this.modelService.updateModel(codeEditorModel, content.value);

‎src/vs/workbench/contrib/welcome/walkThrough/common/walkThroughContentProvider.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export class WalkThroughContentProvider implements ITextModelContentProvider, IW
3535
reject(err);
3636
}
3737
});
38-
}) : this.textFileService.legacyRead(URI.file(resource.fsPath)).then(content => content.value));
38+
}) : this.textFileService.read(URI.file(resource.fsPath)).then(content => content.value));
3939
return content.then(content => {
4040
let codeEditorModel = this.modelService.getModel(resource);
4141
if (!codeEditorModel) {
@@ -61,7 +61,7 @@ export class WalkThroughSnippetContentProvider implements ITextModelContentProvi
6161
}
6262

6363
public provideTextContent(resource: URI): Promise<ITextModel> {
64-
return this.textFileService.legacyRead(URI.file(resource.fsPath)).then(content => {
64+
return this.textFileService.read(URI.file(resource.fsPath)).then(content => {
6565
let codeEditorModel = this.modelService.getModel(resource);
6666
if (!codeEditorModel) {
6767
const j = parseInt(resource.fragment);

‎src/vs/workbench/services/backup/common/backup.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,11 @@
55

66
import { URI } from 'vs/base/common/uri';
77
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
8-
import { IReadTextFileOptions, ITextSnapshot } from 'vs/platform/files/common/files';
8+
import { ITextSnapshot } from 'vs/platform/files/common/files';
99
import { ITextBufferFactory } from 'vs/editor/common/model';
1010

1111
export const IBackupFileService = createDecorator<IBackupFileService>('backupFileService');
1212

13-
export const BACKUP_FILE_RESOLVE_OPTIONS: IReadTextFileOptions = { acceptTextOnly: true, encoding: 'utf8' };
14-
1513
/**
1614
* A service that handles any I/O and state associated with the backup system.
1715
*/

‎src/vs/workbench/services/backup/node/backupFileService.ts‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import * as crypto from 'crypto';
88
import * as pfs from 'vs/base/node/pfs';
99
import { URI as Uri } from 'vs/base/common/uri';
1010
import { ResourceQueue } from 'vs/base/common/async';
11-
import { IBackupFileService, BACKUP_FILE_RESOLVE_OPTIONS } from 'vs/workbench/services/backup/common/backup';
11+
import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
1212
import { IFileService, ITextSnapshot, TextSnapshotReadable } from 'vs/platform/files/common/files';
1313
import { readToMatchingString } from 'vs/base/node/stream';
1414
import { ITextBufferFactory } from 'vs/editor/common/model';
@@ -17,6 +17,7 @@ import { keys } from 'vs/base/common/map';
1717
import { Schemas } from 'vs/base/common/network';
1818
import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
1919
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
20+
import { VSBuffer } from 'vs/base/common/buffer';
2021

2122
export interface IBackupFilesModel {
2223
resolve(backupRoot: string): Promise<IBackupFilesModel>;
@@ -249,19 +250,21 @@ class BackupFileServiceImpl implements IBackupFileService {
249250
}
250251

251252
resolveBackupContent(backup: Uri): Promise<ITextBufferFactory> {
252-
return this.fileService.resolveStreamContent(backup, BACKUP_FILE_RESOLVE_OPTIONS).then(content => {
253+
return this.fileService.readFileStream(backup).then(content => {
253254

254255
// Add a filter method to filter out everything until the meta marker
255256
let metaFound = false;
256-
const metaPreambleFilter = (chunk: string) => {
257+
const metaPreambleFilter = (chunk: VSBuffer) => {
258+
const chunkString = chunk.toString();
259+
257260
if (!metaFound && chunk) {
258-
const metaIndex = chunk.indexOf(BackupFileServiceImpl.META_MARKER);
261+
const metaIndex = chunkString.indexOf(BackupFileServiceImpl.META_MARKER);
259262
if (metaIndex === -1) {
260-
return ''; // meta not yet found, return empty string
263+
return VSBuffer.fromString(''); // meta not yet found, return empty string
261264
}
262265

263266
metaFound = true;
264-
return chunk.substr(metaIndex + 1); // meta found, return everything after
267+
return VSBuffer.fromString(chunkString.substr(metaIndex + 1)); // meta found, return everything after
265268
}
266269

267270
return chunk;

‎src/vs/workbench/services/files2/browser/fileService2.ts‎

Lines changed: 0 additions & 78 deletions
This file was deleted.

‎src/vs/workbench/services/files2/common/fileService2.ts‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import { Disposable, IDisposable, toDisposable, combinedDisposable, dispose } from 'vs/base/common/lifecycle';
7-
import { IFileService, IResolveFileOptions, FileChangesEvent, FileOperationEvent, IFileSystemProviderRegistrationEvent, IFileSystemProvider, IFileStat, IResolveFileResult, IReadTextFileOptions, IContent, IStreamContent, ICreateFileOptions, IFileSystemProviderActivationEvent, FileOperationError, FileOperationResult, FileOperation, FileSystemProviderCapabilities, FileType, toFileSystemProviderErrorCode, FileSystemProviderErrorCode, IStat, IFileStatWithMetadata, IResolveMetadataFileOptions, etag, hasReadWriteCapability, hasFileFolderCopyCapability, hasOpenReadWriteCloseCapability, toFileOperationResult, IFileSystemProviderWithOpenReadWriteCloseCapability, IFileSystemProviderWithFileReadWriteCapability, IResolveFileResultWithMetadata, IWatchOptions, ILegacyFileService, IWriteFileOptions, IReadFileOptions, IFileStreamContent, IFileContent } from 'vs/platform/files/common/files';
7+
import { IFileService, IResolveFileOptions, FileChangesEvent, FileOperationEvent, IFileSystemProviderRegistrationEvent, IFileSystemProvider, IFileStat, IResolveFileResult, IReadTextFileOptions, IContent, ICreateFileOptions, IFileSystemProviderActivationEvent, FileOperationError, FileOperationResult, FileOperation, FileSystemProviderCapabilities, FileType, toFileSystemProviderErrorCode, FileSystemProviderErrorCode, IStat, IFileStatWithMetadata, IResolveMetadataFileOptions, etag, hasReadWriteCapability, hasFileFolderCopyCapability, hasOpenReadWriteCloseCapability, toFileOperationResult, IFileSystemProviderWithOpenReadWriteCloseCapability, IFileSystemProviderWithFileReadWriteCapability, IResolveFileResultWithMetadata, IWatchOptions, ILegacyFileService, IWriteFileOptions, IReadFileOptions, IFileStreamContent, IFileContent } from 'vs/platform/files/common/files';
88
import { URI } from 'vs/base/common/uri';
99
import { Event, Emitter } from 'vs/base/common/event';
1010
import { ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
@@ -532,10 +532,6 @@ export class FileService2 extends Disposable implements IFileService {
532532
return this.joinOnLegacy.then(legacy => legacy.resolveContent(resource, options));
533533
}
534534

535-
async resolveStreamContent(resource: URI, options?: IReadTextFileOptions): Promise<IStreamContent> {
536-
return this.joinOnLegacy.then(legacy => legacy.resolveStreamContent(resource, options));
537-
}
538-
539535
//#endregion
540536

541537
//#region Move/Copy/Delete/Create Folder

‎src/vs/workbench/services/textfile/common/textFileEditorModel.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
306306

307307
// Resolve Content
308308
try {
309-
const content = await this.textFileService.legacyRead(this.resource, { acceptTextOnly: !allowBinary, etag, encoding: this.preferredEncoding });
309+
const content = await this.textFileService.read(this.resource, { acceptTextOnly: !allowBinary, etag, encoding: this.preferredEncoding });
310310

311311
// Clear orphaned state when loading was successful
312312
this.setOrphaned(false);

‎src/vs/workbench/services/textfile/common/textFileService.ts‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -397,22 +397,6 @@ export abstract class TextFileService extends Disposable implements ITextFileSer
397397
};
398398
}
399399

400-
async legacyRead(resource: URI, options?: IReadTextFileOptions): Promise<ITextFileContent> {
401-
const streamContent = await this.fileService.resolveStreamContent(resource, options);
402-
const value = await createTextBufferFactoryFromStream(streamContent.value);
403-
404-
return {
405-
resource: streamContent.resource,
406-
name: streamContent.name,
407-
mtime: streamContent.mtime,
408-
etag: streamContent.etag,
409-
encoding: streamContent.encoding,
410-
isReadonly: streamContent.isReadonly,
411-
size: streamContent.size,
412-
value
413-
};
414-
}
415-
416400
async create(resource: URI, value?: string | ITextSnapshot, options?: ICreateFileOptions): Promise<IFileStatWithMetadata> {
417401
const stat = await this.doCreate(resource, value, options);
418402

0 commit comments

Comments
 (0)