@theia/filesystem 1.77.0-next.1 → 1.77.0-next.108

package/src/browser/file-service-copy.spec.ts

@@ -0,0 +1,226 @@
+// *****************************************************************************
+// Copyright (C) 2026 Sahil Gupta and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { enableJSDOM } from '@theia/core/lib/browser/test/jsdom';
+let disableJSDOM = enableJSDOM();
+
+import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider';
+FrontendApplicationConfigProvider.set({});
+
+import { Disposable, URI } from '@theia/core';
+import { expect } from 'chai';
+import * as sinon from 'sinon';
+import { FileSystemProvider, FileSystemProviderCapabilities } from '../common/files.js';
+import { FileService } from './file-service.js';
+
+disableJSDOM();
+
+function createMockProvider(caseSensitive: boolean): FileSystemProvider {
+    return {
+        capabilities: caseSensitive ? FileSystemProviderCapabilities.PathCaseSensitive : 0,
+        onDidChangeCapabilities: () => Disposable.NULL,
+        onDidChangeFile: () => Disposable.NULL,
+        onFileWatchError: () => Disposable.NULL,
+        watch: () => Disposable.NULL,
+        stat: () => { throw new Error('not implemented'); },
+        readdir: () => { throw new Error('not implemented'); },
+        readFile: () => { throw new Error('not implemented'); },
+        writeFile: () => { throw new Error('not implemented'); },
+        delete: () => { throw new Error('not implemented'); },
+        mkdir: () => { throw new Error('not implemented'); },
+        rename: () => { throw new Error('not implemented'); },
+        copy: () => { throw new Error('not implemented'); },
+    } as unknown as FileSystemProvider;
+}
+
+/** Resolve to the rejection reason of the given promise, or to `undefined` if it fulfills. */
+async function rejection(promise: Promise<unknown>): Promise<Error | undefined> {
+    try {
+        await promise;
+        return undefined;
+    } catch (error) {
+        return error as Error;
+    }
+}
+
+describe('FileService move/copy validation', () => {
+    const sandbox = sinon.createSandbox();
+    let fileService: FileService;
+    let provider: FileSystemProvider;
+    let existsStub: sinon.SinonStub;
+
+    before(() => {
+        disableJSDOM = enableJSDOM();
+    });
+
+    after(() => {
+        disableJSDOM();
+    });
+
+    afterEach(() => {
+        sandbox.restore();
+    });
+
+    /** Create a `FileService` backed by a single mock provider for both source and target. */
+    function setup(caseSensitive: boolean = true): void {
+        sandbox.restore();
+        fileService = new FileService();
+        provider = createMockProvider(caseSensitive);
+        /* eslint-disable @typescript-eslint/no-explicit-any */
+        sandbox.stub(fileService as any, 'withProvider').resolves(provider);
+        sandbox.stub(fileService as any, 'withReadProvider').resolves(provider);
+        sandbox.stub(fileService as any, 'withWriteProvider').resolves(provider);
+        // The error messages name the involved resources through the label provider.
+        (fileService as any).labelProvider = { getLongName: (resource: URI) => resource.path.toString() };
+        /* eslint-enable @typescript-eslint/no-explicit-any */
+        // By default the target does not exist yet, which is the case when pasting a folder into one of its own subfolders.
+        existsStub = sandbox.stub(fileService, 'exists').resolves(false);
+    }
+
+    function validate(source: string, target: string, mode: 'move' | 'copy'): Promise<unknown> {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        return (fileService as any).doValidateMoveCopy(provider, new URI(source), provider, new URI(target), mode, false);
+    }
+
+    describe('source containing the target', () => {
+
+        it('should reject copying a folder into a subfolder of itself', async () => {
+            setup();
+            const error = await rejection(validate('file:///a', 'file:///a/b/a', 'copy'));
+            expect(error, 'copying a folder into its own subfolder was allowed').to.be.an.instanceOf(Error);
+            expect(error!.message).to.contain('is parent of target');
+        });
+
+        it('should reject moving a folder into a subfolder of itself', async () => {
+            setup();
+            const error = await rejection(validate('file:///a', 'file:///a/b', 'move'));
+            expect(error, 'moving a folder into its own subfolder was allowed').to.be.an.instanceOf(Error);
+            expect(error!.message).to.contain('is parent of target');
+        });
+
+        it('should reject a deeply nested target inside the source', async () => {
+            setup();
+            const error = await rejection(validate('file:///a', 'file:///a/b/c/d/a', 'copy'));
+            expect(error, 'copying a folder deep into its own subtree was allowed').to.be.an.instanceOf(Error);
+            expect(error!.message).to.contain('is parent of target');
+        });
+
+        it('should reject copying a folder into its own subfolder through FileService.copy', async () => {
+            setup();
+            const error = await rejection(fileService.copy(new URI('file:///a'), new URI('file:///a/b/a'), { fromUserGesture: false }));
+            expect(error, 'FileService.copy allowed a copy into the source subtree').to.be.an.instanceOf(Error);
+            expect(error!.message).to.contain('is parent of target');
+        });
+
+        it('should reject moving a folder into its own subfolder through FileService.move', async () => {
+            setup();
+            const error = await rejection(fileService.move(new URI('file:///a'), new URI('file:///a/b'), { fromUserGesture: false }));
+            expect(error, 'FileService.move allowed a move into the source subtree').to.be.an.instanceOf(Error);
+            expect(error!.message).to.contain('is parent of target');
+        });
+
+        it('should reject a target inside the source that only differs in case on a case-insensitive provider', async () => {
+            setup(false);
+            const error = await rejection(validate('file:///a', 'file:///A/b/a', 'copy'));
+            expect(error, 'a case-insensitive provider allowed a copy into the source subtree').to.be.an.instanceOf(Error);
+            expect(error!.message).to.contain('is parent of target');
+        });
+    });
+
+    describe('the same resource', () => {
+
+        it('should reject copying a resource onto itself', async () => {
+            setup();
+            const error = await rejection(validate('file:///a/b', 'file:///a/b', 'copy'));
+            expect(error, 'copying a resource onto itself was allowed').to.be.an.instanceOf(Error);
+            expect(error!.message).to.contain('is parent of target');
+        });
+
+        it('should reject moving a resource onto itself', async () => {
+            setup();
+            const error = await rejection(validate('file:///a/b', 'file:///a/b', 'move'));
+            expect(error, 'moving a resource onto itself was allowed').to.be.an.instanceOf(Error);
+            expect(error!.message).to.contain('is parent of target');
+        });
+    });
+
+    describe('unrelated and adjacent targets', () => {
+
+        it('should accept an unrelated target', async () => {
+            setup();
+            const result = await validate('file:///a', 'file:///c/a', 'copy');
+            expect(result).to.deep.equal({ exists: false, isSameResourceWithDifferentPathCase: false });
+        });
+
+        it('should accept a target whose path merely shares a prefix with the source', async () => {
+            setup();
+            const result = await validate('file:///a', 'file:///ab/a', 'copy');
+            expect(result).to.deep.equal({ exists: false, isSameResourceWithDifferentPathCase: false });
+        });
+
+        it('should accept a target in a different file system', async () => {
+            setup();
+            const result = await validate('file:///a', 'memory:///a/b/a', 'copy');
+            expect(result).to.deep.equal({ exists: false, isSameResourceWithDifferentPathCase: false });
+        });
+    });
+
+    describe('the target containing the source', () => {
+
+        it('should reject moving a resource onto the existing folder that contains it', async () => {
+            setup();
+            existsStub.resolves(true);
+            const error = await rejection(validate('file:///a/b', 'file:///a', 'move'));
+            expect(error, 'moving a resource onto its own parent folder was allowed').to.be.an.instanceOf(Error);
+            expect(error!.message).to.contain('would replace the folder it is contained in');
+        });
+    });
+
+    describe('case-only renames on a case-insensitive provider', () => {
+
+        it('should accept a case-only rename', async () => {
+            setup(false);
+            const result = await validate('file:///a/Foo', 'file:///a/foo', 'move');
+            expect(result).to.deep.equal({ exists: false, isSameResourceWithDifferentPathCase: true });
+        });
+
+        it('should accept a case-only rename of a nested resource', async () => {
+            setup(false);
+            const result = await validate('file:///a/b/Foo.ts', 'file:///a/b/foo.ts', 'move');
+            expect(result).to.deep.equal({ exists: false, isSameResourceWithDifferentPathCase: true });
+        });
+
+        it('should accept a case-only rename even when the target is reported as existing', async () => {
+            setup(false);
+            existsStub.resolves(true);
+            const result = await validate('file:///a/Foo', 'file:///a/foo', 'move');
+            expect(result).to.deep.equal({ exists: true, isSameResourceWithDifferentPathCase: true });
+        });
+
+        it('should reject a case-only copy', async () => {
+            setup(false);
+            const error = await rejection(validate('file:///a/Foo', 'file:///a/foo', 'copy'));
+            expect(error, 'a case-only copy was allowed').to.be.an.instanceOf(Error);
+            expect(error!.message).to.contain('is parent of target');
+        });
+
+        it('should accept a case-only rename on a case-sensitive provider as a distinct resource', async () => {
+            setup(true);
+            const result = await validate('file:///a/Foo', 'file:///a/foo', 'move');
+            expect(result).to.deep.equal({ exists: false, isSameResourceWithDifferentPathCase: false });
+        });
+    });
+});

