Skip to content

V
vscode

掘金者说 / vscode
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
V
vscode

体验新版 GitCode，发现更多精彩内容 >>

提交 f01feadf 编写于 作者: B Benjamin Pasero
浏览文件
操作

cleanup & imports

上级 41f53d27
隐藏空白更改
内联 并排
Showing with 76 addition and 82 deletion
src/vs/platform/files/common/files.ts
浏览文件 @ f01feadf
......@@ -357,10 +357,10 @@ export interface IContent extends IBaseStat {
* A Stream emitting strings.
*/
export interface IStringStream {
on(event:'data', callback:(chunk:string)=>void): void;
on(event:'error', callback:(err:any)=>void): void;
on(event:'end', callback:()=>void): void;
on(event:string, callback:any): void;
on(event: 'data', callback: (chunk: string) => void): void;
on(event: 'error', callback: (err: any) => void): void;
on(event: 'end', callback: () => void): void;
on(event: string, callback: any): void;
}
/**
......
src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts
浏览文件 @ f01feadf
......@@ -42,7 +42,6 @@ export class NoTabsTitleControl extends TitleControl {
this.onTitleDoubleClick();
}));
// Detect mouse click
this.toDispose.push(DOM.addDisposableListener(this.titleContainer, DOM.EventType.MOUSE_UP, (e: MouseEvent) => {
DOM.EventHelper.stop(e, false);
......@@ -163,7 +162,7 @@ export class NoTabsTitleControl extends TitleControl {
}
// Update Editor Actions Toolbar
const editorActions = this.getEditorActions({group, editor });
const editorActions = this.getEditorActions({ group, editor });
const primaryEditorActions = prepareActions(editorActions.primary);
if (isActive && editor instanceof EditorInput && editor.supportsSplitEditor()) {
primaryEditorActions.push(this.splitEditorAction);
......
src/vs/workbench/browser/parts/editor/titleControl.ts
浏览文件 @ f01feadf
......@@ -184,7 +184,6 @@ export abstract class TitleControl implements ITitleAreaControl {
public abstract create(parent: HTMLElement): void;
protected abstract doRefresh(): void;
protected doUpdate(): void {
......
src/vs/workbench/common/editor/textEditorModel.ts
浏览文件 @ f01feadf
......@@ -61,11 +61,11 @@ export abstract class BaseTextEditorModel extends EditorModel implements ITextEd
// To avoid flickering, give the mode at most 50ms to load. If the mode doesn't load in 50ms, proceed creating the model with a mode promise
return TPromise.any<any>([TPromise.timeout(50), mode]).then(() => {
return this._createTextEditorModelNow(value, mode, resource);
return this.doCreateTextEditorModel(value, mode, resource);
});
}
private _createTextEditorModelNow(value: string | IRawText, mode: TPromise<IMode>, resource: URI): EditorModel {
private doCreateTextEditorModel(value: string | IRawText, mode: TPromise<IMode>, resource: URI): EditorModel {
let model = resource && this.modelService.getModel(resource);
if (!model) {
model = this.modelService.createModel(value, mode, resource);
......@@ -76,6 +76,7 @@ export abstract class BaseTextEditorModel extends EditorModel implements ITextEd
} else {
model.setValueFromRawText(value);
}
model.setMode(mode);
}
......
src/vs/workbench/parts/files/browser/textFileServices.ts
浏览文件 @ f01feadf
......@@ -13,15 +13,16 @@ import {CACHE, TextFileEditorModel} from 'vs/workbench/parts/files/common/editor
import {IResult, ITextFileOperationResult, ITextFileService, IRawTextContent, IAutoSaveConfiguration, AutoSaveMode} from 'vs/workbench/parts/files/common/files';
import {ConfirmResult} from 'vs/workbench/common/editor';
import {IWorkspaceContextService} from 'vs/workbench/services/workspace/common/contextService';
import {IStringStream, IFileService, IResolveContentOptions, IFilesConfiguration, IFileOperationResult, FileOperationResult, AutoSaveConfiguration} from 'vs/platform/files/common/files';
import {IFileService, IResolveContentOptions, IFilesConfiguration, IFileOperationResult, FileOperationResult, AutoSaveConfiguration} from 'vs/platform/files/common/files';
import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation';
import {IEventService} from 'vs/platform/event/common/event';
import {IConfigurationService} from 'vs/platform/configuration/common/configuration';
import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry';
import {IDisposable, dispose} from 'vs/base/common/lifecycle';
import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService';
import {IRawText} from 'vs/editor/common/editorCommon';
import {IEditorGroupService} from 'vs/workbench/services/group/common/groupService';
import {ModelBuilder} from 'vs/editor/node/model/modelBuilder';
import {IModelService} from 'vs/editor/common/services/modelService';
/**
* The workbench file service implementation implements the raw file service spec and adds additional methods on top.
......@@ -47,7 +48,8 @@ export abstract class TextFileService implements ITextFileService {
@IWorkbenchEditorService protected editorService: IWorkbenchEditorService,
@IEditorGroupService private editorGroupService: IEditorGroupService,
@IEventService private eventService: IEventService,
@IFileService protected fileService: IFileService
@IFileService protected fileService: IFileService,
@IModelService private modelService: IModelService
) {
this.listenerToUnbind = [];
this._onAutoSaveConfigurationChange = new Emitter<IAutoSaveConfiguration>();
......@@ -64,8 +66,8 @@ export abstract class TextFileService implements ITextFileService {
public resolveTextContent(resource: URI, options?: IResolveContentOptions): TPromise<IRawTextContent> {
return this.fileService.resolveStreamContent(resource, options).then((streamContent) => {
return this.stringStreamToRawText(streamContent.value).then((res) => {
let r:IRawTextContent = {
return ModelBuilder.fromStringStream(streamContent.value, this.modelService.getCreationOptions()).then((res) => {
let r: IRawTextContent = {
resource: streamContent.resource,
name: streamContent.name,
mtime: streamContent.mtime,
......@@ -80,8 +82,6 @@ export abstract class TextFileService implements ITextFileService {
});
}
protected abstract stringStreamToRawText(stream:IStringStream): TPromise<{rawText:IRawText; hash:string;}>;
public get onAutoSaveConfigurationChange(): Event<IAutoSaveConfiguration> {
return this._onAutoSaveConfigurationChange.event;
}
......
src/vs/workbench/parts/files/common/files.ts
浏览文件 @ f01feadf
......@@ -247,6 +247,7 @@ export enum AutoSaveMode {
export var ITextFileService = createDecorator<ITextFileService>(TEXT_FILE_SERVICE_ID);
export interface IRawTextContent extends IBaseStat {
/**
* The line grouped content of a text file.
*/
......
src/vs/workbench/parts/files/electron-browser/textFileServices.ts
浏览文件 @ f01feadf
......@@ -18,7 +18,7 @@ import {TextFileService as AbstractTextFileService} from 'vs/workbench/parts/fil
import {CACHE, TextFileEditorModel} from 'vs/workbench/parts/files/common/editors/textFileEditorModel';
import {ITextFileOperationResult, AutoSaveMode} from 'vs/workbench/parts/files/common/files';
import {IUntitledEditorService} from 'vs/workbench/services/untitled/common/untitledEditorService';
import {IFileService, IStringStream} from 'vs/platform/files/common/files';
import {IFileService} from 'vs/platform/files/common/files';
import {BinaryEditorModel} from 'vs/workbench/common/editor/binaryEditorModel';
import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation';
import {IWorkspaceContextService} from 'vs/workbench/services/workspace/common/contextService';
......@@ -30,7 +30,6 @@ import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/edito
import {IWindowService} from 'vs/workbench/services/window/electron-browser/windowService';
import {IEditorGroupService} from 'vs/workbench/services/group/common/groupService';
import {IModelService} from 'vs/editor/common/services/modelService';
import {ModelBuilder, ModelBuilderResult} from 'vs/editor/node/model/modelBuilder';
export class TextFileService extends AbstractTextFileService {
......@@ -47,9 +46,9 @@ export class TextFileService extends AbstractTextFileService {
@IWorkbenchEditorService editorService: IWorkbenchEditorService,
@IEditorGroupService editorGroupService: IEditorGroupService,
@IWindowService private windowService: IWindowService,
@IModelService private modelService: IModelService
@IModelService modelService: IModelService
) {
super(contextService, instantiationService, configurationService, telemetryService, editorService, editorGroupService, eventService, fileService);
super(contextService, instantiationService, configurationService, telemetryService, editorService, editorGroupService, eventService, fileService, modelService);
this.init();
}
......@@ -114,10 +113,6 @@ export class TextFileService extends AbstractTextFileService {
super.dispose();
}
protected stringStreamToRawText(stream:IStringStream): TPromise<ModelBuilderResult> {
return ModelBuilder.fromStringStream(stream, this.modelService.getCreationOptions());
}
public revertAll(resources?: URI[], force?: boolean): TPromise<ITextFileOperationResult> {
// Revert files
......
src/vs/workbench/services/files/node/fileService.ts
浏览文件 @ f01feadf
......@@ -11,7 +11,7 @@ import os = require('os');
import crypto = require('crypto');
import assert = require('assert');
import files = require('vs/platform/files/common/files');
import {IContent, IFileService, IResolveFileOptions, IResolveContentOptions, IFileStat, IStreamContent, IFileOperationResult, FileOperationResult, IBaseStat, IUpdateContentOptions, FileChangeType, EventType, IImportResult, MAX_FILE_SIZE} from 'vs/platform/files/common/files';
import strings = require('vs/base/common/strings');
import arrays = require('vs/base/common/arrays');
import baseMime = require('vs/base/common/mime');
......@@ -66,9 +66,9 @@ function etag(arg1: any, arg2?: any): string {
return '"' + crypto.createHash('sha1').update(String(size) + String(mtime)).digest('hex') + '"';
}
export class FileService implements files.IFileService {
export class FileService implements IFileService {
public serviceId = files.IFileService;
public serviceId = IFileService;
private static FS_EVENT_DELAY = 50; // aggregate and only emit events when changes have stopped for this duration (in ms)
private static MAX_DEGREE_OF_PARALLEL_FS_OPS = 10; // degree of parallel fs calls that we accept at the same time
......@@ -132,7 +132,7 @@ export class FileService implements files.IFileService {
this.workspaceWatcherToDispose = new UnixWatcherService(this.basePath, this.options.watcherIgnoredPatterns, this.eventEmitter, this.options.errorLogger, this.options.verboseLogging, this.options.debugBrkFileWatcherPort).startWatching();
}
public resolveFile(resource: uri, options?: files.IResolveFileOptions): TPromise<files.IFileStat> {
public resolveFile(resource: uri, options?: IResolveFileOptions): TPromise<IFileStat> {
return this.resolve(resource, options);
}
......@@ -140,26 +140,26 @@ export class FileService implements files.IFileService {
return this.resolveFile(resource).then(() => true, () => false);
}
public resolveContent(resource: uri, options?: files.IResolveContentOptions): TPromise<files.IContent> {
return this._resolveContent(resource, options, (resource, etag, enc) => this.resolveFileContent(resource, etag, enc));
public resolveContent(resource: uri, options?: IResolveContentOptions): TPromise<IContent> {
return this.doResolveContent(resource, options, (resource, etag, enc) => this.resolveFileContent(resource, etag, enc));
}
public resolveStreamContent(resource: uri, options?: files.IResolveContentOptions): TPromise<files.IStreamContent> {
return this._resolveContent(resource, options, (resource, etag, enc) => this.resolveFileStreamContent(resource, etag, enc));
public resolveStreamContent(resource: uri, options?: IResolveContentOptions): TPromise<IStreamContent> {
return this.doResolveContent(resource, options, (resource, etag, enc) => this.resolveFileStreamContent(resource, etag, enc));
}
private _resolveContent<T extends files.IBaseStat>(resource: uri, options: files.IResolveContentOptions, contentResolver:(resource: uri, etag?: string, enc?: string) => TPromise<T>): TPromise<T> {
private doResolveContent<T extends IBaseStat>(resource: uri, options: IResolveContentOptions, contentResolver: (resource: uri, etag?: string, enc?: string) => TPromise<T>): TPromise<T> {
let absolutePath = this.toAbsolutePath(resource);
// 1.) detect mimes
return nfcall(mime.detectMimesFromFile, absolutePath).then((detected: mime.IMimeAndEncoding):TPromise<T> => {
return nfcall(mime.detectMimesFromFile, absolutePath).then((detected: mime.IMimeAndEncoding): TPromise<T> => {
let isText = detected.mimes.indexOf(baseMime.MIME_BINARY) === -1;
// Return error early if client only accepts text and this is not text
if (options && options.acceptTextOnly && !isText) {
return TPromise.wrapError(<files.IFileOperationResult>{
return TPromise.wrapError(<IFileOperationResult>{
message: nls.localize('fileBinaryError', "File seems to be binary and cannot be opened as text"),
fileOperationResult: files.FileOperationResult.FILE_IS_BINARY
fileOperationResult: FileOperationResult.FILE_IS_BINARY
});
}
......@@ -191,7 +191,7 @@ export class FileService implements files.IFileService {
}, (error) => {
// bubble up existing file operation results
if (!types.isUndefinedOrNull((<files.IFileOperationResult>error).fileOperationResult)) {
if (!types.isUndefinedOrNull((<IFileOperationResult>error).fileOperationResult)) {
return TPromise.wrapError(error);
}
......@@ -200,18 +200,18 @@ export class FileService implements files.IFileService {
// Return if file not found
if (!exists) {
return TPromise.wrapError(<files.IFileOperationResult>{
return TPromise.wrapError(<IFileOperationResult>{
message: nls.localize('fileNotFoundError', "File not found ({0})", absolutePath),
fileOperationResult: files.FileOperationResult.FILE_NOT_FOUND
fileOperationResult: FileOperationResult.FILE_NOT_FOUND
});
}
// Otherwise check for file being a folder?
return pfs.stat(absolutePath).then((stat) => {
if (stat.isDirectory()) {
return TPromise.wrapError(<files.IFileOperationResult>{
return TPromise.wrapError(<IFileOperationResult>{
message: nls.localize('fileIsDirectoryError', "File is directory ({0})", absolutePath),
fileOperationResult: files.FileOperationResult.FILE_IS_DIRECTORY
fileOperationResult: FileOperationResult.FILE_IS_DIRECTORY
});
}
......@@ -222,10 +222,10 @@ export class FileService implements files.IFileService {
});
}
public resolveContents(resources: uri[]): TPromise<files.IContent[]> {
public resolveContents(resources: uri[]): TPromise<IContent[]> {
let limiter = new Limiter(FileService.MAX_DEGREE_OF_PARALLEL_FS_OPS);
let contentPromises = <TPromise<files.IContent>[]>[];
let contentPromises = <TPromise<IContent>[]>[];
resources.forEach((resource) => {
contentPromises.push(limiter.queue(() => this.resolveFileContent(resource).then((content) => content, (error) => TPromise.as(null /* ignore errors gracefully */))));
});
......@@ -235,7 +235,7 @@ export class FileService implements files.IFileService {
});
}
public updateContent(resource: uri, value: string, options: files.IUpdateContentOptions = Object.create(null)): TPromise<files.IFileStat> {
public updateContent(resource: uri, value: string, options: IUpdateContentOptions = Object.create(null)): TPromise<IFileStat> {
let absolutePath = this.toAbsolutePath(resource);
// 1.) check file
......@@ -292,11 +292,11 @@ export class FileService implements files.IFileService {
});
}
public createFile(resource: uri, content: string = ''): TPromise<files.IFileStat> {
public createFile(resource: uri, content: string = ''): TPromise<IFileStat> {
return this.updateContent(resource, content);
}
public createFolder(resource: uri): TPromise<files.IFileStat> {
public createFolder(resource: uri): TPromise<IFileStat> {
// 1.) create folder
let absolutePath = this.toAbsolutePath(resource);
......@@ -307,21 +307,21 @@ export class FileService implements files.IFileService {
});
}
public rename(resource: uri, newName: string): TPromise<files.IFileStat> {
public rename(resource: uri, newName: string): TPromise<IFileStat> {
let newPath = paths.join(paths.dirname(resource.fsPath), newName);
return this.moveFile(resource, uri.file(newPath));
}
public moveFile(source: uri, target: uri, overwrite?: boolean): TPromise<files.IFileStat> {
public moveFile(source: uri, target: uri, overwrite?: boolean): TPromise<IFileStat> {
return this.moveOrCopyFile(source, target, false, overwrite);
}
public copyFile(source: uri, target: uri, overwrite?: boolean): TPromise<files.IFileStat> {
public copyFile(source: uri, target: uri, overwrite?: boolean): TPromise<IFileStat> {
return this.moveOrCopyFile(source, target, true, overwrite);
}
private moveOrCopyFile(source: uri, target: uri, keepCopy: boolean, overwrite: boolean): TPromise<files.IFileStat> {
private moveOrCopyFile(source: uri, target: uri, keepCopy: boolean, overwrite: boolean): TPromise<IFileStat> {
let sourcePath = this.toAbsolutePath(source);
let targetPath = this.toAbsolutePath(target);
......@@ -342,8 +342,8 @@ export class FileService implements files.IFileService {
// Return early with conflict if target exists and we are not told to overwrite
if (exists && !isCaseRename && !overwrite) {
return TPromise.wrapError(<files.IFileOperationResult>{
fileOperationResult: files.FileOperationResult.FILE_MOVE_CONFLICT
return TPromise.wrapError(<IFileOperationResult>{
fileOperationResult: FileOperationResult.FILE_MOVE_CONFLICT
});
}
......@@ -375,7 +375,7 @@ export class FileService implements files.IFileService {
});
}
public importFile(source: uri, targetFolder: uri): TPromise<files.IImportResult> {
public importFile(source: uri, targetFolder: uri): TPromise<IImportResult> {
let sourcePath = this.toAbsolutePath(source);
let targetResource = uri.file(paths.join(targetFolder.fsPath, paths.basename(source.fsPath)));
let targetPath = this.toAbsolutePath(targetResource);
......@@ -390,7 +390,7 @@ export class FileService implements files.IFileService {
return this.doMoveOrCopyFile(sourcePath, targetPath, true, true).then((exists) => {
// 3.) resolve
return this.resolve(targetResource).then((stat) => <files.IImportResult>{ isNew: !exists, stat: stat });
return this.resolve(targetResource).then((stat) => <IImportResult>{ isNew: !exists, stat: stat });
});
});
}
......@@ -403,12 +403,12 @@ export class FileService implements files.IFileService {
// Helpers
private toAbsolutePath(arg1: uri | files.IFileStat): string {
private toAbsolutePath(arg1: uri | IFileStat): string {
let resource: uri;
if (arg1 instanceof uri) {
resource = <uri>arg1;
} else {
resource = (<files.IFileStat>arg1).resource;
resource = (<IFileStat>arg1).resource;
}
assert.ok(resource && resource.scheme === 'file', 'Invalid resource: ' + resource);
......@@ -416,7 +416,7 @@ export class FileService implements files.IFileService {
return paths.normalize(resource.fsPath);
}
private resolve(resource: uri, options: files.IResolveFileOptions = Object.create(null)): TPromise<files.IFileStat> {
private resolve(resource: uri, options: IResolveFileOptions = Object.create(null)): TPromise<IFileStat> {
return this.toStatResolver(resource)
.then(model => model.resolve(options));
}
......@@ -429,23 +429,22 @@ export class FileService implements files.IFileService {
});
}
private resolveFileStreamContent(resource: uri, etag?: string, enc?: string): TPromise<files.IStreamContent> {
private resolveFileStreamContent(resource: uri, etag?: string, enc?: string): TPromise<IStreamContent> {
let absolutePath = this.toAbsolutePath(resource);
// 1.) stat
return this.resolve(resource).then((model): TPromise<files.IStreamContent> => {
return this.resolve(resource).then((model): TPromise<IStreamContent> => {
// Return early if file not modified since
if (etag && etag === model.etag) {
return TPromise.wrapError(<files.IFileOperationResult>{
fileOperationResult: files.FileOperationResult.FILE_NOT_MODIFIED_SINCE
return TPromise.wrapError(<IFileOperationResult>{
fileOperationResult: FileOperationResult.FILE_NOT_MODIFIED_SINCE
});
}
// Return early if file is too large to load
if (types.isNumber(model.size) && model.size > files.MAX_FILE_SIZE) {
return TPromise.wrapError(<files.IFileOperationResult>{
fileOperationResult: files.FileOperationResult.FILE_TOO_LARGE
if (types.isNumber(model.size) && model.size > MAX_FILE_SIZE) {
return TPromise.wrapError(<IFileOperationResult>{
fileOperationResult: FileOperationResult.FILE_TOO_LARGE
});
}
......@@ -453,17 +452,17 @@ export class FileService implements files.IFileService {
const reader = fs.createReadStream(absolutePath).pipe(encoding.decodeStream(fileEncoding)); // decode takes care of stripping any BOMs from the file content
let content: files.IStreamContent = <any>model;
let content: IStreamContent = <any>model;
content.value = reader;
content.encoding = fileEncoding; // make sure to store the encoding in the model to restore it later when writing
return TPromise.as(content);
});
}
private resolveFileContent(resource: uri, etag?: string, enc?: string): TPromise<files.IContent> {
private resolveFileContent(resource: uri, etag?: string, enc?: string): TPromise<IContent> {
return this.resolveFileStreamContent(resource, etag, enc).then((streamContent) => {
// 2.) read contents
return new TPromise<files.IContent>((c, e) => {
return new TPromise<IContent>((c, e) => {
let done = false;
let chunks: string[] = [];
......@@ -479,7 +478,7 @@ export class FileService implements files.IFileService {
});
streamContent.value.on('end', () => {
let content: files.IContent = <any>streamContent;
let content: IContent = <any>streamContent;
content.value = chunks.join('');
if (!done) {
......@@ -526,7 +525,7 @@ export class FileService implements files.IFileService {
return null;
}
private checkFile(absolutePath: string, options: files.IUpdateContentOptions): TPromise<boolean /* exists */> {
private checkFile(absolutePath: string, options: IUpdateContentOptions): TPromise<boolean /* exists */> {
return pfs.exists(absolutePath).then((exists) => {
if (exists) {
return pfs.stat(absolutePath).then((stat: fs.Stats) => {
......@@ -539,9 +538,9 @@ export class FileService implements files.IFileService {
// Find out if content length has changed
if (options.etag !== etag(stat.size, options.mtime)) {
return TPromise.wrapError(<files.IFileOperationResult>{
return TPromise.wrapError(<IFileOperationResult>{
message: 'File Modified Since',
fileOperationResult: files.FileOperationResult.FILE_MODIFIED_SINCE
fileOperationResult: FileOperationResult.FILE_MODIFIED_SINCE
});
}
}
......@@ -551,9 +550,9 @@ export class FileService implements files.IFileService {
// Throw if file is readonly and we are not instructed to overwrite
if (readonly && !options.overwriteReadonly) {
return TPromise.wrapError(<files.IFileOperationResult>{
return TPromise.wrapError(<IFileOperationResult>{
message: nls.localize('fileReadOnlyError', "File is Read Only"),
fileOperationResult: files.FileOperationResult.FILE_READ_ONLY
fileOperationResult: FileOperationResult.FILE_READ_ONLY
});
}
......@@ -595,7 +594,7 @@ export class FileService implements files.IFileService {
// add to bucket of undelivered events
this.undeliveredRawFileChangesEvents.push({
type: files.FileChangeType.UPDATED,
type: FileChangeType.UPDATED,
path: fsPath
});
......@@ -608,7 +607,7 @@ export class FileService implements files.IFileService {
let normalizedEvents = normalize(buffer);
// Emit
this.eventEmitter.emit(files.EventType.FILE_CHANGES, toFileChangesEvent(normalizedEvents));
this.eventEmitter.emit(EventType.FILE_CHANGES, toFileChangesEvent(normalizedEvents));
return TPromise.as(null);
});
......@@ -666,10 +665,10 @@ export class StatResolver {
this.verboseLogging = verboseLogging;
}
public resolve(options: files.IResolveFileOptions): TPromise<files.IFileStat> {
public resolve(options: IResolveFileOptions): TPromise<IFileStat> {
// General Data
let fileStat: files.IFileStat = {
let fileStat: IFileStat = {
resource: this.resource,
isDirectory: this.isDirectory,
hasChildren: undefined,
......@@ -711,7 +710,7 @@ export class StatResolver {
}
}
private resolveChildren(absolutePath: string, absoluteTargetPaths: string[], resolveSingleChildDescendants: boolean, callback: (children: files.IFileStat[]) => void): void {
private resolveChildren(absolutePath: string, absoluteTargetPaths: string[], resolveSingleChildDescendants: boolean, callback: (children: IFileStat[]) => void): void {
extfs.readdir(absolutePath, (error: Error, files: string[]) => {
if (error) {
if (this.verboseLogging) {
......@@ -722,7 +721,7 @@ export class StatResolver {
}
// for each file in the folder
flow.parallel(files, (file: string, clb: (error: Error, children: files.IFileStat) => void) => {
flow.parallel(files, (file: string, clb: (error: Error, children: IFileStat) => void) => {
let fileResource = uri.file(paths.resolve(absolutePath, file));
let fileStat: fs.Stats;
let $this = this;
......@@ -753,7 +752,7 @@ export class StatResolver {
},
function resolve(childCount: number): void {
let childStat: files.IFileStat = {
let childStat: IFileStat = {
resource: fileResource,
isDirectory: fileStat.isDirectory(),
hasChildren: childCount > 0,
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或