@eclipse-glsp/client 1.1.0-next.9fabd84.216 → 1.1.0-next.a6b28e7.258

package/lib/features/source-model-watcher/source-model-changed-action-handler.js

@@ -11,7 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SourceModelChangedActionHandler = exports.ExternalSourceModelChangedHandler = void 0;
 /********************************************************************************
- * Copyright (c) 2020-2022 EclipseSource and others.
+ * Copyright (c) 2020-2023 EclipseSource 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
@@ -25,24 +25,22 @@ exports.SourceModelChangedActionHandler = exports.ExternalSourceModelChangedHand
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-const protocol_1 = require("@eclipse-glsp/protocol");
 const inversify_1 = require("inversify");
-const types_1 = require("../../base/types");
+const _glsp_sprotty_1 = require("../../glsp-sprotty/index");
 /**
  * An external handler of the source model change event.
  *
  * This allows external applications to react specifically to this event, e.g. by bringing up the diagram,
  * check their dirty state, show a dialog, etc.
  */
-let ExternalSourceModelChangedHandler = class ExternalSourceModelChangedHandler {
+let ExternalSourceModelChangedHandler = exports.ExternalSourceModelChangedHandler = class ExternalSourceModelChangedHandler {
 };
-ExternalSourceModelChangedHandler = __decorate([
+exports.ExternalSourceModelChangedHandler = ExternalSourceModelChangedHandler = __decorate([
     (0, inversify_1.injectable)()
 ], ExternalSourceModelChangedHandler);
-exports.ExternalSourceModelChangedHandler = ExternalSourceModelChangedHandler;
-let SourceModelChangedActionHandler = class SourceModelChangedActionHandler {
+let SourceModelChangedActionHandler = exports.SourceModelChangedActionHandler = class SourceModelChangedActionHandler {
     handle(action) {
-        if (protocol_1.SourceModelChangedAction.is(action)) {
+        if (_glsp_sprotty_1.SourceModelChangedAction.is(action)) {
             if (this.externalModelSourceChangedHandler) {
                 this.externalModelSourceChangedHandler
                     .notifySourceModelChange(action.sourceModelName, this.options)
@@ -57,17 +55,17 @@ let SourceModelChangedActionHandler = class SourceModelChangedActionHandler {
         const timeout = 0;
         const severity = 'WARNING';
         this.dispatcher.dispatchAll([
-            protocol_1.ServerStatusAction.create(message, { severity, timeout }),
-            protocol_1.ServerMessageAction.create(message, { severity, timeout })
+            _glsp_sprotty_1.ServerStatusAction.create(message, { severity, timeout }),
+            _glsp_sprotty_1.ServerMessageAction.create(message, { severity, timeout })
         ]);
     }
 };
 __decorate([
-    (0, inversify_1.inject)(types_1.TYPES.IActionDispatcher),
+    (0, inversify_1.inject)(_glsp_sprotty_1.TYPES.IActionDispatcher),
     __metadata("design:type", Object)
 ], SourceModelChangedActionHandler.prototype, "dispatcher", void 0);
 __decorate([
-    (0, inversify_1.inject)(types_1.TYPES.ViewerOptions),
+    (0, inversify_1.inject)(_glsp_sprotty_1.TYPES.ViewerOptions),
     __metadata("design:type", Object)
 ], SourceModelChangedActionHandler.prototype, "options", void 0);
 __decorate([
@@ -75,8 +73,7 @@ __decorate([
     (0, inversify_1.optional)(),
     __metadata("design:type", ExternalSourceModelChangedHandler)
 ], SourceModelChangedActionHandler.prototype, "externalModelSourceChangedHandler", void 0);
-SourceModelChangedActionHandler = __decorate([
+exports.SourceModelChangedActionHandler = SourceModelChangedActionHandler = __decorate([
     (0, inversify_1.injectable)()
 ], SourceModelChangedActionHandler);
-exports.SourceModelChangedActionHandler = SourceModelChangedActionHandler;
 //# sourceMappingURL=source-model-changed-action-handler.js.map

package/lib/features/source-model-watcher/source-model-changed-action-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"source-model-changed-action-handler.js","sourceRoot":"","sources":["../../../src/features/source-model-watcher/source-model-changed-action-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAmH;AACnH,yCAAyD;AAEzD,4CAAyC;AAEzC;;;;;GAKG;AAEI,IAAe,iCAAiC,GAAhD,MAAe,iCAAiC;CAMtD,CAAA;AANqB,iCAAiC;IADtD,IAAA,sBAAU,GAAE;GACS,iCAAiC,CAMtD;AANqB,8EAAiC;AAShD,IAAM,+BAA+B,GAArC,MAAM,+BAA+B;IAWxC,MAAM,CAAC,MAAc;QACjB,IAAI,mCAAwB,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE;YACrC,IAAI,IAAI,CAAC,iCAAiC,EAAE;gBACxC,IAAI,CAAC,iCAAiC;qBACjC,uBAAuB,CAAC,MAAM,CAAC,eAAe,EAAE,IAAI,CAAC,OAAO,CAAC;qBAC7D,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC;gBAC3D,OAAO;aACV;YACD,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;SACvC;IACL,CAAC;IAES,sBAAsB,CAAC,MAAgC;QAC7D,MAAM,OAAO,GAAG,oBAAoB,MAAM,CAAC,eAAe,qDAAqD,CAAC;QAChH,MAAM,OAAO,GAAG,CAAC,CAAC;QAClB,MAAM,QAAQ,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC;YACxB,6BAAkB,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;YACzD,8BAAmB,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;SAC7D,CAAC,CAAC;IACP,CAAC;CACJ,CAAA;AA/BG;IAAC,IAAA,kBAAM,EAAC,aAAK,CAAC,iBAAiB,CAAC;;mEACQ;AAExC;IAAC,IAAA,kBAAM,EAAC,aAAK,CAAC,aAAa,CAAC;;gEACK;AAEjC;IAAC,IAAA,kBAAM,EAAC,iCAAiC,CAAC;IACzC,IAAA,oBAAQ,GAAE;8BACmC,iCAAiC;0FAAC;AATvE,+BAA+B;IAD3C,IAAA,sBAAU,GAAE;GACA,+BAA+B,CAgC3C;AAhCY,0EAA+B"}
+{"version":3,"file":"source-model-changed-action-handler.js","sourceRoot":"","sources":["../../../src/features/source-model-watcher/source-model-changed-action-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAAyD;AACzD,iDASuB;AAEvB;;;;;GAKG;AAEI,IAAe,iCAAiC,+CAAhD,MAAe,iCAAiC;CAMtD,CAAA;4CANqB,iCAAiC;IADtD,IAAA,sBAAU,GAAE;GACS,iCAAiC,CAMtD;AAGM,IAAM,+BAA+B,6CAArC,MAAM,+BAA+B;IAWxC,MAAM,CAAC,MAAc;QACjB,IAAI,wCAAwB,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE;YACrC,IAAI,IAAI,CAAC,iCAAiC,EAAE;gBACxC,IAAI,CAAC,iCAAiC;qBACjC,uBAAuB,CAAC,MAAM,CAAC,eAAe,EAAE,IAAI,CAAC,OAAO,CAAC;qBAC7D,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC;gBAC3D,OAAO;aACV;YACD,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;SACvC;IACL,CAAC;IAES,sBAAsB,CAAC,MAAgC;QAC7D,MAAM,OAAO,GAAG,oBAAoB,MAAM,CAAC,eAAe,qDAAqD,CAAC;QAChH,MAAM,OAAO,GAAG,CAAC,CAAC;QAClB,MAAM,QAAQ,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC;YACxB,kCAAkB,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;YACzD,mCAAmB,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;SAC7D,CAAC,CAAC;IACP,CAAC;CACJ,CAAA;AA9Ba;IADT,IAAA,kBAAM,EAAC,qBAAK,CAAC,iBAAiB,CAAC;;mEACQ;AAG9B;IADT,IAAA,kBAAM,EAAC,qBAAK,CAAC,aAAa,CAAC;;gEACK;AAIvB;IAFT,IAAA,kBAAM,EAAC,iCAAiC,CAAC;IACzC,IAAA,oBAAQ,GAAE;8BACmC,iCAAiC;0FAAC;0CATvE,+BAA+B;IAD3C,IAAA,sBAAU,GAAE;GACA,+BAA+B,CAgC3C"}

package/lib/features/svg-metadata/di.config.d.ts

@@ -0,0 +1,19 @@
+/********************************************************************************
+ * Copyright (c) 2023 Business Informatics Group (TU Wien) 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 WITH Classpath-exception-2.0
+ ********************************************************************************/
+import { ContainerModule } from 'inversify';
+declare const svgMetadataModule: ContainerModule;
+export default svgMetadataModule;
+//# sourceMappingURL=di.config.d.ts.map

package/lib/features/svg-metadata/di.config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"di.config.d.ts","sourceRoot":"","sources":["../../../src/features/svg-metadata/di.config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAI5C,QAAA,MAAM,iBAAiB,iBAGrB,CAAC;AAEH,eAAe,iBAAiB,CAAC"}

package/lib/features/{rank/model.js → svg-metadata/di.config.js}

@@ -1,6 +1,6 @@
 "use strict";
 /********************************************************************************
- * Copyright (c) 2019-2021 EclipseSource and others.
+ * Copyright (c) 2023 Business Informatics Group (TU Wien) 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
@@ -15,14 +15,12 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRank = exports.isRanked = exports.DEFAULT_RANK = void 0;
-exports.DEFAULT_RANK = 0;
-function isRanked(arg) {
-    return arg !== undefined && arg.rank !== undefined && typeof arg.rank === 'number';
-}
-exports.isRanked = isRanked;
-function getRank(arg) {
-    return isRanked(arg) ? arg.rank : exports.DEFAULT_RANK;
-}
-exports.getRank = getRank;
-//# sourceMappingURL=model.js.map
+const inversify_1 = require("inversify");
+const _glsp_sprotty_1 = require("../../glsp-sprotty/index");
+const metadata_placer_1 = require("./metadata-placer");
+const svgMetadataModule = new inversify_1.ContainerModule(bind => {
+    bind(metadata_placer_1.MetadataPlacer).toSelf().inSingletonScope();
+    bind(_glsp_sprotty_1.TYPES.IVNodePostprocessor).toService(metadata_placer_1.MetadataPlacer);
+});
+exports.default = svgMetadataModule;
+//# sourceMappingURL=di.config.js.map

package/lib/features/svg-metadata/di.config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../../src/features/svg-metadata/di.config.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;AAElF,yCAA4C;AAC5C,iDAAsC;AACtC,uDAAmD;AAEnD,MAAM,iBAAiB,GAAG,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;IACjD,IAAI,CAAC,gCAAc,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACjD,IAAI,CAAC,qBAAK,CAAC,mBAAmB,CAAC,CAAC,SAAS,CAAC,gCAAc,CAAC,CAAC;AAC9D,CAAC,CAAC,CAAC;AAEH,kBAAe,iBAAiB,CAAC"}

package/lib/features/svg-metadata/metadata-placer.d.ts

@@ -0,0 +1,23 @@
+/********************************************************************************
+ * Copyright (c) 2023 Business Informatics Group (TU Wien) 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 WITH Classpath-exception-2.0
+ ********************************************************************************/
+import { VNode } from 'snabbdom';
+import { DOMHelper, IVNodePostprocessor, SModelElement } from '../../glsp-sprotty/index';
+export declare class MetadataPlacer implements IVNodePostprocessor {
+    protected domHelper: DOMHelper;
+    decorate(vnode: VNode, element: SModelElement): VNode;
+    postUpdate(): void;
+}
+//# sourceMappingURL=metadata-placer.d.ts.map

package/lib/features/svg-metadata/metadata-placer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"metadata-placer.d.ts","sourceRoot":"","sources":["../../../src/features/svg-metadata/metadata-placer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAGlF,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAAwB,aAAa,EAA8B,MAAM,eAAe,CAAC;AAEhI,qBACa,cAAe,YAAW,mBAAmB;IAC7B,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC;IAExD,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,aAAa,GAAG,KAAK;IAqBrD,UAAU,IAAI,IAAI;CAGrB"}

package/lib/features/svg-metadata/metadata-placer.js

@@ -0,0 +1,60 @@
+"use strict";
+/********************************************************************************
+ * Copyright (c) 2023 Business Informatics Group (TU Wien) 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 WITH Classpath-exception-2.0
+ ********************************************************************************/
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MetadataPlacer = void 0;
+const inversify_1 = require("inversify");
+const _glsp_sprotty_1 = require("../../glsp-sprotty/index");
+let MetadataPlacer = exports.MetadataPlacer = class MetadataPlacer {
+    decorate(vnode, element) {
+        if (element instanceof _glsp_sprotty_1.SModelRoot) {
+            (0, _glsp_sprotty_1.setAttr)(vnode, 'data-svg-metadata-api', true);
+        }
+        (0, _glsp_sprotty_1.setAttr)(vnode, 'data-svg-metadata-type', element.type);
+        if (element instanceof _glsp_sprotty_1.SChildElement) {
+            (0, _glsp_sprotty_1.setAttr)(vnode, 'data-svg-metadata-parent-id', this.domHelper.createUniqueDOMElementId(element.parent));
+        }
+        if (element instanceof _glsp_sprotty_1.SEdge) {
+            if (element.source !== undefined) {
+                (0, _glsp_sprotty_1.setAttr)(vnode, 'data-svg-metadata-edge-source-id', this.domHelper.createUniqueDOMElementId(element.source));
+            }
+            if (element.target !== undefined) {
+                (0, _glsp_sprotty_1.setAttr)(vnode, 'data-svg-metadata-edge-target-id', this.domHelper.createUniqueDOMElementId(element.target));
+            }
+        }
+        return vnode;
+    }
+    postUpdate() {
+        // empty
+    }
+};
+__decorate([
+    (0, inversify_1.inject)(_glsp_sprotty_1.TYPES.DOMHelper),
+    __metadata("design:type", _glsp_sprotty_1.DOMHelper)
+], MetadataPlacer.prototype, "domHelper", void 0);
+exports.MetadataPlacer = MetadataPlacer = __decorate([
+    (0, inversify_1.injectable)()
+], MetadataPlacer);
+//# sourceMappingURL=metadata-placer.js.map

package/lib/features/svg-metadata/metadata-placer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"metadata-placer.js","sourceRoot":"","sources":["../../../src/features/svg-metadata/metadata-placer.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAElF,yCAA+C;AAE/C,iDAAgI;AAGzH,IAAM,cAAc,4BAApB,MAAM,cAAc;IAGvB,QAAQ,CAAC,KAAY,EAAE,OAAsB;QACzC,IAAI,OAAO,YAAY,0BAAU,EAAE;YAC/B,IAAA,uBAAO,EAAC,KAAK,EAAE,uBAAuB,EAAE,IAAI,CAAC,CAAC;SACjD;QAED,IAAA,uBAAO,EAAC,KAAK,EAAE,wBAAwB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAEvD,IAAI,OAAO,YAAY,6BAAa,EAAE;YAClC,IAAA,uBAAO,EAAC,KAAK,EAAE,6BAA6B,EAAE,IAAI,CAAC,SAAS,CAAC,wBAAwB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;SAC1G;QACD,IAAI,OAAO,YAAY,qBAAK,EAAE;YAC1B,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE;gBAC9B,IAAA,uBAAO,EAAC,KAAK,EAAE,kCAAkC,EAAE,IAAI,CAAC,SAAS,CAAC,wBAAwB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;aAC/G;YACD,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE;gBAC9B,IAAA,uBAAO,EAAC,KAAK,EAAE,kCAAkC,EAAE,IAAI,CAAC,SAAS,CAAC,wBAAwB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;aAC/G;SACJ;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,UAAU;QACN,QAAQ;IACZ,CAAC;CACJ,CAAA;AA1BsC;IAAlC,IAAA,kBAAM,EAAC,qBAAK,CAAC,SAAS,CAAC;8BAAsB,yBAAS;iDAAC;yBAD/C,cAAc;IAD1B,IAAA,sBAAU,GAAE;GACA,cAAc,CA2B1B"}

package/lib/features/tool-palette/di.config.d.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2022 EclipseSource and others.
+ * Copyright (c) 2019-2023 EclipseSource 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

package/lib/features/tool-palette/di.config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"di.config.d.ts","sourceRoot":"","sources":["../../../src/features/tool-palette/di.config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAE5C,OAAO,+BAA+B,CAAC;AAIvC,QAAA,MAAM,iBAAiB,iBAKrB,CAAC;AAEH,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"di.config.d.ts","sourceRoot":"","sources":["../../../src/features/tool-palette/di.config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAE5C,OAAO,+BAA+B,CAAC;AAGvC,QAAA,MAAM,iBAAiB,iBAIrB,CAAC;AAEH,eAAe,iBAAiB,CAAC"}

package/lib/features/tool-palette/di.config.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 /********************************************************************************
- * Copyright (c) 2019-2022 EclipseSource and others.
+ * Copyright (c) 2019-2023 EclipseSource 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
@@ -16,15 +16,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 const inversify_1 = require("inversify");
-const sprotty_1 = require("sprotty");
+const _glsp_sprotty_1 = require("../../glsp-sprotty/index");
 require("../../../css/tool-palette.css");
-const types_1 = require("../../base/types");
 const tool_palette_1 = require("./tool-palette");
-const toolPaletteModule = new inversify_1.ContainerModule((bind, _unbind, isBound, rebind) => {
-    bind(tool_palette_1.ToolPalette).toSelf().inSingletonScope();
-    bind(types_1.TYPES.IUIExtension).toService(tool_palette_1.ToolPalette);
-    (0, sprotty_1.configureActionHandler)({ bind, isBound }, tool_palette_1.EnableToolPaletteAction.KIND, tool_palette_1.ToolPalette);
-    (0, sprotty_1.configureActionHandler)({ bind, isBound }, sprotty_1.EnableDefaultToolsAction.KIND, tool_palette_1.ToolPalette);
+const toolPaletteModule = new inversify_1.ContainerModule((bind, _unbind, isBound, _rebind) => {
+    (0, _glsp_sprotty_1.bindAsService)(bind, _glsp_sprotty_1.TYPES.IUIExtension, tool_palette_1.ToolPalette);
+    (0, _glsp_sprotty_1.configureActionHandler)({ bind, isBound }, tool_palette_1.EnableToolPaletteAction.KIND, tool_palette_1.ToolPalette);
+    (0, _glsp_sprotty_1.configureActionHandler)({ bind, isBound }, _glsp_sprotty_1.EnableDefaultToolsAction.KIND, tool_palette_1.ToolPalette);
 });
 exports.default = toolPaletteModule;
 //# sourceMappingURL=di.config.js.map

package/lib/features/tool-palette/di.config.js.map

@@ -1 +1 @@
-{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../../src/features/tool-palette/di.config.ts"],"names":[],"mappings":";;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAA4C;AAC5C,qCAA2E;AAC3E,yCAAuC;AACvC,4CAAyC;AACzC,iDAAsE;AAEtE,MAAM,iBAAiB,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;IAC7E,IAAI,CAAC,0BAAW,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC9C,IAAI,CAAC,aAAK,CAAC,YAAY,CAAC,CAAC,SAAS,CAAC,0BAAW,CAAC,CAAC;IAChD,IAAA,gCAAsB,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,sCAAuB,CAAC,IAAI,EAAE,0BAAW,CAAC,CAAC;IACrF,IAAA,gCAAsB,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,kCAAwB,CAAC,IAAI,EAAE,0BAAW,CAAC,CAAC;AAC1F,CAAC,CAAC,CAAC;AAEH,kBAAe,iBAAiB,CAAC"}
+{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../../src/features/tool-palette/di.config.ts"],"names":[],"mappings":";;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAA4C;AAC5C,iDAAuG;AACvG,yCAAuC;AACvC,iDAAsE;AAEtE,MAAM,iBAAiB,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;IAC9E,IAAA,6BAAa,EAAC,IAAI,EAAE,qBAAK,CAAC,YAAY,EAAE,0BAAW,CAAC,CAAC;IACrD,IAAA,sCAAsB,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,sCAAuB,CAAC,IAAI,EAAE,0BAAW,CAAC,CAAC;IACrF,IAAA,sCAAsB,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,wCAAwB,CAAC,IAAI,EAAE,0BAAW,CAAC,CAAC;AAC1F,CAAC,CAAC,CAAC;AAEH,kBAAe,iBAAiB,CAAC"}

package/lib/features/tool-palette/tool-palette.d.ts

@@ -1,22 +1,7 @@
-/********************************************************************************
- * Copyright (c) 2019-2022 EclipseSource 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 WITH Classpath-exception-2.0
- ********************************************************************************/
-import { Action, PaletteItem, SetContextActions } from '@eclipse-glsp/protocol';
-import { AbstractUIExtension, IActionHandler, ICommand, IToolManager, SModelRoot } from 'sprotty';
+import { AbstractUIExtension, Action, IActionHandler, ICommand, IToolManager, PaletteItem, SModelRoot, SetContextActions } from '../../glsp-sprotty/index';
 import { GLSPActionDispatcher } from '../../base/action-dispatcher';
-import { EditModeListener, EditorContextService } from '../../base/editor-context-service';
+import { EditorContextService, IEditModeListener } from '../../base/editor-context-service';
+import { FocusTracker } from '../../base/focus-tracker';
 export interface EnableToolPaletteAction extends Action {
     kind: typeof EnableToolPaletteAction.KIND;
 }
@@ -25,15 +10,16 @@ export declare namespace EnableToolPaletteAction {
     function is(object: any): object is EnableToolPaletteAction;
     function create(): EnableToolPaletteAction;
 }
-export declare class ToolPalette extends AbstractUIExtension implements IActionHandler, EditModeListener {
+export declare class ToolPalette extends AbstractUIExtension implements IActionHandler, IEditModeListener {
     static readonly ID = "tool-palette";
     protected readonly actionDispatcher: GLSPActionDispatcher;
     protected readonly toolManager: IToolManager;
     protected readonly editorContext: EditorContextService;
+    protected readonly focusTracker: FocusTracker;
     protected paletteItems: PaletteItem[];
     protected paletteItemsCopy: PaletteItem[];
     protected bodyDiv?: HTMLElement;
-    protected lastActivebutton?: HTMLElement;
+    protected lastActiveButton?: HTMLElement;
     protected defaultToolsButton: HTMLElement;
     protected searchField: HTMLInputElement;
     modelRootId: string;
@@ -61,7 +47,7 @@ export declare class ToolPalette extends AbstractUIExtension implements IActionH
     protected onClickStaticToolButton(button: HTMLElement, toolId?: string): (_ev: MouseEvent) => void;
     changeActiveButton(button?: HTMLElement): void;
     handle(action: Action): ICommand | Action | void;
-    editModeChanged(_oldValue: string, _newValue: string): void;
+    editModeChanged(_newValue: string, _oldValue: string): void;
     protected clearOnEscape(event: KeyboardEvent): void;
     protected clearToolOnEscape(event: KeyboardEvent): void;
     protected handleSetContextActions(action: SetContextActions): void;

package/lib/features/tool-palette/tool-palette.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool-palette.d.ts","sourceRoot":"","sources":["../../../src/features/tool-palette/tool-palette.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tool-palette.d.ts","sourceRoot":"","sources":["../../../src/features/tool-palette/tool-palette.ts"],"names":[],"mappings":"AAgBA,OAAO,EACH,mBAAmB,EACnB,MAAM,EAGN,cAAc,EACd,QAAQ,EACR,YAAY,EAEZ,WAAW,EAGX,UAAU,EACV,iBAAiB,EAKpB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAC5F,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAUxD,MAAM,WAAW,uBAAwB,SAAQ,MAAM;IACnD,IAAI,EAAE,OAAO,uBAAuB,CAAC,IAAI,CAAC;CAC7C;AAED,yBAAiB,uBAAuB,CAAC;IAC9B,MAAM,IAAI,sBAAsB,CAAC;IAExC,SAAgB,EAAE,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,uBAAuB,CAEjE;IAED,SAAgB,MAAM,IAAI,uBAAuB,CAEhD;CACJ;AACD,qBACa,WAAY,SAAQ,mBAAoB,YAAW,cAAc,EAAE,iBAAiB;IAC7F,MAAM,CAAC,QAAQ,CAAC,EAAE,kBAAkB;IAEH,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,oBAAoB,CAAC;IAC/D,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,YAAY,CAAC;IAC3C,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,oBAAoB,CAAC;IAC/D,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IAEpE,SAAS,CAAC,YAAY,EAAE,WAAW,EAAE,CAAC;IACtC,SAAS,CAAC,gBAAgB,EAAE,WAAW,EAAE,CAAM;IAC/C,SAAS,CAAC,OAAO,CAAC,EAAE,WAAW,CAAC;IAChC,SAAS,CAAC,gBAAgB,CAAC,EAAE,WAAW,CAAC;IACzC,SAAS,CAAC,kBAAkB,EAAE,WAAW,CAAC;IAC1C,SAAS,CAAC,WAAW,EAAE,gBAAgB,CAAC;IACxC,WAAW,EAAE,MAAM,CAAC;IAEpB,EAAE,IAAI,MAAM;IAGZ,cAAc,IAAI,MAAM;IAKxB,aAAa,IAAI,IAAI;IAIZ,UAAU,IAAI,OAAO;IAO9B,SAAS,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,WAAW,GAAG,IAAI;cAM/C,YAAY,CAAC,iBAAiB,EAAE,WAAW,EAAE,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,GAAG,IAAI;IAKjG,SAAS,CAAC,wBAAwB,IAAI,IAAI;IAuB1C,SAAS,CAAC,kCAAkC,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI;IAQ1E,SAAS,CAAC,kBAAkB,IAAI,OAAO;IAIvC,SAAS,CAAC,UAAU,IAAI,IAAI;IA2B5B,SAAS,CAAC,YAAY,IAAI,IAAI;IAU9B,OAAO,CAAC,iBAAiB;IAuBzB,SAAS,CAAC,uBAAuB,IAAI,WAAW;IAQhD,SAAS,CAAC,2BAA2B,IAAI,WAAW;IAOpD,SAAS,CAAC,uBAAuB,IAAI,WAAW;IAOhD,SAAS,CAAC,oBAAoB,IAAI,WAAW;IAU7C,SAAS,CAAC,kBAAkB,IAAI,WAAW;IAkB3C,SAAS,CAAC,uBAAuB,IAAI,gBAAgB;IAYrD,SAAS,CAAC,iBAAiB,IAAI,WAAW;IAQ1C,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,GAAG,WAAW;IAazE,SAAS,CAAC,uBAAuB,CAAC,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,SACvD,UAAU;IAS3B,SAAS,CAAC,uBAAuB,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,MAAM,SACrD,UAAU;IAU3B,kBAAkB,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,IAAI;IAa9C,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,GAAG,MAAM,GAAG,IAAI;IAyBhD,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI;IAM3D,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI;IAOnD,SAAS,CAAC,iBAAiB,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI;IAMvD,SAAS,CAAC,uBAAuB,CAAC,MAAM,EAAE,iBAAiB,GAAG,IAAI;IAKlE,SAAS,CAAC,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;CA4BtD;AAED,wBAAgB,OAAO,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,WAAW,GAAG,MAAM,CAM9D;AAED,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW,CAIzD;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,WAAW,GAAG,WAAW,CAmB9D;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAGlE;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAK5E"}

package/lib/features/tool-palette/tool-palette.js

@@ -12,7 +12,7 @@ var ToolPalette_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.changeCodiconClass = exports.changeCSSClass = exports.createToolGroup = exports.createIcon = exports.compare = exports.ToolPalette = exports.EnableToolPaletteAction = void 0;
 /********************************************************************************
- * Copyright (c) 2019-2022 EclipseSource and others.
+ * Copyright (c) 2019-2023 EclipseSource 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
@@ -26,15 +26,13 @@ exports.changeCodiconClass = exports.changeCSSClass = exports.createToolGroup =
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-const protocol_1 = require("@eclipse-glsp/protocol");
 const inversify_1 = require("inversify");
-const sprotty_1 = require("sprotty");
-const codicon_1 = require("sprotty/lib/utils/codicon");
-const keyboard_1 = require("sprotty/lib/utils/keyboard");
+const _glsp_sprotty_1 = require("../../glsp-sprotty/index");
 const action_dispatcher_1 = require("../../base/action-dispatcher");
 const editor_context_service_1 = require("../../base/editor-context-service");
-const delete_tool_1 = require("../tools/delete-tool");
-const marquee_mouse_tool_1 = require("../tools/marquee-mouse-tool");
+const focus_tracker_1 = require("../../base/focus-tracker");
+const delete_tool_1 = require("../tools/deletion/delete-tool");
+const marquee_mouse_tool_1 = require("../tools/marquee-selection/marquee-mouse-tool");
 const CLICKED_CSS_CLASS = 'clicked';
 const SEARCH_ICON_ID = 'search';
 const PALETTE_ICON_ID = 'symbol-color';
@@ -44,15 +42,15 @@ var EnableToolPaletteAction;
 (function (EnableToolPaletteAction) {
     EnableToolPaletteAction.KIND = 'enableToolPalette';
     function is(object) {
-        return protocol_1.Action.hasKind(object, EnableToolPaletteAction.KIND);
+        return _glsp_sprotty_1.Action.hasKind(object, EnableToolPaletteAction.KIND);
     }
     EnableToolPaletteAction.is = is;
     function create() {
         return { kind: EnableToolPaletteAction.KIND };
     }
     EnableToolPaletteAction.create = create;
-})(EnableToolPaletteAction = exports.EnableToolPaletteAction || (exports.EnableToolPaletteAction = {}));
-let ToolPalette = ToolPalette_1 = class ToolPalette extends sprotty_1.AbstractUIExtension {
+})(EnableToolPaletteAction || (exports.EnableToolPaletteAction = EnableToolPaletteAction = {}));
+let ToolPalette = exports.ToolPalette = ToolPalette_1 = class ToolPalette extends _glsp_sprotty_1.AbstractUIExtension {
     constructor() {
         super(...arguments);
         this.paletteItemsCopy = [];
@@ -64,7 +62,7 @@ let ToolPalette = ToolPalette_1 = class ToolPalette extends sprotty_1.AbstractUI
         return ToolPalette_1.ID;
     }
     postConstruct() {
-        this.editorContext.register(this);
+        this.editorContext.onEditModeChanged(change => this.editModeChanged(change.newValue, change.oldValue));
     }
     initialize() {
         if (!this.paletteItems) {
@@ -75,7 +73,7 @@ let ToolPalette = ToolPalette_1 = class ToolPalette extends sprotty_1.AbstractUI
     initializeContents(_containerElement) {
         this.createHeader();
         this.createBody();
-        this.lastActivebutton = this.defaultToolsButton;
+        this.lastActiveButton = this.defaultToolsButton;
     }
     onBeforeShow(_containerElement, root) {
         this.modelRootId = root.id;
@@ -191,7 +189,7 @@ let ToolPalette = ToolPalette_1 = class ToolPalette extends sprotty_1.AbstractUI
         validateActionButton.title = 'Validate model';
         validateActionButton.onclick = _event => {
             const modelIds = [this.modelRootId];
-            this.actionDispatcher.dispatch(protocol_1.RequestMarkersAction.create(modelIds));
+            this.actionDispatcher.dispatch(_glsp_sprotty_1.RequestMarkersAction.create(modelIds, { reason: _glsp_sprotty_1.MarkersReason.BATCH }));
         };
         return validateActionButton;
     }
@@ -255,7 +253,7 @@ let ToolPalette = ToolPalette_1 = class ToolPalette extends sprotty_1.AbstractUI
     onClickStaticToolButton(button, toolId) {
         return (_ev) => {
             if (!this.editorContext.isReadonly) {
-                const action = toolId ? sprotty_1.EnableToolsAction.create([toolId]) : sprotty_1.EnableDefaultToolsAction.create();
+                const action = toolId ? _glsp_sprotty_1.EnableToolsAction.create([toolId]) : _glsp_sprotty_1.EnableDefaultToolsAction.create();
                 this.actionDispatcher.dispatch(action);
                 this.changeActiveButton(button);
                 button.focus();
@@ -263,50 +261,53 @@ let ToolPalette = ToolPalette_1 = class ToolPalette extends sprotty_1.AbstractUI
         };
     }
     changeActiveButton(button) {
-        if (this.lastActivebutton) {
-            this.lastActivebutton.classList.remove(CLICKED_CSS_CLASS);
+        if (this.lastActiveButton) {
+            this.lastActiveButton.classList.remove(CLICKED_CSS_CLASS);
         }
         if (button) {
             button.classList.add(CLICKED_CSS_CLASS);
-            this.lastActivebutton = button;
+            this.lastActiveButton = button;
         }
-        else {
+        else if (this.defaultToolsButton) {
             this.defaultToolsButton.classList.add(CLICKED_CSS_CLASS);
-            this.lastActivebutton = this.defaultToolsButton;
+            this.lastActiveButton = this.defaultToolsButton;
         }
     }
     handle(action) {
         if (action.kind === EnableToolPaletteAction.KIND) {
-            const requestAction = protocol_1.RequestContextActions.create({
+            const requestAction = _glsp_sprotty_1.RequestContextActions.create({
                 contextId: ToolPalette_1.ID,
                 editorContext: {
                     selectedElementIds: []
                 }
             });
             this.actionDispatcher.requestUntil(requestAction).then(response => {
-                if (protocol_1.SetContextActions.is(response)) {
+                if (_glsp_sprotty_1.SetContextActions.is(response)) {
                     this.paletteItems = response.actions.map(e => e);
-                    this.actionDispatcher.dispatch(sprotty_1.SetUIExtensionVisibilityAction.create({ extensionId: ToolPalette_1.ID, visible: !this.editorContext.isReadonly }));
+                    this.actionDispatcher.dispatch(_glsp_sprotty_1.SetUIExtensionVisibilityAction.create({ extensionId: ToolPalette_1.ID, visible: !this.editorContext.isReadonly }));
                 }
             });
         }
-        else if (action.kind === sprotty_1.EnableDefaultToolsAction.KIND) {
+        else if (action.kind === _glsp_sprotty_1.EnableDefaultToolsAction.KIND) {
             this.changeActiveButton();
-            this.restoreFocus();
+            if (this.focusTracker.hasFocus) {
+                // if focus was deliberately taken do not restore focus to the palette
+                this.restoreFocus();
+            }
         }
     }
-    editModeChanged(_oldValue, _newValue) {
-        this.actionDispatcher.dispatch(sprotty_1.SetUIExtensionVisibilityAction.create({ extensionId: ToolPalette_1.ID, visible: !this.editorContext.isReadonly }));
+    editModeChanged(_newValue, _oldValue) {
+        this.actionDispatcher.dispatch(_glsp_sprotty_1.SetUIExtensionVisibilityAction.create({ extensionId: ToolPalette_1.ID, visible: !this.editorContext.isReadonly }));
     }
     clearOnEscape(event) {
-        if ((0, keyboard_1.matchesKeystroke)(event, 'Escape')) {
+        if ((0, _glsp_sprotty_1.matchesKeystroke)(event, 'Escape')) {
             this.searchField.value = '';
             this.requestFilterUpdate('');
         }
     }
     clearToolOnEscape(event) {
-        if ((0, keyboard_1.matchesKeystroke)(event, 'Escape')) {
-            this.actionDispatcher.dispatch(sprotty_1.EnableDefaultToolsAction.create());
+        if ((0, _glsp_sprotty_1.matchesKeystroke)(event, 'Escape')) {
+            this.actionDispatcher.dispatch(_glsp_sprotty_1.EnableDefaultToolsAction.create());
         }
     }
     handleSetContextActions(action) {
@@ -343,27 +344,30 @@ let ToolPalette = ToolPalette_1 = class ToolPalette extends sprotty_1.AbstractUI
 };
 ToolPalette.ID = 'tool-palette';
 __decorate([
-    (0, inversify_1.inject)(sprotty_1.TYPES.IActionDispatcher),
+    (0, inversify_1.inject)(_glsp_sprotty_1.TYPES.IActionDispatcher),
     __metadata("design:type", action_dispatcher_1.GLSPActionDispatcher)
 ], ToolPalette.prototype, "actionDispatcher", void 0);
 __decorate([
-    (0, inversify_1.inject)(sprotty_1.TYPES.IToolManager),
+    (0, inversify_1.inject)(_glsp_sprotty_1.TYPES.IToolManager),
     __metadata("design:type", Object)
 ], ToolPalette.prototype, "toolManager", void 0);
 __decorate([
     (0, inversify_1.inject)(editor_context_service_1.EditorContextService),
     __metadata("design:type", editor_context_service_1.EditorContextService)
 ], ToolPalette.prototype, "editorContext", void 0);
+__decorate([
+    (0, inversify_1.inject)(focus_tracker_1.FocusTracker),
+    __metadata("design:type", focus_tracker_1.FocusTracker)
+], ToolPalette.prototype, "focusTracker", void 0);
 __decorate([
     (0, inversify_1.postConstruct)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", void 0)
 ], ToolPalette.prototype, "postConstruct", null);
-ToolPalette = ToolPalette_1 = __decorate([
+exports.ToolPalette = ToolPalette = ToolPalette_1 = __decorate([
     (0, inversify_1.injectable)()
 ], ToolPalette);
-exports.ToolPalette = ToolPalette;
 function compare(a, b) {
     const sortStringBased = a.sortString.localeCompare(b.sortString);
     if (sortStringBased !== 0) {
@@ -374,7 +378,7 @@ function compare(a, b) {
 exports.compare = compare;
 function createIcon(codiconId) {
     const icon = document.createElement('i');
-    icon.classList.add(...(0, codicon_1.codiconCSSClasses)(codiconId));
+    icon.classList.add(...(0, _glsp_sprotty_1.codiconCSSClasses)(codiconId));
     return icon;
 }
 exports.createIcon = createIcon;
@@ -405,9 +409,9 @@ function changeCSSClass(element, css) {
 exports.changeCSSClass = changeCSSClass;
 function changeCodiconClass(element, codiconId) {
     // eslint-disable-next-line chai-friendly/no-unused-expressions
-    element.classList.contains((0, codicon_1.codiconCSSClasses)(codiconId)[1])
-        ? element.classList.remove((0, codicon_1.codiconCSSClasses)(codiconId)[1])
-        : element.classList.add((0, codicon_1.codiconCSSClasses)(codiconId)[1]);
+    element.classList.contains((0, _glsp_sprotty_1.codiconCSSClasses)(codiconId)[1])
+        ? element.classList.remove((0, _glsp_sprotty_1.codiconCSSClasses)(codiconId)[1])
+        : element.classList.add((0, _glsp_sprotty_1.codiconCSSClasses)(codiconId)[1]);
 }
 exports.changeCodiconClass = changeCodiconClass;
 //# sourceMappingURL=tool-palette.js.map