@theia/filesystem 1.26.0-next.43 → 1.26.0-next.44

package/lib/common/filesystem.d.ts

@@ -1,170 +1,3 @@
-import { TextDocumentContentChangeEvent } from '@theia/core/shared/vscode-languageserver-protocol';
-import { ApplicationError } from '@theia/core/lib/common';
-/**
- * @deprecated since 1.4.0 - in order to support VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908), use `FileService` instead
- */
-export declare const FileSystem: unique symbol;
-export interface FileSystem {
-    /**
-     * Returns the file stat for the given URI.
-     *
-     * If the uri points to a folder it will contain one level of unresolved children.
-     *
-     * `undefined` if a file for the given URI does not exist.
-     *
-     * @deprecated since 1.4.0 - in order to support VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908), use `FileService.resolve` instead
-     */
-    getFileStat(uri: string): Promise<FileStat | undefined>;
-    /**
-     * Finds out if a file identified by the resource exists.
-     *
-     * @deprecated since 1.4.0 - in order to support VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908), use `FileService.exists` instead
-     */
-    exists(uri: string): Promise<boolean>;
-    /**
-     * Resolve the contents of a file identified by the resource.
-     *
-     * @deprecated since 1.4.0 - in order to support VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908), use `FileService.read` instead
-     */
-    resolveContent(uri: string, options?: {
-        encoding?: string;
-    }): Promise<{
-        stat: FileStat;
-        content: string;
-    }>;
-    /**
-     * Updates the content replacing its previous value.
-     *
-     * @deprecated since 1.4.0 - in order to support VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908), use `FileService.write` instead
-     */
-    setContent(file: FileStat, content: string, options?: {
-        encoding?: string;
-    }): Promise<FileStat>;
-    /**
-     * Updates the content replacing its previous value.
-     *
-     * The optional parameter `overwriteEncoding` can be used to transform the encoding of a file.
-     *
-     * |   | encoding | overwriteEncoding | behaviour |
-     * |---|----------|-------------------|-----------|
-     * | 1 | undefined |    undefined     | read & write file in default encoding |
-     * | 2 | undefined |        ✓         | read file in default encoding; write file in `overwriteEncoding` |
-     * | 3 |     ✓    |     undefined     | read & write file in `encoding` |
-     * | 4 |     ✓    |        ✓         | read file in `encoding`; write file in `overwriteEncoding` |
-     *
-     * @deprecated since 1.4.0 - in order to support VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908), use `FileService.write` instead
-     */
-    updateContent(file: FileStat, contentChanges: TextDocumentContentChangeEvent[], options?: {
-        encoding?: string;
-        overwriteEncoding?: string;
-    }): Promise<FileStat>;
-    /**
-     * Moves the file to a new path identified by the resource.
-     *
-     * The optional parameter overwrite can be set to replace an existing file at the location.
-     *
-     * |           | missing | file | empty dir |    dir    |
-     * |-----------|---------|------|-----------|-----------|
-     * | missing   |    x    |   x  |     x     |     x     |
-     * | file      |    ✓    |   x  |     x     |     x     |
-     * | empty dir |    ✓    |   x  |     x     | overwrite |
-     * | dir       |    ✓    |   x  | overwrite | overwrite |
-     *
-     * @deprecated since 1.4.0 - in order to support VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908), use `FileService.move` instead
-     */
-    move(sourceUri: string, targetUri: string, options?: FileMoveOptions): Promise<FileStat>;
-    /**
-     * Copies the file to a path identified by the resource.
-     *
-     * The optional parameter overwrite can be set to replace an existing file at the location.
-     *
-     * @deprecated since 1.4.0 - in order to support VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908), use `FileService.copy` instead
-     */
-    copy(sourceUri: string, targetUri: string, options?: {
-        overwrite?: boolean;
-        recursive?: boolean;
-    }): Promise<FileStat>;
-    /**
-     * Creates a new file with the given path. The returned promise
-     * will have the stat model object as a result.
-     *
-     * The optional parameter content can be used as value to fill into the new file.
-     *
-     * @deprecated since 1.4.0 - in order to support VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908), use `FileService.create` instead
-     */
-    createFile(uri: string, options?: {
-        content?: string;
-        encoding?: string;
-    }): Promise<FileStat>;
-    /**
-     * Creates a new folder with the given path. The returned promise
-     * will have the stat model object as a result.
-     *
-     * @deprecated since 1.4.0 - in order to support VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908), use `FileService.createFolder` instead
-     */
-    createFolder(uri: string): Promise<FileStat>;
-    /**
-     * Creates a new empty file if the given path does not exist and otherwise
-     * will set the mtime and atime of the file to the current date.
-     */
-    touchFile(uri: string): Promise<FileStat>;
-    /**
-     * Deletes the provided file. The optional moveToTrash parameter allows to
-     * move the file to trash.
-     *
-     * @deprecated since 1.4.0 - in order to support VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908), use `FileService.delete` instead
-     */
-    delete(uri: string, options?: FileDeleteOptions): Promise<void>;
-    /**
-     * Returns the encoding of the given file resource.
-     *
-     * @deprecated since 1.4.0 - in order to support VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908) use `FileService.read` without `autoGuessEncoding` option instead
-     */
-    getEncoding(uri: string): Promise<string>;
-    /**
-     * Guess encoding of a given file based on its content.
-     *
-     * @deprecated since 1.4.0 - in order to support VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908), use `FileService.read` with `autoGuessEncoding` option instead
-     */
-    guessEncoding(uri: string): Promise<string | undefined>;
-    /**
-     * Return list of available roots.
-     */
-    getRoots(): Promise<FileStat[]>;
-    /**
-     * Returns a promise that resolves to a file stat representing the current user's home directory.
-     *
-     * @deprecated since 1.4.0 - in order to support VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908), use `EnvVariablesServer.getHomeDirUri` instead
-     */
-    getCurrentUserHome(): Promise<FileStat | undefined>;
-    /**
-     * Resolves to an array of URIs pointing to the available drives on the filesystem.
-     *
-     * @deprecated since 1.4.0 - in order to support VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908), use `EnvVariablesServer.getDrives` instead
-     */
-    getDrives(): Promise<string[]>;
-    /**
-     * Tests a user's permissions for the file or directory specified by URI.
-     * The mode argument is an optional integer that specifies the accessibility checks to be performed.
-     * Check `FileAccess.Constants` for possible values of mode.
-     * It is possible to create a mask consisting of the bitwise `OR` of two or more values (e.g. FileAccess.Constants.W_OK | FileAccess.Constants.R_OK).
-     * If `mode` is not defined, `FileAccess.Constants.F_OK` will be used instead.
-     *
-     * @deprecated since 1.4.0 - in order to support VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908), use `FileService.access` instead
-     */
-    access(uri: string, mode?: number): Promise<boolean>;
-    /**
-     * Returns the path of the given file URI, specific to the backend's operating system.
-     * If the URI is not a file URI, undefined is returned.
-     *
-     * USE WITH CAUTION: You should always prefer URIs to paths if possible, as they are
-     * portable and platform independent. Paths should only be used in cases you directly
-     * interact with the OS, e.g. when running a command on the shell.
-     *
-     * @deprecated since 1.4.0 - in order to support VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908), use `FileService.fsPath` instead
-     */
-    getFsPath(uri: string): Promise<string | undefined>;
-}
 export declare namespace FileAccess {
     namespace Constants {
         /**
@@ -187,63 +20,4 @@ export declare namespace FileAccess {
         const X_OK: number;
     }
 }
-export interface FileMoveOptions {
-    overwrite?: boolean;
-}
-export interface FileDeleteOptions {
-    moveToTrash?: boolean;
-}
-/**
- * A file resource with meta information.
- *
- * @deprecated since 1.4.0 - in order to support VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908), use `FileStat` from `@theia/filesystem/lib/common/files` instead
- */
-export interface FileStat {
-    /**
-     * The URI of the file.
-     */
-    uri: string;
-    /**
-     * The last modification of this file.
-     */
-    lastModification: number;
-    /**
-     * `true` if the resource is a directory. Otherwise, `false`.
-     */
-    isDirectory: boolean;
-    /**
-     * The children of the file stat.
-     * If it is `undefined` and `isDirectory` is `true`, then this file stat is unresolved.
-     */
-    children?: FileStat[];
-    /**
-     * The size of the file if known.
-     */
-    size?: number;
-}
-export declare namespace FileStat {
-    function is(candidate: Object | undefined): candidate is FileStat;
-    function equals(one: object | undefined, other: object | undefined): boolean;
-}
-/**
- * @deprecated since 1.4.0 - in order to support VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908), use `FileOperationError` instead
- */
-export declare namespace FileSystemError {
-    const FileNotFound: ApplicationError.Constructor<-33000, {
-        uri: string;
-    }>;
-    const FileExists: ApplicationError.Constructor<-33001, {
-        uri: string;
-    }>;
-    const FileIsDirectory: ApplicationError.Constructor<-33002, {
-        uri: string;
-    }>;
-    const FileNotDirectory: ApplicationError.Constructor<-33003, {
-        uri: string;
-    }>;
-    const FileIsOutOfSync: ApplicationError.Constructor<-33004, {
-        file: FileStat;
-        stat: FileStat;
-    }>;
-}
 //# sourceMappingURL=filesystem.d.ts.map

package/lib/common/filesystem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filesystem.d.ts","sourceRoot":"","sources":["../../src/common/filesystem.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"filesystem.d.ts","sourceRoot":"","sources":["../../src/common/filesystem.ts"],"names":[],"mappings":"AAgBA,yBAAiB,UAAU,CAAC;IAExB,UAAiB,SAAS,CAAC;QAEvB;;;WAGG;QACI,MAAM,IAAI,EAAE,MAAU,CAAC;QAE9B;;WAEG;QACI,MAAM,IAAI,EAAE,MAAU,CAAC;QAE9B;;WAEG;QACI,MAAM,IAAI,EAAE,MAAU,CAAC;QAE9B;;;WAGG;QACI,MAAM,IAAI,EAAE,MAAU,CAAC;KACjC;CACJ"}

package/lib/common/filesystem.js

@@ -15,12 +15,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 // *****************************************************************************
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FileSystemError = exports.FileStat = exports.FileAccess = exports.FileSystem = void 0;
-const common_1 = require("@theia/core/lib/common");
-/**
- * @deprecated since 1.4.0 - in order to support VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908), use `FileService` instead
- */
-exports.FileSystem = Symbol('FileSystem');
+exports.FileAccess = void 0;
 var FileAccess;
 (function (FileAccess) {
     let Constants;
@@ -45,46 +40,4 @@ var FileAccess;
         Constants.X_OK = 1;
     })(Constants = FileAccess.Constants || (FileAccess.Constants = {}));
 })(FileAccess = exports.FileAccess || (exports.FileAccess = {}));
