@theia/workspace 1.67.0-next.56 → 1.67.0-next.86

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

@@ -0,0 +1,40 @@
+"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");
+const workspace_trust_preferences_1 = require("../common/workspace-trust-preferences");
+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();
+    (0, common_1.bindContributionProvider)(bind, default_workspace_server_1.WorkspaceHandlerContribution);
+    bind(default_workspace_server_1.FileWorkspaceHandlerContribution).toSelf().inSingletonScope();
+    bind(default_workspace_server_1.WorkspaceHandlerContribution).toService(default_workspace_server_1.FileWorkspaceHandlerContribution);
+    bind(common_1.ConnectionHandler).toDynamicValue(ctx => new common_1.RpcConnectionHandler(common_2.workspacePath, () => ctx.container.get(common_2.WorkspaceServer))).inSingletonScope();
+    (0, common_2.bindWorkspacePreferences)(bind);
+    (0, workspace_trust_preferences_1.bindWorkspaceTrustPreferences)(bind);
+});
+//# sourceMappingURL=workspace-backend-module.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"workspace-backend-module.js","sourceRoot":"","sources":["../../src/node/workspace-backend-module.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,4DAA+D;AAC/D,mDAA2G;AAC3G,sCAAqI;AACrI,yEAA8J;AAC9J,kDAA2D;AAC3D,+CAAsE;AACtE,uFAAsF;AAEtF,kBAAe,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;IACtC,IAAI,CAAC,mDAAwB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC3D,IAAI,CAAC,qBAAe,CAAC,CAAC,SAAS,CAAC,mDAAwB,CAAC,CAAC;IAC1D,IAAI,CAAC,iDAAsB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACzD,IAAI,CAAC,wBAAe,CAAC,CAAC,SAAS,CAAC,iDAAsB,CAAC,CAAC;IACxD,IAAI,CAAC,qCAA8B,CAAC,CAAC,SAAS,CAAC,wBAAe,CAAC,CAAC;IAChE,IAAI,CAAC,iCAAwB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC3D,IAAI,CAAC,6BAAoB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAEvD,IAAA,iCAAwB,EAAC,IAAI,EAAE,uDAA4B,CAAC,CAAC;IAE7D,IAAI,CAAC,2DAAgC,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACnE,IAAI,CAAC,uDAA4B,CAAC,CAAC,SAAS,CAAC,2DAAgC,CAAC,CAAC;IAE/E,IAAI,CAAC,0BAAiB,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CACzC,IAAI,6BAAoB,CAAC,sBAAa,EAAE,GAAG,EAAE,CACzC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,wBAAe,CAAC,CACrC,CACJ,CAAC,gBAAgB,EAAE,CAAC;IACrB,IAAA,iCAAwB,EAAC,IAAI,CAAC,CAAC;IAC/B,IAAA,2DAA6B,EAAC,IAAI,CAAC,CAAC;AACxC,CAAC,CAAC,CAAC"}

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@theia/workspace",
-  "version": "1.67.0-next.56+d8f18cc386c",
+  "version": "1.67.0-next.86+03f92ff1d",
   "description": "Theia - Workspace Extension",
   "dependencies": {
-    "@theia/core": "1.67.0-next.56+d8f18cc386c",
-    "@theia/filesystem": "1.67.0-next.56+d8f18cc386c",
-    "@theia/variable-resolver": "1.67.0-next.56+d8f18cc386c",
+    "@theia/core": "1.67.0-next.86+03f92ff1d",
+    "@theia/filesystem": "1.67.0-next.86+03f92ff1d",
+    "@theia/variable-resolver": "1.67.0-next.86+03f92ff1d",
     "jsonc-parser": "^2.2.0",
     "tslib": "^2.6.2",
     "valid-filename": "^2.0.1"
@@ -52,5 +52,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "d8f18cc386c45a736cd193d42eab02c8f64c6b10"
+  "gitHead": "03f92ff1d97dcb199de39b48e60a53535de22808"
 }

package/src/browser/workspace-service.ts

@@ -596,6 +596,11 @@ export class WorkspaceService implements FrontendApplicationContribution, Worksp
         const workspaceData: WorkspaceData = { folders: [], settings: {} };
         if (!this.saved) {
             for (const p of Object.keys(this.schemaService.getJSONSchema(PreferenceScope.Workspace).properties!)) {
+                // The goal is to ensure that workspace-scoped preferences are preserved in the new workspace.
+                // Preferences valid in folder scope will take effect in their folders without being copied.
+                if (this.schemaService.isValidInScope(p, PreferenceScope.Folder)) {
+                    continue;
+                }
                 const preferences = this.preferenceImpl.inspect(p);
                 if (preferences && preferences.workspaceValue) {
                     workspaceData.settings![p] = preferences.workspaceValue;