package/src/browser/file-service-watcher.spec.ts

@@ -23,8 +23,8 @@ FrontendApplicationConfigProvider.set({});
 import { Disposable, Emitter, URI } from '@theia/core';
 import { expect } from 'chai';
 import * as sinon from 'sinon';
-import { FileChange, FileChangeType, FileSystemProvider, FileSystemProviderCapabilities, WatchOptions } from '../common/files';
-import { FileService } from './file-service';
+import { FileChange, FileChangeType, FileSystemProvider, FileSystemProviderCapabilities, WatchOptions } from '../common/files.js';
+import { FileService } from './file-service.js';
 
 disableJSDOM();
 

package/src/browser/file-service.ts

@@ -24,9 +24,9 @@
 // and https://github.com/microsoft/vscode/blob/04c36be045a94fee58e5f8992d3e3fd980294a84/src/vs/workbench/services/workingCopy/common/workingCopyFileOperationParticipant.ts
 
 /* eslint-disable max-len */
+/* eslint-disable @stylistic/brace-style, @stylistic/semi-spacing */
 /* eslint-disable @typescript-eslint/no-shadow */
 /* eslint-disable no-null/no-null */
-/* eslint-disable @typescript-eslint/tslint/config */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 import { injectable, inject, named, postConstruct } from '@theia/core/shared/inversify';
@@ -52,22 +52,22 @@ import {
     ResolveFileResult, ResolveFileResultWithMetadata,
     MoveFileOptions, CopyFileOptions, BaseStatWithMetadata, FileDeleteOptions, FileOperationOptions, hasAccessCapability, hasUpdateCapability,
     hasFileReadStreamCapability, FileSystemProviderWithFileReadStreamCapability, ReadOnlyMessageFileSystemProvider
-} from '../common/files';
+} from '../common/files.js';
 import { BinaryBuffer, BinaryBufferReadable, BinaryBufferReadableStream, BinaryBufferReadableBufferedStream, BinaryBufferWriteableStream } from '@theia/core/lib/common/buffer';
 import { ReadableStream, isReadableStream, isReadableBufferedStream, transform, consumeStream, peekStream, peekReadable, Readable } from '@theia/core/lib/common/stream';
 import { LabelProvider } from '@theia/core/lib/browser/label-provider';
