@eclipse-glsp/client 0.9.0-rc-01 → 0.10.0-next.146a812.165

package/lib/views/rounded-corner.js

@@ -1,76 +1,55 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.scaledRadius = exports.RoundedCornerWrapper = void 0;
-var RoundedCornerWrapper = /** @class */ (function () {
-    function RoundedCornerWrapper(element, cornerRadius) {
+class RoundedCornerWrapper {
+    constructor(element, cornerRadius) {
         this.element = element;
         this.cornerRadius = cornerRadius;
     }
-    Object.defineProperty(RoundedCornerWrapper.prototype, "size", {
-        get: function () {
-            return this.element.size;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(RoundedCornerWrapper.prototype, "topLeftCorner", {
-        get: function () {
-            if (!this._topLeftCorner) {
-                this._topLeftCorner = {
-                    radiusX: scaledRadius(this.cornerRadius.topLeft, this.element.size.width / 2),
-                    radiusY: scaledRadius(this.cornerRadius.topLeft, this.element.size.height / 2)
-                };
-            }
-            return this._topLeftCorner;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(RoundedCornerWrapper.prototype, "topRightCorner", {
-        get: function () {
-            if (!this._topRightCorner) {
-                this._topRightCorner = {
-                    radiusX: scaledRadius(this.cornerRadius.topRight, this.element.size.width / 2),
-                    radiusY: scaledRadius(this.cornerRadius.topRight, this.element.size.height / 2)
-                };
-            }
-            return this._topRightCorner;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(RoundedCornerWrapper.prototype, "bottomRightCorner", {
-        get: function () {
-            if (!this._bottomRightCorner) {
-                this._bottomRightCorner = {
-                    radiusX: scaledRadius(this.cornerRadius.bottomRight, this.element.size.width / 2),
-                    radiusY: scaledRadius(this.cornerRadius.bottomRight, this.element.size.height / 2)
-                };
-            }
-            return this._bottomRightCorner;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(RoundedCornerWrapper.prototype, "bottomLeftCorner", {
-        get: function () {
-            if (!this._bottomLeftCorner) {
-                this._bottomLeftCorner = {
-                    radiusX: scaledRadius(this.cornerRadius.bottomLeft, this.element.size.width / 2),
-                    radiusY: scaledRadius(this.cornerRadius.bottomLeft, this.element.size.height / 2)
-                };
-            }
-            return this._bottomLeftCorner;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    return RoundedCornerWrapper;
-}());
+    get size() {
+        return this.element.size;
+    }
+    get topLeftCorner() {
+        if (!this._topLeftCorner) {
+            this._topLeftCorner = {
+                radiusX: scaledRadius(this.cornerRadius.topLeft, this.element.size.width / 2),
+                radiusY: scaledRadius(this.cornerRadius.topLeft, this.element.size.height / 2)
+            };
+        }
+        return this._topLeftCorner;
+    }
+    get topRightCorner() {
+        if (!this._topRightCorner) {
+            this._topRightCorner = {
+                radiusX: scaledRadius(this.cornerRadius.topRight, this.element.size.width / 2),
+                radiusY: scaledRadius(this.cornerRadius.topRight, this.element.size.height / 2)
+            };
+        }
+        return this._topRightCorner;
+    }
+    get bottomRightCorner() {
+        if (!this._bottomRightCorner) {
+            this._bottomRightCorner = {
+                radiusX: scaledRadius(this.cornerRadius.bottomRight, this.element.size.width / 2),
+                radiusY: scaledRadius(this.cornerRadius.bottomRight, this.element.size.height / 2)
+            };
+        }
+        return this._bottomRightCorner;
+    }
+    get bottomLeftCorner() {
+        if (!this._bottomLeftCorner) {
+            this._bottomLeftCorner = {
+                radiusX: scaledRadius(this.cornerRadius.bottomLeft, this.element.size.width / 2),
+                radiusY: scaledRadius(this.cornerRadius.bottomLeft, this.element.size.height / 2)
+            };
+        }
+        return this._bottomLeftCorner;
+    }
+}
 exports.RoundedCornerWrapper = RoundedCornerWrapper;
 /*
-* Scales the radius if necessary. (Percentual downscaling if the radius is bigger then the maximal allowed length)
-*/
+ * Scales the radius if necessary. (Percentual downscaling if the radius is bigger then the maximal allowed length)
+ */
 function scaledRadius(radius, maximalLength) {
     if (radius <= maximalLength) {
         return radius;

package/lib/views/rounded-corner.js.map

@@ -1 +1 @@
-{"version":3,"file":"rounded-corner.js","sourceRoot":"","sources":["../../src/views/rounded-corner.ts"],"names":[],"mappings":";;;AAwBA;IAMI,8BAA4B,OAA+C,EAAkB,YAA0B;QAA3F,YAAO,GAAP,OAAO,CAAwC;QAAkB,iBAAY,GAAZ,YAAY,CAAc;IACvH,CAAC;IAED,sBAAI,sCAAI;aAAR;YACI,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;QAC7B,CAAC;;;OAAA;IAED,sBAAI,+CAAa;aAAjB;YACI,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;gBACtB,IAAI,CAAC,cAAc,GAAG;oBAClB,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;oBAC7E,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;iBACjF,CAAC;aACL;YACD,OAAO,IAAI,CAAC,cAAc,CAAC;QAC/B,CAAC;;;OAAA;IAED,sBAAI,gDAAc;aAAlB;YACI,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE;gBACvB,IAAI,CAAC,eAAe,GAAG;oBACnB,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;oBAC9E,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;iBAClF,CAAC;aACL;YACD,OAAO,IAAI,CAAC,eAAe,CAAC;QAChC,CAAC;;;OAAA;IAED,sBAAI,mDAAiB;aAArB;YACI,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE;gBAC1B,IAAI,CAAC,kBAAkB,GAAG;oBACtB,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;oBACjF,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;iBACrF,CAAC;aACL;YACD,OAAO,IAAI,CAAC,kBAAkB,CAAC;QACnC,CAAC;;;OAAA;IAED,sBAAI,kDAAgB;aAApB;YACI,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE;gBACzB,IAAI,CAAC,iBAAiB,GAAG;oBACrB,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;oBAChF,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;iBACpF,CAAC;aACL;YACD,OAAO,IAAI,CAAC,iBAAiB,CAAC;QAClC,CAAC;;;OAAA;IACL,2BAAC;AAAD,CAAC,AApDD,IAoDC;AApDY,oDAAoB;AAsDjC;;EAEE;AACF,SAAgB,YAAY,CAAC,MAAc,EAAE,aAAqB;IAC9D,IAAI,MAAM,IAAI,aAAa,EAAE;QACzB,OAAO,MAAM,CAAC;KACjB;SAAM;QACH,OAAO,MAAM,GAAG,CAAC,aAAa,GAAG,MAAM,CAAC,CAAC;KAC5C;AACL,CAAC;AAND,oCAMC"}
+{"version":3,"file":"rounded-corner.js","sourceRoot":"","sources":["../../src/views/rounded-corner.ts"],"names":[],"mappings":";;;AAwBA,MAAa,oBAAoB;IAM7B,YAA4B,OAA+C,EAAkB,YAA0B;QAA3F,YAAO,GAAP,OAAO,CAAwC;QAAkB,iBAAY,GAAZ,YAAY,CAAc;IAAG,CAAC;IAE3H,IAAI,IAAI;QACJ,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;IAC7B,CAAC;IAED,IAAI,aAAa;QACb,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;YACtB,IAAI,CAAC,cAAc,GAAG;gBAClB,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;gBAC7E,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;aACjF,CAAC;SACL;QACD,OAAO,IAAI,CAAC,cAAc,CAAC;IAC/B,CAAC;IAED,IAAI,cAAc;QACd,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE;YACvB,IAAI,CAAC,eAAe,GAAG;gBACnB,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;gBAC9E,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;aAClF,CAAC;SACL;QACD,OAAO,IAAI,CAAC,eAAe,CAAC;IAChC,CAAC;IAED,IAAI,iBAAiB;QACjB,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE;YAC1B,IAAI,CAAC,kBAAkB,GAAG;gBACtB,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;gBACjF,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;aACrF,CAAC;SACL;QACD,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACnC,CAAC;IAED,IAAI,gBAAgB;QAChB,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE;YACzB,IAAI,CAAC,iBAAiB,GAAG;gBACrB,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;gBAChF,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;aACpF,CAAC;SACL;QACD,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAClC,CAAC;CACJ;AAnDD,oDAmDC;AAED;;GAEG;AACH,SAAgB,YAAY,CAAC,MAAc,EAAE,aAAqB;IAC9D,IAAI,MAAM,IAAI,aAAa,EAAE;QACzB,OAAO,MAAM,CAAC;KACjB;SAAM;QACH,OAAO,MAAM,GAAG,CAAC,aAAa,GAAG,MAAM,CAAC,CAAC;KAC5C;AACL,CAAC;AAND,oCAMC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-glsp/client",
-  "version": "0.9.0-rc-01",
+  "version": "0.10.0-next.146a812.165+146a812",
   "description": "A sprotty-based client for GLSP",
   "license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)",
   "keywords": [
@@ -23,19 +23,9 @@
   "bugs": "https://github.com/eclipse-glsp/glsp/issues",
   "contributors": [
     {
-      "name": "Philip Langer",
-      "email": "planger@eclipsesource.com",
-      "url": "https://www.eclipsesource.com"
-    },
-    {
-      "name": "Tobias Ortmayr",
-      "email": "tortmayr@eclipsesource.com",
-      "url": "https://www.eclipsesource.com"
-    },
-    {
-      "name": "Martin Fleck",
-      "email": "mfleck@eclipsesource.com",
-      "url": "https://www.eclipsesource.com"
+      "name": "Eclipse GLSP Project",
+      "email": "glsp-dev@eclipse.org",
+      "url": "https://projects.eclipse.org/projects/ecd.glsp"
     }
   ],
   "files": [
@@ -44,35 +34,27 @@
     "css"
   ],
   "dependencies": {
-    "@eclipse-glsp/protocol": "0.9.0-rc-01",
+    "@eclipse-glsp/protocol": "0.10.0-next.146a812.165+146a812",
     "autocompleter": "5.1.0",
-    "sprotty": "^0.10.0-next.a91d3d7"
+    "sprotty": "0.10.0"
   },
   "devDependencies": {
-    "@babel/runtime": "^7.11.2",
-    "@types/chai": "4.1.3",
-    "@types/mocha": "^5.2.7",
-    "@types/node": "10.14.18",
-    "chai": "^4.2.0",
-    "mocha": "^6.2.0",
-    "mocha-jenkins-reporter": "0.4.5",
-    "reflect-metadata": "^0.1.13",
-    "rimraf": "^2.6.1",
-    "ts-node": "^8.3.0",
-    "typescript": "^3.9.2"
+    "@vscode/codicons": "^0.0.25",
+    "typescript": "^4.5.5"
   },
   "scripts": {
     "prepare": "yarn clean && yarn build && yarn lint",
-    "clean": "rimraf lib",
+    "clean": "rimraf lib tsconfig.tsbuildinfo ",
     "build": "tsc",
     "lint": "eslint -c ./.eslintrc.js --ext .ts,.tsx ./src",
     "watch": "tsc -w",
-    "test": "mocha --opts ../../configs/mocha.opts \"./src/**/*.spec.?(ts|tsx)\"",
-    "test:ci": "export JUNIT_REPORT_PATH=./report.xml && yarn test --colors --reporter mocha-jenkins-reporter"
+    "test": "mocha --config ../../.mocharc.json \"./src/**/*.spec.?(ts|tsx)\"",
+    "test:ci": "export JUNIT_REPORT_PATH=./report.xml && yarn test --reporter mocha-jenkins-reporter"
   },
   "publishConfig": {
     "access": "public"
   },
   "main": "lib/index",
-  "types": "lib/index"
+  "types": "lib/index",
+  "gitHead": "146a8123986421e7a3a9e867d0ded74dd6dec2c0"
 }

package/src/base/action-dispatcher.ts

@@ -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
@@ -13,39 +13,39 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { Action, isResponseAction, RequestAction, ResponseAction } from '@eclipse-glsp/protocol';
 import { inject } from 'inversify';
-import { Action, ActionDispatcher, isResponseAction, RequestAction, ResponseAction } from 'sprotty';
-
+import { ActionDispatcher } from 'sprotty';
 import { ModelInitializationConstraint } from './model-initialization-constraint';
 
 export class GLSPActionDispatcher extends ActionDispatcher {
-
     protected readonly timeouts: Map<string, NodeJS.Timeout> = new Map();
+    protected initializedConstraint = false;
+    @inject(ModelInitializationConstraint) protected initializationConstraint: ModelInitializationConstraint;
 
-    @inject(ModelInitializationConstraint) protected initiailizationConstraint: ModelInitializationConstraint;
-    protected onModelInitialized: Promise<void> = Promise.resolve();
-
-    initialize(): Promise<void> {
+    override initialize(): Promise<void> {
         return super.initialize().then(() => this.startModelInitialization());
     }
 
     startModelInitialization(): void {
-        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(): Promise<void> {
-        return this.onModelInitialized;
+        return this.initializationConstraint.onInitialized();
     }
 
-    dispatch(action: Action): Promise<void> {
+    override dispatch(action: Action): Promise<void> {
         const result = super.dispatch(action);
-        this.initiailizationConstraint.notifyDispatched(action);
+        this.initializationConstraint.notifyDispatched(action);
         return result;
     }
 
-    protected handleAction(action: Action): Promise<void> {
+    protected override handleAction(action: Action): Promise<void> {
         if (isResponseAction(action)) {
             // clear timeout
             const timeout = this.timeouts.get(action.responseId);

package/src/base/actions/focus-change-action.ts

@@ -13,12 +13,12 @@
  *
  * 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 class FocusStateChangedAction implements Action {
     static KIND = 'focusStateChanged';
     readonly kind = FocusStateChangedAction.KIND;
-    constructor(public readonly hasFocus: boolean) { }
+    constructor(public readonly hasFocus: boolean) {}
 }
 
 export function isFocusStateChangedAction(action: Action): action is FocusStateChangedAction {

package/src/base/{args.ts → argumentable.ts}

@@ -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
@@ -13,10 +13,9 @@
  *
  * 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;
 }

package/src/base/auto-complete/auto-complete-actions.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/src/base/auto-complete/auto-complete-widget.ts

@@ -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
@@ -13,12 +13,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { Action, isAction, isLabeledAction, LabeledAction, ValidationStatus } from '@eclipse-glsp/protocol';
 import { AutocompleteResult, AutocompleteSettings } from 'autocompleter';
-import { Action, ILogger, isAction, isLabeledAction, LabeledAction, SModelRoot } from 'sprotty/lib';
+import { codiconCSSClasses, ILogger, SModelRoot } from 'sprotty';
 import { toArray } from 'sprotty/lib/utils/iterable';
 import { matchesKeystroke } from 'sprotty/lib/utils/keyboard';
-
-import { ValidationStatus } from '../actions/edit-validation-actions';
 import { isSetAutoCompleteValueAction } from './auto-complete-actions';
 import { IValidationDecorator } from './validation-decorator';
 
@@ -53,7 +52,7 @@ export interface TextSubmitHandler {
 const configureAutocomplete: (settings: AutocompleteSettings<LabeledAction>) => AutocompleteResult = require('autocompleter');
 
 export class AutoCompleteWidget {
-    loadingIndicatorClasses = ['loading', 'fa', 'fa-spinner', 'fa-pulse', 'fa-3x', 'fa-fw'];
+    loadingIndicatorClasses = codiconCSSClasses('loading', false, true, ['loading']);
 
     protected containerElement: HTMLElement;
     protected inputElement: HTMLInputElement;
@@ -72,12 +71,14 @@ export class AutoCompleteWidget {
         public suggestionProvider: SuggestionProvider,
         public suggestionSubmitHandler: SuggestionSubmitHandler,
         // eslint-disable-next-line @typescript-eslint/no-empty-function
-        protected notifyClose: () => void = () => { },
+        protected notifyClose: () => void = () => {},
         protected logger?: ILogger
-    ) { }
+    ) {}
 
-    configureValidation(inputValidator: InputValidator,
-        validationDecorator: IValidationDecorator = IValidationDecorator.NO_DECORATION): void {
+    configureValidation(
+        inputValidator: InputValidator,
+        validationDecorator: IValidationDecorator = IValidationDecorator.NO_DECORATION
+    ): void {
         this.inputValidator = inputValidator;
         this.validationDecorator = validationDecorator;
     }
@@ -154,25 +155,33 @@ export class AutoCompleteWidget {
             showOnFocus: this.autoSuggestionSettings.showOnFocus,
             debounceWaitMs: this.autoSuggestionSettings.debounceWaitMs,
             minLength: -1,
-            fetch: (text: string, update: (items: LabeledAction[]) => void) =>
-                this.updateSuggestions(update, text, root),
+            fetch: (text: string, update: (items: LabeledAction[]) => void) => this.updateSuggestions(update, text, root),
             onSelect: (item: LabeledAction) => this.onSelect(item),
-            render: (item: LabeledAction, currentValue: string): HTMLDivElement | undefined =>
-                this.renderSuggestions(item, currentValue),
+            render: (item: LabeledAction, currentValue: string): HTMLDivElement | undefined => this.renderSuggestions(item, currentValue),
             customize: (input: HTMLInputElement, inputRect: ClientRect | DOMRect, container: HTMLDivElement, maxHeight: number) => {
                 this.customizeInputElement(input, inputRect, container, maxHeight);
             }
         };
     }
 
-    protected customizeInputElement(input: HTMLInputElement, inputRect: ClientRect | DOMRect, container: HTMLDivElement, maxHeight: number): void {
+    protected customizeInputElement(
+        input: HTMLInputElement,
+        inputRect: ClientRect | DOMRect,
+        container: HTMLDivElement,
+        maxHeight: number
+    ): void {
         // move container into our UIExtension container as this is already positioned correctly
         if (this.containerElement) {
             this.containerElement.appendChild(container);
         }
     }
 
-    protected updateSuggestions(update: (items: LabeledAction[]) => void, text: string, root: Readonly<SModelRoot>, ...contextElementIds: string[]): void {
+    protected updateSuggestions(
+        update: (items: LabeledAction[]) => void,
+        text: string,
+        root: Readonly<SModelRoot>,
+        ...contextElementIds: string[]
+    ): void {
         this.onLoading();
         this.doUpdateSuggestions(text, root)
             .then(actions => {
@@ -230,11 +239,13 @@ export class AutoCompleteWidget {
     }
 
     protected filterActions(filterText: string, actions: LabeledAction[]): LabeledAction[] {
-        return toArray(actions.filter(action => {
-            const label = action.label.toLowerCase();
-            const searchWords = filterText.split(' ');
-            return searchWords.every(word => label.indexOf(word.toLowerCase()) !== -1);
-        }));
+        return toArray(
+            actions.filter(action => {
+                const label = action.label.toLowerCase();
+                const searchWords = filterText.split(' ');
+                return searchWords.every(word => label.indexOf(word.toLowerCase()) !== -1);
+            })
+        );
     }
 
     protected onSelect(item: LabeledAction): void {
@@ -257,10 +268,10 @@ export class AutoCompleteWidget {
     }
 
     private isNoOrExactlyOneMatchingContextAction(): boolean | undefined {
-        return !this.isSuggestionAvailable()
-            || (this.contextActions
-                && this.contextActions.length === 1
-                && this.inputElement.value.endsWith(this.contextActions[0].label));
+        return (
+            !this.isSuggestionAvailable() ||
+            (this.contextActions && this.contextActions.length === 1 && this.inputElement.value.endsWith(this.contextActions[0].label))
+        );
     }
 
     protected isSuggestionAvailable(): boolean | undefined {
@@ -269,7 +280,8 @@ export class AutoCompleteWidget {
 
     validateInput(): void {
         if (this.inputValidator) {
-            this.inputValidator.validate(this.inputElement.value)
+            this.inputValidator
+                .validate(this.inputElement.value)
                 .then(result => this.validationDecorator.decorateValidationResult(result))
                 .catch(error => this.handleErrorDuringValidation(error));
         }

package/src/base/auto-complete/validation-decorator.ts

@@ -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
@@ -13,7 +13,8 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { ValidationStatus } from '../actions/edit-validation-actions';
+import { codiconCSSString } from 'sprotty/lib/utils/codicon';
+import { ValidationStatus } from '@eclipse-glsp/protocol';
 
 export interface IValidationDecorator {
     decorateValidationResult(status: ValidationStatus): void;
@@ -25,29 +26,29 @@ export interface IValidationDecorator {
 export namespace IValidationDecorator {
     export const NO_DECORATION: IValidationDecorator = {
         // eslint-disable-next-line @typescript-eslint/no-empty-function
-        decorateValidationResult(_status: ValidationStatus) { },
+        decorateValidationResult(_status: ValidationStatus) {},
         isValidatedOk(): boolean {
             return false;
         },
         // eslint-disable-next-line @typescript-eslint/no-empty-function
-        invalidate() { },
+        invalidate() {},
         // eslint-disable-next-line @typescript-eslint/no-empty-function
-        dispose() { }
+        dispose() {}
     };
 }
 
 export class ValidationDecorator implements IValidationDecorator {
     warningClasses = ['warning'];
-    warningIconClasses = ['fa', 'fa-question-circle'];
+    warningIconClasses = codiconCSSString('warning');
     errorClasses = ['error'];
-    errorIconClasses = ['fa', 'fa-exclamation-circle'];
+    errorIconClasses = codiconCSSString('error');
 
     isValidated = false;
     hasValidationError = false;
 
     protected decorationDiv?: HTMLDivElement;
 
-    constructor(protected containerElement: HTMLElement) { }
+    constructor(protected containerElement: HTMLElement) {}
 
     decorateValidationResult(status: ValidationStatus): void {
         if (ValidationStatus.isError(status)) {
@@ -67,7 +68,7 @@ export class ValidationDecorator implements IValidationDecorator {
         this.switchCssClasses(this.containerElement, this.errorClasses);
         const div = this.createDecorationDiv();
         this.switchCssClasses(div, this.errorClasses);
-        div.innerHTML = `<span class="${this.errorIconClasses.join(' ')}"></span> ${message}`;
+        div.innerHTML = `<span class="${this.errorIconClasses}"></span> ${message}`;
         this.adjustPosition();
     }
 
@@ -75,7 +76,7 @@ export class ValidationDecorator implements IValidationDecorator {
         this.switchCssClasses(this.containerElement, this.warningClasses);
         const div = this.createDecorationDiv();
         this.switchCssClasses(div, this.warningClasses);
-        div.innerHTML = `<span class="${this.warningIconClasses.join(' ')}"></span> ${message}`;
+        div.innerHTML = `<span class="${this.warningIconClasses}"></span> ${message}`;
         this.adjustPosition();
     }
 
@@ -96,7 +97,7 @@ export class ValidationDecorator implements IValidationDecorator {
     }
 
     protected decorationContainerWidth(): number {
-        return this.containerElement.clientWidth - 22;
+        return this.containerElement.clientWidth - 5;
     }
 
     protected adjustPosition(): void {

package/src/base/command-stack.ts

@@ -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
@@ -13,24 +13,21 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { RedoOperation, UndoOperation } from '@eclipse-glsp/protocol';
 import { inject, injectable } from 'inversify';
 import { CommandStack, IActionDispatcher, SModelRoot, TYPES } from 'sprotty';
 
-import { RedoOperation, UndoOperation } from '../features/undo-redo/model';
-
 @injectable()
 export class GLSPCommandStack extends CommandStack {
-
     @inject(TYPES.IActionDispatcherProvider) protected actionDispatcher: () => Promise<IActionDispatcher>;
 
-    undo(): Promise<SModelRoot> {
+    override undo(): Promise<SModelRoot> {
         this.actionDispatcher().then(dispatcher => dispatcher.dispatch(new UndoOperation()));
         return this.thenUpdate();
     }
 
-    redo(): Promise<SModelRoot> {
+    override redo(): Promise<SModelRoot> {
         this.actionDispatcher().then(dispatcher => dispatcher.dispatch(new RedoOperation()));
         return this.thenUpdate();
     }
 }
-