@theia/workspace 1.45.1 → 1.46.0-next.72

package/lib/node/default-workspace-server.spec.js

@@ -1,86 +1,86 @@
-"use strict";
-// *****************************************************************************
-// Copyright (C) 2022 Alexander Flammer 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 inversify_1 = require("@theia/core/shared/inversify");
-const mock_env_variables_server_1 = require("@theia/core/lib/browser/test/mock-env-variables-server");
-const env_variables_1 = require("@theia/core/lib/common/env-variables");
-const node_1 = require("@theia/core/lib/node");
-const common_1 = require("../common");
-const default_workspace_server_1 = require("./default-workspace-server");
-const chai_1 = require("chai");
-const temp = require("temp");
-const fs = require("fs");
-describe('DefaultWorkspaceServer', function () {
-    describe('getRecentWorkspaces()', async () => {
-        let workspaceServer;
-        let tmpConfigDir;
-        let recentWorkspaceFile;
-        beforeEach(() => {
-            // create a temporary directory
-            const tempDirPath = temp.track().mkdirSync();
-            tmpConfigDir = node_1.FileUri.create(fs.realpathSync(tempDirPath));
-            recentWorkspaceFile = node_1.FileUri.fsPath(tmpConfigDir.resolve('recentworkspace.json'));
-            // create a container with the necessary bindings for the DefaultWorkspaceServer
-            const container = new inversify_1.Container();
-            container.bind(default_workspace_server_1.WorkspaceCliContribution).toSelf().inSingletonScope();
-            container.bind(default_workspace_server_1.DefaultWorkspaceServer).toSelf().inSingletonScope();
-            container.bind(common_1.WorkspaceFileService).toSelf().inSingletonScope();
-            container.bind(common_1.UntitledWorkspaceService).toSelf().inSingletonScope();
-            container.bind(env_variables_1.EnvVariablesServer).toConstantValue(new mock_env_variables_server_1.MockEnvVariablesServerImpl(tmpConfigDir));
-            workspaceServer = container.get(default_workspace_server_1.DefaultWorkspaceServer);
-        });
-        it('should return empty list of workspaces if no recent workspaces file is existing', async function () {
-            const recent = await workspaceServer.getRecentWorkspaces();
-            (0, chai_1.expect)(recent).to.be.empty;
-        });
-        it('should not return non-existing workspaces from recent workspaces file', async function () {
-            fs.writeFileSync(recentWorkspaceFile, JSON.stringify({
-                recentRoots: [
-                    tmpConfigDir.resolve('somethingNotExisting').toString(),
-                    tmpConfigDir.resolve('somethingElseNotExisting').toString()
-                ]
-            }));
-            const recent = await workspaceServer.getRecentWorkspaces();
-            (0, chai_1.expect)(recent).to.be.empty;
-        });
-        it('should return only existing workspaces from recent workspaces file', async function () {
-            fs.writeFileSync(recentWorkspaceFile, JSON.stringify({
-                recentRoots: [
-                    tmpConfigDir.toString(),
-                    tmpConfigDir.resolve('somethingNotExisting').toString()
-                ]
-            }));
-            const recent = await workspaceServer.getRecentWorkspaces();
-            (0, chai_1.expect)(recent).to.have.members([tmpConfigDir.toString()]);
-        });
-        it('should ignore non-string array entries but return remaining existing file paths', async function () {
-            // previously caused: 'TypeError: Cannot read property 'fsPath' of undefined', see issue #10250
-            fs.writeFileSync(recentWorkspaceFile, JSON.stringify({
-                recentRoots: [
-                    [tmpConfigDir.toString()],
-                    {},
-                    12345678,
-                    undefined,
-                    tmpConfigDir.toString(),
-                ]
-            }));
-            const recent = await workspaceServer.getRecentWorkspaces();
-            (0, chai_1.expect)(recent).to.have.members([tmpConfigDir.toString()]);
-        });
-    });
-});
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2022 Alexander Flammer 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 inversify_1 = require("@theia/core/shared/inversify");
+const mock_env_variables_server_1 = require("@theia/core/lib/browser/test/mock-env-variables-server");
+const env_variables_1 = require("@theia/core/lib/common/env-variables");
+const node_1 = require("@theia/core/lib/node");
+const common_1 = require("../common");
+const default_workspace_server_1 = require("./default-workspace-server");
+const chai_1 = require("chai");
+const temp = require("temp");
+const fs = require("fs");
+describe('DefaultWorkspaceServer', function () {
+    describe('getRecentWorkspaces()', async () => {
+        let workspaceServer;
+        let tmpConfigDir;
+        let recentWorkspaceFile;
+        beforeEach(() => {
+            // create a temporary directory
+            const tempDirPath = temp.track().mkdirSync();
+            tmpConfigDir = node_1.FileUri.create(fs.realpathSync(tempDirPath));
+            recentWorkspaceFile = node_1.FileUri.fsPath(tmpConfigDir.resolve('recentworkspace.json'));
+            // create a container with the necessary bindings for the DefaultWorkspaceServer
+            const container = new inversify_1.Container();
+            container.bind(default_workspace_server_1.WorkspaceCliContribution).toSelf().inSingletonScope();
+            container.bind(default_workspace_server_1.DefaultWorkspaceServer).toSelf().inSingletonScope();
+            container.bind(common_1.WorkspaceFileService).toSelf().inSingletonScope();
+            container.bind(common_1.UntitledWorkspaceService).toSelf().inSingletonScope();
+            container.bind(env_variables_1.EnvVariablesServer).toConstantValue(new mock_env_variables_server_1.MockEnvVariablesServerImpl(tmpConfigDir));
+            workspaceServer = container.get(default_workspace_server_1.DefaultWorkspaceServer);
+        });
+        it('should return empty list of workspaces if no recent workspaces file is existing', async function () {
+            const recent = await workspaceServer.getRecentWorkspaces();
+            (0, chai_1.expect)(recent).to.be.empty;
+        });
+        it('should not return non-existing workspaces from recent workspaces file', async function () {
+            fs.writeFileSync(recentWorkspaceFile, JSON.stringify({
+                recentRoots: [
+                    tmpConfigDir.resolve('somethingNotExisting').toString(),
+                    tmpConfigDir.resolve('somethingElseNotExisting').toString()
+                ]
+            }));
+            const recent = await workspaceServer.getRecentWorkspaces();
+            (0, chai_1.expect)(recent).to.be.empty;
+        });
+        it('should return only existing workspaces from recent workspaces file', async function () {
+            fs.writeFileSync(recentWorkspaceFile, JSON.stringify({
+                recentRoots: [
+                    tmpConfigDir.toString(),
+                    tmpConfigDir.resolve('somethingNotExisting').toString()
+                ]
+            }));
+            const recent = await workspaceServer.getRecentWorkspaces();
+            (0, chai_1.expect)(recent).to.have.members([tmpConfigDir.toString()]);
+        });
+        it('should ignore non-string array entries but return remaining existing file paths', async function () {
+            // previously caused: 'TypeError: Cannot read property 'fsPath' of undefined', see issue #10250
+            fs.writeFileSync(recentWorkspaceFile, JSON.stringify({
+                recentRoots: [
+                    [tmpConfigDir.toString()],
+                    {},
+                    12345678,
+                    undefined,
+                    tmpConfigDir.toString(),
+                ]
+            }));
+            const recent = await workspaceServer.getRecentWorkspaces();
+            (0, chai_1.expect)(recent).to.have.members([tmpConfigDir.toString()]);
+        });
+    });
+});
 //# sourceMappingURL=default-workspace-server.spec.js.map

