@theia/filesystem 1.54.0 → 1.55.0-next.25

package/lib/node/{nsfw-watcher/nsfw-filesystem-service.js → parcel-watcher/parcel-filesystem-service.js}

@@ -15,15 +15,15 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NsfwFileSystemWatcherService = exports.NsfwWatcher = exports.WatcherDisposal = exports.NsfwFileSystemWatcherServerOptions = void 0;
-const nsfw = require("@theia/core/shared/nsfw");
+exports.ParcelFileSystemWatcherService = exports.ParcelWatcher = exports.WatcherDisposal = exports.ParcelFileSystemWatcherServerOptions = void 0;
 const path = require("path");
 const fs_1 = require("fs");
 const minimatch_1 = require("minimatch");
 const file_uri_1 = require("@theia/core/lib/common/file-uri");
 const file_change_collection_1 = require("../file-change-collection");
 const promise_util_1 = require("@theia/core/lib/common/promise-util");
-exports.NsfwFileSystemWatcherServerOptions = Symbol('NsfwFileSystemWatcherServerOptions');
+const watcher_1 = require("@theia/core/shared/@parcel/watcher");
+exports.ParcelFileSystemWatcherServerOptions = Symbol('ParcelFileSystemWatcherServerOptions');
 /**
  * This is a flag value passed around upon disposal.
  */
@@ -38,7 +38,7 @@ exports.WatcherDisposal = Symbol('WatcherDisposal');
  * Once there are no more references the handle
  * will wait for some time before destroying its resources.
  */
