@theia/filesystem 1.23.0-next.3 → 1.23.0-next.35

package/src/browser/file-dialog/file-dialog-tree-filters-renderer.tsx

@@ -64,7 +64,7 @@ export class FileDialogTreeFiltersRenderer extends ReactRenderer {
 
     protected readonly handleFilterChanged = (e: React.ChangeEvent<HTMLSelectElement>) => this.onFilterChanged(e);
 
-    protected doRender(): React.ReactNode {
+    protected override doRender(): React.ReactNode {
         if (!this.appliedFilters) {
             return undefined;
         }

package/src/browser/file-dialog/file-dialog-tree.ts

@@ -37,7 +37,7 @@ export class FileDialogTree extends FileTree {
         this.refresh();
     }
 
-    protected async toNodes(fileStat: FileStat, parent: CompositeTreeNode): Promise<TreeNode[]> {
+    protected override async toNodes(fileStat: FileStat, parent: CompositeTreeNode): Promise<TreeNode[]> {
         if (!fileStat.children) {
             return [];
         }

package/src/browser/file-dialog/file-dialog-widget.ts

@@ -28,8 +28,8 @@ export class FileDialogWidget extends FileTreeWidget {
     private _disableFileSelection: boolean = false;
 
     constructor(
-        @inject(TreeProps) readonly props: TreeProps,
-        @inject(FileDialogModel) readonly model: FileDialogModel,
+        @inject(TreeProps) props: TreeProps,
+        @inject(FileDialogModel) override readonly model: FileDialogModel,
         @inject(ContextMenuRenderer) contextMenuRenderer: ContextMenuRenderer
     ) {
         super(props, model, contextMenuRenderer);
@@ -41,7 +41,7 @@ export class FileDialogWidget extends FileTreeWidget {
         this.model.disableFileSelection = isSelectable;
     }
 
-    protected createNodeAttributes(node: TreeNode, props: NodeProps): React.Attributes & React.HTMLAttributes<HTMLElement> {
+    protected override createNodeAttributes(node: TreeNode, props: NodeProps): React.Attributes & React.HTMLAttributes<HTMLElement> {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const attr = super.createNodeAttributes(node, props) as any;
         if (this.shouldDisableSelection(node)) {
@@ -55,7 +55,7 @@ export class FileDialogWidget extends FileTreeWidget {
         return attr;
     }
 
-    protected createNodeClassNames(node: TreeNode, props: NodeProps): string[] {
+    protected override createNodeClassNames(node: TreeNode, props: NodeProps): string[] {
         const classNames = super.createNodeClassNames(node, props);
         if (this.shouldDisableSelection(node)) {
             [SELECTED_CLASS, FOCUS_CLASS].forEach(name => {

package/src/browser/file-dialog/file-dialog.ts

@@ -127,7 +127,7 @@ export abstract class FileDialog<T> extends AbstractDialog<T> {
     @inject(FileDialogTreeFiltersRendererFactory) readonly treeFiltersFactory: FileDialogTreeFiltersRendererFactory;
 
     constructor(
-        @inject(FileDialogProps) readonly props: FileDialogProps
+        @inject(FileDialogProps) override readonly props: FileDialogProps
     ) {
         super(props);
     }
@@ -177,7 +177,7 @@ export abstract class FileDialog<T> extends AbstractDialog<T> {
         return this.widget.model;
     }
 
-    protected onUpdateRequest(msg: Message): void {
+    protected override onUpdateRequest(msg: Message): void {
         super.onUpdateRequest(msg);
         setEnabled(this.back, this.model.canNavigateBackward());
         setEnabled(this.forward, this.model.canNavigateForward());
@@ -194,14 +194,14 @@ export abstract class FileDialog<T> extends AbstractDialog<T> {
         this.widget.update();
     }
 
-    protected handleEnter(event: KeyboardEvent): boolean | void {
+    protected override handleEnter(event: KeyboardEvent): boolean | void {
         if (event.target instanceof HTMLTextAreaElement || this.targetIsDirectoryInput(event.target) || this.targetIsInputToggle(event.target)) {
             return false;
         }
         this.accept();
     }
 
-    protected handleEscape(event: KeyboardEvent): boolean | void {
+    protected override handleEscape(event: KeyboardEvent): boolean | void {
         if (event.target instanceof HTMLTextAreaElement || this.targetIsDirectoryInput(event.target)) {
             return false;
         }
@@ -232,7 +232,7 @@ export abstract class FileDialog<T> extends AbstractDialog<T> {
         }
     }
 
-    protected onAfterAttach(msg: Message): void {
+    protected override onAfterAttach(msg: Message): void {
         Widget.attach(this.treePanel, this.contentNode);
         this.toDisposeOnDetach.push(Disposable.create(() => {
             Widget.detach(this.treePanel);
@@ -279,7 +279,7 @@ export abstract class FileDialog<T> extends AbstractDialog<T> {
 
     protected abstract getAcceptButtonLabel(): string;
 
-    protected onActivateRequest(msg: Message): void {
+    protected override onActivateRequest(msg: Message): void {
         this.widget.activate();
     }
 
@@ -288,12 +288,12 @@ export abstract class FileDialog<T> extends AbstractDialog<T> {
 @injectable()
 export class OpenFileDialog extends FileDialog<MaybeArray<FileStatNode>> {
 
-    constructor(@inject(OpenFileDialogProps) readonly props: OpenFileDialogProps) {
+    constructor(@inject(OpenFileDialogProps) override readonly props: OpenFileDialogProps) {
         super(props);
     }
 
     @postConstruct()
-    init(): void {
+    override init(): void {
         super.init();
         const { props } = this;
         if (props.canSelectFiles !== undefined) {
@@ -305,7 +305,7 @@ export class OpenFileDialog extends FileDialog<MaybeArray<FileStatNode>> {
         return this.props.openLabel ? this.props.openLabel : 'Open';
     }
 
-    protected isValid(value: MaybeArray<FileStatNode>): string {
+    protected override isValid(value: MaybeArray<FileStatNode>): string {
         if (value && !this.props.canSelectMany && value instanceof Array) {
             return 'You can select only one item';
         }
@@ -320,7 +320,7 @@ export class OpenFileDialog extends FileDialog<MaybeArray<FileStatNode>> {
         }
     }
 
-    protected async accept(): Promise<void> {
+    protected override async accept(): Promise<void> {
         const selection = this.value;
         if (!this.props.canSelectFolders
             && !Array.isArray(selection)
@@ -340,12 +340,12 @@ export class SaveFileDialog extends FileDialog<URI | undefined> {
     @inject(LabelProvider)
     protected readonly labelProvider: LabelProvider;
 
-    constructor(@inject(SaveFileDialogProps) readonly props: SaveFileDialogProps) {
+    constructor(@inject(SaveFileDialogProps) override readonly props: SaveFileDialogProps) {
         super(props);
     }
 
     @postConstruct()
-    init(): void {
+    override init(): void {
         super.init();
         const { widget } = this;
         widget.addClass(SAVE_DIALOG_CLASS);
@@ -355,7 +355,7 @@ export class SaveFileDialog extends FileDialog<URI | undefined> {
         return this.props.saveLabel ? this.props.saveLabel : 'Save';
     }
 
-    protected onUpdateRequest(msg: Message): void {
+    protected override onUpdateRequest(msg: Message): void {
         // Update file name field when changing a selection
         if (this.fileNameField) {
             if (this.widget.model.selectedFileStatNodes.length === 1) {
@@ -372,7 +372,7 @@ export class SaveFileDialog extends FileDialog<URI | undefined> {
         super.onUpdateRequest(msg);
     }
 
-    protected isValid(value: URI | undefined): string | boolean {
+    protected override isValid(value: URI | undefined): string | boolean {
         if (this.fileNameField && this.fileNameField.value) {
             return '';
         }
@@ -393,7 +393,7 @@ export class SaveFileDialog extends FileDialog<URI | undefined> {
         return undefined;
     }
 
-    protected onAfterAttach(msg: Message): void {
+    protected override onAfterAttach(msg: Message): void {
         super.onAfterAttach(msg);
 
         const fileNamePanel = document.createElement('div');

package/src/browser/file-selection.ts

@@ -28,8 +28,8 @@ export namespace FileSelection {
     export class CommandHandler extends SelectionCommandHandler<FileSelection> {
 
         constructor(
-            protected readonly selectionService: SelectionService,
-            protected readonly options: SelectionCommandHandler.Options<FileSelection>
+            protected override readonly selectionService: SelectionService,
+            protected override readonly options: SelectionCommandHandler.Options<FileSelection>
         ) {
             super(
                 selectionService,

package/src/browser/file-service.ts

@@ -253,7 +253,7 @@ export class TextFileOperationError extends FileOperationError {
     constructor(
         message: string,
         public textFileOperationResult: TextFileOperationResult,
-        public options?: ReadTextFileOptions & WriteTextFileOptions
+        override options?: ReadTextFileOptions & WriteTextFileOptions
     ) {
         super(message, FileOperationResult.FILE_OTHER_ERROR);
         Object.setPrototypeOf(this, TextFileOperationError.prototype);

package/src/browser/file-tree/file-tree-container.ts

@@ -15,24 +15,22 @@
  ********************************************************************************/
 
 import { interfaces, Container } from '@theia/core/shared/inversify';
-import { createTreeContainer, Tree, TreeImpl, TreeModel, TreeModelImpl, TreeWidget } from '@theia/core/lib/browser';
+import { CompressedExpansionService, CompressionToggle, createTreeContainer, TreeCompressionService, TreeContainerProps } from '@theia/core/lib/browser';
 import { FileTree } from './file-tree';
 import { FileTreeModel } from './file-tree-model';
 import { FileTreeWidget } from './file-tree-widget';
 
-export function createFileTreeContainer(parent: interfaces.Container): Container {
-    const child = createTreeContainer(parent);
+const fileTreeDefaults: Partial<TreeContainerProps> = {
+    tree: FileTree,
+    model: FileTreeModel,
+    widget: FileTreeWidget,
+    expansionService: CompressedExpansionService,
+};
 
-    child.unbind(TreeImpl);
-    child.bind(FileTree).toSelf();
-    child.rebind(Tree).toService(FileTree);
-
-    child.unbind(TreeModelImpl);
-    child.bind(FileTreeModel).toSelf();
-    child.rebind(TreeModel).toService(FileTreeModel);
-
-    child.unbind(TreeWidget);
-    child.bind(FileTreeWidget).toSelf();
+export function createFileTreeContainer(parent: interfaces.Container, overrides?: Partial<TreeContainerProps>): Container {
+    const child = createTreeContainer(parent, { ...fileTreeDefaults, ...overrides });
+    child.bind(CompressionToggle).toConstantValue({ compress: false });
+    child.bind(TreeCompressionService).toSelf().inSingletonScope();
 
     return child;
 }

package/src/browser/file-tree/file-tree-model.ts

@@ -16,7 +16,7 @@
 
 import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
 import URI from '@theia/core/lib/common/uri';
-import { CompositeTreeNode, TreeModelImpl, TreeNode, ConfirmDialog } from '@theia/core/lib/browser';
+import { CompositeTreeNode, TreeNode, ConfirmDialog, CompressedTreeModel } from '@theia/core/lib/browser';
 import { FileStatNode, DirNode, FileNode } from './file-tree';
 import { LocationService } from '../location';
 import { LabelProvider } from '@theia/core/lib/browser/label-provider';
@@ -27,7 +27,7 @@ import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
 import { FileSystemUtils } from '../../common';
 
 @injectable()
-export class FileTreeModel extends TreeModelImpl implements LocationService {
+export class FileTreeModel extends CompressedTreeModel implements LocationService {
 
     @inject(LabelProvider) protected readonly labelProvider: LabelProvider;
 
@@ -41,7 +41,7 @@ export class FileTreeModel extends TreeModelImpl implements LocationService {
     protected readonly environments: EnvVariablesServer;
 
     @postConstruct()
-    protected init(): void {
+    protected override init(): void {
         super.init();
         this.toDispose.push(this.fileService.onDidFilesChange(changes => this.onFilesChanged(changes)));
         this.toDispose.push(this.fileService.onDidRunOperation(event => this.onDidMove(event)));
@@ -142,7 +142,7 @@ export class FileTreeModel extends TreeModelImpl implements LocationService {
         const nodes = new Map<string, CompositeTreeNode>();
         for (const uri of uris) {
             for (const node of this.getNodesByUri(uri.parent)) {
-                if (DirNode.is(node) && node.expanded) {
+                if (DirNode.is(node) && (node.expanded || (this.compressionToggle.compress && this.compressionService.isCompressionParticipant(node)))) {
                     nodes.set(node.id, node);
                 }
             }
@@ -172,6 +172,7 @@ export class FileTreeModel extends TreeModelImpl implements LocationService {
         if (DirNode.is(target) && FileStatNode.is(source)) {
             const name = source.fileStat.name;
             const targetUri = target.uri.resolve(name);
+            if (source.uri.isEqual(targetUri)) { return; }
             try {
                 await this.fileService.move(source.uri, targetUri);
                 return targetUri;

package/src/browser/file-tree/file-tree-widget.tsx

@@ -20,7 +20,7 @@ import { DisposableCollection, Disposable } from '@theia/core/lib/common/disposa
 import URI from '@theia/core/lib/common/uri';
 import { UriSelection } from '@theia/core/lib/common/selection';
 import { isCancelled } from '@theia/core/lib/common/cancellation';
-import { ContextMenuRenderer, NodeProps, TreeProps, TreeNode, CompositeTreeNode, TreeViewWelcomeWidget } from '@theia/core/lib/browser';
+import { ContextMenuRenderer, NodeProps, TreeProps, TreeNode, CompositeTreeNode, CompressedTreeWidget, CompressedNodeProps } from '@theia/core/lib/browser';
 import { FileUploadService } from '../file-upload-service';
 import { DirNode, FileStatNode, FileStatNodeData } from './file-tree';
 import { FileTreeModel } from './file-tree-model';
@@ -33,7 +33,7 @@ export const DIR_NODE_CLASS = 'theia-DirNode';
 export const FILE_STAT_ICON_CLASS = 'theia-FileStatIcon';
 
 @injectable()
-export class FileTreeWidget extends TreeViewWelcomeWidget {
+export class FileTreeWidget extends CompressedTreeWidget {
 
     protected readonly toCancelNodeExpansion = new DisposableCollection();
 
@@ -44,8 +44,8 @@ export class FileTreeWidget extends TreeViewWelcomeWidget {
     protected readonly iconThemeService: IconThemeService;
 
     constructor(
-        @inject(TreeProps) readonly props: TreeProps,
-        @inject(FileTreeModel) readonly model: FileTreeModel,
+        @inject(TreeProps) props: TreeProps,
+        @inject(FileTreeModel) override readonly model: FileTreeModel,
         @inject(ContextMenuRenderer) contextMenuRenderer: ContextMenuRenderer
     ) {
         super(props, model, contextMenuRenderer);
@@ -53,7 +53,7 @@ export class FileTreeWidget extends TreeViewWelcomeWidget {
         this.toDispose.push(this.toCancelNodeExpansion);
     }
 
-    protected createNodeClassNames(node: TreeNode, props: NodeProps): string[] {
+    protected override createNodeClassNames(node: TreeNode, props: NodeProps): string[] {
         const classNames = super.createNodeClassNames(node, props);
         if (FileStatNode.is(node)) {
             classNames.push(FILE_STAT_NODE_CLASS);
@@ -64,7 +64,7 @@ export class FileTreeWidget extends TreeViewWelcomeWidget {
         return classNames;
     }
 
-    protected renderIcon(node: TreeNode, props: NodeProps): React.ReactNode {
+    protected override renderIcon(node: TreeNode, props: NodeProps): React.ReactNode {
         const icon = this.toNodeIcon(node);
         if (icon) {
             return <div className={icon + ' file-icon'}></div>;
@@ -73,7 +73,7 @@ export class FileTreeWidget extends TreeViewWelcomeWidget {
         return null;
     }
 
-    protected createContainerAttributes(): React.HTMLAttributes<HTMLElement> {
+    protected override createContainerAttributes(): React.HTMLAttributes<HTMLElement> {
         const attrs = super.createContainerAttributes();
         return {
             ...attrs,
@@ -84,25 +84,38 @@ export class FileTreeWidget extends TreeViewWelcomeWidget {
         };
     }
 
-    protected createNodeAttributes(node: TreeNode, props: NodeProps): React.Attributes & React.HTMLAttributes<HTMLElement> {
-        const elementAttrs = super.createNodeAttributes(node, props);
+    protected override createNodeAttributes(node: TreeNode, props: NodeProps): React.Attributes & React.HTMLAttributes<HTMLElement> {
         return {
-            ...elementAttrs,
-            draggable: FileStatNode.is(node),
-            onDragStart: event => this.handleDragStartEvent(node, event),
-            onDragEnter: event => this.handleDragEnterEvent(node, event),
-            onDragOver: event => this.handleDragOverEvent(node, event),
-            onDragLeave: event => this.handleDragLeaveEvent(node, event),
-            onDrop: event => this.handleDropEvent(node, event),
+            ...super.createNodeAttributes(node, props),
+            ...this.getNodeDragHandlers(node, props),
             title: this.getNodeTooltip(node)
         };
     }
 
     protected getNodeTooltip(node: TreeNode): string | undefined {
-        const uri = UriSelection.getUri(node);
+        const operativeNode = this.compressionService.getCompressionChain(node)?.tail() ?? node;
+        const uri = UriSelection.getUri(operativeNode);
         return uri ? uri.path.toString() : undefined;
     }
 
+    protected override getCaptionChildEventHandlers(node: TreeNode, props: CompressedNodeProps): React.Attributes & React.HtmlHTMLAttributes<HTMLElement> {
+        return {
+            ...super.getCaptionChildEventHandlers(node, props),
+            ...this.getNodeDragHandlers(node, props),
+        };
+    }
+
+    protected getNodeDragHandlers(node: TreeNode, props: CompressedNodeProps): React.Attributes & React.HtmlHTMLAttributes<HTMLElement> {
+        return {
+            onDragStart: event => this.handleDragStartEvent(node, event),
+            onDragEnter: event => this.handleDragEnterEvent(node, event),
+            onDragOver: event => this.handleDragOverEvent(node, event),
+            onDragLeave: event => this.handleDragLeaveEvent(node, event),
+            onDrop: event => this.handleDropEvent(node, event),
+            draggable: FileStatNode.is(node),
+        };
+    }
+
     protected handleDragStartEvent(node: TreeNode, event: React.DragEvent): void {
         event.stopPropagation();
         let selectedNodes;
@@ -221,7 +234,7 @@ export class FileTreeWidget extends TreeViewWelcomeWidget {
         return !!theme && !!theme.hidesExplorerArrows;
     }
 
-    protected renderExpansionToggle(node: TreeNode, props: NodeProps): React.ReactNode {
+    protected override renderExpansionToggle(node: TreeNode, props: NodeProps): React.ReactNode {
         if (this.hidesExplorerArrows) {
             // eslint-disable-next-line no-null/no-null
             return null;
@@ -229,7 +242,7 @@ export class FileTreeWidget extends TreeViewWelcomeWidget {
         return super.renderExpansionToggle(node, props);
     }
 
-    protected getPaddingLeft(node: TreeNode, props: NodeProps): number {
+    protected override getPaddingLeft(node: TreeNode, props: NodeProps): number {
         if (this.hidesExplorerArrows) {
             // additional left padding instead of top-level expansion toggle
             return super.getPaddingLeft(node, props) + this.props.leftPadding;
@@ -237,7 +250,7 @@ export class FileTreeWidget extends TreeViewWelcomeWidget {
         return super.getPaddingLeft(node, props);
     }
 
-    protected needsExpansionTogglePadding(node: TreeNode): boolean {
+    protected override needsExpansionTogglePadding(node: TreeNode): boolean {
         const theme = this.iconThemeService.getDefinition(this.iconThemeService.current);
         if (theme && (theme.hidesExplorerArrows || (theme.hasFileIcons && !theme.hasFolderIcons))) {
             return false;
@@ -245,7 +258,7 @@ export class FileTreeWidget extends TreeViewWelcomeWidget {
         return super.needsExpansionTogglePadding(node);
     }
 
-    protected deflateForStorage(node: TreeNode): object {
+    protected override deflateForStorage(node: TreeNode): object {
         const deflated = super.deflateForStorage(node);
         if (FileStatNode.is(node) && FileStatNodeData.is(deflated)) {
             deflated.uri = node.uri.toString();
@@ -256,7 +269,7 @@ export class FileTreeWidget extends TreeViewWelcomeWidget {
     }
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    protected inflateFromStorage(node: any, parent?: TreeNode): TreeNode {
+    protected override inflateFromStorage(node: any, parent?: TreeNode): TreeNode {
         if (FileStatNodeData.is(node)) {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             const fileStatNode: FileStatNode = node as any;

package/src/browser/file-tree/file-tree.ts

@@ -34,7 +34,7 @@ export class FileTree extends TreeImpl {
     @inject(MessageService)
     protected readonly messagingService: MessageService;
 
-    async resolveChildren(parent: CompositeTreeNode): Promise<TreeNode[]> {
+    override async resolveChildren(parent: CompositeTreeNode): Promise<TreeNode[]> {
         if (FileStatNode.is(parent)) {
             const fileStat = await this.resolveFileStat(parent);
             if (fileStat) {

package/src/browser/location/location-renderer.tsx

@@ -117,7 +117,7 @@ export class LocationListRenderer extends ReactRenderer {
         this.homeDir = (new URI(homeDirWithPrefix)).path.toString();
     }
 
-    render(): void {
+    override render(): void {
         ReactDOM.render(this.doRender(), this.host, this.doAfterRender);
     }
 
@@ -153,7 +153,7 @@ export class LocationListRenderer extends ReactRenderer {
     protected readonly handleTextInputOnBlur = () => this.toggleToSelectInput();
     protected readonly handleTextInputMouseDown = (e: React.MouseEvent<HTMLSpanElement>) => this.toggleToTextInputOnMouseDown(e);
 
-    protected doRender(): React.ReactElement {
+    protected override doRender(): React.ReactElement {
         return (
             <>
                 {this.renderInputIcon()}
@@ -372,7 +372,7 @@ export class LocationListRenderer extends ReactRenderer {
         return undefined;
     }
 
-    dispose(): void {
+    override dispose(): void {
         super.dispose();
         this.toDisposeOnNewCache.dispose();
     }

package/src/common/remote-file-system-provider.ts

@@ -82,7 +82,7 @@ export const RemoteFileSystemProviderError = ApplicationError.declare(-33005,
 export class RemoteFileSystemProxyFactory<T extends object> extends JsonRpcProxyFactory<T> {
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    protected serializeError(e: any): any {
+    protected override serializeError(e: any): any {
         if (e instanceof FileSystemProviderError) {
             const { code, name } = e;
             return super.serializeError(RemoteFileSystemProviderError(e.message, { code, name }, e.stack));
@@ -91,7 +91,7 @@ export class RemoteFileSystemProxyFactory<T extends object> extends JsonRpcProxy
     }
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    protected deserializeError(capturedError: Error, e: any): any {
+    protected override deserializeError(capturedError: Error, e: any): any {
         const error = super.deserializeError(capturedError, e);
         if (RemoteFileSystemProviderError.is(error)) {
             const fileOperationError = new FileSystemProviderError(error.message, error.data.code);

package/src/electron-browser/file-dialog/electron-file-dialog-service.ts

@@ -44,9 +44,9 @@ export class ElectronFileDialogService extends DefaultFileDialogService {
 
     @inject(MessageService) protected readonly messageService: MessageService;
 
-    async showOpenDialog(props: OpenFileDialogProps & { canSelectMany: true }, folder?: FileStat): Promise<MaybeArray<URI> | undefined>;
-    async showOpenDialog(props: OpenFileDialogProps, folder?: FileStat): Promise<URI | undefined>;
-    async showOpenDialog(props: OpenFileDialogProps, folder?: FileStat): Promise<MaybeArray<URI> | undefined> {
+    override async showOpenDialog(props: OpenFileDialogProps & { canSelectMany: true }, folder?: FileStat): Promise<MaybeArray<URI> | undefined>;
+    override async showOpenDialog(props: OpenFileDialogProps, folder?: FileStat): Promise<URI | undefined>;
+    override async showOpenDialog(props: OpenFileDialogProps, folder?: FileStat): Promise<MaybeArray<URI> | undefined> {
         const rootNode = await this.getRootNode(folder);
         if (rootNode) {
             const { filePaths } = await electronRemote.dialog.showOpenDialog(this.toOpenDialogOptions(rootNode.uri, props));
@@ -62,7 +62,7 @@ export class ElectronFileDialogService extends DefaultFileDialogService {
         return undefined;
     }
 
-    async showSaveDialog(props: SaveFileDialogProps, folder?: FileStat): Promise<URI | undefined> {
+    override async showSaveDialog(props: SaveFileDialogProps, folder?: FileStat): Promise<URI | undefined> {
         const rootNode = await this.getRootNode(folder);
         if (rootNode) {
             const { filePath } = await electronRemote.dialog.showSaveDialog(this.toSaveDialogOptions(rootNode.uri, props));

package/src/node/download/directory-archiver.spec.ts

@@ -45,7 +45,7 @@ describe('directory-archiver', () => {
         await archiver.archive(fromPath, path.join(toPath, 'output.tar'));
         expect(fs.existsSync(path.join(toPath, 'output.tar'))).to.be.true;
         const assertPath = track.mkdirSync('assertPath');
-        return new Promise(resolve => {
+        return new Promise<void>(resolve => {
             fs.createReadStream(path.join(toPath, 'output.tar')).pipe(extract(assertPath)).on('finish', () => {
                 expect(fs.readdirSync(assertPath).sort()).to.be.deep.equal(['A.txt', 'B.txt']);
                 expect(fs.readFileSync(path.join(assertPath, 'A.txt'), { encoding: 'utf8' })).to.be.equal(fs.readFileSync(path.join(fromPath, 'A.txt'), { encoding: 'utf8' }));

package/src/node/download/test/mock-directory-archiver.ts

@@ -23,7 +23,7 @@ export class MockDirectoryArchiver extends DirectoryArchiver {
         super();
     }
 
-    protected async isDir(uri: URI): Promise<boolean> {
+    protected override async isDir(uri: URI): Promise<boolean> {
         return !!this.folders && this.folders.map(u => u.toString()).indexOf(uri.toString()) !== -1;
     }