npm - @theia/filesystem - Versions diffs - 1.53.1 → 1.54.0 - Mend

@theia/filesystem 1.53.1 → 1.54.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

package/lib/browser/file-resource.d.ts +2 -0
package/lib/browser/file-resource.d.ts.map +1 -1
package/lib/browser/file-resource.js +11 -0
package/lib/browser/file-resource.js.map +1 -1
package/lib/browser/file-resource.spec.d.ts +2 -0
package/lib/browser/file-resource.spec.d.ts.map +1 -0
package/lib/browser/file-resource.spec.js +191 -0
package/lib/browser/file-resource.spec.js.map +1 -0
package/package.json +4 -4
package/src/browser/file-resource.spec.ts +255 -0
package/src/browser/file-resource.ts +12 -0

package/lib/browser/file-resource.d.ts CHANGED Viewed

@@ -8,6 +8,7 @@ import { FileService } from './file-service';
 import { LabelProvider } from '@theia/core/lib/browser/label-provider';
 import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
 import { MarkdownString } from '@theia/core/lib/common/markdown-rendering';
+import { Mutex } from 'async-mutex';
 export interface FileResourceVersion extends ResourceVersion {
     readonly encoding: string;
     readonly mtime: number;
@@ -36,6 +37,7 @@ export declare class FileResource implements Resource {
     get version(): FileResourceVersion | undefined;
     get encoding(): string | undefined;
     get readOnly(): boolean | MarkdownString;
+    protected writingLock: Mutex;
     constructor(uri: URI, fileService: FileService, options: FileResourceOptions);
     protected updateReadOnly(): Promise<void>;
     dispose(): void;

package/lib/browser/file-resource.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"file-resource.d.ts","sourceRoot":"","sources":["../../src/browser/file-resource.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,gBAAgB,EAAiB,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAClI,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAyG,qBAAqB,EAAc,MAAM,iBAAiB,CAAC;AAC3K,OAAO,EAAE,WAAW,EAAmD,MAAM,gBAAgB,CAAC;AAE9F,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AAEvE,OAAO,EAAE,+BAA+B,EAAE,MAAM,oDAAoD,CAAC;AAErG,OAAO,EAAE,cAAc,EAAE,MAAM,2CAA2C,CAAC;~~AAE3E~~,MAAM,WAAW,mBAAoB,SAAQ,eAAe;IACxD,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACzB;AACD,yBAAiB,mBAAmB,CAAC;IACjC,SAAgB,EAAE,CAAC,OAAO,EAAE,eAAe,GAAG,SAAS,GAAG,OAAO,IAAI,mBAAmB,CAEvF;CACJ;AAED,MAAM,WAAW,mBAAmB;IAChC,QAAQ,EAAE,OAAO,GAAG,cAAc,CAAA;IAClC,eAAe,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAA;IACvC,gBAAgB,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;CACxD;AAED,qBAAa,YAAa,YAAW,QAAQ;~~IAwBrC~~,QAAQ,CAAC,GAAG,EAAE,GAAG;IACjB,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW;IAC3C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,mBAAmB;~~IAxBnD~~,SAAS,CAAC,cAAc,UAAQ;IAChC,SAAS,CAAC,MAAM,EAAE,qBAAqB,CAAC,QAAQ,CAAC,CAAC;IAElD,SAAS,CAAC,QAAQ,CAAC,SAAS,uBAA8B;IAC1D,SAAS,CAAC,QAAQ,CAAC,0BAA0B,gBAAuB;IACpE,QAAQ,CAAC,mBAAmB,EAAE,KAAK,CAAC,IAAI,CAAC,CAAyC;IAElF,SAAS,CAAC,QAAQ,CAAC,0BAA0B,oCAA2C;IACxF,QAAQ,CAAC,mBAAmB,EAAE,KAAK,CAAC,OAAO,GAAG,cAAc,CAAC,CAAyC;IAEtG,SAAS,CAAC,QAAQ,EAAE,mBAAmB,GAAG,SAAS,CAAC;IACpD,IAAI,OAAO,IAAI,mBAAmB,GAAG,SAAS,CAE7C;IACD,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IACD,IAAI,QAAQ,IAAI,OAAO,GAAG,cAAc,CAEvC;~~gBAGY~~,GAAG,EAAE,GAAG,EACE,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,mBAAmB;cAgCnC,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAc/C,OAAO,IAAI,IAAI;IAIT,YAAY,CAAC,OAAO,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IA6C9D,UAAU,CAAC,OAAO,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IA6ClF,SAAS,CAAC,OAAO,YAAmB,MAAM,GAAG,SAAS,MAAM,CAAC,YAAY,mBAAmB,KAAG,QAAQ,IAAI,CAAC,~~CA0B1G~~;IAEF,UAAU,CAAC,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;IACpC,YAAY,CAAC,EAAE,QAAQ,CAAC,cAAc,CAAC,CAAC;IACxC,kBAAkB,CAAC,EAAE,QAAQ,CAAC,oBAAoB,CAAC,CAAC;IACpD,SAAS,CAAC,0BAA0B,IAAI,IAAI;IAa5C,SAAS,CAAC,oBAAoB,EAAE,QAAQ,CAAC,oBAAoB,CAAC,~~CA+B5D~~;IAEI,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;cAMtB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAMrB,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;~~cAS5B~~,eAAe,IAAI,OAAO,CAAC,OAAO,CAAC;cAInC,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAIpE;AAED,qBACa,oBAAqB,YAAW,gBAAgB;IAGzD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAG5C,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAGhD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,+BAA+B,CAAC;IAE/D,OAAO,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,YAAY,CAAC;cAwB9B,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC;cAW3C,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAoB9E"}
1	+ {"version":3,"file":"file-resource.d.ts","sourceRoot":"","sources":["../../src/browser/file-resource.ts"],"names":[],"mappings":"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"}

package/lib/browser/file-resource.js CHANGED Viewed

@@ -28,6 +28,7 @@ const label_provider_1 = require("@theia/core/lib/browser/label-provider");
 const filesystem_preferences_1 = require("./filesystem-preferences");
 const frontend_application_state_1 = require("@theia/core/lib/browser/frontend-application-state");
 const core_1 = require("@theia/core");
+const async_mutex_1 = require("async-mutex");
 var FileResourceVersion;
 (function (FileResourceVersion) {
     function is(version) {
@@ -56,10 +57,12 @@ class FileResource {
         this.onDidChangeContents = this.onDidChangeContentsEmitter.event;
         this.onDidChangeReadOnlyEmitter = new event_1.Emitter();
         this.onDidChangeReadOnly = this.onDidChangeReadOnlyEmitter.event;
+        this.writingLock = new async_mutex_1.Mutex();
         this.doWrite = async (content, options) => {
             const version = (options === null || options === void 0 ? void 0 : options.version) || this._version;
             const current = FileResourceVersion.is(version) ? version : undefined;
             const etag = current === null || current === void 0 ? void 0 : current.etag;
+            const releaseLock = await this.writingLock.acquire();
             try {
                 const stat = await this.fileService.write(this.uri, content, {
                     encoding: options === null || options === void 0 ? void 0 : options.encoding,
@@ -83,6 +86,9 @@ class FileResource {
                 }
                 throw e;
             }
+            finally {
+                releaseLock();
+            }
         };
         this.doSaveContentChanges = async (changes, options) => {
             const version = (options === null || options === void 0 ? void 0 : options.version) || this._version;
@@ -91,6 +97,7 @@ class FileResource {
                 throw resource_1.ResourceError.NotFound({ message: 'has not been read yet', data: { uri: this.uri } });
             }
             const etag = current === null || current === void 0 ? void 0 : current.etag;
+            const releaseLock = await this.writingLock.acquire();
             try {
                 const stat = await this.fileService.update(this.uri, changes, {
                     readEncoding: current.encoding,
@@ -116,6 +123,9 @@ class FileResource {
                 }
                 throw e;
             }
+            finally {
+                releaseLock();
+            }
         };
         this.toDispose.push(this.onDidChangeContentsEmitter);
         this.toDispose.push(this.onDidChangeReadOnlyEmitter);
@@ -285,6 +295,7 @@ class FileResource {
     }
     async isInSync() {
         try {
+            await this.writingLock.waitForUnlock();
             const stat = await this.fileService.resolve(this.uri, { resolveMetadata: true });
             return !!this.version && this.version.mtime >= stat.mtime;
         }

package/lib/browser/file-resource.js.map CHANGED Viewed

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

package/lib/browser/file-resource.spec.d.ts ADDED Viewed

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

package/lib/browser/file-resource.spec.d.ts.map ADDED Viewed

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

package/lib/browser/file-resource.spec.js ADDED Viewed

@@ -0,0 +1,191 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2024 Toro Cloud Pty Ltd 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
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+const jsdom_1 = require("@theia/core/lib/browser/test/jsdom");
+let disableJSDOM = (0, jsdom_1.enableJSDOM)();
+const frontend_application_config_provider_1 = require("@theia/core/lib/browser/frontend-application-config-provider");
+frontend_application_config_provider_1.FrontendApplicationConfigProvider.set({});
+const core_1 = require("@theia/core");
+const promise_util_1 = require("@theia/core/lib/common/promise-util");
+const chai_1 = require("chai");
+const sinon = require("sinon");
+const files_1 = require("../common/files");
+const file_resource_1 = require("./file-resource");
+const file_service_1 = require("./file-service");
+disableJSDOM();
+describe.only('file-resource', () => {
+    const sandbox = sinon.createSandbox();
+    const mockEmitter = new core_1.Emitter();
+    const mockOnChangeEmitter = new core_1.Emitter();
+    const mockFileService = new file_service_1.FileService();
+    before(() => {
+        disableJSDOM = (0, jsdom_1.enableJSDOM)();
+    });
+    beforeEach(() => {
+        sandbox.restore();
+        sandbox.stub(mockFileService, 'onDidFilesChange').get(() => mockOnChangeEmitter.event);
+        sandbox.stub(mockFileService, 'onDidRunOperation').returns(core_1.Disposable.NULL);
+        sandbox.stub(mockFileService, 'watch').get(() => mockEmitter.event);
+        sandbox.stub(mockFileService, 'onDidChangeFileSystemProviderCapabilities').get(() => mockEmitter.event);
+        sandbox.stub(mockFileService, 'onDidChangeFileSystemProviderReadOnlyMessage').get(() => mockEmitter.event);
+    });
+    after(() => {
+        disableJSDOM();
+    });
+    it('should save contents and not trigger change event', async () => {
+        const resource = new file_resource_1.FileResource(new core_1.URI('file://test/file.txt'), mockFileService, { readOnly: false, shouldOpenAsText: () => Promise.resolve(true), shouldOverwrite: () => Promise.resolve(true) });
+        const onChangeSpy = sandbox.spy();
+        resource.onDidChangeContents(onChangeSpy);
+        const deferred = new promise_util_1.Deferred();
+        sandbox.stub(mockFileService, 'write')
+            .callsFake(() => deferred.promise);
+        sandbox.stub(mockFileService, 'resolve')
+            .resolves({
+            mtime: 1,
+            ctime: 0,
+            size: 0,
+            etag: '',
+            isFile: true,
+            isDirectory: false,
+            isSymbolicLink: false,
+            isReadonly: false,
+            name: 'file.txt',
+            resource: new core_1.URI('file://test/file.txt')
+        });
+        resource.saveContents('test');
+        await new Promise(resolve => setTimeout(resolve, 0));
+        mockOnChangeEmitter.fire(new files_1.FileChangesEvent([{
+                resource: new core_1.URI('file://test/file.txt'),
+                type: 0 /* FileChangeType.UPDATED */
+            }]));
+        await new Promise(resolve => setImmediate(resolve));
+        (0, chai_1.expect)(onChangeSpy.called).to.be.false;
+        deferred.resolve({
+            mtime: 0,
+            ctime: 0,
+            size: 0,
+            etag: '',
+            encoding: 'utf-8',
+            isFile: true,
+            isDirectory: false,
+            isSymbolicLink: false,
+            isReadonly: false,
+            name: 'file.txt',
+            resource: new core_1.URI('file://test/file.txt')
+        });
+        await new Promise(resolve => setImmediate(resolve));
+        (0, chai_1.expect)(resource.version).to.deep.equal({ etag: '', mtime: 0, encoding: 'utf-8' });
+    });
+    it('should save content changes and not trigger change event', async () => {
+        sandbox.stub(mockFileService, 'hasCapability').returns(true);
+        const resource = new file_resource_1.FileResource(new core_1.URI('file://test/file.txt'), mockFileService, { readOnly: false, shouldOpenAsText: () => Promise.resolve(true), shouldOverwrite: () => Promise.resolve(true) });
+        const onChangeSpy = sandbox.spy();
+        resource.onDidChangeContents(onChangeSpy);
+        sandbox.stub(mockFileService, 'read')
+            .resolves({
+            mtime: 1,
+            ctime: 0,
+            size: 0,
+            etag: '',
+            name: 'file.txt',
+            resource: new core_1.URI('file://test/file.txt'),
+            value: 'test',
+            encoding: 'utf-8'
+        });
+        await resource.readContents();
+        const deferred = new promise_util_1.Deferred();
+        sandbox.stub(mockFileService, 'update')
+            .callsFake(() => deferred.promise);
+        sandbox.stub(mockFileService, 'resolve')
+            .resolves({
+            mtime: 1,
+            ctime: 0,
+            size: 0,
+            etag: '',
+            isFile: true,
+            isDirectory: false,
+            isSymbolicLink: false,
+            isReadonly: false,
+            name: 'file.txt',
+            resource: new core_1.URI('file://test/file.txt')
+        });
+        resource.saveContentChanges([{
+                range: { start: { line: 0, character: 0 }, end: { line: 0, character: 0 } },
+                rangeLength: 0,
+                text: 'test'
+            }]);
+        await new Promise(resolve => setTimeout(resolve, 0));
+        mockOnChangeEmitter.fire(new files_1.FileChangesEvent([{
+                resource: new core_1.URI('file://test/file.txt'),
+                type: 0 /* FileChangeType.UPDATED */
+            }]));
+        await new Promise(resolve => setImmediate(resolve));
+        (0, chai_1.expect)(onChangeSpy.called).to.be.false;
+        deferred.resolve({
+            mtime: 0,
+            ctime: 0,
+            size: 0,
+            etag: '',
+            encoding: 'utf-8',
+            isFile: true,
+            isDirectory: false,
+            isSymbolicLink: false,
+            isReadonly: false,
+            name: 'file.txt',
+            resource: new core_1.URI('file://test/file.txt')
+        });
+        await new Promise(resolve => setImmediate(resolve));
+        (0, chai_1.expect)(resource.version).to.deep.equal({ etag: '', mtime: 0, encoding: 'utf-8' });
+    });
+    it('should trigger change event if file is updated and not in sync', async () => {
+        const resource = new file_resource_1.FileResource(new core_1.URI('file://test/file.txt'), mockFileService, { readOnly: false, shouldOpenAsText: () => Promise.resolve(true), shouldOverwrite: () => Promise.resolve(true) });
+        const onChangeSpy = sandbox.spy();
+        resource.onDidChangeContents(onChangeSpy);
+        sandbox.stub(mockFileService, 'read')
+            .resolves({
+            mtime: 1,
+            ctime: 0,
+            size: 0,
+            etag: '',
+            name: 'file.txt',
+            resource: new core_1.URI('file://test/file.txt'),
+            value: 'test',
+            encoding: 'utf-8'
+        });
+        await resource.readContents();
+        sandbox.stub(mockFileService, 'resolve')
+            .resolves({
+            mtime: 2,
+            ctime: 0,
+            size: 0,
+            etag: '',
+            isFile: true,
+            isDirectory: false,
+            isSymbolicLink: false,
+            isReadonly: false,
+            name: 'file.txt',
+            resource: new core_1.URI('file://test/file.txt')
+        });
+        mockOnChangeEmitter.fire(new files_1.FileChangesEvent([{
+                resource: new core_1.URI('file://test/file.txt'),
+                type: 0 /* FileChangeType.UPDATED */
+            }]));
+        await new Promise(resolve => setImmediate(resolve));
+        (0, chai_1.expect)(onChangeSpy.called).to.be.true;
+    });
+});
+//# sourceMappingURL=file-resource.spec.js.map

package/lib/browser/file-resource.spec.js.map ADDED Viewed

@@ -0,0 +1 @@

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

package/package.json CHANGED Viewed

@@ -1,9 +1,9 @@
 {
   "name": "@theia/filesystem",
-  "version": "1.53.1",
+  "version": "1.54.0",
   "description": "Theia - FileSystem Extension",
   "dependencies": {
-    "@theia/core": "1.53.1",
+    "@theia/core": "1.54.0",
     "@types/body-parser": "^1.17.0",
     "@types/multer": "^1.4.7",
     "@types/rimraf": "^2.0.2",
@@ -73,10 +73,10 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.53.1"
+    "@theia/ext-scripts": "1.54.0"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "e891c9be687dce3645614b7b75ec0dcd4c2057f4"
+  "gitHead": "8fb36a237db744cff6e78eaff1481e1f36bb7a69"
 }

package/src/browser/file-resource.spec.ts ADDED Viewed

@@ -0,0 +1,255 @@
+// *****************************************************************************
+// Copyright (C) 2024 Toro Cloud Pty Ltd 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, Emitter, URI } from '@theia/core';
+import { Deferred } from '@theia/core/lib/common/promise-util';
+import { expect } from 'chai';
+import * as sinon from 'sinon';
+import { FileChangesEvent, FileChangeType, FileStatWithMetadata } from '../common/files';
+import { FileResource } from './file-resource';
+import { FileService } from './file-service';
+disableJSDOM();
+describe.only('file-resource', () => {
+    const sandbox = sinon.createSandbox();
+    const mockEmitter = new Emitter();
+    const mockOnChangeEmitter = new Emitter<FileChangesEvent>();
+    const mockFileService = new FileService();
+    before(() => {
+        disableJSDOM = enableJSDOM();
+    });
+    beforeEach(() => {
+        sandbox.restore();
+        sandbox.stub(mockFileService, 'onDidFilesChange').get(() =>
+            mockOnChangeEmitter.event
+        );
+        sandbox.stub(mockFileService, 'onDidRunOperation').returns(Disposable.NULL);
+        sandbox.stub(mockFileService, 'watch').get(() =>
+            mockEmitter.event
+        );
+        sandbox.stub(mockFileService, 'onDidChangeFileSystemProviderCapabilities').get(() =>
+            mockEmitter.event
+        );
+        sandbox.stub(mockFileService, 'onDidChangeFileSystemProviderReadOnlyMessage').get(() =>
+            mockEmitter.event
+        );
+    });
+    after(() => {
+        disableJSDOM();
+    });
+    it('should save contents and not trigger change event', async () => {
+        const resource = new FileResource(new URI('file://test/file.txt'),
+            mockFileService, { readOnly: false, shouldOpenAsText: () => Promise.resolve(true), shouldOverwrite: () => Promise.resolve(true) });
+        const onChangeSpy = sandbox.spy();
+        resource.onDidChangeContents(onChangeSpy);
+        const deferred = new Deferred<FileStatWithMetadata & { encoding: string }>();
+        sandbox.stub(mockFileService, 'write')
+            .callsFake(() =>
+                deferred.promise
+            );
+        sandbox.stub(mockFileService, 'resolve')
+            .resolves({
+                mtime: 1,
+                ctime: 0,
+                size: 0,
+                etag: '',
+                isFile: true,
+                isDirectory: false,
+                isSymbolicLink: false,
+                isReadonly: false,
+                name: 'file.txt',
+                resource: new URI('file://test/file.txt')
+            });
+        resource.saveContents!('test');
+        await new Promise(resolve => setTimeout(resolve, 0));
+        mockOnChangeEmitter.fire(new FileChangesEvent(
+            [{
+                resource: new URI('file://test/file.txt'),
+                type: FileChangeType.UPDATED
+            }]
+        ));
+        await new Promise(resolve => setImmediate(resolve));
+        expect(onChangeSpy.called).to.be.false;
+        deferred.resolve({
+            mtime: 0,
+            ctime: 0,
+            size: 0,
+            etag: '',
+            encoding: 'utf-8',
+            isFile: true,
+            isDirectory: false,
+            isSymbolicLink: false,
+            isReadonly: false,
+            name: 'file.txt',
+            resource: new URI('file://test/file.txt')
+        });
+        await new Promise(resolve => setImmediate(resolve));
+        expect(resource.version).to.deep.equal({ etag: '', mtime: 0, encoding: 'utf-8' });
+    });
+    it('should save content changes and not trigger change event', async () => {
+        sandbox.stub(mockFileService, 'hasCapability').returns(true);
+        const resource = new FileResource(new URI('file://test/file.txt'),
+            mockFileService, { readOnly: false, shouldOpenAsText: () => Promise.resolve(true), shouldOverwrite: () => Promise.resolve(true) });
+        const onChangeSpy = sandbox.spy();
+        resource.onDidChangeContents(onChangeSpy);
+        sandbox.stub(mockFileService, 'read')
+            .resolves({
+                mtime: 1,
+                ctime: 0,
+                size: 0,
+                etag: '',
+                name: 'file.txt',
+                resource: new URI('file://test/file.txt'),
+                value: 'test',
+                encoding: 'utf-8'
+            });
+        await resource.readContents!();
+        const deferred = new Deferred<FileStatWithMetadata & { encoding: string }>();
+        sandbox.stub(mockFileService, 'update')
+            .callsFake(() =>
+                deferred.promise
+            );
+        sandbox.stub(mockFileService, 'resolve')
+            .resolves({
+                mtime: 1,
+                ctime: 0,
+                size: 0,
+                etag: '',
+                isFile: true,
+                isDirectory: false,
+                isSymbolicLink: false,
+                isReadonly: false,
+                name: 'file.txt',
+                resource: new URI('file://test/file.txt')
+            });
+        resource.saveContentChanges!([{
+            range: { start: { line: 0, character: 0 }, end: { line: 0, character: 0 } },
+            rangeLength: 0,
+            text: 'test'
+        }]);
+        await new Promise(resolve => setTimeout(resolve, 0));
+        mockOnChangeEmitter.fire(new FileChangesEvent(
+            [{
+                resource: new URI('file://test/file.txt'),
+                type: FileChangeType.UPDATED
+            }]
+        ));
+        await new Promise(resolve => setImmediate(resolve));
+        expect(onChangeSpy.called).to.be.false;
+        deferred.resolve({
+            mtime: 0,
+            ctime: 0,
+            size: 0,
+            etag: '',
+            encoding: 'utf-8',
+            isFile: true,
+            isDirectory: false,
+            isSymbolicLink: false,
+            isReadonly: false,
+            name: 'file.txt',
+            resource: new URI('file://test/file.txt')
+        });
+        await new Promise(resolve => setImmediate(resolve));
+        expect(resource.version).to.deep.equal({ etag: '', mtime: 0, encoding: 'utf-8' });
+    });
+    it('should trigger change event if file is updated and not in sync', async () => {
+        const resource = new FileResource(new URI('file://test/file.txt'),
+            mockFileService, { readOnly: false, shouldOpenAsText: () => Promise.resolve(true), shouldOverwrite: () => Promise.resolve(true) });
+        const onChangeSpy = sandbox.spy();
+        resource.onDidChangeContents(onChangeSpy);
+        sandbox.stub(mockFileService, 'read')
+            .resolves({
+                mtime: 1,
+                ctime: 0,
+                size: 0,
+                etag: '',
+                name: 'file.txt',
+                resource: new URI('file://test/file.txt'),
+                value: 'test',
+                encoding: 'utf-8'
+            });
+        await resource.readContents!();
+        sandbox.stub(mockFileService, 'resolve')
+            .resolves({
+                mtime: 2,
+                ctime: 0,
+                size: 0,
+                etag: '',
+                isFile: true,
+                isDirectory: false,
+                isSymbolicLink: false,
+                isReadonly: false,
+                name: 'file.txt',
+                resource: new URI('file://test/file.txt')
+            });
+        mockOnChangeEmitter.fire(new FileChangesEvent(
+            [{
+                resource: new URI('file://test/file.txt'),
+                type: FileChangeType.UPDATED
+            }]
+        ));
+        await new Promise(resolve => setImmediate(resolve));
+        expect(onChangeSpy.called).to.be.true;
+    });
+});

package/src/browser/file-resource.ts CHANGED Viewed

@@ -28,6 +28,7 @@ import { GENERAL_MAX_FILE_SIZE_MB } from './filesystem-preferences';
 import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
 import { nls } from '@theia/core';
 import { MarkdownString } from '@theia/core/lib/common/markdown-rendering';
+import { Mutex } from 'async-mutex';
 export interface FileResourceVersion extends ResourceVersion {
     readonly encoding: string;
@@ -69,6 +70,8 @@ export class FileResource implements Resource {
         return this.options.readOnly;
     }
+    protected writingLock = new Mutex();
     constructor(
         readonly uri: URI,
         protected readonly fileService: FileService,
@@ -216,6 +219,8 @@ export class FileResource implements Resource {
         const version = options?.version || this._version;
         const current = FileResourceVersion.is(version) ? version : undefined;
         const etag = current?.etag;
+        const releaseLock = await this.writingLock.acquire();
         try {
             const stat = await this.fileService.write(this.uri, content, {
                 encoding: options?.encoding,
@@ -237,6 +242,8 @@ export class FileResource implements Resource {
                 throw ResourceError.OutOfSync({ message, stack, data: { uri: this.uri } });
             }
             throw e;
+        } finally {
+            releaseLock();
         }
     };
@@ -263,6 +270,8 @@ export class FileResource implements Resource {
             throw ResourceError.NotFound({ message: 'has not been read yet', data: { uri: this.uri } });
         }
         const etag = current?.etag;
+        const releaseLock = await this.writingLock.acquire();
         try {
             const stat = await this.fileService.update(this.uri, changes, {
                 readEncoding: current.encoding,
@@ -286,6 +295,8 @@ export class FileResource implements Resource {
                 throw ResourceError.OutOfSync({ message, stack, data: { uri: this.uri } });
             }
             throw e;
+        } finally {
+            releaseLock();
         }
     };
@@ -303,6 +314,7 @@ export class FileResource implements Resource {
     }
     protected async isInSync(): Promise<boolean> {
         try {
+            await this.writingLock.waitForUnlock();
             const stat = await this.fileService.resolve(this.uri, { resolveMetadata: true });
             return !!this.version && this.version.mtime >= stat.mtime;
         } catch {