-class NsfwWatcher {
+class ParcelWatcher {
     constructor(
     /** Initial reference to this handle. */
     initialClientId, 
@@ -46,22 +46,22 @@ class NsfwWatcher {
     fsPath, 
     /** Watcher-specific options */
     watcherOptions, 
-    /** Logging and Nsfw options */
-    nsfwFileSystemWatchServerOptions, 
+    /** Logging and parcel watcher options */
+    parcelFileSystemWatchServerOptions, 
     /** The client to forward events to. */
     fileSystemWatcherClient, 
     /** Amount of time in ms to wait once this handle is not referenced anymore. */
     deferredDisposalTimeout = 10000) {
         this.fsPath = fsPath;
         this.watcherOptions = watcherOptions;
-        this.nsfwFileSystemWatchServerOptions = nsfwFileSystemWatchServerOptions;
+        this.parcelFileSystemWatchServerOptions = parcelFileSystemWatchServerOptions;
         this.fileSystemWatcherClient = fileSystemWatcherClient;
         this.deferredDisposalTimeout = deferredDisposalTimeout;
         this.disposed = false;
         /**
          * Used for debugging to keep track of the watchers.
          */
-        this.debugId = NsfwWatcher.debugIdSequence++;
+        this.debugId = ParcelWatcher.debugIdSequence++;
         /**
          * This deferred only rejects with `WatcherDisposal` and never resolves.
          */
@@ -78,7 +78,7 @@ class NsfwWatcher {
          * Ensures that events are processed in the order they are emitted,
          * despite being processed async.
          */
-        this.nsfwEventProcessingQueue = Promise.resolve();
+        this.parcelEventProcessingQueue = Promise.resolve();
         /**
          * Resolves once this handle disposed itself and its resources. Never throws.
          */
@@ -161,7 +161,7 @@ class NsfwWatcher {
     }
     /**
      * When starting a watcher, we'll first check and wait for the path to exists
-     * before running an NSFW watcher.
+     * before running a parcel watcher.
      */
     async start() {
         while (await fs_1.promises.stat(this.fsPath).then(() => false, () => true)) {
@@ -169,71 +169,60 @@ class NsfwWatcher {
             this.assertNotDisposed();
         }
         this.assertNotDisposed();
-        const watcher = await this.createNsfw();
+        const watcher = await this.createWatcher();
         this.assertNotDisposed();
-        await watcher.start();
         this.debug('STARTED', `disposed=${this.disposed}`);
         // The watcher could be disposed while it was starting, make sure to check for this:
         if (this.disposed) {
-            await this.stopNsfw(watcher);
+            await this.stopWatcher(watcher);
             throw exports.WatcherDisposal;
         }
-        this.nsfw = watcher;
+        this.watcher = watcher;
     }
     /**
-     * Given a started nsfw instance, gracefully shut it down.
+     * Given a started parcel watcher instance, gracefully shut it down.
      */
-    async stopNsfw(watcher) {
-        await watcher.stop()
+    async stopWatcher(watcher) {
+        await watcher.unsubscribe()
             .then(() => 'success=true', error => error)
             .then(status => this.debug('STOPPED', status));
     }
-    async createNsfw() {
-        const fsPath = await fs_1.promises.realpath(this.fsPath);
-        return nsfw(fsPath, events => this.handleNsfwEvents(events), {
-            ...this.nsfwFileSystemWatchServerOptions.nsfwOptions,
-            // The errorCallback is called whenever NSFW crashes *while* watching.
-            // See https://github.com/atom/github/issues/342
-            errorCallback: error => {
-                console.error(`NSFW service error on "${fsPath}":`, error);
+    async createWatcher() {
+        let fsPath = await fs_1.promises.realpath(this.fsPath);
+        if ((await fs_1.promises.stat(fsPath)).isFile()) {
+            fsPath = path.dirname(fsPath);
+        }
+        return (0, watcher_1.subscribe)(fsPath, (err, events) => {
+            if (err) {
+                console.error(`Watcher service error on "${fsPath}":`, err);
                 this._dispose();
                 this.fireError();
-                // Make sure to call user's error handling code:
-                if (this.nsfwFileSystemWatchServerOptions.nsfwOptions.errorCallback) {
-                    this.nsfwFileSystemWatchServerOptions.nsfwOptions.errorCallback(error);
-                }
-            },
+                return;
+            }
+            this.handleWatcherEvents(events);
+        }, {
+            ...this.parcelFileSystemWatchServerOptions.parcelOptions
         });
     }
-    handleNsfwEvents(events) {
+    handleWatcherEvents(events) {
         // Only process events if someone is listening.
         if (this.isInUse()) {
-            // This callback is async, but nsfw won't wait for it to finish before firing the next one.
+            // This callback is async, but parcel won't wait for it to finish before firing the next one.
             // We will use a lock/queue to make sure everything is processed in the order it arrives.
-            this.nsfwEventProcessingQueue = this.nsfwEventProcessingQueue.then(async () => {
+            this.parcelEventProcessingQueue = this.parcelEventProcessingQueue.then(async () => {
                 const fileChangeCollection = new file_change_collection_1.FileChangeCollection();
-                await Promise.all(events.map(async (event) => {
-                    if (event.action === 3 /* nsfw.actions.RENAMED */) {
-                        const [oldPath, newPath] = await Promise.all([
-                            this.resolveEventPath(event.directory, event.oldFile),
-                            this.resolveEventPath(event.newDirectory, event.newFile),
-                        ]);
-                        this.pushFileChange(fileChangeCollection, 2 /* FileChangeType.DELETED */, oldPath);
-                        this.pushFileChange(fileChangeCollection, 1 /* FileChangeType.ADDED */, newPath);
+                for (const event of events) {
+                    const filePath = event.path;
+                    if (event.type === 'create') {
+                        this.pushFileChange(fileChangeCollection, 1 /* FileChangeType.ADDED */, filePath);
                     }
-                    else {
-                        const filePath = await this.resolveEventPath(event.directory, event.file);
-                        if (event.action === 0 /* nsfw.actions.CREATED */) {
-                            this.pushFileChange(fileChangeCollection, 1 /* FileChangeType.ADDED */, filePath);
-                        }
-                        else if (event.action === 1 /* nsfw.actions.DELETED */) {
-                            this.pushFileChange(fileChangeCollection, 2 /* FileChangeType.DELETED */, filePath);
-                        }
-                        else if (event.action === 2 /* nsfw.actions.MODIFIED */) {
-                            this.pushFileChange(fileChangeCollection, 0 /* FileChangeType.UPDATED */, filePath);
-                        }
+                    else if (event.type === 'delete') {
+                        this.pushFileChange(fileChangeCollection, 2 /* FileChangeType.DELETED */, filePath);
                     }
-                }));
+                    else if (event.type === 'update') {
+                        this.pushFileChange(fileChangeCollection, 0 /* FileChangeType.UPDATED */, filePath);
+                    }
+                }
                 const changes = fileChangeCollection.values();
                 // If all changes are part of the ignored files, the collection will be empty.
                 if (changes.length > 0) {
@@ -246,7 +235,7 @@ class NsfwWatcher {
         }
     }
     async resolveEventPath(directory, file) {
-        // nsfw already resolves symlinks, the paths should be clean already:
+        // parcel already resolves symlinks, the paths should be clean already:
         return path.resolve(directory, file);
     }
     pushFileChange(changes, type, filePath) {
@@ -291,27 +280,27 @@ class NsfwWatcher {
         if (!this.disposed) {
             this.disposed = true;
             this.deferredDisposalDeferred.reject(exports.WatcherDisposal);
-            if (this.nsfw) {
-                this.stopNsfw(this.nsfw);
-                this.nsfw = undefined;
+            if (this.watcher) {
+                this.stopWatcher(this.watcher);
+                this.watcher = undefined;
             }
             this.debug('DISPOSED');
         }
     }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     info(prefix, ...params) {
-        this.nsfwFileSystemWatchServerOptions.info(`${prefix} NsfwWatcher(${this.debugId} at "${this.fsPath}"):`, ...params);
+        this.parcelFileSystemWatchServerOptions.info(`${prefix} ParcelWatcher(${this.debugId} at "${this.fsPath}"):`, ...params);
     }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     debug(prefix, ...params) {
-        if (this.nsfwFileSystemWatchServerOptions.verbose) {
+        if (this.parcelFileSystemWatchServerOptions.verbose) {
             this.info(prefix, ...params);
         }
     }
 }
-exports.NsfwWatcher = NsfwWatcher;
-NsfwWatcher.debugIdSequence = 0;
-class NsfwFileSystemWatcherService {
+exports.ParcelWatcher = ParcelWatcher;
+ParcelWatcher.debugIdSequence = 0;
+class ParcelFileSystemWatcherService {
     constructor(options) {
         this.watcherId = 0;
         this.watchers = new Map();
@@ -324,7 +313,7 @@ class NsfwFileSystemWatcherService {
             onError: event => { var _a; return (_a = this.client) === null || _a === void 0 ? void 0 : _a.onError(event); },
         };
         this.options = {
-            nsfwOptions: {},
+            parcelOptions: {},
             verbose: false,
             info: (message, ...args) => console.info(message, ...args),
             error: (message, ...args) => console.error(message, ...args),
@@ -362,7 +351,7 @@ class NsfwFileSystemWatcherService {
             ignored: options.ignored
                 .map(pattern => new minimatch_1.Minimatch(pattern, { dot: true })),
         };
-        return new NsfwWatcher(clientId, fsPath, watcherOptions, this.options, this.maybeClient);
+        return new ParcelWatcher(clientId, fsPath, watcherOptions, this.options, this.maybeClient);
     }
     async unwatchFileChanges(watcherId) {
         const handle = this.watcherHandles.get(watcherId);
@@ -402,5 +391,5 @@ class NsfwFileSystemWatcherService {
         // Singletons shouldn't be disposed...
     }
 }
-exports.NsfwFileSystemWatcherService = NsfwFileSystemWatcherService;
-//# sourceMappingURL=nsfw-filesystem-service.js.map
+exports.ParcelFileSystemWatcherService = ParcelFileSystemWatcherService;
+//# sourceMappingURL=parcel-filesystem-service.js.map

package/lib/node/parcel-watcher/parcel-filesystem-service.js.map

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

package/lib/node/parcel-watcher/parcel-filesystem-watcher.spec.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=parcel-filesystem-watcher.spec.d.ts.map

package/lib/node/parcel-watcher/parcel-filesystem-watcher.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"parcel-filesystem-watcher.spec.d.ts","sourceRoot":"","sources":["../../../src/node/parcel-watcher/parcel-filesystem-watcher.spec.ts"],"names":[],"mappings":""}

package/lib/node/{nsfw-watcher/nsfw-filesystem-watcher.spec.js → parcel-watcher/parcel-filesystem-watcher.spec.js}

@@ -21,10 +21,10 @@ const cp = require("child_process");
 const fs = require("@theia/core/shared/fs-extra");
 const assert = require("assert");
 const node_1 = require("@theia/core/lib/node");
-const nsfw_filesystem_service_1 = require("./nsfw-filesystem-service");
+const parcel_filesystem_service_1 = require("./parcel-filesystem-service");
 const expect = chai.expect;
 const track = temp.track();
-describe('nsfw-filesystem-watcher', function () {
+describe('parcel-filesystem-watcher', function () {
     let root;
     let watcherService;
     let watcherId;
@@ -32,7 +32,7 @@ describe('nsfw-filesystem-watcher', function () {
     beforeEach(async () => {
         let tempPath = temp.mkdirSync('node-fs-root');
         // Sometimes tempPath will use some Windows 8.3 short name in its path. This is a problem
-        // since NSFW always returns paths with long names. We need to convert here.
+        // since parcel always returns paths with long names. We need to convert here.
         // See: https://stackoverflow.com/a/34473971/7983255
         if (process.platform === 'win32') {
             tempPath = cp.execSync(`powershell "(Get-Item -LiteralPath '${tempPath}').FullName"`, {
@@ -40,9 +40,9 @@ describe('nsfw-filesystem-watcher', function () {
             }).trim();
         }
         root = node_1.FileUri.create(fs.realpathSync(tempPath));
-        watcherService = createNsfwFileSystemWatcherService();
+        watcherService = createParcelFileSystemWatcherService();
         watcherId = await watcherService.watchFileChanges(0, root.toString());
-        await sleep(2000);
+        await sleep(200);
     });
     afterEach(async () => {
         track.cleanupSync();
@@ -65,13 +65,13 @@ describe('nsfw-filesystem-watcher', function () {
         ];
         fs.mkdirSync(node_1.FileUri.fsPath(root.resolve('foo')));
         expect(fs.statSync(node_1.FileUri.fsPath(root.resolve('foo'))).isDirectory()).to.be.true;
-        await sleep(2000);
+        await sleep(200);
         fs.mkdirSync(node_1.FileUri.fsPath(root.resolve('foo').resolve('bar')));
         expect(fs.statSync(node_1.FileUri.fsPath(root.resolve('foo').resolve('bar'))).isDirectory()).to.be.true;
-        await sleep(2000);
+        await sleep(200);
         fs.writeFileSync(node_1.FileUri.fsPath(root.resolve('foo').resolve('bar').resolve('baz.txt')), 'baz');
         expect(fs.readFileSync(node_1.FileUri.fsPath(root.resolve('foo').resolve('bar').resolve('baz.txt')), 'utf8')).to.be.equal('baz');
-        await sleep(2000);
+        await sleep(200);
         assert.deepStrictEqual([...actualUris], expectedUris);
     });
     it('Should not receive file changes events from in the workspace by default if unwatched', async function () {
@@ -88,16 +88,16 @@ describe('nsfw-filesystem-watcher', function () {
         await watcherService.unwatchFileChanges(watcherId);
         fs.mkdirSync(node_1.FileUri.fsPath(root.resolve('foo')));
         expect(fs.statSync(node_1.FileUri.fsPath(root.resolve('foo'))).isDirectory()).to.be.true;
-        await sleep(2000);
+        await sleep(200);
         fs.mkdirSync(node_1.FileUri.fsPath(root.resolve('foo').resolve('bar')));
         expect(fs.statSync(node_1.FileUri.fsPath(root.resolve('foo').resolve('bar'))).isDirectory()).to.be.true;
-        await sleep(2000);
+        await sleep(200);
         fs.writeFileSync(node_1.FileUri.fsPath(root.resolve('foo').resolve('bar').resolve('baz.txt')), 'baz');
         expect(fs.readFileSync(node_1.FileUri.fsPath(root.resolve('foo').resolve('bar').resolve('baz.txt')), 'utf8')).to.be.equal('baz');
-        await sleep(2000);
+        await sleep(200);
         assert.deepStrictEqual(actualUris.size, 0);
     });
-    it('Renaming should emit a DELETED change followed by ADDED', async function () {
+    it('Renaming should emit a DELETED and ADDED event', async function () {
         const file_txt = root.resolve('file.txt');
         const FILE_txt = root.resolve('FILE.txt');
         const changes = [];
@@ -106,38 +106,31 @@ describe('nsfw-filesystem-watcher', function () {
             onError: console.error
         });
         await fs.promises.writeFile(node_1.FileUri.fsPath(file_txt), 'random content\n');
-        await sleep(1000);
+        await sleep(200);
         await fs.promises.rename(node_1.FileUri.fsPath(file_txt), node_1.FileUri.fsPath(FILE_txt));
-        await sleep(1000);
+        await sleep(200);
+        // The order of DELETED and ADDED is not deterministic
         try {
             expect(changes).deep.eq([
                 // initial file creation change event:
                 { type: 1 /* FileChangeType.ADDED */, uri: file_txt.toString() },
                 // rename change events:
                 { type: 2 /* FileChangeType.DELETED */, uri: file_txt.toString() },
-                { type: 1 /* FileChangeType.ADDED */, uri: FILE_txt.toString() }
+                { type: 1 /* FileChangeType.ADDED */, uri: FILE_txt.toString() },
             ]);
         }
-        catch (error) {
-            // TODO: remove this try/catch once the bug on macOS is fixed.
-            // See https://github.com/Axosoft/nsfw/issues/146
-            if (process.platform !== 'darwin') {
-                throw error;
-            }
-            // On macOS we only get ADDED events for some reason
+        catch {
             expect(changes).deep.eq([
                 // initial file creation change event:
                 { type: 1 /* FileChangeType.ADDED */, uri: file_txt.toString() },
                 // rename change events:
-                { type: 1 /* FileChangeType.ADDED */, uri: file_txt.toString() },
-                { type: 1 /* FileChangeType.ADDED */, uri: FILE_txt.toString() }
+                { type: 1 /* FileChangeType.ADDED */, uri: FILE_txt.toString() },
+                { type: 2 /* FileChangeType.DELETED */, uri: file_txt.toString() },
             ]);
-            // Mark the test case as skipped so it stands out that the bogus branch got tested
-            this.skip();
         }
     });
-    function createNsfwFileSystemWatcherService() {
-        return new nsfw_filesystem_service_1.NsfwFileSystemWatcherService({
+    function createParcelFileSystemWatcherService() {
+        return new parcel_filesystem_service_1.ParcelFileSystemWatcherService({
             verbose: true
         });
     }
@@ -149,4 +142,4 @@ describe('nsfw-filesystem-watcher', function () {
 process.on('unhandledRejection', (reason) => {
     console.error('Unhandled promise rejection: ' + reason);
 });
-//# sourceMappingURL=nsfw-filesystem-watcher.spec.js.map
+//# sourceMappingURL=parcel-filesystem-watcher.spec.js.map

package/lib/node/parcel-watcher/parcel-filesystem-watcher.spec.js.map

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

package/lib/node/parcel-watcher/parcel-options.d.ts

@@ -0,0 +1,7 @@
+import { Options } from '@theia/core/shared/@parcel/watcher';
+/**
+ * Inversify service identifier allowing extensions to override options passed to parcel by the file watcher.
+ */
+export declare const ParcelWatcherOptions: unique symbol;
+export type ParcelWatcherOptions = Options;
+//# sourceMappingURL=parcel-options.d.ts.map

package/lib/node/parcel-watcher/parcel-options.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"parcel-options.d.ts","sourceRoot":"","sources":["../../../src/node/parcel-watcher/parcel-options.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAC;AAE7D;;GAEG;AACH,eAAO,MAAM,oBAAoB,eAAiC,CAAC;AACnE,MAAM,MAAM,oBAAoB,GAAG,OAAO,CAAC"}

package/lib/node/{nsfw-watcher/nsfw-options.js → parcel-watcher/parcel-options.js}

@@ -15,9 +15,9 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NsfwOptions = void 0;
+exports.ParcelWatcherOptions = void 0;
 /**
- * Inversify service identifier allowing extensions to override options passed to nsfw by the file watcher.
+ * Inversify service identifier allowing extensions to override options passed to parcel by the file watcher.
  */
-exports.NsfwOptions = Symbol('NsfwOptions');
-//# sourceMappingURL=nsfw-options.js.map
+exports.ParcelWatcherOptions = Symbol('ParcelWatcherOptions');
+//# sourceMappingURL=parcel-options.js.map

package/lib/node/parcel-watcher/parcel-options.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"parcel-options.js","sourceRoot":"","sources":["../../../src/node/parcel-watcher/parcel-options.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,8CAA8C;AAC9C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAIhF;;GAEG;AACU,QAAA,oBAAoB,GAAG,MAAM,CAAC,sBAAsB,CAAC,CAAC"}

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "@theia/filesystem",
-  "version": "1.54.0",
+  "version": "1.55.0-next.25+2be612f8a",
   "description": "Theia - FileSystem Extension",
   "dependencies": {
-    "@theia/core": "1.54.0",
+    "@theia/core": "1.55.0-next.25+2be612f8a",
     "@types/body-parser": "^1.17.0",
     "@types/multer": "^1.4.7",
-    "@types/rimraf": "^2.0.2",
     "@types/tar-fs": "^1.16.1",
     "async-mutex": "^0.3.1",
     "body-parser": "^1.18.3",
@@ -14,7 +13,7 @@
     "http-status-codes": "^1.3.0",
     "minimatch": "^5.1.0",
     "multer": "1.4.4-lts.1",
-    "rimraf": "^2.6.2",
+    "rimraf": "^5.0.0",
     "stat-mode": "^1.0.0",
     "tar-fs": "^1.16.2",
     "trash": "^7.2.0",
@@ -78,5 +77,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "8fb36a237db744cff6e78eaff1481e1f36bb7a69"
+  "gitHead": "2be612f8a7efb90c1183ba47f0897040925b304a"
 }

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

@@ -21,7 +21,7 @@ import { FileStatNode, DirNode, FileNode } from './file-tree';
 import { LocationService } from '../location';
 import { LabelProvider } from '@theia/core/lib/browser/label-provider';
 import { FileService } from '../file-service';
-import { FileOperationError, FileOperationResult, FileChangesEvent, FileChangeType, FileChange, FileOperation, FileOperationEvent } from '../../common/files';
+import { FileOperationError, FileOperationResult, FileChangesEvent, FileChangeType, FileChange } from '../../common/files';
 import { MessageService } from '@theia/core/lib/common/message-service';
 import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
 import { FileSystemUtils } from '../../common';
@@ -45,7 +45,6 @@ export class FileTreeModel extends CompressedTreeModel implements LocationServic
     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)));
     }
 
     get location(): URI | undefined {
@@ -92,23 +91,6 @@ export class FileTreeModel extends CompressedTreeModel implements LocationServic
         }
     }
 
-    /**
-     * to workaround https://github.com/Axosoft/nsfw/issues/42
-     */
-    protected onDidMove(event: FileOperationEvent): void {
-        if (!event.isOperation(FileOperation.MOVE)) {
-            return;
-        }
-        if (event.resource.parent.toString() === event.target.resource.parent.toString()) {
-            // file rename
-            return;
-        }
-        this.refreshAffectedNodes([
-            event.resource,
-            event.target.resource
-        ]);
-    }
-
     protected onFilesChanged(changes: FileChangesEvent): void {
         if (!this.refreshAffectedNodes(this.getAffectedUris(changes)) && this.isRootAffected(changes)) {
             this.refresh();

package/src/browser/filesystem-preferences.ts

@@ -46,8 +46,7 @@ export const filesystemPreferenceSchema: PreferenceSchema = {
             },
             default: {
                 '**/.git/objects/**': true,
-                '**/.git/subtree-cache/**': true,
-                '**/node_modules/**': true
+                '**/.git/subtree-cache/**': true
             },
             scope: 'resource'
         },

package/src/node/download/file-download-cache.ts

@@ -15,7 +15,7 @@
 // *****************************************************************************
 import { injectable, inject } from '@theia/core/shared/inversify';
 import { ILogger } from '@theia/core/lib/common/logger';
-import * as rimraf from 'rimraf';
+import { rimraf } from 'rimraf';
 
 export interface DownloadStorageItem {
     file: string;
@@ -70,10 +70,8 @@ export class FileDownloadCache {
     }
 
     protected deleteRecursively(pathToDelete: string): void {
-        rimraf(pathToDelete, error => {
-            if (error) {
-                this.logger.warn(`An error occurred while deleting the temporary data from the disk. Cannot clean up: ${pathToDelete}.`, error);
-            }
+        rimraf(pathToDelete).catch(error => {
+            this.logger.warn(`An error occurred while deleting the temporary data from the disk. Cannot clean up: ${pathToDelete}.`, error);
         });
     }