@eclipse-glsp/client 2.2.0-next.345 → 2.2.0-next.346
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/base/model/model-registry.d.ts.map +1 -1
- package/lib/base/model/model-registry.js +3 -1
- package/lib/base/model/model-registry.js.map +1 -1
- package/lib/features/validation/issue-marker.d.ts +2 -2
- package/lib/features/validation/issue-marker.d.ts.map +1 -1
- package/lib/features/validation/issue-marker.js +5 -3
- package/lib/features/validation/issue-marker.js.map +1 -1
- package/package.json +3 -3
- package/src/base/model/model-registry.ts +5 -1
- package/src/features/validation/issue-marker.ts +6 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-registry.d.ts","sourceRoot":"","sources":["../../../src/base/model/model-registry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,aAAa,EAAE,wBAAwB,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAIhG;;;;GAIG;AACH,qBACa,cAAe,SAAQ,cAAc;IAGrC,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE,IAAI,KAAK,aAAa,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"model-registry.d.ts","sourceRoot":"","sources":["../../../src/base/model/model-registry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,aAAa,EAAE,wBAAwB,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAIhG;;;;GAIG;AACH,qBACa,cAAe,SAAQ,cAAc;IAGrC,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE,IAAI,KAAK,aAAa,GAAG,IAAI;cAetD,kBAAkB,CAAC,MAAM,EAAE,wBAAwB,GAAG,SAAS,MAAM,EAAE,GAAG,SAAS;CAQzG"}
|
|
@@ -39,7 +39,9 @@ let GModelRegistry = class GModelRegistry extends sprotty_1.SModelRegistry {
|
|
|
39
39
|
}
|
|
40
40
|
if (this.hasKey(key)) {
|
|
41
41
|
// do not throw error but log overwriting
|
|
42
|
-
console.log(`Factory for model element '${key}' will be overwritten.`);
|
|
42
|
+
console.log(`Key is already registered: ${key}.Factory for model element '${key}' will be overwritten.`);
|
|
43
|
+
console.warn('Implicit overwriting by registering the same key twice is deprecated' +
|
|
44
|
+
"\n Use 'overrideModelElement()' instead of 'configureModelElement()' for explicit overwriting.");
|
|
43
45
|
}
|
|
44
46
|
this.elements.set(key, factory);
|
|
45
47
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-registry.js","sourceRoot":"","sources":["../../../src/base/model/model-registry.ts"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,mDAAgG;AAChG,yCAAuC;AACvC,kDAA8C;AAE9C;;;;GAIG;AAEI,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,wBAAc;IAC9C;iDAC6C;IACpC,QAAQ,CAAC,GAAW,EAAE,OAAmC;QAC9D,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;QACxC,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;YACnB,yCAAyC;YACzC,OAAO,CAAC,GAAG,CAAC,8BAA8B,GAAG,wBAAwB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"model-registry.js","sourceRoot":"","sources":["../../../src/base/model/model-registry.ts"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,mDAAgG;AAChG,yCAAuC;AACvC,kDAA8C;AAE9C;;;;GAIG;AAEI,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,wBAAc;IAC9C;iDAC6C;IACpC,QAAQ,CAAC,GAAW,EAAE,OAAmC;QAC9D,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;QACxC,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;YACnB,yCAAyC;YACzC,OAAO,CAAC,GAAG,CAAC,8BAA8B,GAAG,+BAA+B,GAAG,wBAAwB,CAAC,CAAC;YACzG,OAAO,CAAC,IAAI,CACR,sEAAsE;gBAClE,gGAAgG,CACvG,CAAC;QACN,CAAC;QACD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACpC,CAAC;IAEkB,kBAAkB,CAAC,MAAgC;;QAClE,wDAAwD;QACxD,MAAM,QAAQ,GAAG,CAAC,GAAG,CAAC,MAAA,KAAK,CAAC,kBAAkB,CAAC,MAAM,CAAC,mCAAI,EAAE,CAAC,CAAC,CAAC;QAC/D,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,0BAAW,CAAC,EAAE,CAAC;YAClC,QAAQ,CAAC,IAAI,CAAC,0BAAW,CAAC,CAAC;QAC/B,CAAC;QACD,OAAO,QAAQ,CAAC;IACpB,CAAC;CACJ,CAAA;AA1BY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,sBAAU,GAAE;GACA,cAAc,CA0B1B"}
|
|
@@ -13,8 +13,8 @@
|
|
|
13
13
|
*
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
|
-
import { Bounds, GIssue, GIssueSeverity, GParentElement, Marker, Projectable,
|
|
17
|
-
export declare class GIssueMarker extends
|
|
16
|
+
import { Bounds, GIssue, GIssueSeverity, GParentElement, Marker, Projectable, SIssueMarkerImpl } from '@eclipse-glsp/sprotty';
|
|
17
|
+
export declare class GIssueMarker extends SIssueMarkerImpl implements Projectable {
|
|
18
18
|
constructor();
|
|
19
19
|
projectionCssClasses: string[];
|
|
20
20
|
projectedBounds?: Bounds;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"issue-marker.d.ts","sourceRoot":"","sources":["../../../src/features/validation/issue-marker.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,MAAM,EAEN,MAAM,EACN,cAAc,EACd,cAAc,EACd,MAAM,EAEN,WAAW,EACX,
|
|
1
|
+
{"version":3,"file":"issue-marker.d.ts","sourceRoot":"","sources":["../../../src/features/validation/issue-marker.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,MAAM,EAEN,MAAM,EACN,cAAc,EACd,cAAc,EACd,MAAM,EAEN,WAAW,EACX,gBAAgB,EAEnB,MAAM,uBAAuB,CAAC;AAE/B,qBAAa,YAAa,SAAQ,gBAAiB,YAAW,WAAW;;IAKrE,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,CAoB5E;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,YAAY,GAAG,cAAc,CAWhE"}
|
|
@@ -17,7 +17,7 @@ exports.getSeverity = exports.createGIssue = exports.getGIssueMarker = exports.g
|
|
|
17
17
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
18
18
|
********************************************************************************/
|
|
19
19
|
const sprotty_1 = require("@eclipse-glsp/sprotty");
|
|
20
|
-
class GIssueMarker extends sprotty_1.
|
|
20
|
+
class GIssueMarker extends sprotty_1.SIssueMarkerImpl {
|
|
21
21
|
constructor() {
|
|
22
22
|
super();
|
|
23
23
|
this.issues = [];
|
|
@@ -73,8 +73,10 @@ exports.getGIssueMarker = getGIssueMarker;
|
|
|
73
73
|
* @returns the created `GIssue`.
|
|
74
74
|
*/
|
|
75
75
|
function createGIssue(marker, parent) {
|
|
76
|
-
const issue =
|
|
77
|
-
|
|
76
|
+
const issue = {
|
|
77
|
+
message: marker.description,
|
|
78
|
+
severity: 'info'
|
|
79
|
+
};
|
|
78
80
|
switch (marker.kind) {
|
|
79
81
|
case sprotty_1.MarkerKind.ERROR: {
|
|
80
82
|
issue.severity = 'error';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"issue-marker.js","sourceRoot":"","sources":["../../../src/features/validation/issue-marker.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,mDAW+B;AAE/B,MAAa,YAAa,SAAQ,
|
|
1
|
+
{"version":3,"file":"issue-marker.js","sourceRoot":"","sources":["../../../src/features/validation/issue-marker.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,mDAW+B;AAE/B,MAAa,YAAa,SAAQ,0BAAgB;IAC9C;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,CAAC;QAC5B,WAAW,GAAG,IAAI,YAAY,EAAE,CAAC;QACjC,IAAI,IAAA,uBAAa,EAAC,YAAY,CAAC,EAAE,CAAC;YAC9B,WAAW,CAAC,eAAe,GAAG,YAAY,CAAC,aAAa,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QAClF,CAAC;QACD,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAClC,CAAC;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,CAAC;QACxC,IAAI,KAAK,YAAY,YAAY,EAAE,CAAC;YAChC,WAAW,GAAG,KAAK,CAAC;QACxB,CAAC;IACL,CAAC;IAED,OAAO,WAAW,CAAC;AACvB,CAAC;AAVD,0CAUC;AAED;;;;;GAKG;AACH,SAAgB,YAAY,CAAC,MAAc,EAAE,MAAuB;IAChE,MAAM,KAAK,GAAW;QAClB,OAAO,EAAE,MAAM,CAAC,WAAW;QAC3B,QAAQ,EAAE,MAAM;KACnB,CAAC;IACF,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,oBAAU,CAAC,KAAK,CAAC,CAAC,CAAC;YACpB,KAAK,CAAC,QAAQ,GAAG,OAAO,CAAC;YACzB,MAAM;QACV,CAAC;QACD,KAAK,oBAAU,CAAC,IAAI,CAAC,CAAC,CAAC;YACnB,KAAK,CAAC,QAAQ,GAAG,MAAM,CAAC;YACxB,MAAM;QACV,CAAC;QACD,KAAK,oBAAU,CAAC,OAAO,CAAC,CAAC,CAAC;YACtB,KAAK,CAAC,QAAQ,GAAG,SAAS,CAAC;YAC3B,MAAM;QACV,CAAC;IACL,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AApBD,oCAoBC;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,CAAC;QACxD,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;YACvB,OAAO,QAAQ,CAAC;QACpB,CAAC;QACD,IAAI,QAAQ,KAAK,SAAS,IAAI,eAAe,KAAK,MAAM,EAAE,CAAC;YACvD,eAAe,GAAG,QAAQ,CAAC;QAC/B,CAAC;IACL,CAAC;IACD,OAAO,eAAe,CAAC;AAC3B,CAAC;AAXD,kCAWC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eclipse-glsp/client",
|
|
3
|
-
"version": "2.2.0-next.
|
|
3
|
+
"version": "2.2.0-next.346+dd2a425",
|
|
4
4
|
"description": "A sprotty-based client for GLSP",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"eclipse",
|
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
"watch": "tsc -w"
|
|
47
47
|
},
|
|
48
48
|
"dependencies": {
|
|
49
|
-
"@eclipse-glsp/sprotty": "2.2.0-next.
|
|
49
|
+
"@eclipse-glsp/sprotty": "2.2.0-next.346+dd2a425",
|
|
50
50
|
"autocompleter": "^9.1.0",
|
|
51
51
|
"file-saver": "^2.0.5",
|
|
52
52
|
"lodash": "4.17.21"
|
|
@@ -61,5 +61,5 @@
|
|
|
61
61
|
"publishConfig": {
|
|
62
62
|
"access": "public"
|
|
63
63
|
},
|
|
64
|
-
"gitHead": "
|
|
64
|
+
"gitHead": "dd2a42501677d4175a47c78cc1900012937e7051"
|
|
65
65
|
}
|
|
@@ -32,7 +32,11 @@ export class GModelRegistry extends SModelRegistry {
|
|
|
32
32
|
}
|
|
33
33
|
if (this.hasKey(key)) {
|
|
34
34
|
// do not throw error but log overwriting
|
|
35
|
-
console.log(`Factory for model element '${key}' will be overwritten.`);
|
|
35
|
+
console.log(`Key is already registered: ${key}.Factory for model element '${key}' will be overwritten.`);
|
|
36
|
+
console.warn(
|
|
37
|
+
'Implicit overwriting by registering the same key twice is deprecated' +
|
|
38
|
+
"\n Use 'overrideModelElement()' instead of 'configureModelElement()' for explicit overwriting."
|
|
39
|
+
);
|
|
36
40
|
}
|
|
37
41
|
this.elements.set(key, factory);
|
|
38
42
|
}
|
|
@@ -22,11 +22,11 @@ import {
|
|
|
22
22
|
Marker,
|
|
23
23
|
MarkerKind,
|
|
24
24
|
Projectable,
|
|
25
|
-
|
|
25
|
+
SIssueMarkerImpl,
|
|
26
26
|
isBoundsAware
|
|
27
27
|
} from '@eclipse-glsp/sprotty';
|
|
28
28
|
|
|
29
|
-
export class GIssueMarker extends
|
|
29
|
+
export class GIssueMarker extends SIssueMarkerImpl implements Projectable {
|
|
30
30
|
constructor() {
|
|
31
31
|
super();
|
|
32
32
|
this.features = new Set<symbol>(GDecoration.DEFAULT_FEATURES);
|
|
@@ -90,9 +90,10 @@ export function getGIssueMarker(modelElement: GParentElement): GIssueMarker | un
|
|
|
90
90
|
* @returns the created `GIssue`.
|
|
91
91
|
*/
|
|
92
92
|
export function createGIssue(marker: Marker, parent?: GParentElement): GIssue {
|
|
93
|
-
const issue =
|
|
94
|
-
|
|
95
|
-
|
|
93
|
+
const issue: GIssue = {
|
|
94
|
+
message: marker.description,
|
|
95
|
+
severity: 'info'
|
|
96
|
+
};
|
|
96
97
|
switch (marker.kind) {
|
|
97
98
|
case MarkerKind.ERROR: {
|
|
98
99
|
issue.severity = 'error';
|