@theia/filesystem 1.18.0-next.d3501165 → 1.19.0

package/src/browser/filesystem-preferences.ts

@@ -23,6 +23,7 @@ import {
     PreferenceContribution
 } from '@theia/core/lib/browser/preferences';
 import { SUPPORTED_ENCODINGS } from '@theia/core/lib/browser/supported-encodings';
+import { nls } from '@theia/core/lib/common/nls';
 
 // See https://github.com/Microsoft/vscode/issues/30180
 export const WIN32_MAX_FILE_SIZE_MB = 300; // 300 MB
@@ -38,7 +39,7 @@ export const filesystemPreferenceSchema: PreferenceSchema = {
     type: 'object',
     properties: {
         'files.watcherExclude': {
-            description: 'List of paths to exclude from the filesystem watcher',
+            description: nls.localize('vscode/files.contribution/watcherExclude', 'List of paths to exclude from the filesystem watcher'),
             additionalProperties: {
                 type: 'boolean'
             },
@@ -52,46 +53,60 @@ export const filesystemPreferenceSchema: PreferenceSchema = {
         'files.exclude': {
             type: 'object',
             default: { '**/.git': true, '**/.svn': true, '**/.hg': true, '**/CVS': true, '**/.DS_Store': true },
-            description: 'Configure glob patterns for excluding files and folders.',
+            description: nls.localize('vscode/files.contribution/exclude', 'Configure glob patterns for excluding files and folders.'),
             scope: 'resource'
         },
         'files.enableTrash': {
             type: 'boolean',
             default: true,
-            description: 'Moves files/folders to the OS trash (recycle bin on Windows) when deleting. Disabling this will delete files/folders permanently.'
+            description: nls.localize(
+                'vscode/files.contribution/useTrash',
+                'Moves files/folders to the OS trash (recycle bin on Windows) when deleting. Disabling this will delete files/folders permanently.'
+            )
         },
         'files.associations': {
             type: 'object',
-            description: 'Configure file associations to languages (e.g. \"*.extension\": \"html\"). \
-These have precedence over the default associations of the languages installed.'
+            description: nls.localize(
+                'vscode/files.contribution/associations',
+                'Configure file associations to languages (e.g. \"*.extension\": \"html\"). These have precedence over the default associations of the languages installed.'
+            )
         },
         'files.autoGuessEncoding': {
             type: 'boolean',
             default: false,
-            description: 'When enabled, the editor will attempt to guess the character set encoding when opening files. This setting can also be configured per language.',
+            description: nls.localize(
+                'vscode/files.contribution/autoGuessEncoding',
+                'When enabled, the editor will attempt to guess the character set encoding when opening files. This setting can also be configured per language.'
+            ),
             scope: 'language-overridable',
             included: Object.keys(SUPPORTED_ENCODINGS).length > 1
         },
         'files.participants.timeout': {
             type: 'number',
             default: 5000,
-            markdownDescription: 'Timeout in milliseconds after which file participants for create, rename, and delete are cancelled. Use `0` to disable participants.'
+            markdownDescription: nls.localize(
+                'vscode/mainThreadFileSystemEventService/files.participants.timeout',
+                'Timeout in milliseconds after which file participants for create, rename, and delete are cancelled. Use `0` to disable participants.'
+            )
         },
         'files.maxFileSizeMB': {
             type: 'number',
             default: MAX_FILE_SIZE_MB,
-            markdownDescription: 'Controls the max file size in MB which is possible to open.'
+            markdownDescription: nls.localize('theia/filesystem/maxFileSizeMB', 'Controls the max file size in MB which is possible to open.')
         },
         'files.trimTrailingWhitespace': {
             type: 'boolean',
             default: false,
-            description: 'When enabled, will trim trailing whitespace when saving a file.',
+            description: nls.localize('vscode/files.contribution/trimTrailingWhitespace', 'When enabled, will trim trailing whitespace when saving a file.'),
             scope: 'language-overridable'
         },
         'files.maxConcurrentUploads': {
             type: 'integer',
             default: 1,
-            description: 'Maximum number of concurrent files to upload when uploading multiple files. 0 means all files will be uploaded concurrently.',
+            description: nls.localize(
+                'theia/filesystem/maxConcurrentUploads',
+                'Maximum number of concurrent files to upload when uploading multiple files. 0 means all files will be uploaded concurrently.'
+            ),
         }
     }
 };

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

@@ -19,12 +19,12 @@ import { LocationService } from './location-service';
 import * as React from '@theia/core/shared/react';
 import * as ReactDOM from '@theia/core/shared/react-dom';
 import { FileService } from '../file-service';
-import { DisposableCollection, Emitter } from '@theia/core/lib/common';
+import { DisposableCollection, Emitter, Path } from '@theia/core/lib/common';
 import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
 import { FileDialogModel } from '../file-dialog/file-dialog-model';
 import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
 import { ReactRenderer } from '@theia/core/lib/browser/widgets/react-renderer';
-import { Path } from '@theia/core/lib/common';
+import { codicon } from '@theia/core/lib/browser';
 
 interface AutoSuggestDataEvent {
     parent: string;
@@ -179,7 +179,7 @@ export class LocationListRenderer extends ReactRenderer {
                     ? LocationListRenderer.Tooltips.TOGGLE_SELECT_INPUT
                     : LocationListRenderer.Tooltips.TOGGLE_TEXT_INPUT}
             >
-                <i className={this.doShowTextInput ? 'fa fa-folder-open' : 'fa fa-edit'} />
+                <i className={codicon(this.doShowTextInput ? 'folder-opened' : 'edit')} />
             </span>
         );
     }

package/src/browser/style/file-dialog.css

@@ -16,8 +16,8 @@
 
 :root {
     --theia-private-file-dialog-input-height: 21px;
-    --theia-private-location-list-panel-left: 82px;
-    --theia-private-location-list-panel-width: 417px;
+    --theia-private-location-list-panel-left: 92px;
+    --theia-private-location-list-panel-width: 407px;
     --theia-private-navigation-panel-icon-size: 21px;
     --theia-private-navigation-panel-line-height: 23px;
 }
@@ -64,30 +64,22 @@
 /*
  * Navigation panel items
  */
- 
-.dialogContent .theia-NavigationPanel span
- {
+
+.dialogContent .theia-NavigationPanel span {
     position: absolute;
-    top: 0px;
+    top: 2px;
     line-height: var(--theia-private-navigation-panel-line-height);
     cursor: pointer;
     width: var(--theia-private-navigation-panel-icon-size);
     text-align: center;
 }
 
-.dialogContent .theia-NavigationPanel span:not(.theia-mod-disabled) i.active 
-{
-    transform: scale(var(--theia-toolbar-active-transform-scale));
-}
-
-.dialogContent .theia-NavigationPanel span:focus 
-{
+.dialogContent .theia-NavigationPanel span:focus {
     outline: none;
     box-shadow: none;
 }
 
-.dialogContent .theia-NavigationPanel span:focus-visible
-{
+.dialogContent .theia-NavigationPanel span:focus-visible {
     outline-width: 1px;
     outline-style: solid;
     outline-offset: -1px;
@@ -95,14 +87,13 @@
     outline-color: var(--theia-focusBorder);
 }
 
-.dialogContent .theia-NavigationBack.theia-mod-disabled:focus,
-.dialogContent .theia-NavigationForward.theia-mod-disabled:focus,
-.dialogContent .theia-NavigationHome.theia-mod-disabled:focus,
-.dialogContent .theia-NavigationUp.theia-mod-disabled:focus
-{
-    outline: none;
-    border: none;
-    opacity: var(--theia-mod-disabled-opacity) !important;
+.dialogContent span.theia-mod-disabled {
+    pointer-events: none;
+    cursor: default;
+}
+
+.dialogContent span.theia-mod-disabled .action-item {
+    background: none;
 }
 
 .dialogContent .theia-NavigationBack {
@@ -110,15 +101,15 @@
 }
 
 .dialogContent .theia-NavigationForward {
-    left: 21px;
+    left: 23px;
 }
 
 .dialogContent .theia-NavigationHome {
-    left: 41px;
+    left: 45px;
 }
 
 .dialogContent .theia-NavigationUp {
-    left: 61px;
+    left: 67px;
 }
 
 .dialogContent .theia-LocationListPanel {

package/src/browser/style/file-icons.css

@@ -27,12 +27,23 @@
     font-size: calc(var(--theia-content-font-size) * 0.8);
 }
 
+.p-TabBar-tabIcon.theia-file-icons-js.file-icon {
+    padding-left: 1px !important;
+    padding-right: 3px !important;
+}
+
 .theia-file-icons-js.file-icon {
     min-width: var(--theia-icon-size);
-    height: var(--theia-icon-size);
     display: flex;
     justify-content: center;
     align-items: center;
+    padding-left: 2px;
+    padding-right: 4px;
+}
+
+.default-folder-icon,
+.default-file-icon {
+    padding-right: 6px;
 }
 
 .fa-file:before,

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

@@ -35,6 +35,7 @@ type DialogProperties = 'openFile' | 'openDirectory' | 'multiSelections' | 'show
 // and at packaging time, clients can decide whether they need the native or the browser-based
 // solution.
 //
+// eslint-disable-next-line @theia/runtime-import-check
 import { FileUri } from '@theia/core/lib/node/file-uri';
 
 @injectable()
@@ -91,13 +92,17 @@ export class ElectronFileDialogService extends DefaultFileDialogService {
     }
 
     protected async canRead(uris: MaybeArray<URI>): Promise<boolean> {
-        const inaccessibleFilePaths = await Promise.all((Array.isArray(uris) ? uris : [uris]).map(
-            async uri => (!await this.fileService.access(uri, FileAccess.Constants.R_OK) && uri.path || '')
-        ).filter(e => e));
-        if (inaccessibleFilePaths.length) {
-            this.messageService.error(`Cannot read ${inaccessibleFilePaths.length} resources: ${inaccessibleFilePaths.join(', ')}`);
+        const resources = Array.isArray(uris) ? uris : [uris];
+        const unreadableResourcePaths: string[] = [];
+        await Promise.all(resources.map(async resource => {
+            if (!await this.fileService.access(resource, FileAccess.Constants.R_OK)) {
+                unreadableResourcePaths.push(resource.path.toString());
+            }
+        }));
+        if (unreadableResourcePaths.length > 0) {
+            this.messageService.error(`Cannot read ${unreadableResourcePaths.length} resource(s): ${unreadableResourcePaths.join(', ')}`);
         }
-        return !!inaccessibleFilePaths.length;
+        return unreadableResourcePaths.length === 0;
     }
 
     protected toDialogOptions(uri: URI, props: SaveFileDialogProps | OpenFileDialogProps, dialogTitle: string): electron.FileDialogProps {

package/src/node/node-file-upload-service.ts

@@ -63,7 +63,7 @@ export class NodeFileUploadService implements BackendApplicationContribution {
         }
         try {
             const target = FileUri.fsPath(fields.uri);
-            await fs.move(request.file.path, target);
+            await fs.move(request.file.path, target, { overwrite: true });
             response.status(200).send(target); // ok
         } catch (error) {
             console.error(error);