package/lib/node/index.d.ts

@@ -1,3 +1,3 @@
-export * from './default-workspace-server';
-export * from './workspace-backend-module';
+export * from './default-workspace-server';
+export * from './workspace-backend-module';
 //# sourceMappingURL=index.d.ts.map

package/lib/node/index.js

@@ -1,30 +1,30 @@
-"use strict";
-// *****************************************************************************
-// Copyright (C) 2017 TypeFox 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
-// *****************************************************************************
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./default-workspace-server"), exports);
-__exportStar(require("./workspace-backend-module"), exports);
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2017 TypeFox 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
+// *****************************************************************************
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./default-workspace-server"), exports);
+__exportStar(require("./workspace-backend-module"), exports);
 //# sourceMappingURL=index.js.map

package/lib/node/workspace-backend-module.d.ts

@@ -1,4 +1,4 @@
-import { ContainerModule } from '@theia/core/shared/inversify';
-declare const _default: ContainerModule;
-export default _default;
+import { ContainerModule } from '@theia/core/shared/inversify';
+declare const _default: ContainerModule;
+export default _default;
 //# sourceMappingURL=workspace-backend-module.d.ts.map

package/lib/node/workspace-backend-module.js

@@ -1,34 +1,34 @@
-"use strict";
-// *****************************************************************************
-// Copyright (C) 2017 TypeFox 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 inversify_1 = require("@theia/core/shared/inversify");
-const common_1 = require("@theia/core/lib/common");
-const common_2 = require("../common");
-const default_workspace_server_1 = require("./default-workspace-server");
-const cli_1 = require("@theia/core/lib/node/cli");
-const node_1 = require("@theia/core/lib/node");
-exports.default = new inversify_1.ContainerModule(bind => {
-    bind(default_workspace_server_1.WorkspaceCliContribution).toSelf().inSingletonScope();
-    bind(cli_1.CliContribution).toService(default_workspace_server_1.WorkspaceCliContribution);
-    bind(default_workspace_server_1.DefaultWorkspaceServer).toSelf().inSingletonScope();
-    bind(common_2.WorkspaceServer).toService(default_workspace_server_1.DefaultWorkspaceServer);
-    bind(node_1.BackendApplicationContribution).toService(common_2.WorkspaceServer);
-    bind(common_2.UntitledWorkspaceService).toSelf().inSingletonScope();
-    bind(common_2.WorkspaceFileService).toSelf().inSingletonScope();
-    bind(common_1.ConnectionHandler).toDynamicValue(ctx => new common_1.RpcConnectionHandler(common_2.workspacePath, () => ctx.container.get(common_2.WorkspaceServer))).inSingletonScope();
-});
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2017 TypeFox 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 inversify_1 = require("@theia/core/shared/inversify");
+const common_1 = require("@theia/core/lib/common");
+const common_2 = require("../common");
+const default_workspace_server_1 = require("./default-workspace-server");
+const cli_1 = require("@theia/core/lib/node/cli");
+const node_1 = require("@theia/core/lib/node");
+exports.default = new inversify_1.ContainerModule(bind => {
+    bind(default_workspace_server_1.WorkspaceCliContribution).toSelf().inSingletonScope();
+    bind(cli_1.CliContribution).toService(default_workspace_server_1.WorkspaceCliContribution);
+    bind(default_workspace_server_1.DefaultWorkspaceServer).toSelf().inSingletonScope();
+    bind(common_2.WorkspaceServer).toService(default_workspace_server_1.DefaultWorkspaceServer);
+    bind(node_1.BackendApplicationContribution).toService(common_2.WorkspaceServer);
+    bind(common_2.UntitledWorkspaceService).toSelf().inSingletonScope();
+    bind(common_2.WorkspaceFileService).toSelf().inSingletonScope();
+    bind(common_1.ConnectionHandler).toDynamicValue(ctx => new common_1.RpcConnectionHandler(common_2.workspacePath, () => ctx.container.get(common_2.WorkspaceServer))).inSingletonScope();
+});
 //# sourceMappingURL=workspace-backend-module.js.map

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@theia/workspace",
-  "version": "1.45.1",
+  "version": "1.46.0-next.72+4a275b29d",
   "description": "Theia - Workspace Extension",
   "dependencies": {
-    "@theia/core": "1.45.1",
-    "@theia/filesystem": "1.45.1",
-    "@theia/variable-resolver": "1.45.1",
+    "@theia/core": "1.46.0-next.72+4a275b29d",
+    "@theia/filesystem": "1.46.0-next.72+4a275b29d",
+    "@theia/variable-resolver": "1.46.0-next.72+4a275b29d",
     "jsonc-parser": "^2.2.0",
     "valid-filename": "^2.0.1"
   },
