diff --git a/src/vs/workbench/parts/files/common/files.ts b/src/vs/workbench/parts/files/common/files.ts index b9d0f9176900aba8439c9cf9653e5a67524b477e..a9e2408688195e440d1e7086f9e25502386650ff 100644 --- a/src/vs/workbench/parts/files/common/files.ts +++ b/src/vs/workbench/parts/files/common/files.ts @@ -45,7 +45,7 @@ export interface IExplorerService { readonly onDidChangeItem: Event; readonly onDidChangeEditable: Event; readonly onDidSelectItem: Event<{ item?: ExplorerItem, reveal?: boolean }>; - readonly onDidCopyItems: Event<{ items: ExplorerItem[], cut: boolean, previouslyCutItems: ExplorerItem[] }>; + readonly onDidCopyItems: Event<{ items: ExplorerItem[], cut: boolean, previouslyCutItems: ExplorerItem[] | undefined }>; setEditable(stat: ExplorerItem, data: IEditableData): void; getEditableData(stat: ExplorerItem): IEditableData | undefined; diff --git a/src/vs/workbench/parts/files/electron-browser/explorerService.ts b/src/vs/workbench/parts/files/electron-browser/explorerService.ts index ae302bff94bde115126ee6a25864214103d4db61..a439f87af54785cc85eb4aeb5f33c07871e17aa6 100644 --- a/src/vs/workbench/parts/files/electron-browser/explorerService.ts +++ b/src/vs/workbench/parts/files/electron-browser/explorerService.ts @@ -34,11 +34,11 @@ export class ExplorerService implements IExplorerService { private _onDidChangeItem = new Emitter(); private _onDidChangeEditable = new Emitter(); private _onDidSelectItem = new Emitter<{ item?: ExplorerItem, reveal?: boolean }>(); - private _onDidCopyItems = new Emitter<{ items: ExplorerItem[], cut: boolean, previouslyCutItems: ExplorerItem[] }>(); + private _onDidCopyItems = new Emitter<{ items: ExplorerItem[], cut: boolean, previouslyCutItems: ExplorerItem[] | undefined }>(); private disposables: IDisposable[] = []; private editableStats = new Map(); private _sortOrder: SortOrder; - private cutItems: ExplorerItem[]; + private cutItems: ExplorerItem[] | undefined; constructor( @IFileService private fileService: IFileService, @@ -68,7 +68,7 @@ export class ExplorerService implements IExplorerService { return this._onDidSelectItem.event; } - get onDidCopyItems(): Event<{ items: ExplorerItem[], cut: boolean, previouslyCutItems: ExplorerItem[] }> { + get onDidCopyItems(): Event<{ items: ExplorerItem[], cut: boolean, previouslyCutItems: ExplorerItem[] | undefined }> { return this._onDidCopyItems.event; } @@ -120,7 +120,7 @@ export class ExplorerService implements IExplorerService { } isCut(item: ExplorerItem): boolean { - return this.cutItems && this.cutItems.indexOf(item) >= 0; + return !!this.cutItems && this.cutItems.indexOf(item) >= 0; } getEditableData(stat: ExplorerItem): IEditableData | undefined {