-var FileStat;
-(function (FileStat) {
-    function is(candidate) {
-        return typeof candidate === 'object' && ('uri' in candidate) && ('lastModification' in candidate) && ('isDirectory' in candidate);
-    }
-    FileStat.is = is;
-    function equals(one, other) {
-        if (!one || !other || !is(one) || !is(other)) {
-            return false;
-        }
-        return one.uri === other.uri
-            && one.lastModification === other.lastModification
-            && one.isDirectory === other.isDirectory;
-    }
-    FileStat.equals = equals;
-})(FileStat = exports.FileStat || (exports.FileStat = {}));
-/**
- * @deprecated since 1.4.0 - in order to support VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908), use `FileOperationError` instead
- */
-var FileSystemError;
-(function (FileSystemError) {
-    FileSystemError.FileNotFound = common_1.ApplicationError.declare(-33000, (uri, prefix) => ({
-        message: `${prefix ? prefix + ' ' : ''}'${uri}' has not been found.`,
-        data: { uri }
-    }));
-    FileSystemError.FileExists = common_1.ApplicationError.declare(-33001, (uri, prefix) => ({
-        message: `${prefix ? prefix + ' ' : ''}'${uri}' already exists.`,
-        data: { uri }
-    }));
-    FileSystemError.FileIsDirectory = common_1.ApplicationError.declare(-33002, (uri, prefix) => ({
-        message: `${prefix ? prefix + ' ' : ''}'${uri}' is a directory.`,
-        data: { uri }
-    }));
-    FileSystemError.FileNotDirectory = common_1.ApplicationError.declare(-33003, (uri, prefix) => ({
-        message: `${prefix ? prefix + ' ' : ''}'${uri}' is not a directory.`,
-        data: { uri }
-    }));
-    FileSystemError.FileIsOutOfSync = common_1.ApplicationError.declare(-33004, (file, stat) => ({
-        message: `'${file.uri}' is out of sync.`,
-        data: { file, stat }
-    }));
-})(FileSystemError = exports.FileSystemError || (exports.FileSystemError = {}));
 //# sourceMappingURL=filesystem.js.map