-import { FileSystemPreferences } from '../common/filesystem-preferences';
+import { FileSystemPreferences } from '../common/filesystem-preferences.js';
 import { ProgressService } from '@theia/core/lib/common/progress-service';
-import { DelegatingFileSystemProvider } from '../common/delegating-file-system-provider';
+import { DelegatingFileSystemProvider } from '../common/delegating-file-system-provider.js';
 import type { TextDocumentContentChangeEvent } from '@theia/core/shared/vscode-languageserver-protocol';
 import { EncodingRegistry } from '@theia/core/lib/browser/encoding-registry';
 import { UTF8, UTF8_with_bom } from '@theia/core/lib/common/encodings';
 import { EncodingService, ResourceEncoding, DecodeStreamResult } from '@theia/core/lib/common/encoding-service';
 import { Minimatch } from 'minimatch';
 import { Mutable } from '@theia/core/lib/common/types';
-import { readFileIntoStream } from '../common/io';
-import { FileSystemWatcherErrorHandler } from './filesystem-watcher-error-handler';
-import { FileSystemUtils } from '../common/filesystem-utils';
+import { readFileIntoStream } from '../common/io.js';
+import { FileSystemWatcherErrorHandler } from './filesystem-watcher-error-handler.js';
+import { FileSystemUtils } from '../common/filesystem-utils.js';
 import { nls, ILogger } from '@theia/core';
 import { MarkdownString } from '@theia/core/lib/common/markdown-rendering';
 
