@theia/workspace 1.68.0-next.7 → 1.68.0-next.79

package/lib/browser/workspace-trust-service.spec.js

@@ -0,0 +1,357 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2026 EclipseSource GmbH.
+//
+// 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 chai_1 = require("chai");
+const sinon = require("sinon");
+const preferences_1 = require("@theia/core/lib/common/preferences");
+const workspace_trust_service_1 = require("./workspace-trust-service");
+const workspace_trust_preferences_1 = require("../common/workspace-trust-preferences");
+const uri_1 = require("@theia/core/lib/common/uri");
+class TestableWorkspaceTrustService extends workspace_trust_service_1.WorkspaceTrustService {
+    async testHandlePreferenceChange(change) {
+        return this.handlePreferenceChange(change);
+    }
+    async testHandleWorkspaceChanged() {
+        return this.handleWorkspaceChanged();
+    }
+    setCurrentTrust(trust) {
+        this.currentTrust = trust;
+    }
+    getCurrentTrust() {
+        return this.currentTrust;
+    }
+    isWorkspaceTrustResolved() {
+        return super.isWorkspaceTrustResolved();
+    }
+    async testCalculateWorkspaceTrust() {
+        return this.calculateWorkspaceTrust();
+    }
+}
+describe('WorkspaceTrustService', () => {
+    let service;
+    beforeEach(() => {
+        service = new TestableWorkspaceTrustService();
+    });
+    afterEach(() => {
+        sinon.restore();
+    });
+    describe('calculateWorkspaceTrust', () => {
+        let workspaceTrustPrefStub;
+        let workspaceServiceStub;
+        let untitledWorkspaceServiceStub;
+        let envVariablesServerStub;
+        beforeEach(() => {
+            workspaceTrustPrefStub = {
+                [workspace_trust_preferences_1.WORKSPACE_TRUST_ENABLED]: true,
+                [workspace_trust_preferences_1.WORKSPACE_TRUST_EMPTY_WINDOW]: false,
+                [workspace_trust_preferences_1.WORKSPACE_TRUST_STARTUP_PROMPT]: workspace_trust_preferences_1.WorkspaceTrustPrompt.NEVER,
+                [workspace_trust_preferences_1.WORKSPACE_TRUST_TRUSTED_FOLDERS]: []
+            };
+            workspaceServiceStub = {
+                tryGetRoots: () => [],
+                workspace: undefined,
+                saved: false
+            };
+            untitledWorkspaceServiceStub = {
+                isUntitledWorkspace: () => false
+            };
+            envVariablesServerStub = {
+                getConfigDirUri: async () => 'file:///home/user/.theia'
+            };
+            service.workspaceTrustPref = workspaceTrustPrefStub;
+            service.workspaceService = workspaceServiceStub;
+            service.untitledWorkspaceService = untitledWorkspaceServiceStub;
+            service.envVariablesServer = envVariablesServerStub;
+        });
+        it('should return true when trust is disabled', async () => {
+            workspaceTrustPrefStub[workspace_trust_preferences_1.WORKSPACE_TRUST_ENABLED] = false;
+            (0, chai_1.expect)(await service.testCalculateWorkspaceTrust()).to.be.true;
+        });
+        describe('empty workspace', () => {
+            it('should return emptyWindow setting when no workspace is open', async () => {
+                workspaceServiceStub.workspace = undefined;
+                workspaceTrustPrefStub[workspace_trust_preferences_1.WORKSPACE_TRUST_EMPTY_WINDOW] = true;
+                (0, chai_1.expect)(await service.testCalculateWorkspaceTrust()).to.be.true;
+            });
+            it('should return false when emptyWindow is false and no workspace', async () => {
+                workspaceServiceStub.workspace = undefined;
+                workspaceTrustPrefStub[workspace_trust_preferences_1.WORKSPACE_TRUST_EMPTY_WINDOW] = false;
+                (0, chai_1.expect)(await service.testCalculateWorkspaceTrust()).to.be.false;
+            });
+            it('should return emptyWindow setting for untitled workspace with no folders', async () => {
+                workspaceServiceStub.workspace = { resource: new uri_1.default('file:///home/user/.theia/workspaces/Untitled-123.theia-workspace') };
+                workspaceServiceStub.tryGetRoots = () => [];
+                untitledWorkspaceServiceStub.isUntitledWorkspace = () => true;
+                workspaceTrustPrefStub[workspace_trust_preferences_1.WORKSPACE_TRUST_EMPTY_WINDOW] = true;
+                (0, chai_1.expect)(await service.testCalculateWorkspaceTrust()).to.be.true;
+            });
+            it('should not treat saved workspace with no folders as empty', async () => {
+                workspaceServiceStub.workspace = { resource: new uri_1.default('file:///home/user/my.theia-workspace') };
+                workspaceServiceStub.tryGetRoots = () => [];
+                workspaceServiceStub.saved = true;
+                untitledWorkspaceServiceStub.isUntitledWorkspace = () => false;
+                workspaceTrustPrefStub[workspace_trust_preferences_1.WORKSPACE_TRUST_EMPTY_WINDOW] = true;
+                // Should return false because saved workspace with 0 folders is not "empty"
+                // and the workspace file is not trusted
+                (0, chai_1.expect)(await service.testCalculateWorkspaceTrust()).to.be.false;
+            });
+        });
+        describe('single-root workspace', () => {
+            it('should return true when folder is in trusted folders', async () => {
+                workspaceTrustPrefStub[workspace_trust_preferences_1.WORKSPACE_TRUST_TRUSTED_FOLDERS] = ['file:///home/user/project'];
+                workspaceServiceStub.workspace = { resource: new uri_1.default('file:///home/user/project') };
+                workspaceServiceStub.tryGetRoots = () => [
+                    { resource: new uri_1.default('file:///home/user/project') }
+                ];
+                (0, chai_1.expect)(await service.testCalculateWorkspaceTrust()).to.be.true;
+            });
+            it('should return true when parent folder is trusted', async () => {
+                workspaceTrustPrefStub[workspace_trust_preferences_1.WORKSPACE_TRUST_TRUSTED_FOLDERS] = ['file:///home/user'];
+                workspaceServiceStub.workspace = { resource: new uri_1.default('file:///home/user/project') };
+                workspaceServiceStub.tryGetRoots = () => [
+                    { resource: new uri_1.default('file:///home/user/project') }
+                ];
+                (0, chai_1.expect)(await service.testCalculateWorkspaceTrust()).to.be.true;
+            });
+            it('should return false when folder is not trusted', async () => {
+                workspaceTrustPrefStub[workspace_trust_preferences_1.WORKSPACE_TRUST_TRUSTED_FOLDERS] = ['file:///home/other'];
+                workspaceServiceStub.workspace = { resource: new uri_1.default('file:///home/user/project') };
+                workspaceServiceStub.tryGetRoots = () => [
+                    { resource: new uri_1.default('file:///home/user/project') }
+                ];
+                (0, chai_1.expect)(await service.testCalculateWorkspaceTrust()).to.be.false;
+            });
+        });
+        describe('multi-root workspace', () => {
+            it('should return true when all folders are trusted', async () => {
+                workspaceTrustPrefStub[workspace_trust_preferences_1.WORKSPACE_TRUST_TRUSTED_FOLDERS] = [
+                    'file:///home/user/project1',
+                    'file:///home/user/project2'
+                ];
+                workspaceServiceStub.workspace = { resource: new uri_1.default('file:///home/user/my.theia-workspace') };
+                workspaceServiceStub.tryGetRoots = () => [
+                    { resource: new uri_1.default('file:///home/user/project1') },
+                    { resource: new uri_1.default('file:///home/user/project2') }
+                ];
+                (0, chai_1.expect)(await service.testCalculateWorkspaceTrust()).to.be.true;
+            });
+            it('should return false when one folder is not trusted', async () => {
+                workspaceTrustPrefStub[workspace_trust_preferences_1.WORKSPACE_TRUST_TRUSTED_FOLDERS] = ['file:///home/user/project1'];
+                workspaceServiceStub.workspace = { resource: new uri_1.default('file:///home/user/my.theia-workspace') };
+                workspaceServiceStub.tryGetRoots = () => [
+                    { resource: new uri_1.default('file:///home/user/project1') },
+                    { resource: new uri_1.default('file:///home/user/project2') }
+                ];
+                (0, chai_1.expect)(await service.testCalculateWorkspaceTrust()).to.be.false;
+            });
+            it('should return true when parent folder covers all roots', async () => {
+                workspaceTrustPrefStub[workspace_trust_preferences_1.WORKSPACE_TRUST_TRUSTED_FOLDERS] = ['file:///home/user'];
+                workspaceServiceStub.workspace = { resource: new uri_1.default('file:///home/user/my.theia-workspace') };
+                workspaceServiceStub.tryGetRoots = () => [
+                    { resource: new uri_1.default('file:///home/user/project1') },
+                    { resource: new uri_1.default('file:///home/user/project2') }
+                ];
+                (0, chai_1.expect)(await service.testCalculateWorkspaceTrust()).to.be.true;
+            });
+        });
+        describe('saved workspace file trust', () => {
+            it('should require workspace file to be trusted for saved workspaces', async () => {
+                // Folder is trusted but workspace file location is not
+                workspaceTrustPrefStub[workspace_trust_preferences_1.WORKSPACE_TRUST_TRUSTED_FOLDERS] = ['file:///home/user/project'];
+                workspaceServiceStub.workspace = { resource: new uri_1.default('file:///other/location/my.theia-workspace') };
+                workspaceServiceStub.saved = true;
+                workspaceServiceStub.tryGetRoots = () => [
+                    { resource: new uri_1.default('file:///home/user/project') }
+                ];
+                (0, chai_1.expect)(await service.testCalculateWorkspaceTrust()).to.be.false;
+            });
+            it('should return true when both folder and workspace file are trusted', async () => {
+                workspaceTrustPrefStub[workspace_trust_preferences_1.WORKSPACE_TRUST_TRUSTED_FOLDERS] = ['file:///home/user'];
+                workspaceServiceStub.workspace = { resource: new uri_1.default('file:///home/user/my.theia-workspace') };
+                workspaceServiceStub.saved = true;
+                workspaceServiceStub.tryGetRoots = () => [
+                    { resource: new uri_1.default('file:///home/user/project') }
+                ];
+                (0, chai_1.expect)(await service.testCalculateWorkspaceTrust()).to.be.true;
+            });
+            it('should not require workspace file trust for unsaved workspaces', async () => {
+                workspaceTrustPrefStub[workspace_trust_preferences_1.WORKSPACE_TRUST_TRUSTED_FOLDERS] = ['file:///home/user/project'];
+                workspaceServiceStub.workspace = { resource: new uri_1.default('file:///tmp/untitled.theia-workspace') };
+                workspaceServiceStub.saved = false;
+                workspaceServiceStub.tryGetRoots = () => [
+                    { resource: new uri_1.default('file:///home/user/project') }
+                ];
+                (0, chai_1.expect)(await service.testCalculateWorkspaceTrust()).to.be.true;
+            });
+        });
+    });
+    describe('handleWorkspaceChanged', () => {
+        let resolveWorkspaceTrustStub;
+        let getWorkspaceTrustStub;
+        let updateRestrictedModeIndicatorStub;
+        beforeEach(() => {
+            resolveWorkspaceTrustStub = sinon.stub(service, 'resolveWorkspaceTrust').resolves();
+            getWorkspaceTrustStub = sinon.stub(service, 'getWorkspaceTrust').resolves(true);
+            updateRestrictedModeIndicatorStub = sinon.stub(service, 'updateRestrictedModeIndicator');
+        });
+        it('should reset trust state when workspace changes', async () => {
+            service.setCurrentTrust(true);
+            await service.testHandleWorkspaceChanged();
+            (0, chai_1.expect)(service.getCurrentTrust()).to.be.undefined;
+        });
+        it('should re-evaluate trust when workspace changes', async () => {
+            service.setCurrentTrust(true);
+            await service.testHandleWorkspaceChanged();
+            (0, chai_1.expect)(resolveWorkspaceTrustStub.calledOnce).to.be.true;
+        });
+        it('should update restricted mode indicator after workspace change if not trusted', async () => {
+            getWorkspaceTrustStub.resolves(false);
+            await service.testHandleWorkspaceChanged();
+            (0, chai_1.expect)(updateRestrictedModeIndicatorStub.calledOnceWith(false)).to.be.true;
+        });
+        it('should reset workspaceTrust deferred to unresolved state', async () => {
+            // First resolve the trust
+            service.setCurrentTrust(true);
+            await service.testHandleWorkspaceChanged();
+            // After workspace change, it should be reset and resolved again via resolveWorkspaceTrust
+            (0, chai_1.expect)(resolveWorkspaceTrustStub.calledOnce).to.be.true;
+        });
+    });
+    describe('handlePreferenceChange', () => {
+        let areAllWorkspaceUrisTrustedStub;
+        let setWorkspaceTrustStub;
+        let isEmptyWorkspaceStub;
+        let workspaceTrustPrefStub;
+        beforeEach(() => {
+            areAllWorkspaceUrisTrustedStub = sinon.stub(service, 'areAllWorkspaceUrisTrusted');
+            setWorkspaceTrustStub = sinon.stub(service, 'setWorkspaceTrust');
+            isEmptyWorkspaceStub = sinon.stub(service, 'isEmptyWorkspace');
+            // Mock workspaceTrustPref - default emptyWindow to false so trusted folders logic runs
+            workspaceTrustPrefStub = { [workspace_trust_preferences_1.WORKSPACE_TRUST_EMPTY_WINDOW]: false };
+            service.workspaceTrustPref = workspaceTrustPrefStub;
+            // Default to non-empty workspace
+            isEmptyWorkspaceStub.resolves(false);
+        });
+        it('should update trust to true when all workspace URIs become trusted', async () => {
+            service.setCurrentTrust(false);
+            areAllWorkspaceUrisTrustedStub.resolves(true);
+            const change = {
+                preferenceName: workspace_trust_preferences_1.WORKSPACE_TRUST_TRUSTED_FOLDERS,
+                scope: preferences_1.PreferenceScope.User,
+                domain: [],
+                affects: () => true
+            };
+            await service.testHandlePreferenceChange(change);
+            (0, chai_1.expect)(setWorkspaceTrustStub.calledOnceWith(true)).to.be.true;
+        });
+        it('should update trust to false when not all workspace URIs are trusted', async () => {
+            service.setCurrentTrust(true);
+            areAllWorkspaceUrisTrustedStub.resolves(false);
+            const change = {
+                preferenceName: workspace_trust_preferences_1.WORKSPACE_TRUST_TRUSTED_FOLDERS,
+                scope: preferences_1.PreferenceScope.User,
+                domain: [],
+                affects: () => true
+            };
+            await service.testHandlePreferenceChange(change);
+            (0, chai_1.expect)(setWorkspaceTrustStub.calledOnceWith(false)).to.be.true;
+        });
+        it('should not update trust when trustedFolders change does not affect trust status', async () => {
+            service.setCurrentTrust(false);
+            areAllWorkspaceUrisTrustedStub.resolves(false);
+            const change = {
+                preferenceName: workspace_trust_preferences_1.WORKSPACE_TRUST_TRUSTED_FOLDERS,
+                scope: preferences_1.PreferenceScope.User,
+                domain: [],
+                affects: () => true
+            };
+            await service.testHandlePreferenceChange(change);
+            (0, chai_1.expect)(setWorkspaceTrustStub.called).to.be.false;
+        });
+        describe('emptyWindow setting changes', () => {
+            beforeEach(() => {
+                // Reset to empty workspace for empty window tests
+                isEmptyWorkspaceStub.resolves(true);
+            });
+            it('should update trust to true when emptyWindow setting changes to true for empty window', async () => {
+                service.setCurrentTrust(false);
+                workspaceTrustPrefStub[workspace_trust_preferences_1.WORKSPACE_TRUST_EMPTY_WINDOW] = true;
+                const change = {
+                    preferenceName: workspace_trust_preferences_1.WORKSPACE_TRUST_EMPTY_WINDOW,
+                    scope: preferences_1.PreferenceScope.User,
+                    domain: [],
+                    affects: () => true
+                };
+                await service.testHandlePreferenceChange(change);
+                (0, chai_1.expect)(setWorkspaceTrustStub.calledOnceWith(true)).to.be.true;
+            });
+            it('should update trust to false when emptyWindow setting changes to false for empty window', async () => {
+                service.setCurrentTrust(true);
+                const change = {
+                    preferenceName: workspace_trust_preferences_1.WORKSPACE_TRUST_EMPTY_WINDOW,
+                    scope: preferences_1.PreferenceScope.User,
+                    domain: [],
+                    affects: () => true
+                };
+                await service.testHandlePreferenceChange(change);
+                (0, chai_1.expect)(setWorkspaceTrustStub.calledOnceWith(false)).to.be.true;
+            });
+            it('should not update trust when emptyWindow setting changes but workspace has roots', async () => {
+                service.setCurrentTrust(false);
+                isEmptyWorkspaceStub.resolves(false);
+                const change = {
+                    preferenceName: workspace_trust_preferences_1.WORKSPACE_TRUST_EMPTY_WINDOW,
+                    scope: preferences_1.PreferenceScope.User,
+                    domain: [],
+                    affects: () => true
+                };
+                await service.testHandlePreferenceChange(change);
+                (0, chai_1.expect)(setWorkspaceTrustStub.called).to.be.false;
+            });
+            it('should not update trust when emptyWindow setting changes but trust already matches', async () => {
+                service.setCurrentTrust(true);
+                workspaceTrustPrefStub[workspace_trust_preferences_1.WORKSPACE_TRUST_EMPTY_WINDOW] = true;
+                const change = {
+                    preferenceName: workspace_trust_preferences_1.WORKSPACE_TRUST_EMPTY_WINDOW,
+                    scope: preferences_1.PreferenceScope.User,
+                    domain: [],
+                    affects: () => true
+                };
+                await service.testHandlePreferenceChange(change);
+                (0, chai_1.expect)(setWorkspaceTrustStub.called).to.be.false;
+            });
+        });
+        describe('trustedFolders change for empty window with emptyWindow enabled', () => {
+            beforeEach(() => {
+                isEmptyWorkspaceStub.resolves(true);
+                workspaceTrustPrefStub[workspace_trust_preferences_1.WORKSPACE_TRUST_EMPTY_WINDOW] = true;
+            });
+            it('should not change trust when trustedFolders change for empty window with emptyWindow enabled', async () => {
+                service.setCurrentTrust(true);
+                const change = {
+                    preferenceName: workspace_trust_preferences_1.WORKSPACE_TRUST_TRUSTED_FOLDERS,
+                    scope: preferences_1.PreferenceScope.User,
+                    domain: [],
+                    affects: () => true
+                };
+                await service.testHandlePreferenceChange(change);
+                (0, chai_1.expect)(setWorkspaceTrustStub.called).to.be.false;
+            });
+        });
+    });
+});
+//# sourceMappingURL=workspace-trust-service.spec.js.map