package/lib/common/filesystem.js.map

@@ -1 +1 @@
-{"version":3,"file":"filesystem.js","sourceRoot":"","sources":["../../src/common/filesystem.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"filesystem.js","sourceRoot":"","sources":["../../src/common/filesystem.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;AAEhF,IAAiB,UAAU,CA0B1B;AA1BD,WAAiB,UAAU;IAEvB,IAAiB,SAAS,CAuBzB;IAvBD,WAAiB,SAAS;QAEtB;;;WAGG;QACU,cAAI,GAAW,CAAC,CAAC;QAE9B;;WAEG;QACU,cAAI,GAAW,CAAC,CAAC;QAE9B;;WAEG;QACU,cAAI,GAAW,CAAC,CAAC;QAE9B;;;WAGG;QACU,cAAI,GAAW,CAAC,CAAC;IAClC,CAAC,EAvBgB,SAAS,GAAT,oBAAS,KAAT,oBAAS,QAuBzB;AACL,CAAC,EA1BgB,UAAU,GAAV,kBAAU,KAAV,kBAAU,QA0B1B"}

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@theia/filesystem",
-  "version": "1.26.0-next.43+9a10b6b5daa",
+  "version": "1.26.0-next.44+4099a4ec58f",
   "description": "Theia - FileSystem Extension",
   "dependencies": {
-    "@theia/core": "1.26.0-next.43+9a10b6b5daa",
+    "@theia/core": "1.26.0-next.44+4099a4ec58f",
     "@types/body-parser": "^1.17.0",
     "@types/multer": "^1.4.7",
     "@types/rimraf": "^2.0.2",
@@ -68,5 +68,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "9a10b6b5daab5e046f28fde8803b3612e84f6ff4"
+  "gitHead": "4099a4ec58f8573a36b32514d37b7d8541db7030"
 }

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

@@ -280,7 +280,7 @@ export class FileTreeWidget extends CompressedTreeWidget {
             if (node.fileStat) {
                 stat = {
                     type: node.fileStat.isDirectory ? FileType.Directory : FileType.File,
-                    mtime: node.fileStat.lastModification,
+                    mtime: node.fileStat.mtime,
                     size: node.fileStat.size
                 };
                 delete node['fileStat'];

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

@@ -19,7 +19,6 @@ import URI from '@theia/core/lib/common/uri';
 import { TreeNode, CompositeTreeNode, SelectableTreeNode, ExpandableTreeNode, TreeImpl } from '@theia/core/lib/browser';
 import { Mutable } from '@theia/core/lib/common/types';
 import { FileStat, Stat, FileType, FileOperationError, FileOperationResult } from '../../common/files';
-import { FileStat as DeprecatedFileStat } from '../../common/filesystem';
 import { UriSelection } from '@theia/core/lib/common/selection';
 import { MessageService } from '@theia/core/lib/common/message-service';
 import { FileSelection } from '../file-selection';
@@ -117,7 +116,7 @@ export namespace FileStatNode {
 export type FileStatNodeData = Omit<FileStatNode, 'uri' | 'fileStat'> & {
     uri: string
     stat?: Stat | { type: FileType } & Partial<Stat>
-    fileStat?: DeprecatedFileStat
+    fileStat?: FileStat
 };
 export namespace FileStatNodeData {
     export function is(node: object | undefined): node is FileStatNodeData {

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

@@ -21,21 +21,14 @@ 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 './filesystem-preferences';
-import { FileSystemWatcher } from './filesystem-watcher';
 import { FileSystemFrontendContribution } from './filesystem-frontend-contribution';
 import { FileUploadService } from './file-upload-service';
 import { FileTreeDecoratorAdapter, FileTreeLabelProvider } from './file-tree';
 import { FileService, FileServiceContribution } from './file-service';
 import { RemoteFileSystemProvider, RemoteFileSystemServer, remoteFileSystemPath, RemoteFileSystemProxyFactory } from '../common/remote-file-system-provider';
-import { FileSystem, FileStat, FileMoveOptions, FileDeleteOptions, FileSystemError } from '../common/filesystem';
-import URI from '@theia/core/lib/common/uri';
-import { FileOperationError, FileOperationResult, BaseStatWithMetadata, FileStatWithMetadata, etag } from '../common/files';
-import { TextDocumentContentChangeEvent } from '@theia/core/shared/vscode-languageserver-protocol';
-import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
 import { bindContributionProvider } from '@theia/core/lib/common/contribution-provider';
 import { RemoteFileServiceContribution } from './remote-file-service-contribution';
 import { FileSystemWatcherErrorHandler } from './filesystem-watcher-error-handler';
-import { UTF8 } from '@theia/core/lib/common/encodings';
 import { FilepathBreadcrumbsContribution } from './breadcrumbs/filepath-breadcrumbs-contribution';
 import { BreadcrumbsFileTreeWidget, createFileTreeBreadcrumbsWidget } from './breadcrumbs/filepath-breadcrumbs-container';
 import { FilesystemSaveResourceService } from './filesystem-save-resource-service';
@@ -54,163 +47,8 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     bind(RemoteFileServiceContribution).toSelf().inSingletonScope();
     bind(FileServiceContribution).toService(RemoteFileServiceContribution);
 
-    bind(FileSystemWatcher).toSelf().inSingletonScope();
     bind(FileSystemWatcherErrorHandler).toSelf().inSingletonScope();
 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    bind(FileSystem).toDynamicValue(({ container }) => {
-        const fileService = container.get(FileService);
-        const environments = container.get<EnvVariablesServer>(EnvVariablesServer);
-        const convertStat: (stat: BaseStatWithMetadata | FileStatWithMetadata) => FileStat = stat => ({
-            uri: stat.resource.toString(),
-            lastModification: stat.mtime,
-            size: stat.size,
-            isDirectory: 'isDirectory' in stat && stat.isDirectory,
-            children: 'children' in stat ? stat.children?.map(convertStat) : undefined
-        });
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const rethrowError: (uri: string, error: any) => never = (uri, error) => {
-            if (error instanceof FileOperationError) {
-                if (error.fileOperationResult === FileOperationResult.FILE_NOT_FOUND) {
-                    throw FileSystemError.FileNotFound(uri);
-                }
-                if (error.fileOperationResult === FileOperationResult.FILE_IS_DIRECTORY) {
-                    throw FileSystemError.FileIsDirectory(uri);
-                }
-                if (error.fileOperationResult === FileOperationResult.FILE_NOT_DIRECTORY) {
-                    throw FileSystemError.FileNotDirectory(uri);
-                }
-                if (error.fileOperationResult === FileOperationResult.FILE_MODIFIED_SINCE) {
-                    throw FileSystemError.FileIsOutOfSync(uri);
-                }
-            }
-            throw error;
-        };
-        return new class implements FileSystem {
-            async getFileStat(uri: string): Promise<FileStat | undefined> {
-                try {
-                    const stat = await fileService.resolve(new URI(uri), { resolveMetadata: true });
-                    return convertStat(stat);
-                } catch (e) {
-                    if (e instanceof FileOperationError && e.fileOperationResult === FileOperationResult.FILE_NOT_FOUND) {
-                        return undefined;
-                    }
-                    rethrowError(uri, e);
-                }
-            }
-            exists(uri: string): Promise<boolean> {
-                return fileService.exists(new URI(uri));
-            }
-            async resolveContent(uri: string, options?: { encoding?: string | undefined; } | undefined): Promise<{ stat: FileStat; content: string; }> {
-                try {
-                    const content = await fileService.read(new URI(uri), options);
-                    return {
-                        stat: convertStat(content),
-                        content: content.value
-                    };
-                } catch (e) {
-                    rethrowError(uri, e);
-                }
-            }
-            async setContent(file: FileStat, content: string, options?: { encoding?: string | undefined; } | undefined): Promise<FileStat> {
-                try {
-                    const result = await fileService.write(new URI(file.uri), content, {
-                        ...options,
-                        mtime: file.lastModification
-                    });
-                    return convertStat(result);
-                } catch (e) {
-                    rethrowError(file.uri, e);
-                }
-            }
-            async updateContent(file: FileStat, contentChanges: TextDocumentContentChangeEvent[], options?: {
-                encoding?: string | undefined;
-                overwriteEncoding?: string | undefined;
-            } | undefined): Promise<FileStat> {
-                try {
-                    const result = await fileService.update(new URI(file.uri), contentChanges, {
-                        mtime: file.lastModification,
-                        etag: etag({ size: file.size, mtime: file.lastModification }),
-                        readEncoding: options?.encoding || UTF8,
-                        encoding: options?.overwriteEncoding,
-                        overwriteEncoding: !!options?.overwriteEncoding
-                    });
-                    return convertStat(result);
-                } catch (e) {
-                    rethrowError(file.uri, e);
-                }
-            }
-            async move(sourceUri: string, targetUri: string, options?: FileMoveOptions | undefined): Promise<FileStat> {
-                try {
-                    const result = await fileService.move(new URI(sourceUri), new URI(targetUri), options);
-                    return convertStat(result);
-                } catch (e) {
-                    rethrowError(sourceUri, e);
-                }
-            }
-            async copy(sourceUri: string, targetUri: string, options?: { overwrite?: boolean | undefined; recursive?: boolean | undefined; } | undefined): Promise<FileStat> {
-                try {
-                    const result = await fileService.copy(new URI(sourceUri), new URI(targetUri), options);
-                    return convertStat(result);
-                } catch (e) {
-                    rethrowError(sourceUri, e);
-                }
-            }
-            async createFile(uri: string, options?: { content?: string | undefined; encoding?: string | undefined; } | undefined): Promise<FileStat> {
-                try {
-                    const result = await fileService.create(new URI(uri), options?.content, { encoding: options?.encoding });
-                    return convertStat(result);
-                } catch (e) {
-                    rethrowError(uri, e);
-                }
-            }
-            async createFolder(uri: string): Promise<FileStat> {
-                try {
-                    const result = await fileService.createFolder(new URI(uri));
-                    return convertStat(result);
-                } catch (e) {
-                    rethrowError(uri, e);
-                }
-            }
-            touchFile(uri: string): Promise<FileStat> {
-                throw new Error('Method not implemented.');
-            }
-            async delete(uri: string, options?: FileDeleteOptions | undefined): Promise<void> {
-                try {
-                    return await fileService.delete(new URI(uri), { useTrash: options?.moveToTrash, recursive: true });
-                } catch (e) {
-                    rethrowError(uri, e);
-                }
-            }
-            async getEncoding(uri: string): Promise<string> {
-                const { encoding } = await fileService.read(new URI(uri));
-                return encoding;
-            }
-            async guessEncoding(uri: string): Promise<string | undefined> {
-                const { encoding } = await fileService.read(new URI(uri), { autoGuessEncoding: true });
-                return encoding;
-            }
-            async getRoots(): Promise<FileStat[]> {
-                const drives = await environments.getDrives();
-                const roots = await Promise.all(drives.map(uri => this.getFileStat(uri)));
-                return roots.filter(root => !!root) as FileStat[];
-            }
-            async getCurrentUserHome(): Promise<FileStat | undefined> {
-                return this.getFileStat(await environments.getHomeDirUri());
-            }
-            getDrives(): Promise<string[]> {
-                return environments.getDrives();
-            }
-            access(uri: string, mode?: number | undefined): Promise<boolean> {
-                return fileService.access(new URI(uri), mode);
-            }
-            getFsPath(uri: string): Promise<string | undefined> {
-                return fileService.fsPath(new URI(uri));
-            }
-
-        };
-    }).inSingletonScope();
-
     bindFileResource(bind);
 
     bind(FileUploadService).toSelf().inSingletonScope();

package/src/browser/index.ts

@@ -18,5 +18,4 @@ export * from './location';
 export * from './file-tree';
 export * from './file-dialog';
 export * from './filesystem-preferences';
-export * from './filesystem-watcher';
 export * from './file-resource';

package/src/common/filesystem-watcher-protocol.ts

@@ -14,8 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { injectable, inject } from '@theia/core/shared/inversify';
-import { JsonRpcServer, JsonRpcProxy } from '@theia/core';
+import { JsonRpcServer } from '@theia/core';
 import { FileChangeType } from './files';
 export { FileChangeType };
 
@@ -95,68 +94,3 @@ export interface FileChange {
     uri: string;
     type: FileChangeType;
 }
-
-export const FileSystemWatcherServerProxy = Symbol('FileSystemWatcherServerProxy');
-export type FileSystemWatcherServerProxy = JsonRpcProxy<FileSystemWatcherServer>;
-
-/**
- * @deprecated not used internally anymore.
- */
-@injectable()
-export class ReconnectingFileSystemWatcherServer implements FileSystemWatcherServer {
-
-    protected watcherSequence = 1;
-    protected readonly watchParams = new Map<number, {
-        uri: string;
-        options?: WatchOptions
-    }>();
-    protected readonly localToRemoteWatcher = new Map<number, number>();
-
-    constructor(
-        @inject(FileSystemWatcherServerProxy) protected readonly proxy: FileSystemWatcherServerProxy
-    ) {
-        const onInitialized = this.proxy.onDidOpenConnection(() => {
-            // skip reconnection on the first connection
-            onInitialized.dispose();
-            this.proxy.onDidOpenConnection(() => this.reconnect());
-        });
-    }
-
-    protected reconnect(): void {
-        for (const [watcher, { uri, options }] of this.watchParams.entries()) {
-            this.doWatchFileChanges(watcher, uri, options);
-        }
-    }
-
-    dispose(): void {
-        this.proxy.dispose();
-    }
-
-    watchFileChanges(uri: string, options?: WatchOptions): Promise<number> {
-        const watcher = this.watcherSequence++;
-        this.watchParams.set(watcher, { uri, options });
-        return this.doWatchFileChanges(watcher, uri, options);
-    }
-
-    protected doWatchFileChanges(watcher: number, uri: string, options?: WatchOptions): Promise<number> {
-        return this.proxy.watchFileChanges(uri, options).then(remote => {
-            this.localToRemoteWatcher.set(watcher, remote);
-            return watcher;
-        });
-    }
-
-    unwatchFileChanges(watcher: number): Promise<void> {
-        this.watchParams.delete(watcher);
-        const remote = this.localToRemoteWatcher.get(watcher);
-        if (remote) {
-            this.localToRemoteWatcher.delete(watcher);
-            return this.proxy.unwatchFileChanges(remote);
-        }
-        return Promise.resolve();
-    }
-
-    setClient(client: FileSystemWatcherClient | undefined): void {
-        this.proxy.setClient(client);
-    }
-
-}