@@ -201,7 +201,7 @@ export const FileServiceContribution = Symbol('FileServiceContribution');
  *         });
  *
  *     }
- *```
+ * ```
  */
 export interface FileServiceContribution {
     /**
@@ -409,6 +409,15 @@ export class FileService {
         if (!activation) {
             const deferredActivation = new Deferred<FileSystemProvider>();
             this.activations.set(scheme, activation = deferredActivation.promise);
+            // Resolve the activation as soon as a provider is registered for the scheme. Otherwise a
+            // slow or dangling `onWillActivateFileSystemProvider` listener whose `waitUntil` promise
+            // never settles would wedge this activation (and everything awaiting it) forever. See #17506.
+            const registration = this.onDidChangeFileSystemProviderRegistrations(event => {
+                if (event.added && event.scheme === scheme && event.provider) {
+                    deferredActivation.resolve(event.provider);
+                }
+            });
+            deferredActivation.promise.then(() => registration.dispose(), () => registration.dispose());
             WaitUntilEvent.fire(this.onWillActivateFileSystemProviderEmitter, { scheme }).then(() => {
                 provider = this.providers.get(scheme);
                 if (!provider) {
@@ -515,7 +524,7 @@ export class FileService {
      */
     resolve(resource: URI, options: ResolveMetadataFileOptions): Promise<FileStatWithMetadata>;
     resolve(resource: URI, options?: ResolveFileOptions | undefined): Promise<FileStat>;
-    async resolve(resource: any, options?: any) {
+    async resolve(resource: any, options?: any): Promise<FileStat> {
         try {
             return await this.doResolveFile(resource, options);
         } catch (error) {
@@ -1282,7 +1291,7 @@ export class FileService {
                 throw new Error(nls.localizeByDefault("Unable to move/copy when source '{0}' is parent of target '{1}'.", this.resourceForError(source), this.resourceForError(target)));
             }
 
-            if (!isSameResourceWithDifferentPathCase && target.isEqualOrParent(source, isPathCaseSensitive)) {
+            if (!isSameResourceWithDifferentPathCase && source.isEqualOrParent(target, isPathCaseSensitive)) {
                 throw new Error(nls.localizeByDefault("Unable to move/copy when source '{0}' is parent of target '{1}'.", this.resourceForError(source), this.resourceForError(target)));
             }
         }
@@ -1295,7 +1304,7 @@ export class FileService {
             // it as it would delete the source as well. In this case we have to throw
             if (sourceProvider === targetProvider) {
                 const isPathCaseSensitive = !!(sourceProvider.capabilities & FileSystemProviderCapabilities.PathCaseSensitive);
-                if (source.isEqualOrParent(target, isPathCaseSensitive)) {
+                if (target.isEqualOrParent(source, isPathCaseSensitive)) {
                     throw new Error(nls.localizeByDefault("Unable to move/copy '{0}' into '{1}' since a file would replace the folder it is contained in.", this.resourceForError(source), this.resourceForError(target)));
                 }
             }
@@ -2107,6 +2116,8 @@ export class FileService {
             }
         } else if (detectedEncoding) {
             preferredEncoding = detectedEncoding;
+        } else if (this.preferences.get('files.encoding', undefined, resource.toString()) === UTF8_with_bom) {
+            preferredEncoding = UTF8; // if we did not detect UTF 8 BOM before, this can only be UTF 8 then
         }
 
         return this.getEncodingForResource(resource, preferredEncoding);

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

@@ -16,9 +16,9 @@
 
 import { interfaces, Container } from '@theia/core/shared/inversify';
 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';
+import { FileTree } from './file-tree.js';
+import { FileTreeModel } from './file-tree-model.js';
+import { FileTreeWidget } from './file-tree-widget.js';
 
 const fileTreeDefaults: Partial<TreeContainerProps> = {
     tree: FileTree,

package/src/browser/file-tree/file-tree-decorator-adapter.spec.ts

@@ -24,7 +24,7 @@ import { CancellationToken, Emitter, Event } from '@theia/core/lib/common';
 import URI from '@theia/core/lib/common/uri';
 import { Container } from '@theia/core/shared/inversify';
 import { expect } from 'chai';
-import { FileTreeDecoratorAdapter } from './file-tree-decorator-adapter';
+import { FileTreeDecoratorAdapter } from './file-tree-decorator-adapter.js';
 
 disableJSDOM();
 

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

@@ -21,7 +21,7 @@ import { Decoration, DecorationsService } from '@theia/core/lib/browser/decorati
 import { TreeNode, TreeDecoration, TreeDecorator, Tree, TopDownTreeIterator } from '@theia/core/lib/browser';
 import { MaybePromise } from '@theia/core/lib/common/types';
 import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
-import { FileStatNode } from './file-tree';
+import { FileStatNode } from './file-tree.js';
 
 @injectable()
 export class FileTreeDecoratorAdapter implements TreeDecorator {

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

@@ -16,7 +16,7 @@
 
 import { injectable, inject } from '@theia/core/shared/inversify';
 import { LabelProviderContribution, DidChangeLabelEvent, LabelProvider } from '@theia/core/lib/browser/label-provider';
-import { FileStatNode } from './file-tree';
+import { FileStatNode } from './file-tree.js';
 import { TreeLabelProvider } from '@theia/core/lib/browser/tree/tree-label-provider';
 
 @injectable()

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

@@ -17,14 +17,14 @@
 import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
 import URI from '@theia/core/lib/common/uri';
 import { CompositeTreeNode, TreeNode, ConfirmDialog, CompressedTreeModel, Dialog } from '@theia/core/lib/browser';
-import { FileStatNode, DirNode, FileNode } from './file-tree';
-import { LocationService } from '../location';
+import { FileStatNode, DirNode, FileNode } from './file-tree.js';
+import { LocationService } from '../location/index.js';
 import { LabelProvider } from '@theia/core/lib/browser/label-provider';
-import { FileService } from '../file-service';
-import { FileOperationError, FileOperationResult, FileChangesEvent, FileChangeType, FileChange } from '../../common/files';
+import { FileService } from '../file-service.js';
+import { FileOperationError, FileOperationResult, FileChangesEvent, FileChangeType, FileChange } from '../../common/files.js';
 import { MessageService } from '@theia/core/lib/common/message-service';
 import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
-import { FileSystemUtils } from '../../common';
+import { FileSystemUtils } from '../../common/index.js';
 import { nls } from '@theia/core';
 
 @injectable()
@@ -133,12 +133,15 @@ export class FileTreeModel extends CompressedTreeModel implements LocationServic
         return nodes;
     }
 
-    async copy(source: URI, target: Readonly<FileStatNode>): Promise<URI> {
+    async copy(source: URI, target: Readonly<FileStatNode>): Promise<URI | undefined> {
         /** If the target is a file or if the target is a directory, but is the same as the source, use the parent of the target as a destination. */
         const parentNode = (target.fileStat.isFile || target.uri.isEqual(source)) ? target.parent : target;
         if (!FileStatNode.is(parentNode)) {
             throw new Error('Parent of file has to be a FileStatNode');
         }
+        if (source.isEqualOrParent(parentNode.uri)) {
+            return undefined;
+        }
         let targetUri = parentNode.uri.resolve(source.path.base);
         try {
             const parent = await this.fileService.resolve(parentNode.uri);
@@ -156,6 +159,9 @@ export class FileTreeModel extends CompressedTreeModel implements LocationServic
      */
     async move(source: TreeNode, target: TreeNode): Promise<URI | undefined> {
         if (DirNode.is(target) && FileStatNode.is(source)) {
+            if (source.uri.isEqualOrParent(target.uri)) {
+                return undefined;
+            }
             const name = source.fileStat.name;
             const targetUri = target.uri.resolve(name);
             if (source.uri.isEqual(targetUri)) { return; }

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

@@ -21,13 +21,13 @@ 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, CompressedTreeWidget, CompressedNodeProps } from '@theia/core/lib/browser';
-import { DirNode, FileStatNode, FileStatNodeData } from './file-tree';
-import { FileTreeModel } from './file-tree-model';
+import { DirNode, FileStatNode, FileStatNodeData } from './file-tree.js';
+import { FileTreeModel } from './file-tree-model.js';
 import { IconThemeService } from '@theia/core/lib/browser/icon-theme-service';
 import { ApplicationShell } from '@theia/core/lib/browser/shell';
-import { FileStat, FileType } from '../../common/files';
+import { FileStat, FileType } from '../../common/files.js';
 import { isOSX, ILogger } from '@theia/core';
-import { FileUploadService } from '../../common/upload/file-upload';
+import { FileUploadService } from '../../common/upload/file-upload.js';
 
 export const FILE_TREE_CLASS = 'theia-FileTree';
 export const FILE_STAT_NODE_CLASS = 'theia-FileStatNode';
@@ -98,7 +98,10 @@ export class FileTreeWidget extends CompressedTreeWidget {
     }
 
     protected getNodeTooltip(node: TreeNode): string | undefined {
-        const operativeNode = this.compressionService.getCompressionChain(node)?.tail() ?? node;
+        const operativeNode = this.compressionToggle.compress
+            ? this.compressionService.getCompressionChain(node)?.tail() ?? node
+            : node;
+
         const uri = UriSelection.getUri(operativeNode);
         return uri ? uri.path.fsPath() : undefined;
     }

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

@@ -18,11 +18,11 @@ import { injectable, inject } from '@theia/core/shared/inversify';
 import URI from '@theia/core/lib/common/uri';
 import { isObject, Mutable } from '@theia/core/lib/common';
 import { TreeNode, CompositeTreeNode, SelectableTreeNode, ExpandableTreeNode, TreeImpl } from '@theia/core/lib/browser';
-import { FileStat, Stat, FileType, FileOperationError, FileOperationResult } from '../../common/files';
+import { FileStat, Stat, FileType, FileOperationError, FileOperationResult } from '../../common/files.js';
 import { UriSelection } from '@theia/core/lib/common/selection';
 import { MessageService } from '@theia/core/lib/common/message-service';
-import { FileSelection } from '../file-selection';
-import { FileService } from '../file-service';
+import { FileSelection } from '../file-selection.js';
+import { FileService } from '../file-service.js';
 
 @injectable()
 export class FileTree extends TreeImpl {

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

@@ -14,9 +14,9 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-export * from './file-tree';
-export * from './file-tree-model';
-export * from './file-tree-widget';
-export * from './file-tree-container';
-export * from './file-tree-decorator-adapter';
-export * from './file-tree-label-provider';
+export * from './file-tree.js';
+export * from './file-tree-model.js';
+export * from './file-tree-widget.js';
+export * from './file-tree-container.js';
+export * from './file-tree-decorator-adapter.js';
+export * from './file-tree-label-provider.js';

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

@@ -37,12 +37,12 @@ import URI from '@theia/core/lib/common/uri';
 import { environment } from '@theia/core/shared/@theia/application-package/lib/environment';
 import { inject, injectable, named } from '@theia/core/shared/inversify';
 import { UserWorkingDirectoryProvider } from '@theia/core/lib/browser/user-working-directory-provider';
-import { FileChangeType, FileChangesEvent, FileOperation } from '../common/files';
-import { FileDialogService, SaveFileDialogProps } from './file-dialog';
-import { FileSelection } from './file-selection';
-import { FileService, UserFileOperationEvent } from './file-service';
-import { FileSystemPreferences } from '../common/filesystem-preferences';
-import { FileUploadService } from '../common/upload/file-upload';
+import { FileChangeType, FileChangesEvent, FileOperation } from '../common/files.js';
+import { FileDialogService, SaveFileDialogProps } from './file-dialog/index.js';
+import { FileSelection } from './file-selection.js';
+import { FileService, UserFileOperationEvent } from './file-service.js';
+import { FileSystemPreferences } from '../common/filesystem-preferences.js';
+import { FileUploadService } from '../common/upload/file-upload.js';
 
 export namespace FileSystemCommands {
 

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

@@ -19,22 +19,22 @@ import '../../src/browser/style/index.css';
 import { ContainerModule, interfaces } from '@theia/core/shared/inversify';
 import { ResourceResolver, CommandContribution } from '@theia/core/lib/common';
 import { WebSocketConnectionProvider, FrontendApplicationContribution, LabelProviderContribution, BreadcrumbsContribution } from '@theia/core/lib/browser';
-import { FileResourceResolver } from './file-resource';
-import { bindFileSystemPreferences } from '../common/filesystem-preferences';
-import { FileSystemFrontendContribution } from './filesystem-frontend-contribution';
-import { FileTreeDecoratorAdapter, FileTreeLabelProvider } from './file-tree';
-import { FileService, FileServiceContribution } from './file-service';
-import { RemoteFileSystemProvider, RemoteFileSystemServer, remoteFileSystemPath, RemoteFileSystemProxyFactory } from '../common/remote-file-system-provider';
+import { FileResourceResolver } from './file-resource.js';
+import { bindFileSystemPreferences } from '../common/filesystem-preferences.js';
+import { FileSystemFrontendContribution } from './filesystem-frontend-contribution.js';
+import { FileTreeDecoratorAdapter, FileTreeLabelProvider } from './file-tree/index.js';
+import { FileService, FileServiceContribution } from './file-service.js';
+import { RemoteFileSystemProvider, RemoteFileSystemServer, remoteFileSystemPath, RemoteFileSystemProxyFactory } from '../common/remote-file-system-provider.js';
 import { bindRootContributionProvider } from '@theia/core/lib/common/contribution-provider';
-import { RemoteFileServiceContribution } from './remote-file-service-contribution';
-import { FileSystemWatcherErrorHandler } from './filesystem-watcher-error-handler';
-import { FilepathBreadcrumbsContribution } from './breadcrumbs/filepath-breadcrumbs-contribution';
-import { BreadcrumbsFileTreeWidget, createFileTreeBreadcrumbsWidget } from './breadcrumbs/filepath-breadcrumbs-container';
-import { FilesystemSaveableService } from './filesystem-saveable-service';
+import { RemoteFileServiceContribution } from './remote-file-service-contribution.js';
+import { FileSystemWatcherErrorHandler } from './filesystem-watcher-error-handler.js';
+import { FilepathBreadcrumbsContribution } from './breadcrumbs/filepath-breadcrumbs-contribution.js';
+import { BreadcrumbsFileTreeWidget, createFileTreeBreadcrumbsWidget } from './breadcrumbs/filepath-breadcrumbs-container.js';
+import { FilesystemSaveableService } from './filesystem-saveable-service.js';
 import { SaveableService } from '@theia/core/lib/browser/saveable-service';
-import { VSCodeFileServiceContribution, VSCodeFileSystemProvider } from './vscode-file-service-contribution';
-import { FileUploadService } from '../common/upload/file-upload';
-import { FileUploadServiceImpl } from './upload/file-upload-service-impl';
+import { VSCodeFileServiceContribution, VSCodeFileSystemProvider } from './vscode-file-service-contribution.js';
+import { FileUploadService } from '../common/upload/file-upload.js';
+import { FileUploadServiceImpl } from './upload/file-upload-service-impl.js';
 
 export default new ContainerModule((bind, unbind, isBound, rebind) => {
     bindFileSystemPreferences(bind);

package/src/browser/filesystem-saveable-service.ts

@@ -19,8 +19,8 @@ import { inject, injectable, named } from '@theia/core/shared/inversify';
 import { Navigatable, Saveable, SaveableSource, SaveOptions, Widget, open, OpenerService, ConfirmDialog, CommonCommands, LabelProvider } from '@theia/core/lib/browser';
 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';
+import { FileService } from './file-service.js';
+import { FileDialogService } from './file-dialog/index.js';
 import { BinaryBuffer } from '@theia/core/lib/common/buffer';
 
 @injectable()

package/src/browser/index.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-export * from './location';
-export * from './file-tree';
-export * from './file-dialog';
-export * from './file-resource';
+export * from './location/index.js';
+export * from './file-tree/index.js';
+export * from './file-dialog/index.js';
+export * from './file-resource.js';

package/src/browser/location/index.ts

@@ -14,5 +14,5 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-export * from './location-service';
-export * from './location-renderer';
+export * from './location-service.js';
+export * from './location-renderer.js';

package/src/browser/location/location-renderer.spec.ts

@@ -20,9 +20,9 @@ let disableJSDOM = enableJSDOM();
 import URI from '@theia/core/lib/common/uri';
 import { expect } from 'chai';
 import * as React from '@theia/core/shared/react';
-import type { FileDialogModel } from '../file-dialog/file-dialog-model';
-import { LocationListRenderer } from './location-renderer';
-import type { LocationService } from './location-service';
+import type { FileDialogModel } from '../file-dialog/file-dialog-model.js';
+import { LocationListRenderer } from './location-renderer.js';
+import type { LocationService } from './location-service.js';
 
 disableJSDOM();
 

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

@@ -15,12 +15,12 @@
 // *****************************************************************************
 
 import URI from '@theia/core/lib/common/uri';
-import { LocationService } from './location-service';
+import { LocationService } from './location-service.js';
 import * as React from '@theia/core/shared/react';
-import { FileService } from '../file-service';
+import { FileService } from '../file-service.js';
 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 { FileDialogModel } from '../file-dialog/file-dialog-model.js';
 import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
 import { ReactRenderer } from '@theia/core/lib/browser/widgets/react-renderer';
 import { codicon } from '@theia/core/lib/browser';

package/src/browser/remote-file-service-contribution.ts

@@ -15,8 +15,8 @@
 // *****************************************************************************
 
 import { inject, injectable } from '@theia/core/shared/inversify';
-import { FileServiceContribution, FileService } from './file-service';
-import { RemoteFileSystemProvider } from '../common/remote-file-system-provider';
+import { FileServiceContribution, FileService } from './file-service.js';
+import { RemoteFileSystemProvider } from '../common/remote-file-system-provider.js';
 
 @injectable()
 export class RemoteFileServiceContribution implements FileServiceContribution {