@eclipse-glsp/client 0.9.0-next.fd1a8bb6 → 0.10.0-next.5dad48d.159

package/README.md

@@ -2,11 +2,13 @@
 
 A web-based diagram client framework for the [Graphical Language Server Platform (GLSP)](https://github.com/eclipse-glsp/glsp) based on [Eclipse Sprotty](https://github.com/eclipse/sprotty).
 
-
 ## Building
+
 This project is built with `yarn` and is available from npm via [@eclipse-glsp/client](https://www.npmjs.com/package/@eclipse-glsp/client).
 
 ## More information
-For more information, please visit the [Eclipse GLSP Umbrella repository](https://github.com/eclipse-glsp/glsp) and the [Eclipse GLSP Website](https://www.eclipse.org/glsp/). If you have questions, contact us on our [spectrum chat](https://spectrum.chat/glsp/) and have a look at our [communication and support options](https://www.eclipse.org/glsp/contact/).
+
+For more information, please visit the [Eclipse GLSP Umbrella repository](https://github.com/eclipse-glsp/glsp) and the [Eclipse GLSP Website](https://www.eclipse.org/glsp/).
+If you have questions, contact us on our [spectrum chat](https://spectrum.chat/glsp/) and have a look at our [communication and support options](https://www.eclipse.org/glsp/contact/).
 
 ![alt](https://www.eclipse.org/glsp/images/diagramanimated.gif)

package/css/command-palette.css

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019 EclipseSource and others.
+ * Copyright (c) 2019-2021 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
@@ -30,6 +30,8 @@
 
 .command-palette-suggestions .icon {
     padding-right: 0.3em;
+    display: flex;
+    align-self: center;
 }
 
 .command-palette-suggestions em {
@@ -37,22 +39,24 @@
     font-style: normal;
 }
 
-.command-palette-suggestions>div {
+.command-palette-suggestions > div {
     padding: 0 4px;
+    display: flex;
 }
 
 .command-palette-suggestions .group {
     background: #eee;
 }
 
-.command-palette-suggestions>div:hover:not(.group), .command-palette-suggestions>div.selected {
+.command-palette-suggestions > div:hover:not(.group),
+.command-palette-suggestions > div.selected {
     cursor: pointer;
 }
 
-.command-palette-suggestions>div:hover:not(.group) {
+.command-palette-suggestions > div:hover:not(.group) {
     background: #e0e0e0;
 }
 
-.command-palette-suggestions>div.selected {
+.command-palette-suggestions > div.selected {
     background: #bbdefb;
 }

package/css/decoration.css

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020 EclipseSource and others.
+ * Copyright (c) 2020-2021 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
@@ -18,10 +18,11 @@
     --glsp-error-foreground: red;
     --glsp-warning-foreground: yellow;
     --glsp-info-foreground: lightblue;
+    --glsp-issue-background: rgb(255 255 255 / 85%);
 }
 
 .sprotty-issue-background {
-    fill: none;
+    fill: var(--glsp-issue-background);
 }
 
 .sprotty-issue.sprotty-error {

package/css/glsp-sprotty.css

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019 EclipseSource and others.
+ * 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
@@ -16,7 +16,7 @@
 
 .sprotty {
     padding: 0px;
-    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+    font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
 }
 
 .sprotty svg text::selection {
@@ -31,16 +31,17 @@
 }
 
 .sprotty-popup {
-    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+    font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
     position: absolute;
     background: white;
     border-radius: 5px;
     border: 1px solid;
     max-width: 400px;
     min-width: 100px;
+    z-index: 1;
 }
 
-.sprotty-popup>div {
+.sprotty-popup > div {
     margin: 10px;
 }
 
@@ -50,23 +51,55 @@
 
 .sprotty-resize-handle {
     /* radius does not work in Firefox */
-    r: 7px;
-    fill: #884;
+    r: 5px;
+    fill: #1d80d1;
     stroke: none;
     z-index: 1000;
 }
 
 .sprotty-resize-handle.selected {
-    fill: #66a;
+    fill: #1d80d1;
 }
 
 .sprotty-resize-handle.active {
-    fill: #0074e8;
+    fill: #1d80d1;
 }
 
-.sprotty-resize-handle.mouseover {
-    stroke: #112;
-    stroke-width: 1;
+.sprotty-edge {
+    fill: none;
+    stroke-width: 1.5px;
+}
+
+.sprotty-edge.selected {
+    stroke-width: 1.5px;
+}
+
+.sprotty-edge.mouseover:not(.selected) path {
+    stroke-width: 1.5px;
+}
+
+.sprotty-node:not(.selected) {
+    stroke-width: 0px;
+}
+
+.sprotty-node.mouseover:not(.selected),
+.sprotty-edge.mouseover:not(.selected) {
+    opacity: 60%;
+}
+
+.sprotty-node.selected,
+.sprotty-edge.selected {
+    stroke: #1d80d1;
+    stroke-width: 1.5px;
+    stroke-dashoffset: 5;
+    stroke-dasharray: 5, 5;
+    stroke-linecap: round;
+}
+
+.sprotty-edge.mouseover:not(.selected) .arrow,
+.sprotty-edge.selected .arrow {
+    stroke-dashoffset: none;
+    stroke-dasharray: none;
 }
 
 .node-creation-mode {
@@ -89,12 +122,21 @@
     cursor: pointer;
 }
 
-.edge-creation-select-target-mode, .edge-reconnect-select-target-mode {
+.edge-creation-select-target-mode,
+.edge-reconnect-select-target-mode {
     cursor: crosshair;
 }
 
-.resize-mode {
-    cursor: none;
+.move-mode {
+    cursor: move;
+}
+
+.resize-nesw-mode {
+    cursor: nesw-resize;
+}
+
+.resize-nwse-mode {
+    cursor: nwse-resize;
 }
 
 .element-deletion-mode {
@@ -104,3 +146,72 @@
 .marquee-mode {
     cursor: crosshair;
 }
+
+.sprotty-node.marquee {
+    fill: lightgray;
+    opacity: 0.2;
+}
+
+.sprotty-edge > .sprotty-routing-handle {
+    r: 5px;
+    fill: #1d80d1;
+    stroke: none;
+    z-index: 1000;
+}
+
+.sprotty-edge > .sprotty-routing-handle[data-kind='line'] {
+    opacity: 0.35;
+}
+
+.sprotty-edge > .sprotty-routing-handle.selected {
+    fill: #1d80d1;
+}
+
+.sprotty-edge > .sprotty-routing-handle.mouseover {
+    stroke: #1d80d1a1;
+    stroke-width: 1;
+}
+
+.sprotty-missing {
+    stroke-width: 1;
+    stroke: #f00;
+    fill: #f00;
+    font-size: 14pt;
+    text-anchor: middle;
+}
+
+g .movement-not-allowed > .sprotty-node {
+    stroke: var(--glsp-error-foreground) !important;
+}
+
+.sprotty-resize-handle.movement-not-allowed {
+    stroke: var(--glsp-error-foreground) !important;
+    fill: var(--glsp-error-foreground) !important;
+}
+
+.error > .sprotty-node {
+    filter: drop-shadow(0px 0px 2px var(--glsp-error-foreground)) !important;
+}
+
+.warning > .sprotty-node {
+    filter: drop-shadow(0px 0px 2px var(--glsp-warning-foreground)) !important;
+}
+
+.info > .sprotty-node {
+    filter: drop-shadow(0px 0px 2px var(--glsp-info-foreground)) !important;
+}
+
+svg {
+    border-style: solid;
+    border-width: 1px;
+    border-color: #bbb;
+}
+
+text {
+    stroke-width: 0;
+    stroke: #000;
+    fill: #000;
+    font-family: sans-serif;
+    font-size: 8pt;
+    text-anchor: middle;
+}

package/css/tool-palette.css

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019 EclipseSource and others.
+ * Copyright (c) 2019-2021 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
@@ -14,15 +14,13 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-@import url("https://use.fontawesome.com/releases/v5.6.3/css/all.css");
 /* Css for main container */
-
 .tool-palette {
     position: absolute;
-    right: 25px;
+    right: 30px;
     top: 25px;
     text-align: center;
-    width: 180px;
+    width: 225px;
     display: block;
     z-index: 1000;
     border-style: solid;
@@ -47,29 +45,41 @@
 .palette-header {
     padding: 0.4em;
     text-align: left;
-    font-size: 1.15em;
-    font-weight: bold;
-    background: #CCCCCC;
+    background: #cccccc;
     border: 1px solid rgba(60, 60, 60, 0.6);
     box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    flex-wrap: wrap;
+}
+
+.header-icon {
+    display: flex;
+    align-items: center;
 }
 
 .header-icon i {
-    margin-right: 0.2em
+    margin-right: 0.2em;
+}
+
+.header-tools {
+    display: flex;
+    align-items: center;
 }
 
 .header-tools i {
-    border: 1px solid #CCCCCC;
-    padding: 0.2em;
-    margin-right: 0.2em;
+    border: 1px solid #cccccc;
+    padding: 0.15em;
+    margin-right: 0.15em;
 }
 
 .header-tools i:hover {
-    background: #DFDFDF;
+    background: #dfdfdf;
 }
 
 .header-tools .clicked {
-    background: #BDDAEF;
+    background: #bddaef;
     border: 1px solid rgba(60, 60, 60, 0.6);
 }
 
@@ -83,16 +93,17 @@
 
 .tool-group {
     text-align: left;
-    background: #EDEDEE;
+    background: #ededee;
 }
 
 .group-header {
-    font-weight: bold;
-    background: #CCCCCC;
+    background: #cccccc;
+    display: flex;
+    align-items: center;
 }
 
 .group-header:hover {
-    background: #AAAAAA;
+    background: #aaaaaa;
 }
 
 .group-header i {
@@ -100,16 +111,22 @@
 }
 
 .tool-button {
-    background: #EDEDEE;
+    background: #ededee;
     padding: 0.4em;
+    display: flex;
+    align-items: center;
+}
+
+.tool-button i {
+    margin-right: 0.4em;
 }
 
 .tool-button:hover {
-    background: #DFDFDF;
+    background: #dfdfdf;
 }
 
 .tool-button.clicked {
-    background: #BDDAEF;
+    background: #bddaef;
 }
 
 .tool-button.collapsed {
@@ -123,16 +140,16 @@
 
 .minimize-palette-button {
     position: absolute;
-    right: 12px;
-    top: 25px;
+    right: 10px;
+    top: 35px;
     z-index: 1000;
 }
 
 .search-input {
-    background: #DFDFDF;
+    background: #dfdfdf;
     color: black;
-    border: v#BDDAEF;
+    border: #bddaef;
     padding-left: 3px;
-    width: 150px;
-    margin-left: 5px;
+    width: 100%;
+    margin: 3px;
 }

package/lib/base/action-dispatcher.d.ts

@@ -1,10 +1,26 @@
 /// <reference types="node" />
-import { Action, ActionDispatcher, RequestAction, ResponseAction } from 'sprotty';
+/********************************************************************************
+ * Copyright (c) 2019-2021 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, RequestAction, ResponseAction } from '@eclipse-glsp/protocol';
+import { ActionDispatcher } from 'sprotty';
 import { ModelInitializationConstraint } from './model-initialization-constraint';
 export declare class GLSPActionDispatcher extends ActionDispatcher {
     protected readonly timeouts: Map<string, NodeJS.Timeout>;
-    protected initiailizationConstraint: ModelInitializationConstraint;
-    protected onModelInitialized: Promise<void>;
+    protected initializedConstraint: boolean;
+    protected initializationConstraint: ModelInitializationConstraint;
     initialize(): Promise<void>;
     startModelInitialization(): void;
     onceModelInitialized(): Promise<void>;

package/lib/base/action-dispatcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"action-dispatcher.d.ts","sourceRoot":"","sources":["../../src/base/action-dispatcher.ts"],"names":[],"mappings":";AAgBA,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAoB,aAAa,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAEpG,OAAO,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AAElF,qBAAa,oBAAqB,SAAQ,gBAAgB;IACtD,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,CAAa;IAE9B,SAAS,CAAC,yBAAyB,EAAE,6BAA6B,CAAC;IAC1G,SAAS,CAAC,kBAAkB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAqB;IAEhE,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B,wBAAwB,IAAI,IAAI;IAMhC,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAIrC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAMvC,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBrD;;;;;;;;;OASG;IACH,YAAY,CAAC,GAAG,SAAS,cAAc,EAAE,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,EAAE,SAAS,SAAO,EAAE,eAAe,UAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;CA0BhI"}
+{"version":3,"file":"action-dispatcher.d.ts","sourceRoot":"","sources":["../../src/base/action-dispatcher.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAoB,aAAa,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAEjG,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AAElF,qBAAa,oBAAqB,SAAQ,gBAAgB;IACtD,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,CAAa;IACrE,SAAS,CAAC,qBAAqB,UAAS;IACD,SAAS,CAAC,wBAAwB,EAAE,6BAA6B,CAAC;IAEzG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B,wBAAwB,IAAI,IAAI;IAQhC,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAIrC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAMvC,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBrD;;;;;;;;;OASG;IACH,YAAY,CAAC,GAAG,SAAS,cAAc,EAAE,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,EAAE,SAAS,SAAO,EAAE,eAAe,UAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;CA0BhI"}

package/lib/base/action-dispatcher.js

@@ -25,6 +25,7 @@ exports.GLSPActionDispatcher = void 0;
  *
  * 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 model_initialization_constraint_1 = require("./model-initialization-constraint");
@@ -32,26 +33,28 @@ class GLSPActionDispatcher extends sprotty_1.ActionDispatcher {
     constructor() {
         super(...arguments);
         this.timeouts = new Map();
-        this.onModelInitialized = Promise.resolve();
+        this.initializedConstraint = false;
     }
     initialize() {
         return super.initialize().then(() => this.startModelInitialization());
     }
     startModelInitialization() {
-        this.logger.log(this, 'Starting model initialization mode');
-        this.onModelInitialized = this.initiailizationConstraint.onInitialized();
-        this.onModelInitialized.then(() => this.logger.log(this, 'Model initialization completed'));
+        if (!this.initializedConstraint) {
+            this.logger.log(this, 'Starting model initialization mode');
+            this.initializationConstraint.onInitialized().then(() => this.logger.log(this, 'Model initialization completed'));
+            this.initializedConstraint = true;
+        }
     }
     onceModelInitialized() {
-        return this.onModelInitialized;
+        return this.initializationConstraint.onInitialized();
     }
     dispatch(action) {
         const result = super.dispatch(action);
-        this.initiailizationConstraint.notifyDispatched(action);
+        this.initializationConstraint.notifyDispatched(action);
         return result;
     }
     handleAction(action) {
-        if (sprotty_1.isResponseAction(action)) {
+        if (protocol_1.isResponseAction(action)) {
             // clear timeout
             const timeout = this.timeouts.get(action.responseId);
             if (timeout !== undefined) {
@@ -105,6 +108,6 @@ class GLSPActionDispatcher extends sprotty_1.ActionDispatcher {
 __decorate([
     inversify_1.inject(model_initialization_constraint_1.ModelInitializationConstraint),
     __metadata("design:type", model_initialization_constraint_1.ModelInitializationConstraint)
-], GLSPActionDispatcher.prototype, "initiailizationConstraint", void 0);
+], GLSPActionDispatcher.prototype, "initializationConstraint", void 0);
 exports.GLSPActionDispatcher = GLSPActionDispatcher;
 //# sourceMappingURL=action-dispatcher.js.map

package/lib/base/action-dispatcher.js.map

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

package/lib/base/actions/focus-change-action.d.ts

@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action } from 'sprotty';
+import { Action } from '@eclipse-glsp/protocol';
 export declare class FocusStateChangedAction implements Action {
     readonly hasFocus: boolean;
     static KIND: string;

package/lib/base/actions/focus-change-action.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"focus-change-action.d.ts","sourceRoot":"","sources":["../../../src/base/actions/focus-change-action.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEjC,qBAAa,uBAAwB,YAAW,MAAM;aAGtB,QAAQ,EAAE,OAAO;IAF7C,MAAM,CAAC,IAAI,SAAuB;IAClC,QAAQ,CAAC,IAAI,SAAgC;gBACjB,QAAQ,EAAE,OAAO;CAChD;AAED,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,IAAI,uBAAuB,CAE3F"}
+{"version":3,"file":"focus-change-action.d.ts","sourceRoot":"","sources":["../../../src/base/actions/focus-change-action.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAEhD,qBAAa,uBAAwB,YAAW,MAAM;aAGtB,QAAQ,EAAE,OAAO;IAF7C,MAAM,CAAC,IAAI,SAAuB;IAClC,QAAQ,CAAC,IAAI,SAAgC;gBACjB,QAAQ,EAAE,OAAO;CAChD;AAED,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,IAAI,uBAAuB,CAE3F"}

package/lib/base/{args.d.ts → argumentable.d.ts}

@@ -13,12 +13,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { Args } from '@eclipse-glsp/protocol';
 import { SModelElement } from 'sprotty';
-export interface Args {
-    [key: string]: string | number | boolean;
-}
 export interface SArgumentable {
     args: Args;
 }
 export declare function hasArguments(element?: SModelElement): element is SModelElement & SArgumentable;
-//# sourceMappingURL=args.d.ts.map
+//# sourceMappingURL=argumentable.d.ts.map

package/lib/base/argumentable.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"argumentable.d.ts","sourceRoot":"","sources":["../../src/base/argumentable.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAExC,MAAM,WAAW,aAAa;IAC1B,IAAI,EAAE,IAAI,CAAC;CACd;AAED,wBAAgB,YAAY,CAAC,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,IAAI,aAAa,GAAG,aAAa,CAE9F"}

package/lib/base/{args.js → argumentable.js}

@@ -5,4 +5,4 @@ function hasArguments(element) {
     return element !== undefined && 'args' in element;
 }
 exports.hasArguments = hasArguments;
-//# sourceMappingURL=args.js.map
+//# sourceMappingURL=argumentable.js.map

package/lib/base/argumentable.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"argumentable.js","sourceRoot":"","sources":["../../src/base/argumentable.ts"],"names":[],"mappings":";;;AAsBA,SAAgB,YAAY,CAAC,OAAuB;IAChD,OAAO,OAAO,KAAK,SAAS,IAAI,MAAM,IAAI,OAAO,CAAC;AACtD,CAAC;AAFD,oCAEC"}

package/lib/base/auto-complete/auto-complete-actions.d.ts

@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { LabeledAction } from 'sprotty/lib';
+import { LabeledAction } from '@eclipse-glsp/protocol';
 export interface SetAutoCompleteValueAction extends LabeledAction {
     readonly text: string;
 }

package/lib/base/auto-complete/auto-complete-actions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auto-complete-actions.d.ts","sourceRoot":"","sources":["../../../src/base/auto-complete/auto-complete-actions.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,MAAM,WAAW,0BAA2B,SAAQ,aAAa;IAC7D,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACzB;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,aAAa,GAAG,MAAM,IAAI,0BAA0B,CAExG"}
+{"version":3,"file":"auto-complete-actions.d.ts","sourceRoot":"","sources":["../../../src/base/auto-complete/auto-complete-actions.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAEvD,MAAM,WAAW,0BAA2B,SAAQ,aAAa;IAC7D,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACzB;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,aAAa,GAAG,MAAM,IAAI,0BAA0B,CAExG"}

package/lib/base/auto-complete/auto-complete-widget.d.ts

@@ -13,9 +13,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { Action, LabeledAction, ValidationStatus } from '@eclipse-glsp/protocol';
 import { AutocompleteResult, AutocompleteSettings } from 'autocompleter';
-import { Action, ILogger, LabeledAction, SModelRoot } from 'sprotty/lib';
-import { ValidationStatus } from '../actions/edit-validation-actions';
+import { ILogger, SModelRoot } from 'sprotty';
 import { IValidationDecorator } from './validation-decorator';
 export interface AutoCompleteSettings {
     readonly noSuggestionsMessage?: string;

package/lib/base/auto-complete/auto-complete-widget.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auto-complete-widget.d.ts","sourceRoot":"","sources":["../../../src/base/auto-complete/auto-complete-widget.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"auto-complete-widget.d.ts","sourceRoot":"","sources":["../../../src/base/auto-complete/auto-complete-widget.ts"],"names":[],"mappings":"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"}