@eclipse-glsp/client 0.9.0-next.6d10f92e → 0.9.0-next.75608185

package/lib/views/rounded-corner.js

@@ -0,0 +1,62 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.scaledRadius = exports.RoundedCornerWrapper = void 0;
+class RoundedCornerWrapper {
+    constructor(element, cornerRadius) {
+        this.element = element;
+        this.cornerRadius = cornerRadius;
+    }
+    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)
+ */
+function scaledRadius(radius, maximalLength) {
+    if (radius <= maximalLength) {
+        return radius;
+    }
+    else {
+        return radius * (maximalLength / radius);
+    }
+}
+exports.scaledRadius = scaledRadius;
+//# sourceMappingURL=rounded-corner.js.map

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

@@ -0,0 +1 @@
+{"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-next.6d10f92e",
+  "version": "0.9.0-next.75608185",
   "description": "A sprotty-based client for GLSP",
   "license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)",
   "keywords": [
@@ -12,39 +12,29 @@
     "glsp",
     "diagram editor"
   ],
-  "homepage": "https://www.eclipse.org/glsp/",
-  "bugs": "https://github.com/eclipse-glsp/glsp-client/issues",
-  "files": [
-    "lib",
-    "src",
-    "css"
-  ],
   "author": {
     "name": "Eclipse GLSP"
   },
-  "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"
-    }
-  ],
+  "homepage": "https://www.eclipse.org/glsp/",
   "repository": {
     "type": "git",
     "url": "https://github.com/eclipse-glsp/glsp-client.git"
   },
+  "bugs": "https://github.com/eclipse-glsp/glsp/issues",
+  "contributors": [
+    {
+      "name": "Eclipse GLSP Project",
+      "email": "glsp-dev@eclipse.org",
+      "url": "https://projects.eclipse.org/projects/ecd.glsp"
+    }
+  ],
+  "files": [
+    "lib",
+    "src",
+    "css"
+  ],
   "dependencies": {
-    "@eclipse-glsp/protocol": "0.9.0-next.6d10f92e",
+    "@eclipse-glsp/protocol": "0.9.0-next.75608185",
     "autocompleter": "5.1.0",
     "sprotty": "next"
   },
@@ -53,22 +43,24 @@
     "@types/chai": "4.1.3",
     "@types/mocha": "^5.2.7",
     "@types/node": "10.14.18",
+    "@vscode/codicons": "^0.0.25",
     "chai": "^4.2.0",
-    "jenkins-mocha": "^8.0.0",
+    "ignore-styles": "^5.0.1",
     "mocha": "^6.2.0",
+    "mocha-jenkins-reporter": "0.4.5",
     "reflect-metadata": "^0.1.13",
     "rimraf": "^2.6.1",
     "ts-node": "^8.3.0",