package/lib/browser/workspace-trust-service.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"workspace-trust-service.spec.js","sourceRoot":"","sources":["../../src/browser/workspace-trust-service.spec.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,gFAAgF;AAChF,gFAAgF;;AAEhF,+BAA8B;AAC9B,+BAA+B;AAC/B,oEAAuF;AACvF,uEAAkE;AAClE,uFAM+C;AAC/C,oDAA6C;AAE7C,MAAM,6BAA8B,SAAQ,+CAAqB;IACtD,KAAK,CAAC,0BAA0B,CAAC,MAAwB;QAC5D,OAAO,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;IAC/C,CAAC;IAEM,KAAK,CAAC,0BAA0B;QACnC,OAAO,IAAI,CAAC,sBAAsB,EAAE,CAAC;IACzC,CAAC;IAEM,eAAe,CAAC,KAA0B;QAC7C,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;IAC9B,CAAC;IAEM,eAAe;QAClB,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IAEe,wBAAwB;QACpC,OAAO,KAAK,CAAC,wBAAwB,EAAE,CAAC;IAC5C,CAAC;IAEM,KAAK,CAAC,2BAA2B;QACpC,OAAO,IAAI,CAAC,uBAAuB,EAAE,CAAC;IAC1C,CAAC;CACJ;AAED,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACnC,IAAI,OAAsC,CAAC;IAE3C,UAAU,CAAC,GAAG,EAAE;QACZ,OAAO,GAAG,IAAI,6BAA6B,EAAE,CAAC;IAClD,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACX,KAAK,CAAC,OAAO,EAAE,CAAC;IACpB,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;QACrC,IAAI,sBAAkD,CAAC;QACvD,IAAI,oBAIH,CAAC;QACF,IAAI,4BAEH,CAAC;QACF,IAAI,sBAEH,CAAC;QAEF,UAAU,CAAC,GAAG,EAAE;YACZ,sBAAsB,GAAG;gBACrB,CAAC,qDAAuB,CAAC,EAAE,IAAI;gBAC/B,CAAC,0DAA4B,CAAC,EAAE,KAAK;gBACrC,CAAC,4DAA8B,CAAC,EAAE,kDAAoB,CAAC,KAAK;gBAC5D,CAAC,6DAA+B,CAAC,EAAE,EAAE;aACxC,CAAC;YACF,oBAAoB,GAAG;gBACnB,WAAW,EAAE,GAAG,EAAE,CAAC,EAAE;gBACrB,SAAS,EAAE,SAAS;gBACpB,KAAK,EAAE,KAAK;aACf,CAAC;YACF,4BAA4B,GAAG;gBAC3B,mBAAmB,EAAE,GAAG,EAAE,CAAC,KAAK;aACnC,CAAC;YACF,sBAAsB,GAAG;gBACrB,eAAe,EAAE,KAAK,IAAI,EAAE,CAAC,0BAA0B;aAC1D,CAAC;YAED,OAA4E,CAAC,kBAAkB,GAAG,sBAAsB,CAAC;YACzH,OAAwE,CAAC,gBAAgB,GAAG,oBAAoB,CAAC;YACjH,OAAwF,CAAC,wBAAwB,GAAG,4BAA4B,CAAC;YACjJ,OAA4E,CAAC,kBAAkB,GAAG,sBAAsB,CAAC;QAC9H,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,2CAA2C,EAAE,KAAK,IAAI,EAAE;YACvD,sBAAsB,CAAC,qDAAuB,CAAC,GAAG,KAAK,CAAC;YAExD,IAAA,aAAM,EAAC,MAAM,OAAO,CAAC,2BAA2B,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QACnE,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;YAC7B,EAAE,CAAC,6DAA6D,EAAE,KAAK,IAAI,EAAE;gBACzE,oBAAoB,CAAC,SAAS,GAAG,SAAS,CAAC;gBAC3C,sBAAsB,CAAC,0DAA4B,CAAC,GAAG,IAAI,CAAC;gBAE5D,IAAA,aAAM,EAAC,MAAM,OAAO,CAAC,2BAA2B,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;YACnE,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,gEAAgE,EAAE,KAAK,IAAI,EAAE;gBAC5E,oBAAoB,CAAC,SAAS,GAAG,SAAS,CAAC;gBAC3C,sBAAsB,CAAC,0DAA4B,CAAC,GAAG,KAAK,CAAC;gBAE7D,IAAA,aAAM,EAAC,MAAM,OAAO,CAAC,2BAA2B,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;YACpE,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,0EAA0E,EAAE,KAAK,IAAI,EAAE;gBACtF,oBAAoB,CAAC,SAAS,GAAG,EAAE,QAAQ,EAAE,IAAI,aAAG,CAAC,kEAAkE,CAAC,EAAE,CAAC;gBAC3H,oBAAoB,CAAC,WAAW,GAAG,GAAG,EAAE,CAAC,EAAE,CAAC;gBAC5C,4BAA4B,CAAC,mBAAmB,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC;gBAC9D,sBAAsB,CAAC,0DAA4B,CAAC,GAAG,IAAI,CAAC;gBAE5D,IAAA,aAAM,EAAC,MAAM,OAAO,CAAC,2BAA2B,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;YACnE,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,2DAA2D,EAAE,KAAK,IAAI,EAAE;gBACvE,oBAAoB,CAAC,SAAS,GAAG,EAAE,QAAQ,EAAE,IAAI,aAAG,CAAC,sCAAsC,CAAC,EAAE,CAAC;gBAC/F,oBAAoB,CAAC,WAAW,GAAG,GAAG,EAAE,CAAC,EAAE,CAAC;gBAC5C,oBAAoB,CAAC,KAAK,GAAG,IAAI,CAAC;gBAClC,4BAA4B,CAAC,mBAAmB,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC;gBAC/D,sBAAsB,CAAC,0DAA4B,CAAC,GAAG,IAAI,CAAC;gBAE5D,4EAA4E;gBAC5E,wCAAwC;gBACxC,IAAA,aAAM,EAAC,MAAM,OAAO,CAAC,2BAA2B,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;YACpE,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;YACnC,EAAE,CAAC,sDAAsD,EAAE,KAAK,IAAI,EAAE;gBAClE,sBAAsB,CAAC,6DAA+B,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;gBACxF,oBAAoB,CAAC,SAAS,GAAG,EAAE,QAAQ,EAAE,IAAI,aAAG,CAAC,2BAA2B,CAAC,EAAE,CAAC;gBACpF,oBAAoB,CAAC,WAAW,GAAG,GAAG,EAAE,CAAC;oBACrC,EAAE,QAAQ,EAAE,IAAI,aAAG,CAAC,2BAA2B,CAAC,EAAE;iBACrD,CAAC;gBAEF,IAAA,aAAM,EAAC,MAAM,OAAO,CAAC,2BAA2B,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;YACnE,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,kDAAkD,EAAE,KAAK,IAAI,EAAE;gBAC9D,sBAAsB,CAAC,6DAA+B,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;gBAChF,oBAAoB,CAAC,SAAS,GAAG,EAAE,QAAQ,EAAE,IAAI,aAAG,CAAC,2BAA2B,CAAC,EAAE,CAAC;gBACpF,oBAAoB,CAAC,WAAW,GAAG,GAAG,EAAE,CAAC;oBACrC,EAAE,QAAQ,EAAE,IAAI,aAAG,CAAC,2BAA2B,CAAC,EAAE;iBACrD,CAAC;gBAEF,IAAA,aAAM,EAAC,MAAM,OAAO,CAAC,2BAA2B,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;YACnE,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,gDAAgD,EAAE,KAAK,IAAI,EAAE;gBAC5D,sBAAsB,CAAC,6DAA+B,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;gBACjF,oBAAoB,CAAC,SAAS,GAAG,EAAE,QAAQ,EAAE,IAAI,aAAG,CAAC,2BAA2B,CAAC,EAAE,CAAC;gBACpF,oBAAoB,CAAC,WAAW,GAAG,GAAG,EAAE,CAAC;oBACrC,EAAE,QAAQ,EAAE,IAAI,aAAG,CAAC,2BAA2B,CAAC,EAAE;iBACrD,CAAC;gBAEF,IAAA,aAAM,EAAC,MAAM,OAAO,CAAC,2BAA2B,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;YACpE,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;YAClC,EAAE,CAAC,iDAAiD,EAAE,KAAK,IAAI,EAAE;gBAC7D,sBAAsB,CAAC,6DAA+B,CAAC,GAAG;oBACtD,4BAA4B;oBAC5B,4BAA4B;iBAC/B,CAAC;gBACF,oBAAoB,CAAC,SAAS,GAAG,EAAE,QAAQ,EAAE,IAAI,aAAG,CAAC,sCAAsC,CAAC,EAAE,CAAC;gBAC/F,oBAAoB,CAAC,WAAW,GAAG,GAAG,EAAE,CAAC;oBACrC,EAAE,QAAQ,EAAE,IAAI,aAAG,CAAC,4BAA4B,CAAC,EAAE;oBACnD,EAAE,QAAQ,EAAE,IAAI,aAAG,CAAC,4BAA4B,CAAC,EAAE;iBACtD,CAAC;gBAEF,IAAA,aAAM,EAAC,MAAM,OAAO,CAAC,2BAA2B,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;YACnE,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;gBAChE,sBAAsB,CAAC,6DAA+B,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;gBACzF,oBAAoB,CAAC,SAAS,GAAG,EAAE,QAAQ,EAAE,IAAI,aAAG,CAAC,sCAAsC,CAAC,EAAE,CAAC;gBAC/F,oBAAoB,CAAC,WAAW,GAAG,GAAG,EAAE,CAAC;oBACrC,EAAE,QAAQ,EAAE,IAAI,aAAG,CAAC,4BAA4B,CAAC,EAAE;oBACnD,EAAE,QAAQ,EAAE,IAAI,aAAG,CAAC,4BAA4B,CAAC,EAAE;iBACtD,CAAC;gBAEF,IAAA,aAAM,EAAC,MAAM,OAAO,CAAC,2BAA2B,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;YACpE,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;gBACpE,sBAAsB,CAAC,6DAA+B,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;gBAChF,oBAAoB,CAAC,SAAS,GAAG,EAAE,QAAQ,EAAE,IAAI,aAAG,CAAC,sCAAsC,CAAC,EAAE,CAAC;gBAC/F,oBAAoB,CAAC,WAAW,GAAG,GAAG,EAAE,CAAC;oBACrC,EAAE,QAAQ,EAAE,IAAI,aAAG,CAAC,4BAA4B,CAAC,EAAE;oBACnD,EAAE,QAAQ,EAAE,IAAI,aAAG,CAAC,4BAA4B,CAAC,EAAE;iBACtD,CAAC;gBAEF,IAAA,aAAM,EAAC,MAAM,OAAO,CAAC,2BAA2B,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;YACnE,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;YACxC,EAAE,CAAC,kEAAkE,EAAE,KAAK,IAAI,EAAE;gBAC9E,uDAAuD;gBACvD,sBAAsB,CAAC,6DAA+B,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;gBACxF,oBAAoB,CAAC,SAAS,GAAG,EAAE,QAAQ,EAAE,IAAI,aAAG,CAAC,2CAA2C,CAAC,EAAE,CAAC;gBACpG,oBAAoB,CAAC,KAAK,GAAG,IAAI,CAAC;gBAClC,oBAAoB,CAAC,WAAW,GAAG,GAAG,EAAE,CAAC;oBACrC,EAAE,QAAQ,EAAE,IAAI,aAAG,CAAC,2BAA2B,CAAC,EAAE;iBACrD,CAAC;gBAEF,IAAA,aAAM,EAAC,MAAM,OAAO,CAAC,2BAA2B,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;YACpE,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,oEAAoE,EAAE,KAAK,IAAI,EAAE;gBAChF,sBAAsB,CAAC,6DAA+B,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;gBAChF,oBAAoB,CAAC,SAAS,GAAG,EAAE,QAAQ,EAAE,IAAI,aAAG,CAAC,sCAAsC,CAAC,EAAE,CAAC;gBAC/F,oBAAoB,CAAC,KAAK,GAAG,IAAI,CAAC;gBAClC,oBAAoB,CAAC,WAAW,GAAG,GAAG,EAAE,CAAC;oBACrC,EAAE,QAAQ,EAAE,IAAI,aAAG,CAAC,2BAA2B,CAAC,EAAE;iBACrD,CAAC;gBAEF,IAAA,aAAM,EAAC,MAAM,OAAO,CAAC,2BAA2B,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;YACnE,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,gEAAgE,EAAE,KAAK,IAAI,EAAE;gBAC5E,sBAAsB,CAAC,6DAA+B,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;gBACxF,oBAAoB,CAAC,SAAS,GAAG,EAAE,QAAQ,EAAE,IAAI,aAAG,CAAC,sCAAsC,CAAC,EAAE,CAAC;gBAC/F,oBAAoB,CAAC,KAAK,GAAG,KAAK,CAAC;gBACnC,oBAAoB,CAAC,WAAW,GAAG,GAAG,EAAE,CAAC;oBACrC,EAAE,QAAQ,EAAE,IAAI,aAAG,CAAC,2BAA2B,CAAC,EAAE;iBACrD,CAAC;gBAEF,IAAA,aAAM,EAAC,MAAM,OAAO,CAAC,2BAA2B,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;YACnE,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;QACpC,IAAI,yBAA0C,CAAC;QAC/C,IAAI,qBAAsC,CAAC;QAC3C,IAAI,iCAAkD,CAAC;QAEvD,UAAU,CAAC,GAAG,EAAE;YACZ,yBAAyB,GAAG,KAAK,CAAC,IAAI,CAAC,OAAoE,EAAE,uBAAuB,CAAC,CAAC,QAAQ,EAAE,CAAC;YACjJ,qBAAqB,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAChF,iCAAiC,GAAG,KAAK,CAAC,IAAI,CAC1C,OAAiF,EACjF,+BAA+B,CAClC,CAAC;QACN,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iDAAiD,EAAE,KAAK,IAAI,EAAE;YAC7D,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;YAE9B,MAAM,OAAO,CAAC,0BAA0B,EAAE,CAAC;YAE3C,IAAA,aAAM,EAAC,OAAO,CAAC,eAAe,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC;QACtD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iDAAiD,EAAE,KAAK,IAAI,EAAE;YAC7D,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;YAE9B,MAAM,OAAO,CAAC,0BAA0B,EAAE,CAAC;YAE3C,IAAA,aAAM,EAAC,yBAAyB,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QAC5D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,+EAA+E,EAAE,KAAK,IAAI,EAAE;YAC3F,qBAAqB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YAEtC,MAAM,OAAO,CAAC,0BAA0B,EAAE,CAAC;YAE3C,IAAA,aAAM,EAAC,iCAAiC,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QAC/E,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,0DAA0D,EAAE,KAAK,IAAI,EAAE;YACtE,0BAA0B;YAC1B,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;YAE9B,MAAM,OAAO,CAAC,0BAA0B,EAAE,CAAC;YAE3C,0FAA0F;YAC1F,IAAA,aAAM,EAAC,yBAAyB,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QAC5D,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;QACpC,IAAI,8BAA+C,CAAC;QACpD,IAAI,qBAAsC,CAAC;QAC3C,IAAI,oBAAqC,CAAC;QAC1C,IAAI,sBAAkD,CAAC;QAEvD,UAAU,CAAC,GAAG,EAAE;YACZ,8BAA8B,GAAG,KAAK,CAAC,IAAI,CAAC,OAA4E,EAAE,4BAA4B,CAAC,CAAC;YACxJ,qBAAqB,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC;YACjE,oBAAoB,GAAG,KAAK,CAAC,IAAI,CAAC,OAAkE,EAAE,kBAAkB,CAAC,CAAC;YAC1H,uFAAuF;YACvF,sBAAsB,GAAG,EAAE,CAAC,0DAA4B,CAAC,EAAE,KAAK,EAAE,CAAC;YAClE,OAAyE,CAAC,kBAAkB,GAAG,sBAAsB,CAAC;YACvH,iCAAiC;YACjC,oBAAoB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,oEAAoE,EAAE,KAAK,IAAI,EAAE;YAChF,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;YAC/B,8BAA8B,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAE9C,MAAM,MAAM,GAAqB;gBAC7B,cAAc,EAAE,6DAA+B;gBAC/C,KAAK,EAAE,6BAAe,CAAC,IAAI;gBAC3B,MAAM,EAAE,EAAE;gBACV,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI;aACtB,CAAC;YAEF,MAAM,OAAO,CAAC,0BAA0B,CAAC,MAAM,CAAC,CAAC;YAEjD,IAAA,aAAM,EAAC,qBAAqB,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QAClE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,sEAAsE,EAAE,KAAK,IAAI,EAAE;YAClF,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;YAC9B,8BAA8B,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YAE/C,MAAM,MAAM,GAAqB;gBAC7B,cAAc,EAAE,6DAA+B;gBAC/C,KAAK,EAAE,6BAAe,CAAC,IAAI;gBAC3B,MAAM,EAAE,EAAE;gBACV,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI;aACtB,CAAC;YAEF,MAAM,OAAO,CAAC,0BAA0B,CAAC,MAAM,CAAC,CAAC;YAEjD,IAAA,aAAM,EAAC,qBAAqB,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QACnE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iFAAiF,EAAE,KAAK,IAAI,EAAE;YAC7F,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;YAC/B,8BAA8B,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YAE/C,MAAM,MAAM,GAAqB;gBAC7B,cAAc,EAAE,6DAA+B;gBAC/C,KAAK,EAAE,6BAAe,CAAC,IAAI;gBAC3B,MAAM,EAAE,EAAE;gBACV,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI;aACtB,CAAC;YAEF,MAAM,OAAO,CAAC,0BAA0B,CAAC,MAAM,CAAC,CAAC;YAEjD,IAAA,aAAM,EAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;QACrD,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,6BAA6B,EAAE,GAAG,EAAE;YACzC,UAAU,CAAC,GAAG,EAAE;gBACZ,kDAAkD;gBAClD,oBAAoB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACxC,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,uFAAuF,EAAE,KAAK,IAAI,EAAE;gBACnG,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;gBAC/B,sBAAsB,CAAC,0DAA4B,CAAC,GAAG,IAAI,CAAC;gBAE5D,MAAM,MAAM,GAAqB;oBAC7B,cAAc,EAAE,0DAA4B;oBAC5C,KAAK,EAAE,6BAAe,CAAC,IAAI;oBAC3B,MAAM,EAAE,EAAE;oBACV,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI;iBACtB,CAAC;gBAEF,MAAM,OAAO,CAAC,0BAA0B,CAAC,MAAM,CAAC,CAAC;gBAEjD,IAAA,aAAM,EAAC,qBAAqB,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;YAClE,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,yFAAyF,EAAE,KAAK,IAAI,EAAE;gBACrG,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;gBAE9B,MAAM,MAAM,GAAqB;oBAC7B,cAAc,EAAE,0DAA4B;oBAC5C,KAAK,EAAE,6BAAe,CAAC,IAAI;oBAC3B,MAAM,EAAE,EAAE;oBACV,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI;iBACtB,CAAC;gBAEF,MAAM,OAAO,CAAC,0BAA0B,CAAC,MAAM,CAAC,CAAC;gBAEjD,IAAA,aAAM,EAAC,qBAAqB,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;YACnE,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,kFAAkF,EAAE,KAAK,IAAI,EAAE;gBAC9F,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;gBAC/B,oBAAoB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;gBAErC,MAAM,MAAM,GAAqB;oBAC7B,cAAc,EAAE,0DAA4B;oBAC5C,KAAK,EAAE,6BAAe,CAAC,IAAI;oBAC3B,MAAM,EAAE,EAAE;oBACV,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI;iBACtB,CAAC;gBAEF,MAAM,OAAO,CAAC,0BAA0B,CAAC,MAAM,CAAC,CAAC;gBAEjD,IAAA,aAAM,EAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;YACrD,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,oFAAoF,EAAE,KAAK,IAAI,EAAE;gBAChG,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;gBAC9B,sBAAsB,CAAC,0DAA4B,CAAC,GAAG,IAAI,CAAC;gBAE5D,MAAM,MAAM,GAAqB;oBAC7B,cAAc,EAAE,0DAA4B;oBAC5C,KAAK,EAAE,6BAAe,CAAC,IAAI;oBAC3B,MAAM,EAAE,EAAE;oBACV,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI;iBACtB,CAAC;gBAEF,MAAM,OAAO,CAAC,0BAA0B,CAAC,MAAM,CAAC,CAAC;gBAEjD,IAAA,aAAM,EAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;YACrD,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,iEAAiE,EAAE,GAAG,EAAE;YAC7E,UAAU,CAAC,GAAG,EAAE;gBACZ,oBAAoB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gBACpC,sBAAsB,CAAC,0DAA4B,CAAC,GAAG,IAAI,CAAC;YAChE,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,8FAA8F,EAAE,KAAK,IAAI,EAAE;gBAC1G,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;gBAE9B,MAAM,MAAM,GAAqB;oBAC7B,cAAc,EAAE,6DAA+B;oBAC/C,KAAK,EAAE,6BAAe,CAAC,IAAI;oBAC3B,MAAM,EAAE,EAAE;oBACV,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI;iBACtB,CAAC;gBAEF,MAAM,OAAO,CAAC,0BAA0B,CAAC,MAAM,CAAC,CAAC;gBAEjD,IAAA,aAAM,EAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;YACrD,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

package/lib/browser/workspace-uri-contribution.js

@@ -68,12 +68,11 @@ let WorkspaceUriLabelProviderContribution = class WorkspaceUriLabelProviderContr
         return this.getLongName(uri.parent);
     }
     asURIIconReference(element) {
-        var _a;
         if (files_1.FileStat.is(element)) {
             return label_provider_1.URIIconReference.create(element.isDirectory ? 'folder' : 'file', element.resource);
         }
         const uri = this.getUri(element);
-        if (uri && ((_a = this.workspaceVariable.getWorkspaceRootUri(uri)) === null || _a === void 0 ? void 0 : _a.isEqual(uri))) {
+        if (uri && this.workspaceVariable.getWorkspaceRootUri(uri)?.isEqual(uri)) {
             return label_provider_1.URIIconReference.create('folder', uri);
         }
         return element;

package/lib/browser/workspace-uri-contribution.js.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-uri-contribution.js","sourceRoot":"","sources":["../../src/browser/workspace-uri-contribution.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,gFAAgF;AAChF,gFAAgF;;;;AAEhF,2EAA+G;AAC/G,oDAA6C;AAC7C,4DAAiF;AACjF,8DAA8D;AAC9D,2DAAuD;AACvD,uFAAkF;AAG3E,IAAM,qCAAqC,GAA3C,MAAM,qCAAsC,SAAQ,oDAAmC;IAMjF,IAAI;QACT,gCAAgC;IACpC,CAAC;IAEQ,SAAS,CAAC,OAAe;QAC9B,IAAI,CAAC,OAAO,YAAY,aAAG,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,IAAI,iCAAgB,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,gBAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;YAChH,OAAO,EAAE,CAAC;QACd,CAAC;QACD,OAAO,CAAC,CAAC;IACb,CAAC;IAEQ,OAAO,CAAC,OAA0C;QACvD,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3D,CAAC;IAEQ,OAAO,CAAC,OAA0C;QACvD,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED;;OAEG;IACM,WAAW,CAAC,OAA0C;QAC3D,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACjC,IAAI,GAAG,EAAE,CAAC;YACN,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;YAC5C,IAAI,UAAU,EAAE,CAAC;gBACb,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;YAC3C,CAAC;QACL,CAAC;QACD,MAAM,YAAY,GAAG,GAAG,IAAI,IAAI,CAAC,iBAAiB,CAAC,wBAAwB,CAAC,GAAG,CAAC,CAAC;QACjF,OAAO,YAAY,IAAI,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;IAC/E,CAAC;IAEQ,UAAU,CAAC,OAA0C;QAC1D,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACjC,IAAI,CAAC,GAAG,EAAE,CAAC;YACP,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QACrC,CAAC;QACD,4HAA4H;QAC5H,MAAM,YAAY,GAAG,GAAG,IAAI,IAAI,CAAC,iBAAiB,CAAC,wBAAwB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACxF,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;YAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,GAAG,CAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACpI,MAAM,SAAS,GAAG,MAAM,IAAI,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;YACtD,OAAO,MAAM,GAAG,SAAS,GAAG,YAAY,CAAC;QAC7C,CAAC;QACD,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACxC,CAAC;IAES,kBAAkB,CAAC,OAA0C;;QACnE,IAAI,gBAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;YACvB,OAAO,iCAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC9F,CAAC;QACD,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACjC,IAAI,GAAG,KAAI,MAAA,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,GAAG,CAAC,0CAAE,OAAO,CAAC,GAAG,CAAC,CAAA,EAAE,CAAC;YACvE,OAAO,iCAAgB,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAClD,CAAC;QACD,OAAO,OAAO,CAAC;IACnB,CAAC;IAEkB,MAAM,CAAC,OAA0C;QAChE,IAAI,gBAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;YACvB,OAAO,OAAO,CAAC,QAAQ,CAAC;QAC5B,CAAC;QACD,OAAO,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;CACJ,CAAA;AAxEY,sFAAqC;AAEY;IAAzD,IAAA,kBAAM,EAAC,+DAA6B,CAAC;sCAAuC,+DAA6B;gFAAC;AAC9D;IAA5C,IAAA,kBAAM,EAAC,oCAAgB,CAAC;sCAAsC,oCAAgB;+EAAC;AAGvE;IADR,IAAA,yBAAa,GAAE;;;;iEAGf;gDARQ,qCAAqC;IADjD,IAAA,sBAAU,GAAE;GACA,qCAAqC,CAwEjD"}
+{"version":3,"file":"workspace-uri-contribution.js","sourceRoot":"","sources":["../../src/browser/workspace-uri-contribution.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,gFAAgF;AAChF,gFAAgF;;;;AAEhF,2EAA+G;AAC/G,oDAA6C;AAC7C,4DAAiF;AACjF,8DAA8D;AAC9D,2DAAuD;AACvD,uFAAkF;AAG3E,IAAM,qCAAqC,GAA3C,MAAM,qCAAsC,SAAQ,oDAAmC;IAMjF,IAAI;QACT,gCAAgC;IACpC,CAAC;IAEQ,SAAS,CAAC,OAAe;QAC9B,IAAI,CAAC,OAAO,YAAY,aAAG,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,IAAI,iCAAgB,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,gBAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;YAChH,OAAO,EAAE,CAAC;QACd,CAAC;QACD,OAAO,CAAC,CAAC;IACb,CAAC;IAEQ,OAAO,CAAC,OAA0C;QACvD,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3D,CAAC;IAEQ,OAAO,CAAC,OAA0C;QACvD,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED;;OAEG;IACM,WAAW,CAAC,OAA0C;QAC3D,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACjC,IAAI,GAAG,EAAE,CAAC;YACN,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;YAC5C,IAAI,UAAU,EAAE,CAAC;gBACb,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;YAC3C,CAAC;QACL,CAAC;QACD,MAAM,YAAY,GAAG,GAAG,IAAI,IAAI,CAAC,iBAAiB,CAAC,wBAAwB,CAAC,GAAG,CAAC,CAAC;QACjF,OAAO,YAAY,IAAI,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;IAC/E,CAAC;IAEQ,UAAU,CAAC,OAA0C;QAC1D,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACjC,IAAI,CAAC,GAAG,EAAE,CAAC;YACP,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QACrC,CAAC;QACD,4HAA4H;QAC5H,MAAM,YAAY,GAAG,GAAG,IAAI,IAAI,CAAC,iBAAiB,CAAC,wBAAwB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACxF,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;YAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,GAAG,CAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACpI,MAAM,SAAS,GAAG,MAAM,IAAI,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;YACtD,OAAO,MAAM,GAAG,SAAS,GAAG,YAAY,CAAC;QAC7C,CAAC;QACD,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACxC,CAAC;IAES,kBAAkB,CAAC,OAA0C;QACnE,IAAI,gBAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;YACvB,OAAO,iCAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC9F,CAAC;QACD,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACjC,IAAI,GAAG,IAAI,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YACvE,OAAO,iCAAgB,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAClD,CAAC;QACD,OAAO,OAAO,CAAC;IACnB,CAAC;IAEkB,MAAM,CAAC,OAA0C;QAChE,IAAI,gBAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;YACvB,OAAO,OAAO,CAAC,QAAQ,CAAC;QAC5B,CAAC;QACD,OAAO,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;CACJ,CAAA;AAxEY,sFAAqC;AAEY;IAAzD,IAAA,kBAAM,EAAC,+DAA6B,CAAC;sCAAuC,+DAA6B;gFAAC;AAC9D;IAA5C,IAAA,kBAAM,EAAC,oCAAgB,CAAC;sCAAsC,oCAAgB;+EAAC;AAGvE;IADR,IAAA,yBAAa,GAAE;;;;iEAGf;gDARQ,qCAAqC;IADjD,IAAA,sBAAU,GAAE;GACA,qCAAqC,CAwEjD"}

package/lib/browser/workspace-user-working-directory-provider.js

@@ -23,12 +23,13 @@ const workspace_service_1 = require("./workspace-service");
 const file_service_1 = require("@theia/filesystem/lib/browser/file-service");
 let WorkspaceUserWorkingDirectoryProvider = class WorkspaceUserWorkingDirectoryProvider extends user_working_directory_provider_1.UserWorkingDirectoryProvider {
     async getUserWorkingDir() {
-        var _a, _b, _c;
-        return (_c = (_b = (_a = await this.getFromSelection()) !== null && _a !== void 0 ? _a : await this.getFromLastOpenResource()) !== null && _b !== void 0 ? _b : await this.getFromWorkspace()) !== null && _c !== void 0 ? _c : this.getFromUserHome();
+        return await this.getFromSelection()
+            ?? await this.getFromLastOpenResource()
+            ?? await this.getFromWorkspace()
+            ?? this.getFromUserHome();
     }
     getFromWorkspace() {
-        var _a;
-        return (_a = this.workspaceService.tryGetRoots()[0]) === null || _a === void 0 ? void 0 : _a.resource;
+        return this.workspaceService.tryGetRoots()[0]?.resource;
     }
     async ensureIsDirectory(uri) {
         if (uri) {
@@ -36,7 +37,7 @@ let WorkspaceUserWorkingDirectoryProvider = class WorkspaceUserWorkingDirectoryP
             const stat = await this.fileService.resolve(asFile)
                 .catch(() => this.fileService.resolve(asFile.parent))
                 .catch(() => undefined);
-            return (stat === null || stat === void 0 ? void 0 : stat.isDirectory) ? stat.resource : stat === null || stat === void 0 ? void 0 : stat.resource.parent;
+            return stat?.isDirectory ? stat.resource : stat?.resource.parent;
         }
     }
 };

package/lib/browser/workspace-user-working-directory-provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-user-working-directory-provider.js","sourceRoot":"","sources":["../../src/browser/workspace-user-working-directory-provider.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,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;;;;AAEhF,4DAAkE;AAClE,6GAAuG;AAEvG,2DAAuD;AAEvD,6EAAyE;AAGlE,IAAM,qCAAqC,GAA3C,MAAM,qCAAsC,SAAQ,8DAA4B;IAI1E,KAAK,CAAC,iBAAiB;;QAC5B,OAAO,MAAA,MAAA,MAAA,MAAM,IAAI,CAAC,gBAAgB,EAAE,mCAC7B,MAAM,IAAI,CAAC,uBAAuB,EAAE,mCACpC,MAAM,IAAI,CAAC,gBAAgB,EAAE,mCAC7B,IAAI,CAAC,eAAe,EAAE,CAAC;IAClC,CAAC;IAES,gBAAgB;;QACtB,OAAO,MAAA,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,0CAAE,QAAQ,CAAC;IAC5D,CAAC;IAEkB,KAAK,CAAC,iBAAiB,CAAC,GAAS;QAChD,IAAI,GAAG,EAAE,CAAC;YACN,MAAM,MAAM,GAAG,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YACtC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC;iBAC9C,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;iBACpD,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;YAC5B,OAAO,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,WAAW,EAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,CAAC,MAAM,CAAC;QACrE,CAAC;IACL,CAAC;CACJ,CAAA;AAxBY,sFAAqC;AACD;IAA5C,IAAA,kBAAM,EAAC,oCAAgB,CAAC;sCAAsC,oCAAgB;+EAAC;AACxC;IAAvC,IAAA,kBAAM,EAAC,0BAAW,CAAC;sCAAiC,0BAAW;0EAAC;gDAFxD,qCAAqC;IADjD,IAAA,sBAAU,GAAE;GACA,qCAAqC,CAwBjD"}
+{"version":3,"file":"workspace-user-working-directory-provider.js","sourceRoot":"","sources":["../../src/browser/workspace-user-working-directory-provider.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,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;;;;AAEhF,4DAAkE;AAClE,6GAAuG;AAEvG,2DAAuD;AAEvD,6EAAyE;AAGlE,IAAM,qCAAqC,GAA3C,MAAM,qCAAsC,SAAQ,8DAA4B;IAI1E,KAAK,CAAC,iBAAiB;QAC5B,OAAO,MAAM,IAAI,CAAC,gBAAgB,EAAE;eAC7B,MAAM,IAAI,CAAC,uBAAuB,EAAE;eACpC,MAAM,IAAI,CAAC,gBAAgB,EAAE;eAC7B,IAAI,CAAC,eAAe,EAAE,CAAC;IAClC,CAAC;IAES,gBAAgB;QACtB,OAAO,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC;IAC5D,CAAC;IAEkB,KAAK,CAAC,iBAAiB,CAAC,GAAS;QAChD,IAAI,GAAG,EAAE,CAAC;YACN,MAAM,MAAM,GAAG,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YACtC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC;iBAC9C,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;iBACpD,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;YAC5B,OAAO,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC;QACrE,CAAC;IACL,CAAC;CACJ,CAAA;AAxBY,sFAAqC;AACD;IAA5C,IAAA,kBAAM,EAAC,oCAAgB,CAAC;sCAAsC,oCAAgB;+EAAC;AACxC;IAAvC,IAAA,kBAAM,EAAC,0BAAW,CAAC;sCAAiC,0BAAW;0EAAC;gDAFxD,qCAAqC;IADjD,IAAA,sBAAU,GAAE;GACA,qCAAqC,CAwBjD"}

package/lib/common/untitled-workspace-service.d.ts

@@ -3,7 +3,14 @@ import { MaybePromise } from '@theia/core';
 import { WorkspaceFileService } from './workspace-file-service';
 export declare class UntitledWorkspaceService {
     protected readonly workspaceFileService: WorkspaceFileService;
-    isUntitledWorkspace(candidate?: URI): boolean;
+    /**
+     * Check if a URI is an untitled workspace.
+     * @param candidate The URI to check
+     * @param configDirUri Optional config directory URI. If provided, also verifies
+     *                     that the candidate is under the expected workspaces directory.
+     *                     This is the secure check and should be used when possible.
+     */
+    isUntitledWorkspace(candidate?: URI, configDirUri?: URI): boolean;
     getUntitledWorkspaceUri(configDirUri: URI, isAcceptable: (candidate: URI) => MaybePromise<boolean>, warnOnHits?: () => unknown): Promise<URI>;
 }
 //# sourceMappingURL=untitled-workspace-service.d.ts.map

package/lib/common/untitled-workspace-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"untitled-workspace-service.d.ts","sourceRoot":"","sources":["../../src/common/untitled-workspace-service.ts"],"names":[],"mappings":"AAgBA,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAE7C,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEhE,qBACa,wBAAwB;IAGjC,SAAS,CAAC,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IAE9D,mBAAmB,CAAC,SAAS,CAAC,EAAE,GAAG,GAAG,OAAO;IAIvC,uBAAuB,CAAC,YAAY,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC,SAAS,EAAE,GAAG,KAAK,YAAY,CAAC,OAAO,CAAC,EAAE,UAAU,CAAC,EAAE,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC;CAkBtJ"}
+{"version":3,"file":"untitled-workspace-service.d.ts","sourceRoot":"","sources":["../../src/common/untitled-workspace-service.ts"],"names":[],"mappings":"AAgBA,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAE7C,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEhE,qBACa,wBAAwB;IAGjC,SAAS,CAAC,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IAE9D;;;;;;OAMG;IACH,mBAAmB,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,YAAY,CAAC,EAAE,GAAG,GAAG,OAAO;IAgB3D,uBAAuB,CAAC,YAAY,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC,SAAS,EAAE,GAAG,KAAK,YAAY,CAAC,OAAO,CAAC,EAAE,UAAU,CAAC,EAAE,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC;CAkBtJ"}

package/lib/common/untitled-workspace-service.js

@@ -20,8 +20,27 @@ const tslib_1 = require("tslib");
 const inversify_1 = require("@theia/core/shared/inversify");
 const workspace_file_service_1 = require("./workspace-file-service");
 let UntitledWorkspaceService = class UntitledWorkspaceService {
-    isUntitledWorkspace(candidate) {
-        return !!candidate && this.workspaceFileService.isWorkspaceFile(candidate) && candidate.path.base.startsWith('Untitled');
+    /**
+     * Check if a URI is an untitled workspace.
+     * @param candidate The URI to check
+     * @param configDirUri Optional config directory URI. If provided, also verifies
+     *                     that the candidate is under the expected workspaces directory.
+     *                     This is the secure check and should be used when possible.
+     */
+    isUntitledWorkspace(candidate, configDirUri) {
+        if (!candidate || !this.workspaceFileService.isWorkspaceFile(candidate)) {
+            return false;
+        }
+        if (!candidate.path.base.startsWith('Untitled')) {
+            return false;
+        }
+        // If configDirUri is provided, verify the candidate is in the expected location
+        if (configDirUri) {
+            const expectedParentDir = configDirUri.resolve('workspaces');
+            return expectedParentDir.isEqualOrParent(candidate);
+        }
+        // Without configDirUri, fall back to name-only check (less secure)
+        return true;
     }
     async getUntitledWorkspaceUri(configDirUri, isAcceptable, warnOnHits) {
         const parentDir = configDirUri.resolve('workspaces');
@@ -33,7 +52,7 @@ let UntitledWorkspaceService = class UntitledWorkspaceService {
             attempts++;
             uri = parentDir.resolve(`Untitled-${Math.round(Math.random() * 1000)}.${defaultFileExtension}`);
             if (attempts === 10) {
-                warnOnHits === null || warnOnHits === void 0 ? void 0 : warnOnHits();
+                warnOnHits?.();
             }
             if (attempts === 50) {
                 throw new Error('Workspace Service: too many attempts to find unused filename.');

package/lib/common/untitled-workspace-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"untitled-workspace-service.js","sourceRoot":"","sources":["../../src/common/untitled-workspace-service.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,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;;;;AAGhF,4DAAkE;AAElE,qEAAgE;AAGzD,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IAKjC,mBAAmB,CAAC,SAAe;QAC/B,OAAO,CAAC,CAAC,SAAS,IAAI,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;IAC7H,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,YAAiB,EAAE,YAAuD,EAAE,UAA0B;QAChI,MAAM,SAAS,GAAG,YAAY,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QACrD,MAAM,mBAAmB,GAAG,IAAI,CAAC,oBAAoB,CAAC,0BAA0B,EAAE,CAAC;QACnF,MAAM,oBAAoB,GAAG,mBAAmB,CAAC,IAAI,CAAC,oBAAoB,CAAC,oBAAoB,CAAC,CAAC;QACjG,IAAI,GAAG,CAAC;QACR,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,GAAG,CAAC;YACA,QAAQ,EAAE,CAAC;YACX,GAAG,GAAG,SAAS,CAAC,OAAO,CAAC,YAAY,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,oBAAoB,EAAE,CAAC,CAAC;YAChG,IAAI,QAAQ,KAAK,EAAE,EAAE,CAAC;gBAClB,UAAU,aAAV,UAAU,uBAAV,UAAU,EAAI,CAAC;YACnB,CAAC;YACD,IAAI,QAAQ,KAAK,EAAE,EAAE,CAAC;gBAClB,MAAM,IAAI,KAAK,CAAC,+DAA+D,CAAC,CAAC;YACrF,CAAC;QACL,CAAC,QAAQ,CAAC,CAAC,MAAM,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE;QACrC,OAAO,GAAG,CAAC;IACf,CAAC;CACJ,CAAA;AA3BY,4DAAwB;AAGd;IADlB,IAAA,kBAAM,EAAC,6CAAoB,CAAC;sCACY,6CAAoB;sEAAC;mCAHrD,wBAAwB;IADpC,IAAA,sBAAU,GAAE;GACA,wBAAwB,CA2BpC"}
+{"version":3,"file":"untitled-workspace-service.js","sourceRoot":"","sources":["../../src/common/untitled-workspace-service.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,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;;;;AAGhF,4DAAkE;AAElE,qEAAgE;AAGzD,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IAKjC;;;;;;OAMG;IACH,mBAAmB,CAAC,SAAe,EAAE,YAAkB;QACnD,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE,CAAC;YACtE,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;YAC9C,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,gFAAgF;QAChF,IAAI,YAAY,EAAE,CAAC;YACf,MAAM,iBAAiB,GAAG,YAAY,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;YAC7D,OAAO,iBAAiB,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QACxD,CAAC;QACD,mEAAmE;QACnE,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,YAAiB,EAAE,YAAuD,EAAE,UAA0B;QAChI,MAAM,SAAS,GAAG,YAAY,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QACrD,MAAM,mBAAmB,GAAG,IAAI,CAAC,oBAAoB,CAAC,0BAA0B,EAAE,CAAC;QACnF,MAAM,oBAAoB,GAAG,mBAAmB,CAAC,IAAI,CAAC,oBAAoB,CAAC,oBAAoB,CAAC,CAAC;QACjG,IAAI,GAAG,CAAC;QACR,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,GAAG,CAAC;YACA,QAAQ,EAAE,CAAC;YACX,GAAG,GAAG,SAAS,CAAC,OAAO,CAAC,YAAY,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,oBAAoB,EAAE,CAAC,CAAC;YAChG,IAAI,QAAQ,KAAK,EAAE,EAAE,CAAC;gBAClB,UAAU,EAAE,EAAE,CAAC;YACnB,CAAC;YACD,IAAI,QAAQ,KAAK,EAAE,EAAE,CAAC;gBAClB,MAAM,IAAI,KAAK,CAAC,+DAA+D,CAAC,CAAC;YACrF,CAAC;QACL,CAAC,QAAQ,CAAC,CAAC,MAAM,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE;QACrC,OAAO,GAAG,CAAC;IACf,CAAC;CACJ,CAAA;AA9CY,4DAAwB;AAGd;IADlB,IAAA,kBAAM,EAAC,6CAAoB,CAAC;sCACY,6CAAoB;sEAAC;mCAHrD,wBAAwB;IADpC,IAAA,sBAAU,GAAE;GACA,wBAAwB,CA8CpC"}

package/lib/common/workspace-preferences.js

@@ -15,7 +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.bindWorkspacePreferences = exports.createWorkspacePreferences = exports.WorkspacePreferences = exports.WorkspacePreferenceContribution = exports.workspacePreferenceSchema = void 0;
+exports.WorkspacePreferences = exports.WorkspacePreferenceContribution = exports.workspacePreferenceSchema = void 0;
+exports.createWorkspacePreferences = createWorkspacePreferences;
+exports.bindWorkspacePreferences = bindWorkspacePreferences;
 const preferences_1 = require("@theia/core/lib/common/preferences");
 const nls_1 = require("@theia/core/lib/common/nls");
 exports.workspacePreferenceSchema = {
@@ -32,7 +34,6 @@ exports.WorkspacePreferences = Symbol('WorkspacePreferences');
 function createWorkspacePreferences(preferences, schema = exports.workspacePreferenceSchema) {
     return (0, preferences_1.createPreferenceProxy)(preferences, schema);
 }
-exports.createWorkspacePreferences = createWorkspacePreferences;
 function bindWorkspacePreferences(bind) {
     bind(exports.WorkspacePreferences).toDynamicValue(ctx => {
         const preferences = ctx.container.get(preferences_1.PreferenceService);
@@ -42,5 +43,4 @@ function bindWorkspacePreferences(bind) {
     bind(exports.WorkspacePreferenceContribution).toConstantValue({ schema: exports.workspacePreferenceSchema });
     bind(preferences_1.PreferenceContribution).toService(exports.WorkspacePreferenceContribution);
 }
-exports.bindWorkspacePreferences = bindWorkspacePreferences;
 //# sourceMappingURL=workspace-preferences.js.map

package/lib/common/workspace-preferences.js.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-preferences.js","sourceRoot":"","sources":["../../src/common/workspace-preferences.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,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;;;AAGhF,oEAAyJ;AACzJ,oDAAiD;AAEpC,QAAA,yBAAyB,GAAqB;IACvD,UAAU,EAAE;QACR,0BAA0B,EAAE;YACxB,WAAW,EAAE,SAAG,CAAC,QAAQ,CAAC,gCAAgC,EAAE,8CAA8C,CAAC;YAC3G,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,KAAK;SACjB;KACJ;CACJ,CAAC;AAMW,QAAA,+BAA+B,GAAG,MAAM,CAAC,iCAAiC,CAAC,CAAC;AAC5E,QAAA,oBAAoB,GAAG,MAAM,CAAC,sBAAsB,CAAC,CAAC;AAGnE,SAAgB,0BAA0B,CAAC,WAA8B,EAAE,SAA2B,iCAAyB;IAC3H,OAAO,IAAA,mCAAqB,EAAC,WAAW,EAAE,MAAM,CAAC,CAAC;AACtD,CAAC;AAFD,gEAEC;AAED,SAAgB,wBAAwB,CAAC,IAAqB;IAC1D,IAAI,CAAC,4BAAoB,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;QAC5C,MAAM,WAAW,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAoB,+BAAiB,CAAC,CAAC;QAC5E,MAAM,YAAY,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAyB,uCAA+B,CAAC,CAAC;QAChG,OAAO,0BAA0B,CAAC,WAAW,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;IACxE,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACtB,IAAI,CAAC,uCAA+B,CAAC,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,iCAAyB,EAAE,CAAC,CAAC;IAC7F,IAAI,CAAC,oCAAsB,CAAC,CAAC,SAAS,CAAC,uCAA+B,CAAC,CAAC;AAC5E,CAAC;AARD,4DAQC"}
+{"version":3,"file":"workspace-preferences.js","sourceRoot":"","sources":["../../src/common/workspace-preferences.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,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;;;AAwBhF,gEAEC;AAED,4DAQC;AAjCD,oEAAyJ;AACzJ,oDAAiD;AAEpC,QAAA,yBAAyB,GAAqB;IACvD,UAAU,EAAE;QACR,0BAA0B,EAAE;YACxB,WAAW,EAAE,SAAG,CAAC,QAAQ,CAAC,gCAAgC,EAAE,8CAA8C,CAAC;YAC3G,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,KAAK;SACjB;KACJ;CACJ,CAAC;AAMW,QAAA,+BAA+B,GAAG,MAAM,CAAC,iCAAiC,CAAC,CAAC;AAC5E,QAAA,oBAAoB,GAAG,MAAM,CAAC,sBAAsB,CAAC,CAAC;AAGnE,SAAgB,0BAA0B,CAAC,WAA8B,EAAE,SAA2B,iCAAyB;IAC3H,OAAO,IAAA,mCAAqB,EAAC,WAAW,EAAE,MAAM,CAAC,CAAC;AACtD,CAAC;AAED,SAAgB,wBAAwB,CAAC,IAAqB;IAC1D,IAAI,CAAC,4BAAoB,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;QAC5C,MAAM,WAAW,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAoB,+BAAiB,CAAC,CAAC;QAC5E,MAAM,YAAY,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAyB,uCAA+B,CAAC,CAAC;QAChG,OAAO,0BAA0B,CAAC,WAAW,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;IACxE,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACtB,IAAI,CAAC,uCAA+B,CAAC,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,iCAAyB,EAAE,CAAC,CAAC;IAC7F,IAAI,CAAC,oCAAsB,CAAC,CAAC,SAAS,CAAC,uCAA+B,CAAC,CAAC;AAC5E,CAAC"}

package/lib/common/workspace-trust-preferences.d.ts

@@ -3,6 +3,7 @@ import { interfaces } from '@theia/core/shared/inversify';
 export declare const WORKSPACE_TRUST_ENABLED = "security.workspace.trust.enabled";
 export declare const WORKSPACE_TRUST_STARTUP_PROMPT = "security.workspace.trust.startupPrompt";
 export declare const WORKSPACE_TRUST_EMPTY_WINDOW = "security.workspace.trust.emptyWindow";
+export declare const WORKSPACE_TRUST_TRUSTED_FOLDERS = "security.workspace.trust.trustedFolders";
 export declare enum WorkspaceTrustPrompt {
     ALWAYS = "always",
     ONCE = "once",
@@ -13,6 +14,7 @@ export interface WorkspaceTrustConfiguration {
     [WORKSPACE_TRUST_ENABLED]: boolean;
     [WORKSPACE_TRUST_STARTUP_PROMPT]: WorkspaceTrustPrompt;
     [WORKSPACE_TRUST_EMPTY_WINDOW]: boolean;
+    [WORKSPACE_TRUST_TRUSTED_FOLDERS]: string[];
 }
 export declare const WorkspaceTrustPreferenceContribution: unique symbol;
 export declare const WorkspaceTrustPreferences: unique symbol;

package/lib/common/workspace-trust-preferences.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-trust-preferences.d.ts","sourceRoot":"","sources":["../../src/common/workspace-trust-preferences.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAyB,eAAe,EAAmB,iBAAiB,EAA0B,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAE1K,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAE1D,eAAO,MAAM,uBAAuB,qCAAqC,CAAC;AAC1E,eAAO,MAAM,8BAA8B,2CAA2C,CAAC;AACvF,eAAO,MAAM,4BAA4B,yCAAyC,CAAC;AAEnF,oBAAY,oBAAoB;IAC5B,MAAM,WAAW;IACjB,IAAI,SAAS;IACb,KAAK,UAAU;CAClB;AAED,eAAO,MAAM,8BAA8B,EAAE,gBAmB5C,CAAC;AAEF,MAAM,WAAW,2BAA2B;IACxC,CAAC,uBAAuB,CAAC,EAAE,OAAO,CAAC;IACnC,CAAC,8BAA8B,CAAC,EAAE,oBAAoB,CAAC;IACvD,CAAC,4BAA4B,CAAC,EAAE,OAAO,CAAC;CAC3C;AAED,eAAO,MAAM,oCAAoC,eAAiD,CAAC;AACnG,eAAO,MAAM,yBAAyB,eAAsC,CAAC;AAC7E,MAAM,MAAM,yBAAyB,GAAG,eAAe,CAAC,2BAA2B,CAAC,CAAC;AAErF,wBAAgB,+BAA+B,CAAC,WAAW,EAAE,iBAAiB,EAAE,MAAM,GAAE,gBAAiD,GAAG,yBAAyB,CAEpK;AAED,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,GAAG,IAAI,CAQzE"}
+{"version":3,"file":"workspace-trust-preferences.d.ts","sourceRoot":"","sources":["../../src/common/workspace-trust-preferences.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAyB,eAAe,EAAmB,iBAAiB,EAA0B,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAE1K,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAE1D,eAAO,MAAM,uBAAuB,qCAAqC,CAAC;AAC1E,eAAO,MAAM,8BAA8B,2CAA2C,CAAC;AACvF,eAAO,MAAM,4BAA4B,yCAAyC,CAAC;AACnF,eAAO,MAAM,+BAA+B,4CAA4C,CAAC;AAEzF,oBAAY,oBAAoB;IAC5B,MAAM,WAAW;IACjB,IAAI,SAAS;IACb,KAAK,UAAU;CAClB;AAED,eAAO,MAAM,8BAA8B,EAAE,gBA4B5C,CAAC;AAEF,MAAM,WAAW,2BAA2B;IACxC,CAAC,uBAAuB,CAAC,EAAE,OAAO,CAAC;IACnC,CAAC,8BAA8B,CAAC,EAAE,oBAAoB,CAAC;IACvD,CAAC,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACxC,CAAC,+BAA+B,CAAC,EAAE,MAAM,EAAE,CAAC;CAC/C;AAED,eAAO,MAAM,oCAAoC,eAAiD,CAAC;AACnG,eAAO,MAAM,yBAAyB,eAAsC,CAAC;AAC7E,MAAM,MAAM,yBAAyB,GAAG,eAAe,CAAC,2BAA2B,CAAC,CAAC;AAErF,wBAAgB,+BAA+B,CAAC,WAAW,EAAE,iBAAiB,EAAE,MAAM,GAAE,gBAAiD,GAAG,yBAAyB,CAEpK;AAED,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,GAAG,IAAI,CAQzE"}