@theia/filesystem 1.46.0-next.200 → 1.46.0-next.230

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@theia/filesystem",
-  "version": "1.46.0-next.200+44b4f27c6",
+  "version": "1.46.0-next.230+d79b7101a",
   "description": "Theia - FileSystem Extension",
   "dependencies": {
-    "@theia/core": "1.46.0-next.200+44b4f27c6",
+    "@theia/core": "1.46.0-next.230+d79b7101a",
     "@types/body-parser": "^1.17.0",
     "@types/multer": "^1.4.7",
     "@types/rimraf": "^2.0.2",
@@ -73,10 +73,10 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.49.0"
+    "@theia/ext-scripts": "1.50.0"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "44b4f27c63028c1bdc7dcd9b565d666428af6f97"
+  "gitHead": "d79b7101adef9db71e74c13744a3fde4f79a343c"
 }

package/src/browser/filesystem-frontend-contribution.ts

@@ -145,7 +145,7 @@ export class FileSystemFrontendContribution implements FrontendApplicationContri
         commands.registerCommand(FileSystemCommands.UPLOAD, {
             isEnabled: (...args: unknown[]) => {
                 const selection = this.getSelection(...args);
-                return !!selection && this.canUpload(selection);
+                return !!selection && !environment.electron.is();
             },
             isVisible: () => !environment.electron.is(),
             execute: (...args: unknown[]) => {
@@ -162,14 +162,10 @@ export class FileSystemFrontendContribution implements FrontendApplicationContri
         });
     }
 
-    protected canUpload({ fileStat }: FileSelection): boolean {
-        return !environment.electron.is() && fileStat.isDirectory;
-    }
-
     protected async upload(selection: FileSelection): Promise<FileUploadResult | undefined> {
         try {
             const source = TreeWidgetSelection.getSource(this.selectionService.selection);
-            const fileUploadResult = await this.uploadService.upload(selection.fileStat.resource);
+            const fileUploadResult = await this.uploadService.upload(selection.fileStat.isDirectory ? selection.fileStat.resource : selection.fileStat.resource.parent);
             if (ExpandableTreeNode.is(selection) && source) {
                 await source.model.expandNode(selection);
             }

package/src/browser/filesystem-frontend-module.ts

@@ -31,8 +31,8 @@ import { RemoteFileServiceContribution } from './remote-file-service-contributio
 import { FileSystemWatcherErrorHandler } from './filesystem-watcher-error-handler';
 import { FilepathBreadcrumbsContribution } from './breadcrumbs/filepath-breadcrumbs-contribution';
 import { BreadcrumbsFileTreeWidget, createFileTreeBreadcrumbsWidget } from './breadcrumbs/filepath-breadcrumbs-container';
-import { FilesystemSaveResourceService } from './filesystem-save-resource-service';
-import { SaveResourceService } from '@theia/core/lib/browser/save-resource-service';
+import { FilesystemSaveableService } from './filesystem-saveable-service';
+import { SaveableService } from '@theia/core/lib/browser/saveable-service';
 
 export default new ContainerModule((bind, unbind, isBound, rebind) => {
     bindFileSystemPreferences(bind);
@@ -65,8 +65,8 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     bind(FilepathBreadcrumbsContribution).toSelf().inSingletonScope();
     bind(BreadcrumbsContribution).toService(FilepathBreadcrumbsContribution);
 
-    bind(FilesystemSaveResourceService).toSelf().inSingletonScope();
-    rebind(SaveResourceService).toService(FilesystemSaveResourceService);
+    bind(FilesystemSaveableService).toSelf().inSingletonScope();
+    rebind(SaveableService).toService(FilesystemSaveableService);
 
     bind(FileTreeDecoratorAdapter).toSelf().inSingletonScope();
 });

package/src/browser/{filesystem-save-resource-service.ts → filesystem-saveable-service.ts}

@@ -14,20 +14,25 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { environment, nls } from '@theia/core';
+import { environment, MessageService, nls } from '@theia/core';
 import { inject, injectable } from '@theia/core/shared/inversify';
 import { Navigatable, Saveable, SaveableSource, SaveOptions, Widget, open, OpenerService, ConfirmDialog, FormatType, CommonCommands } from '@theia/core/lib/browser';
-import { SaveResourceService } from '@theia/core/lib/browser/save-resource-service';
+import { SaveableService } from '@theia/core/lib/browser/saveable-service';
 import URI from '@theia/core/lib/common/uri';
 import { FileService } from './file-service';
 import { FileDialogService } from './file-dialog';
 
 @injectable()
-export class FilesystemSaveResourceService extends SaveResourceService {
+export class FilesystemSaveableService extends SaveableService {
 
-    @inject(FileService) protected readonly fileService: FileService;
-    @inject(FileDialogService) protected readonly fileDialogService: FileDialogService;
-    @inject(OpenerService) protected readonly openerService: OpenerService;
+    @inject(MessageService)
+    protected readonly messageService: MessageService;
+    @inject(FileService)
+    protected readonly fileService: FileService;
+    @inject(FileDialogService)
+    protected readonly fileDialogService: FileDialogService;
+    @inject(OpenerService)
+    protected readonly openerService: OpenerService;
 
     /**
      * This method ensures a few things about `widget`:

package/src/common/files.ts

@@ -525,6 +525,7 @@ export interface WatchOptions {
 }
 
 export const enum FileSystemProviderCapabilities {
+    None = 0,
     FileReadWrite = 1 << 1,
     FileOpenReadWriteClose = 1 << 2,
     FileReadStream = 1 << 4,
@@ -774,7 +775,7 @@ export interface ReadOnlyMessageFileSystemProvider {
 export namespace ReadOnlyMessageFileSystemProvider {
     export function is(arg: unknown): arg is ReadOnlyMessageFileSystemProvider {
         return isObject<ReadOnlyMessageFileSystemProvider>(arg)
-        && 'readOnlyMessage' in arg;
+            && 'readOnlyMessage' in arg;
     }
 }
 

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

@@ -151,7 +151,7 @@ export class RemoteFileSystemProvider implements Required<FileSystemProvider>, D
         options: WatchOptions
     }>();
 
-    private _capabilities: FileSystemProviderCapabilities = 0;
+    private _capabilities: FileSystemProviderCapabilities = FileSystemProviderCapabilities.None;
     get capabilities(): FileSystemProviderCapabilities { return this._capabilities; }
 
     private _readOnlyMessage: MarkdownString | undefined = undefined;

package/lib/browser/filesystem-save-resource-service.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"filesystem-save-resource-service.d.ts","sourceRoot":"","sources":["../../src/browser/filesystem-save-resource-service.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,WAAW,EAAY,cAAc,EAAE,WAAW,EAAE,MAAM,EAAQ,aAAa,EAA6C,MAAM,yBAAyB,CAAC;AACrK,OAAO,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AACpF,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAElD,qBACa,6BAA8B,SAAQ,mBAAmB;IAE7C,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IACtC,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAC5D,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAEvE;;;;;OAKG;IACM,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,IAAI,MAAM,GAAG,cAAc,GAAG,WAAW;IAS/F;;OAEG;IACY,MAAM,CAAC,YAAY,EAAE,MAAM,GAAG,cAAc,GAAG,WAAW,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC;IAgC3H;;;;OAIG;YACW,WAAW;IAsBnB,gBAAgB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC;IAalD,OAAO,CAAC,UAAU;CAGrB"}

package/lib/browser/filesystem-save-resource-service.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"filesystem-save-resource-service.js","sourceRoot":"","sources":["../../src/browser/filesystem-save-resource-service.ts"],"names":[],"mappings":"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"}