@@ -16,6 +16,9 @@
     {
       "frontend": "lib/browser/workspace-frontend-module",
       "backend": "lib/node/workspace-backend-module"
+    },
+    {
+      "frontendOnly": "lib/browser-only/workspace-frontend-only-module"
     }
   ],
   "keywords": [
@@ -43,10 +46,10 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.45.1"
+    "@theia/ext-scripts": "1.46.0"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "3837c50544190b80d0ad8e87aa9fa9f286c70fcc"
+  "gitHead": "4a275b29d0db6c81190488c7f76cb667da05ef19"
 }

package/src/browser/canonical-uri-service.ts

@@ -1,57 +1,57 @@
-// *****************************************************************************
-// Copyright (C) 2023 STMicroelectronics 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 { CancellationToken, URI } from '@theia/core/lib/common';
-import { injectable } from '@theia/core/shared/inversify';
-import { Disposable } from '@theia/core/shared/vscode-languageserver-protocol';
-
-export interface CanonicalUriProvider extends Disposable {
-    provideCanonicalUri(uri: URI, targetScheme: string, token: CancellationToken): Promise<URI | undefined>;
-}
-
-@injectable()
-export class CanonicalUriService {
-    private providers = new Map<string, CanonicalUriProvider>();
-
-    registerCanonicalUriProvider(scheme: string, provider: CanonicalUriProvider): Disposable {
-        if (this.providers.has(scheme)) {
-            throw new Error(`Canonical URI provider for scheme: '${scheme}' already exists`);
-        }
-
-        this.providers.set(scheme, provider);
-        return Disposable.create(() => { this.removeCanonicalUriProvider(scheme); });
-    }
-
-    private removeCanonicalUriProvider(scheme: string): void {
-        const provider = this.providers.get(scheme);
-        if (!provider) {
-            throw new Error(`No Canonical URI provider for scheme: '${scheme}' exists`);
-        }
-
-        this.providers.delete(scheme);
-        provider.dispose();
-    }
-
-    async provideCanonicalUri(uri: URI, targetScheme: string, token: CancellationToken = CancellationToken.None): Promise<URI | undefined> {
-        const provider = this.providers.get(uri.scheme);
-        if (!provider) {
-            console.warn(`No Canonical URI provider for scheme: '${uri.scheme}' exists`);
-            return undefined;
-        }
-
-        return provider.provideCanonicalUri(uri, targetScheme, token);
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2023 STMicroelectronics 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 { CancellationToken, URI } from '@theia/core/lib/common';
+import { injectable } from '@theia/core/shared/inversify';
+import { Disposable } from '@theia/core/shared/vscode-languageserver-protocol';
+
+export interface CanonicalUriProvider extends Disposable {
+    provideCanonicalUri(uri: URI, targetScheme: string, token: CancellationToken): Promise<URI | undefined>;
+}
+
+@injectable()
+export class CanonicalUriService {
+    private providers = new Map<string, CanonicalUriProvider>();
+
+    registerCanonicalUriProvider(scheme: string, provider: CanonicalUriProvider): Disposable {
+        if (this.providers.has(scheme)) {
+            throw new Error(`Canonical URI provider for scheme: '${scheme}' already exists`);
+        }
+
+        this.providers.set(scheme, provider);
+        return Disposable.create(() => { this.removeCanonicalUriProvider(scheme); });
+    }
+
+    private removeCanonicalUriProvider(scheme: string): void {
+        const provider = this.providers.get(scheme);
+        if (!provider) {
+            throw new Error(`No Canonical URI provider for scheme: '${scheme}' exists`);
+        }
+
+        this.providers.delete(scheme);
+        provider.dispose();
+    }
+
+    async provideCanonicalUri(uri: URI, targetScheme: string, token: CancellationToken = CancellationToken.None): Promise<URI | undefined> {
+        const provider = this.providers.get(uri.scheme);
+        if (!provider) {
+            console.warn(`No Canonical URI provider for scheme: '${uri.scheme}' exists`);
+            return undefined;
+        }
+
+        return provider.provideCanonicalUri(uri, targetScheme, token);
+    }
+}

package/src/browser/diff-service.ts

@@ -1,62 +1,62 @@
-// *****************************************************************************
-// Copyright (C) 2017 TypeFox 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 { inject, injectable } from '@theia/core/shared/inversify';
-import URI from '@theia/core/lib/common/uri';
-import { DiffUris } from '@theia/core/lib/browser/diff-uris';
-import { open, OpenerService, OpenerOptions } from '@theia/core/lib/browser';
-import { MessageService } from '@theia/core/lib/common/message-service';
-import { FileService } from '@theia/filesystem/lib/browser/file-service';
-
-@injectable()
-export class DiffService {
-
-    @inject(FileService) protected readonly fileService: FileService;
-    @inject(OpenerService) protected readonly openerService: OpenerService;
-    @inject(MessageService) protected readonly messageService: MessageService;
-
-    public async openDiffEditor(left: URI, right: URI, label?: string, options?: OpenerOptions): Promise<void> {
-        if (left.scheme === 'file' && right.scheme === 'file') {
-            const [resolvedLeft, resolvedRight] = await this.fileService.resolveAll([{ resource: left }, { resource: right }]);
-            if (resolvedLeft.success && resolvedRight.success) {
-                const leftStat = resolvedLeft.stat;
-                const rightStat = resolvedRight.stat;
-                if (leftStat && rightStat) {
-                    if (!leftStat.isDirectory && !rightStat.isDirectory) {
-                        const uri = DiffUris.encode(left, right, label);
-                        await open(this.openerService, uri, options);
-                    } else {
-                        const details = (() => {
-                            if (leftStat.isDirectory && rightStat.isDirectory) {
-                                return 'Both resource were a directory.';
-                            } else {
-                                if (leftStat.isDirectory) {
-                                    return `'${left.path.base}' was a directory.`;
-                                } else {
-                                    return `'${right.path.base}' was a directory.`;
-                                }
-                            }
-                        });
-                        this.messageService.warn(`Directories cannot be compared. ${details()}`);
-                    }
-                }
-            }
-        } else {
-            const uri = DiffUris.encode(left, right, label);
-            await open(this.openerService, uri, options);
-        }
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2017 TypeFox 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 { inject, injectable } from '@theia/core/shared/inversify';
+import URI from '@theia/core/lib/common/uri';
+import { DiffUris } from '@theia/core/lib/browser/diff-uris';
+import { open, OpenerService, OpenerOptions } from '@theia/core/lib/browser';
+import { MessageService } from '@theia/core/lib/common/message-service';
+import { FileService } from '@theia/filesystem/lib/browser/file-service';
+
+@injectable()
+export class DiffService {
+
+    @inject(FileService) protected readonly fileService: FileService;
+    @inject(OpenerService) protected readonly openerService: OpenerService;
+    @inject(MessageService) protected readonly messageService: MessageService;
+
+    public async openDiffEditor(left: URI, right: URI, label?: string, options?: OpenerOptions): Promise<void> {
+        if (left.scheme === 'file' && right.scheme === 'file') {
+            const [resolvedLeft, resolvedRight] = await this.fileService.resolveAll([{ resource: left }, { resource: right }]);
+            if (resolvedLeft.success && resolvedRight.success) {
+                const leftStat = resolvedLeft.stat;
+                const rightStat = resolvedRight.stat;
+                if (leftStat && rightStat) {
+                    if (!leftStat.isDirectory && !rightStat.isDirectory) {
+                        const uri = DiffUris.encode(left, right, label);
+                        await open(this.openerService, uri, options);
+                    } else {
+                        const details = (() => {
+                            if (leftStat.isDirectory && rightStat.isDirectory) {
+                                return 'Both resource were a directory.';
+                            } else {
+                                if (leftStat.isDirectory) {
+                                    return `'${left.path.base}' was a directory.`;
+                                } else {
+                                    return `'${right.path.base}' was a directory.`;
+                                }
+                            }
+                        });
+                        this.messageService.warn(`Directories cannot be compared. ${details()}`);
+                    }
+                }
+            }
+        } else {
+            const uri = DiffUris.encode(left, right, label);
+            await open(this.openerService, uri, options);
+        }
+    }
+}