@eclipse-glsp/client 1.1.0-next.26c3266.182 → 1.1.0-next.fe0b297.182
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/features/hover/hover.d.ts +1 -2
- package/lib/features/hover/hover.d.ts.map +1 -1
- package/lib/features/hover/hover.js +2 -15
- package/lib/features/hover/hover.js.map +1 -1
- package/lib/features/validation/issue-marker.d.ts +2 -1
- package/lib/features/validation/issue-marker.d.ts.map +1 -1
- package/lib/features/validation/issue-marker.js +15 -3
- package/lib/features/validation/issue-marker.js.map +1 -1
- package/lib/features/validation/validate.d.ts.map +1 -1
- package/lib/features/validation/validate.js +2 -3
- package/lib/features/validation/validate.js.map +1 -1
- package/package.json +3 -3
- package/src/features/hover/hover.ts +2 -24
- package/src/features/validation/issue-marker.ts +14 -2
- package/src/features/validation/validate.ts +1 -2
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
16
|
import { Action, Bounds, SModelElementSchema, SModelRootSchema } from '@eclipse-glsp/protocol';
|
|
17
|
-
import { HoverMouseListener, IActionHandler, ICommand,
|
|
17
|
+
import { HoverMouseListener, IActionHandler, ICommand, SModelElement } from 'sprotty';
|
|
18
18
|
import { GIssueMarker } from '../validation/issue-marker';
|
|
19
19
|
export declare class GlspHoverMouseListener extends HoverMouseListener implements IActionHandler {
|
|
20
20
|
protected enableHover: boolean;
|
|
@@ -35,5 +35,4 @@ export declare class GlspHoverMouseListener extends HoverMouseListener implement
|
|
|
35
35
|
protected createIssueMessage(marker: GIssueMarker): string;
|
|
36
36
|
protected modifyBounds(bounds: Bounds): Bounds;
|
|
37
37
|
}
|
|
38
|
-
export declare function getSeverity(marker: SIssueMarker): SIssueSeverity;
|
|
39
38
|
//# sourceMappingURL=hover.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hover.d.ts","sourceRoot":"","sources":["../../../src/features/hover/hover.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,MAAM,EACN,MAAM,EAIN,mBAAmB,EACnB,gBAAgB,EACnB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,
|
|
1
|
+
{"version":3,"file":"hover.d.ts","sourceRoot":"","sources":["../../../src/features/hover/hover.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,MAAM,EACN,MAAM,EAIN,mBAAmB,EACnB,gBAAgB,EACnB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAmC,kBAAkB,EAAE,cAAc,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAIvH,OAAO,EAAe,YAAY,EAAE,MAAM,4BAA4B,CAAC;AACvE,qBACa,sBAAuB,SAAQ,kBAAmB,YAAW,cAAc;IACpF,SAAS,CAAC,WAAW,UAAQ;IAC7B;;;;;;;;OAQG;IACH,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,QAAQ;IAevC,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE;cAOvE,mBAAmB,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;IAiBjG,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,GAAG,gBAAgB;IAYlF,SAAS,CAAC,sBAAsB,CAAC,MAAM,EAAE,YAAY,GAAG,mBAAmB;IAS3E,SAAS,CAAC,kBAAkB,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM;IAI1D,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;CAGjD"}
|
|
@@ -6,7 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
6
6
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
7
|
};
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
-
exports.
|
|
9
|
+
exports.GlspHoverMouseListener = void 0;
|
|
10
10
|
/********************************************************************************
|
|
11
11
|
* Copyright (c) 2020-2022 EclipseSource and others.
|
|
12
12
|
*
|
|
@@ -97,7 +97,7 @@ let GlspHoverMouseListener = class GlspHoverMouseListener extends sprotty_1.Hove
|
|
|
97
97
|
return {
|
|
98
98
|
type: 'pre-rendered',
|
|
99
99
|
id: 'popup-title',
|
|
100
|
-
code: `<div class="${getSeverity(marker)}"><div class="sprotty-popup-title">${message}</div></div>`
|
|
100
|
+
code: `<div class="${(0, issue_marker_1.getSeverity)(marker)}"><div class="sprotty-popup-title">${message}</div></div>`
|
|
101
101
|
};
|
|
102
102
|
}
|
|
103
103
|
createIssueMessage(marker) {
|
|
@@ -111,17 +111,4 @@ GlspHoverMouseListener = __decorate([
|
|
|
111
111
|
(0, inversify_1.injectable)()
|
|
112
112
|
], GlspHoverMouseListener);
|
|
113
113
|
exports.GlspHoverMouseListener = GlspHoverMouseListener;
|
|
114
|
-
function getSeverity(marker) {
|
|
115
|
-
let currentSeverity = 'info';
|
|
116
|
-
for (const severity of marker.issues.map(s => s.severity)) {
|
|
117
|
-
if (severity === 'error') {
|
|
118
|
-
return severity;
|
|
119
|
-
}
|
|
120
|
-
if (severity === 'warning' && currentSeverity === 'info') {
|
|
121
|
-
currentSeverity = severity;
|
|
122
|
-
}
|
|
123
|
-
}
|
|
124
|
-
return currentSeverity;
|
|
125
|
-
}
|
|
126
|
-
exports.getSeverity = getSeverity;
|
|
127
114
|
//# sourceMappingURL=hover.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hover.js","sourceRoot":"","sources":["../../../src/features/hover/hover.ts"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAQgC;AAChC,yCAAuC;AACvC,
|
|
1
|
+
{"version":3,"file":"hover.js","sourceRoot":"","sources":["../../../src/features/hover/hover.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
16
|
import { Bounds, Marker } from '@eclipse-glsp/protocol';
|
|
17
|
-
import { Projectable, SIssue, SIssueMarker, SParentElement } from 'sprotty';
|
|
17
|
+
import { Projectable, SIssue, SIssueMarker, SIssueSeverity, SParentElement } from 'sprotty';
|
|
18
18
|
export declare class GIssueMarker extends SIssueMarker implements Projectable {
|
|
19
19
|
constructor();
|
|
20
20
|
projectionCssClasses: string[];
|
|
@@ -45,4 +45,5 @@ export declare function getSIssueMarker(modelElement: SParentElement): GIssueMar
|
|
|
45
45
|
* @returns the created `SIssue`.
|
|
46
46
|
*/
|
|
47
47
|
export declare function createSIssue(marker: Marker, parent?: SParentElement): SIssue;
|
|
48
|
+
export declare function getSeverity(marker: SIssueMarker): SIssueSeverity;
|
|
48
49
|
//# sourceMappingURL=issue-marker.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"issue-marker.d.ts","sourceRoot":"","sources":["../../../src/features/validation/issue-marker.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,MAAM,EAAc,MAAM,wBAAwB,CAAC;AACpE,OAAO,EAAiB,WAAW,EAAe,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"issue-marker.d.ts","sourceRoot":"","sources":["../../../src/features/validation/issue-marker.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,MAAM,EAAc,MAAM,wBAAwB,CAAC;AACpE,OAAO,EAAiB,WAAW,EAAe,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAExH,qBAAa,YAAa,SAAQ,YAAa,YAAW,WAAW;;IAKjE,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B,eAAe,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,EAAE,CAAM;IACtB,IAAI,SAAY;IAEzB,2BAA2B,IAAI,IAAI;CAItC;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,YAAY,EAAE,cAAc,GAAG,YAAY,CAclF;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,YAAY,EAAE,cAAc,GAAG,YAAY,GAAG,SAAS,CAUtF;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,cAAc,GAAG,MAAM,CAmB5E;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,YAAY,GAAG,cAAc,CAWhE"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.createSIssue = exports.getSIssueMarker = exports.getOrCreateSIssueMarker = exports.GIssueMarker = void 0;
|
|
3
|
+
exports.getSeverity = exports.createSIssue = exports.getSIssueMarker = exports.getOrCreateSIssueMarker = exports.GIssueMarker = void 0;
|
|
4
4
|
/********************************************************************************
|
|
5
5
|
* Copyright (c) 2019-2021 EclipseSource and others.
|
|
6
6
|
*
|
|
@@ -18,7 +18,6 @@ exports.createSIssue = exports.getSIssueMarker = exports.getOrCreateSIssueMarker
|
|
|
18
18
|
********************************************************************************/
|
|
19
19
|
const protocol_1 = require("@eclipse-glsp/protocol");
|
|
20
20
|
const sprotty_1 = require("sprotty");
|
|
21
|
-
const hover_1 = require("../hover/hover");
|
|
22
21
|
class GIssueMarker extends sprotty_1.SIssueMarker {
|
|
23
22
|
constructor() {
|
|
24
23
|
super();
|
|
@@ -27,7 +26,7 @@ class GIssueMarker extends sprotty_1.SIssueMarker {
|
|
|
27
26
|
this.features = new Set(sprotty_1.SDecoration.DEFAULT_FEATURES);
|
|
28
27
|
}
|
|
29
28
|
computeProjectionCssClasses() {
|
|
30
|
-
const severityCss =
|
|
29
|
+
const severityCss = getSeverity(this);
|
|
31
30
|
this.projectionCssClasses = ['sprotty-issue', 'sprotty-' + severityCss];
|
|
32
31
|
}
|
|
33
32
|
}
|
|
@@ -94,4 +93,17 @@ function createSIssue(marker, parent) {
|
|
|
94
93
|
return issue;
|
|
95
94
|
}
|
|
96
95
|
exports.createSIssue = createSIssue;
|
|
96
|
+
function getSeverity(marker) {
|
|
97
|
+
let currentSeverity = 'info';
|
|
98
|
+
for (const severity of marker.issues.map(s => s.severity)) {
|
|
99
|
+
if (severity === 'error') {
|
|
100
|
+
return severity;
|
|
101
|
+
}
|
|
102
|
+
if (severity === 'warning' && currentSeverity === 'info') {
|
|
103
|
+
currentSeverity = severity;
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
return currentSeverity;
|
|
107
|
+
}
|
|
108
|
+
exports.getSeverity = getSeverity;
|
|
97
109
|
//# sourceMappingURL=issue-marker.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"issue-marker.js","sourceRoot":"","sources":["../../../src/features/validation/issue-marker.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAoE;AACpE,
|
|
1
|
+
{"version":3,"file":"issue-marker.js","sourceRoot":"","sources":["../../../src/features/validation/issue-marker.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAoE;AACpE,qCAAwH;AAExH,MAAa,YAAa,SAAQ,sBAAY;IAC1C;QACI,KAAK,EAAE,CAAC;QAKH,WAAM,GAAa,EAAE,CAAC;QACtB,SAAI,GAAG,QAAQ,CAAC;QALrB,IAAI,CAAC,QAAQ,GAAG,IAAI,GAAG,CAAS,qBAAW,CAAC,gBAAgB,CAAC,CAAC;IAClE,CAAC;IAMD,2BAA2B;QACvB,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;QACtC,IAAI,CAAC,oBAAoB,GAAG,CAAC,eAAe,EAAE,UAAU,GAAG,WAAW,CAAC,CAAC;IAC5E,CAAC;CACJ;AAdD,oCAcC;AAED;;;;;;GAMG;AACH,SAAgB,uBAAuB,CAAC,YAA4B;IAChE,IAAI,WAAqC,CAAC;IAE1C,WAAW,GAAG,eAAe,CAAC,YAAY,CAAC,CAAC;IAE5C,IAAI,WAAW,KAAK,SAAS,EAAE;QAC3B,WAAW,GAAG,IAAI,YAAY,EAAE,CAAC;QACjC,IAAI,IAAA,uBAAa,EAAC,YAAY,CAAC,EAAE;YAC7B,WAAW,CAAC,eAAe,GAAG,YAAY,CAAC,aAAa,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;SACjF;QACD,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;KACjC;IAED,OAAO,WAAW,CAAC;AACvB,CAAC;AAdD,0DAcC;AAED;;;;;GAKG;AACH,SAAgB,eAAe,CAAC,YAA4B;IACxD,IAAI,WAAqC,CAAC;IAE1C,KAAK,MAAM,KAAK,IAAI,YAAY,CAAC,QAAQ,EAAE;QACvC,IAAI,KAAK,YAAY,YAAY,EAAE;YAC/B,WAAW,GAAG,KAAK,CAAC;SACvB;KACJ;IAED,OAAO,WAAW,CAAC;AACvB,CAAC;AAVD,0CAUC;AAED;;;;;GAKG;AACH,SAAgB,YAAY,CAAC,MAAc,EAAE,MAAuB;IAChE,MAAM,KAAK,GAAG,IAAI,gBAAM,EAAE,CAAC;IAC3B,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC,WAAW,CAAC;IAEnC,QAAQ,MAAM,CAAC,IAAI,EAAE;QACjB,KAAK,qBAAU,CAAC,KAAK,CAAC,CAAC;YACnB,KAAK,CAAC,QAAQ,GAAG,OAAO,CAAC;YACzB,MAAM;SACT;QACD,KAAK,qBAAU,CAAC,IAAI,CAAC,CAAC;YAClB,KAAK,CAAC,QAAQ,GAAG,MAAM,CAAC;YACxB,MAAM;SACT;QACD,KAAK,qBAAU,CAAC,OAAO,CAAC,CAAC;YACrB,KAAK,CAAC,QAAQ,GAAG,SAAS,CAAC;YAC3B,MAAM;SACT;KACJ;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAnBD,oCAmBC;AAED,SAAgB,WAAW,CAAC,MAAoB;IAC5C,IAAI,eAAe,GAAmB,MAAM,CAAC;IAC7C,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE;QACvD,IAAI,QAAQ,KAAK,OAAO,EAAE;YACtB,OAAO,QAAQ,CAAC;SACnB;QACD,IAAI,QAAQ,KAAK,SAAS,IAAI,eAAe,KAAK,MAAM,EAAE;YACtD,eAAe,GAAG,QAAQ,CAAC;SAC9B;KACJ;IACD,OAAO,eAAe,CAAC;AAC3B,CAAC;AAXD,kCAWC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../../src/features/validation/validate.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,mBAAmB,EAAgB,MAAM,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE7G,OAAO,EAAE,uBAAuB,EAAE,aAAa,EAAE,iBAAiB,EAAE,cAAc,EAAE,QAAQ,EAAgC,MAAM,SAAS,CAAC;AAC5I,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../../src/features/validation/validate.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,mBAAmB,EAAgB,MAAM,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE7G,OAAO,EAAE,uBAAuB,EAAE,aAAa,EAAE,iBAAiB,EAAE,cAAc,EAAE,QAAQ,EAAgC,MAAM,SAAS,CAAC;AAC5I,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAGzE,OAAO,EAAE,yBAAyB,EAAE,gBAAgB,EAAE,MAAM,6CAA6C,CAAC;AAC1G,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAGzD;;;GAGG;AACH,qBACa,yBAA0B,YAAW,gBAAgB;IACrB,SAAS,CAAC,wBAAwB,EAAE,yBAAyB,CAAC;IAE9D,SAAS,CAAC,gBAAgB,EAAE,MAAM,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAEtG,OAAO,CAAC,gBAAgB,CAAqB;IAG7C,OAAO;IAEP;;;OAGG;IACH,gCAAgC,CAAC,MAAM,EAAE,kBAAkB,GAAG,IAAI;CAcrE;AAED;;;;;GAKG;AACH,8BACsB,qBAAqB;IACvC,aAAa,EAAE,MAAM,CAAC;IAEtB,SAAS,CAAC,gBAAgB,CAAC,EAAE,iBAAiB,CAAC;IAE/C,OAAO,CAAC,gBAAgB,EAAE,iBAAiB,GAAG,IAAI;IAIlD,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI;IAMtC,QAAQ,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;CACnE;AAED,qBACa,uBAAwB,YAAW,cAAc;IAE1D,SAAS,CAAC,yBAAyB,EAAE,yBAAyB,CAAC;IAI/D,SAAS,CAAC,qBAAqB,CAAC,EAAE,qBAAqB,CAAC;IAGxD,SAAS,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IAErD,MAAM,CAAC,MAAM,EAAE,gBAAgB,GAAG,IAAI,GAAG,MAAM,GAAG,QAAQ;IAKpD,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAMrD;AAED;;GAEG;AACH,MAAM,WAAW,kBAAmB,SAAQ,MAAM;IAC9C,IAAI,EAAE,OAAO,kBAAkB,CAAC,IAAI,CAAC;IACrC,OAAO,EAAE,MAAM,EAAE,CAAC;CACrB;AAED,yBAAiB,kBAAkB,CAAC;IACzB,MAAM,IAAI,iBAAiB,CAAC;IAEnC,SAAgB,EAAE,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,kBAAkB,CAE5D;IAED,SAAgB,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,kBAAkB,CAK5D;CACJ;AAED;;;GAGG;AACH,qBACa,mBAAoB,SAAQ,eAAe;IAGlB,SAAS,CAAC,MAAM,EAAE,kBAAkB;IAFtE,MAAM,CAAC,IAAI,SAA2B;gBAEM,MAAM,EAAE,kBAAkB;IAItE,OAAO,CAAC,OAAO,EAAE,uBAAuB,GAAG,aAAa;CAe3D;AAiBD;;GAEG;AACH,qBACa,oBAAqB,SAAQ,eAAe;IAGnB,SAAS,CAAC,MAAM,EAAE,mBAAmB;IAFvE,MAAM,CAAC,IAAI,SAA4B;gBAEK,MAAM,EAAE,mBAAmB;IAIvE,OAAO,CAAC,OAAO,EAAE,uBAAuB,GAAG,aAAa;CAwB3D"}
|
|
@@ -34,7 +34,6 @@ const sprotty_1 = require("sprotty");
|
|
|
34
34
|
const editor_context_service_1 = require("../../base/editor-context-service");
|
|
35
35
|
const types_1 = require("../../base/types");
|
|
36
36
|
const smodel_util_1 = require("../../utils/smodel-util");
|
|
37
|
-
const hover_1 = require("../hover/hover");
|
|
38
37
|
const model_1 = require("../tool-feedback/model");
|
|
39
38
|
const issue_marker_1 = require("./issue-marker");
|
|
40
39
|
/**
|
|
@@ -172,7 +171,7 @@ ApplyMarkersCommand = __decorate([
|
|
|
172
171
|
], ApplyMarkersCommand);
|
|
173
172
|
exports.ApplyMarkersCommand = ApplyMarkersCommand;
|
|
174
173
|
function addMaxSeverityCSSClassToIssueParent(modelElement, issueMarker) {
|
|
175
|
-
const maxSeverityCSSClass = (0,
|
|
174
|
+
const maxSeverityCSSClass = (0, issue_marker_1.getSeverity)(issueMarker);
|
|
176
175
|
if (!modelElement.cssClasses) {
|
|
177
176
|
modelElement.cssClasses = [maxSeverityCSSClass];
|
|
178
177
|
}
|
|
@@ -182,7 +181,7 @@ function addMaxSeverityCSSClassToIssueParent(modelElement, issueMarker) {
|
|
|
182
181
|
}
|
|
183
182
|
}
|
|
184
183
|
function removeCSSClassFromIssueParent(modelElement, issueMarker) {
|
|
185
|
-
const severity = (0,
|
|
184
|
+
const severity = (0, issue_marker_1.getSeverity)(issueMarker);
|
|
186
185
|
(0, smodel_util_1.removeCssClasses)(modelElement, [severity]);
|
|
187
186
|
}
|
|
188
187
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../src/features/validation/validate.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAA6G;AAC7G,yCAAyD;AACzD,qCAA4I;AAC5I,8EAAyE;AACzE,4CAAyC;AACzC,yDAA2D;
|
|
1
|
+
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../src/features/validation/validate.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eclipse-glsp/client",
|
|
3
|
-
"version": "1.1.0-next.
|
|
3
|
+
"version": "1.1.0-next.fe0b297.182+fe0b297",
|
|
4
4
|
"description": "A sprotty-based client for GLSP",
|
|
5
5
|
"license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)",
|
|
6
6
|
"keywords": [
|
|
@@ -34,7 +34,7 @@
|
|
|
34
34
|
"css"
|
|
35
35
|
],
|
|
36
36
|
"dependencies": {
|
|
37
|
-
"@eclipse-glsp/protocol": "1.1.0-next.
|
|
37
|
+
"@eclipse-glsp/protocol": "1.1.0-next.fe0b297.182+fe0b297",
|
|
38
38
|
"autocompleter": "5.1.0",
|
|
39
39
|
"sprotty": "0.12.0"
|
|
40
40
|
},
|
|
@@ -57,5 +57,5 @@
|
|
|
57
57
|
},
|
|
58
58
|
"main": "lib/index",
|
|
59
59
|
"types": "lib/index",
|
|
60
|
-
"gitHead": "
|
|
60
|
+
"gitHead": "fe0b29761e9844d8541ce4cafeaf7e00976157e1"
|
|
61
61
|
}
|
|
@@ -23,20 +23,11 @@ import {
|
|
|
23
23
|
SModelRootSchema
|
|
24
24
|
} from '@eclipse-glsp/protocol';
|
|
25
25
|
import { injectable } from 'inversify';
|
|
26
|
-
import {
|
|
27
|
-
EMPTY_ROOT,
|
|
28
|
-
HoverFeedbackAction,
|
|
29
|
-
HoverMouseListener,
|
|
30
|
-
IActionHandler,
|
|
31
|
-
ICommand,
|
|
32
|
-
SIssueMarker,
|
|
33
|
-
SIssueSeverity,
|
|
34
|
-
SModelElement
|
|
35
|
-
} from 'sprotty';
|
|
26
|
+
import { EMPTY_ROOT, HoverFeedbackAction, HoverMouseListener, IActionHandler, ICommand, SModelElement } from 'sprotty';
|
|
36
27
|
import { FocusStateChangedAction } from '../../base/actions/focus-change-action';
|
|
37
28
|
import { EnableDefaultToolsAction, EnableToolsAction } from '../../base/tool-manager/tool-actions';
|
|
38
29
|
import { EdgeCreationTool } from '../tools/edge-creation-tool';
|
|
39
|
-
import { GIssueMarker } from '../validation/issue-marker';
|
|
30
|
+
import { getSeverity, GIssueMarker } from '../validation/issue-marker';
|
|
40
31
|
@injectable()
|
|
41
32
|
export class GlspHoverMouseListener extends HoverMouseListener implements IActionHandler {
|
|
42
33
|
protected enableHover = true;
|
|
@@ -117,16 +108,3 @@ export class GlspHoverMouseListener extends HoverMouseListener implements IActio
|
|
|
117
108
|
return bounds;
|
|
118
109
|
}
|
|
119
110
|
}
|
|
120
|
-
|
|
121
|
-
export function getSeverity(marker: SIssueMarker): SIssueSeverity {
|
|
122
|
-
let currentSeverity: SIssueSeverity = 'info';
|
|
123
|
-
for (const severity of marker.issues.map(s => s.severity)) {
|
|
124
|
-
if (severity === 'error') {
|
|
125
|
-
return severity;
|
|
126
|
-
}
|
|
127
|
-
if (severity === 'warning' && currentSeverity === 'info') {
|
|
128
|
-
currentSeverity = severity;
|
|
129
|
-
}
|
|
130
|
-
}
|
|
131
|
-
return currentSeverity;
|
|
132
|
-
}
|
|
@@ -14,8 +14,7 @@
|
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
16
|
import { Bounds, Marker, MarkerKind } from '@eclipse-glsp/protocol';
|
|
17
|
-
import { isBoundsAware, Projectable, SDecoration, SIssue, SIssueMarker, SParentElement } from 'sprotty';
|
|
18
|
-
import { getSeverity } from '../hover/hover';
|
|
17
|
+
import { isBoundsAware, Projectable, SDecoration, SIssue, SIssueMarker, SIssueSeverity, SParentElement } from 'sprotty';
|
|
19
18
|
|
|
20
19
|
export class GIssueMarker extends SIssueMarker implements Projectable {
|
|
21
20
|
constructor() {
|
|
@@ -100,3 +99,16 @@ export function createSIssue(marker: Marker, parent?: SParentElement): SIssue {
|
|
|
100
99
|
}
|
|
101
100
|
return issue;
|
|
102
101
|
}
|
|
102
|
+
|
|
103
|
+
export function getSeverity(marker: SIssueMarker): SIssueSeverity {
|
|
104
|
+
let currentSeverity: SIssueSeverity = 'info';
|
|
105
|
+
for (const severity of marker.issues.map(s => s.severity)) {
|
|
106
|
+
if (severity === 'error') {
|
|
107
|
+
return severity;
|
|
108
|
+
}
|
|
109
|
+
if (severity === 'warning' && currentSeverity === 'info') {
|
|
110
|
+
currentSeverity = severity;
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
return currentSeverity;
|
|
114
|
+
}
|
|
@@ -19,10 +19,9 @@ import { CommandExecutionContext, CommandReturn, IActionDispatcher, IActionHandl
|
|
|
19
19
|
import { EditorContextService } from '../../base/editor-context-service';
|
|
20
20
|
import { TYPES } from '../../base/types';
|
|
21
21
|
import { removeCssClasses } from '../../utils/smodel-util';
|
|
22
|
-
import { getSeverity } from '../hover/hover';
|
|
23
22
|
import { IFeedbackActionDispatcher, IFeedbackEmitter } from '../tool-feedback/feedback-action-dispatcher';
|
|
24
23
|
import { FeedbackCommand } from '../tool-feedback/model';
|
|
25
|
-
import { createSIssue, getOrCreateSIssueMarker, getSIssueMarker, GIssueMarker } from './issue-marker';
|
|
24
|
+
import { createSIssue, getOrCreateSIssueMarker, getSeverity, getSIssueMarker, GIssueMarker } from './issue-marker';
|
|
26
25
|
|
|
27
26
|
/**
|
|
28
27
|
* Feedback emitter sending actions for visualizing model validation feedback and
|