-    "tslint": "^5.5.0",
     "typescript": "^3.9.2"
   },
   "scripts": {
-    "prepare": "yarn run clean && yarn run build",
+    "prepare": "yarn clean && yarn build && yarn lint",
     "clean": "rimraf lib",
-    "build": "tsc && yarn run lint",
-    "lint": "tslint -c ../../tslint.json --project ./tsconfig.json",
+    "build": "tsc",
+    "lint": "eslint -c ./.eslintrc.js --ext .ts,.tsx ./src",
     "watch": "tsc -w",
-    "test": "jenkins-mocha --opts ../../configs/mocha.opts \"./src/**/*.spec.?(ts|tsx)\""
+    "test": "mocha --opts ./mocha.opts \"./src/**/*.spec.?(ts|tsx)\"",
+    "test:ci": "export JUNIT_REPORT_PATH=./report.xml && yarn test --reporter mocha-jenkins-reporter"
   },
   "publishConfig": {
     "access": "public"

package/src/base/action-dispatcher.ts

@@ -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
@@ -13,13 +13,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { inject } from "inversify";
-import { Action, ActionDispatcher, isResponseAction, RequestAction, ResponseAction } from "sprotty";
-
-import { ModelInitializationConstraint } from "./model-initialization-constraint";
+import { Action, isResponseAction, RequestAction, ResponseAction } from '@eclipse-glsp/protocol';
+import { inject } from 'inversify';
+import { ActionDispatcher } from 'sprotty';
+import { ModelInitializationConstraint } from './model-initialization-constraint';
 
 export class GLSPActionDispatcher extends ActionDispatcher {
-
     protected readonly timeouts: Map<string, NodeJS.Timeout> = new Map();
 
     @inject(ModelInitializationConstraint) protected initiailizationConstraint: ModelInitializationConstraint;
@@ -29,7 +28,7 @@ export class GLSPActionDispatcher extends ActionDispatcher {
         return super.initialize().then(() => this.startModelInitialization());
     }
 
-    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'));
@@ -74,7 +73,7 @@ export class GLSPActionDispatcher extends ActionDispatcher {
      * If `rejectOnTimeout` is set to false (default) the returned promise will be resolved with
      * no value, otherwise it will be rejected.
      */
-    requestUntil<Res extends ResponseAction>(action: RequestAction<Res>, timeoutMs: number = 2000, rejectOnTimeout: boolean = false): Promise<Res> {
+    requestUntil<Res extends ResponseAction>(action: RequestAction<Res>, timeoutMs = 2000, rejectOnTimeout = false): Promise<Res> {
         if (!action.requestId) {
             return Promise.reject(new Error('Request without requestId'));
         }

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,9 +13,8 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { SModelElement } from "sprotty";
-
-export type Args = { [key: string]: string | number | boolean };
+import { Args } from '@eclipse-glsp/protocol';
+import { SModelElement } from 'sprotty';
 
 export interface SArgumentable {
     args: Args;

package/src/base/auto-complete/auto-complete-actions.ts

@@ -13,12 +13,12 @@
  *
  * 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;
 }
 
 export function isSetAutoCompleteValueAction(action: LabeledAction): action is SetAutoCompleteValueAction {
-    return action !== undefined && (<SetAutoCompleteValueAction>action).text !== undefined;
+    return action !== undefined && (action as SetAutoCompleteValueAction).text !== undefined;
 }

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,14 +13,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { AutocompleteResult, AutocompleteSettings } from "autocompleter";
-import { Action, ILogger, isAction, isLabeledAction, LabeledAction, SModelRoot } from "sprotty/lib";
-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";
+import { Action, isAction, isLabeledAction, LabeledAction, ValidationStatus } from '@eclipse-glsp/protocol';
+import { AutocompleteResult, AutocompleteSettings } from 'autocompleter';
+import { codiconCSSClasses, ILogger, SModelRoot } from 'sprotty';
+import { toArray } from 'sprotty/lib/utils/iterable';
+import { matchesKeystroke } from 'sprotty/lib/utils/keyboard';
+import { isSetAutoCompleteValueAction } from './auto-complete-actions';
+import { IValidationDecorator } from './validation-decorator';
 
 export interface AutoCompleteSettings {
     readonly noSuggestionsMessage?: string;
@@ -49,10 +48,11 @@ export interface TextSubmitHandler {
     executeFromTextOnlyInput(input: string): void;
 }
 
+// eslint-disable-next-line @typescript-eslint/no-var-requires
 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;
@@ -70,12 +70,15 @@ export class AutoCompleteWidget {
         public autoSuggestionSettings: AutoCompleteSettings,
         public suggestionProvider: SuggestionProvider,
         public suggestionSubmitHandler: SuggestionSubmitHandler,
-        protected notifyClose: () => void = () => { },
+        // eslint-disable-next-line @typescript-eslint/no-empty-function
+        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;
     }
@@ -103,7 +106,7 @@ export class AutoCompleteWidget {
         return inputElement;
     }
 
-    protected handleKeyDown(event: KeyboardEvent) {
+    protected handleKeyDown(event: KeyboardEvent): void {
         if (matchesKeystroke(event, 'Escape')) {
             this.notifyClose();
             return;
@@ -127,16 +130,16 @@ export class AutoCompleteWidget {
         }
     }
 
-    protected isInputElementChanged() {
+    protected isInputElementChanged(): boolean {
         return this.inputElement.value !== this.previousContent;
     }
 
-    protected invalidateValidationResultAndContextActions() {
+    protected invalidateValidationResultAndContextActions(): void {
         this.contextActions = undefined;
         this.validationDecorator.invalidate();
     }
 
-    open(root: Readonly<SModelRoot>, ...contextElementIds: string[]) {
+    open(root: Readonly<SModelRoot>, ...contextElementIds: string[]): void {
         this.contextActions = undefined;
         this.autoCompleteResult = configureAutocomplete(this.autocompleteSettings(root));
         this.previousContent = this.inputElement.value;
@@ -152,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) {
+    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[]) {
+    protected updateSuggestions(
+        update: (items: LabeledAction[]) => void,
+        text: string,
+        root: Readonly<SModelRoot>,
+        ...contextElementIds: string[]
+    ): void {
         this.onLoading();
         this.doUpdateSuggestions(text, root)
             .then(actions => {
@@ -179,12 +190,14 @@ export class AutoCompleteWidget {
                 this.onLoaded('success');
             })
             .catch(reason => {
-                if (this.logger) { this.logger.error(this, 'Failed to obtain suggestions', reason); }
+                if (this.logger) {
+                    this.logger.error(this, 'Failed to obtain suggestions', reason);
+                }
                 this.onLoaded('error');
             });
     }
 
-    protected onLoading() {
+    protected onLoading(): void {
         if (this.loadingIndicator && this.containerElement.contains(this.loadingIndicator)) {
             return;
         }
@@ -197,7 +210,7 @@ export class AutoCompleteWidget {
         return this.suggestionProvider.provideSuggestions(text);
     }
 
-    protected onLoaded(_success: 'success' | 'error') {
+    protected onLoaded(_success: 'success' | 'error'): void {
         if (this.containerElement.contains(this.loadingIndicator)) {
             this.containerElement.removeChild(this.loadingIndicator);
         }
@@ -206,7 +219,7 @@ export class AutoCompleteWidget {
         this.previousContent = this.inputElement.value;
     }
 
-    protected renderSuggestions(item: LabeledAction, value: string) {
+    protected renderSuggestions(item: LabeledAction, value: string): HTMLDivElement {
         const itemElement = document.createElement('div');
         const wordMatcher = this.espaceForRegExp(value).split(' ').join('|');
         const regex = new RegExp(wordMatcher, 'gi');
@@ -217,23 +230,25 @@ export class AutoCompleteWidget {
         return itemElement;
     }
 
-    protected espaceForRegExp(value: string) {
+    protected espaceForRegExp(value: string): string {
         return value.replace(/([.?*+^$[\]\\(){}|-])/g, '\\$1');
     }
 
-    protected renderIcon(itemElement: HTMLDivElement, icon: string) {
+    protected renderIcon(itemElement: HTMLDivElement, icon: string): void {
         itemElement.innerHTML += `<span class="icon ${icon}"></span>`;
     }
 
     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) {
+    protected onSelect(item: LabeledAction): void {
         if (isSetAutoCompleteValueAction(item)) {
             this.inputElement.value = item.text;
             // trigger update of suggestions with an keyup event
@@ -244,7 +259,7 @@ export class AutoCompleteWidget {
         }
     }
 
-    protected validateInputIfNoContextActions() {
+    protected validateInputIfNoContextActions(): void {
         if (this.isNoOrExactlyOneMatchingContextAction()) {
             this.validateInput();
         } else {
@@ -252,27 +267,30 @@ export class AutoCompleteWidget {
         }
     }
 
-    private isNoOrExactlyOneMatchingContextAction() {
-        return !this.isSuggestionAvailable()
-            || (this.contextActions
-                && this.contextActions.length === 1
-                && this.inputElement.value.endsWith(this.contextActions[0].label));
+    private isNoOrExactlyOneMatchingContextAction(): boolean | undefined {
+        return (
+            !this.isSuggestionAvailable() ||
+            (this.contextActions && this.contextActions.length === 1 && this.inputElement.value.endsWith(this.contextActions[0].label))
+        );
     }
 
-    protected isSuggestionAvailable() {
+    protected isSuggestionAvailable(): boolean | undefined {
         return this.contextActions && this.contextActions.length > 0;
     }
 
-    validateInput() {
+    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));
         }
     }
 
-    protected handleErrorDuringValidation(error: Error) {
-        if (this.logger) { this.logger.error(this, 'Failed to validate input', error); }
+    protected handleErrorDuringValidation(error: Error): void {
+        if (this.logger) {
+            this.logger.error(this, 'Failed to validate input', error);
+        }
         this.validationDecorator.dispose();
     }
 
@@ -290,7 +308,7 @@ export class AutoCompleteWidget {
         return this.inputElement;
     }
 
-    dispose() {
+    dispose(): void {
         this.validationDecorator.dispose();
         if (this.autoCompleteResult) {
             this.autoCompleteResult.destroy();

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;
@@ -24,25 +25,30 @@ export interface IValidationDecorator {
 
 export namespace IValidationDecorator {
     export const NO_DECORATION: IValidationDecorator = {
-        decorateValidationResult(_status: ValidationStatus) { },
-        isValidatedOk(): boolean { return false; },
-        invalidate() { },
-        dispose() { }
+        // eslint-disable-next-line @typescript-eslint/no-empty-function
+        decorateValidationResult(_status: ValidationStatus) {},
+        isValidatedOk(): boolean {
+            return false;
+        },
+        // eslint-disable-next-line @typescript-eslint/no-empty-function
+        invalidate() {},
+        // eslint-disable-next-line @typescript-eslint/no-empty-function
+        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: boolean = false;
-    hasValidationError: boolean = false;
+    isValidated = false;
+    hasValidationError = false;
 
     protected decorationDiv?: HTMLDivElement;
 
-    constructor(protected containerElement: HTMLElement) { }
+    constructor(protected containerElement: HTMLElement) {}
 
     decorateValidationResult(status: ValidationStatus): void {
         if (ValidationStatus.isError(status)) {
@@ -62,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();
     }
 
@@ -70,11 +76,11 @@ 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();
     }
 
-    protected switchCssClasses(element: HTMLElement, cssClasses: string[]) {
+    protected switchCssClasses(element: HTMLElement, cssClasses: string[]): void {
         element.classList.remove(...this.errorClasses, ...this.warningClasses);
         element.classList.add(...cssClasses);
     }
@@ -91,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-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,14 +13,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { inject, injectable } from "inversify";
-import { CommandStack, IActionDispatcher, SModelRoot, TYPES } from "sprotty";
-
-import { RedoOperation, UndoOperation } from "../features/undo-redo/model";
+import { RedoOperation, UndoOperation } from '@eclipse-glsp/protocol';
+import { inject, injectable } from 'inversify';
+import { CommandStack, IActionDispatcher, SModelRoot, TYPES } from 'sprotty';
 
 @injectable()
 export class GLSPCommandStack extends CommandStack {
-
     @inject(TYPES.IActionDispatcherProvider) protected actionDispatcher: () => Promise<IActionDispatcher>;
 
     undo(): Promise<SModelRoot> {
@@ -33,4 +31,3 @@ export class GLSPCommandStack extends CommandStack {
         return this.thenUpdate();
     }
 }
-