@eclipse-glsp/client 0.10.0-next.c94277c.176 → 1.0.0
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/css/decoration.css +5 -1
- package/css/glsp-sprotty.css +39 -0
- package/css/tool-palette.css +2 -2
- package/lib/base/container-modules.js +8 -8
- package/lib/base/container-modules.js.map +1 -1
- package/lib/features/context-menu/selection-service-aware-context-menu-mouse-listener.d.ts +5 -7
- package/lib/features/context-menu/selection-service-aware-context-menu-mouse-listener.d.ts.map +1 -1
- package/lib/features/context-menu/selection-service-aware-context-menu-mouse-listener.js +7 -14
- package/lib/features/context-menu/selection-service-aware-context-menu-mouse-listener.js.map +1 -1
- 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/mouse-tool/mouse-tool.d.ts +0 -1
- package/lib/features/mouse-tool/mouse-tool.d.ts.map +1 -1
- package/lib/features/mouse-tool/mouse-tool.js +0 -3
- package/lib/features/mouse-tool/mouse-tool.js.map +1 -1
- package/lib/features/select/select-mouse-listener.d.ts +3 -1
- package/lib/features/select/select-mouse-listener.d.ts.map +1 -1
- package/lib/features/select/select-mouse-listener.js +62 -0
- package/lib/features/select/select-mouse-listener.js.map +1 -1
- package/lib/features/source-model-watcher/di.config.d.ts +4 -0
- package/lib/features/{model-source-watcher → source-model-watcher}/di.config.d.ts.map +1 -1
- package/lib/features/{model-source-watcher → source-model-watcher}/di.config.js +4 -4
- package/lib/features/{model-source-watcher → source-model-watcher}/di.config.js.map +1 -1
- package/lib/features/{model-source-watcher/model-source-changed-action-handler.d.ts → source-model-watcher/source-model-changed-action-handler.d.ts} +9 -9
- package/lib/features/{model-source-watcher/model-source-changed-action-handler.d.ts.map → source-model-watcher/source-model-changed-action-handler.d.ts.map} +1 -1
- package/lib/features/{model-source-watcher/model-source-changed-action-handler.js → source-model-watcher/source-model-changed-action-handler.js} +19 -19
- package/lib/features/{model-source-watcher/model-source-changed-action-handler.js.map → source-model-watcher/source-model-changed-action-handler.js.map} +1 -1
- package/lib/features/validation/issue-marker.d.ts +11 -5
- package/lib/features/validation/issue-marker.d.ts.map +1 -1
- package/lib/features/validation/issue-marker.js +25 -5
- 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 +6 -3
- package/lib/features/validation/validate.js.map +1 -1
- package/lib/index.d.ts +3 -3
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +11 -11
- package/lib/index.js.map +1 -1
- package/lib/views/glsp-projection-view.d.ts +30 -0
- package/lib/views/glsp-projection-view.d.ts.map +1 -0
- package/lib/views/glsp-projection-view.js +142 -0
- package/lib/views/glsp-projection-view.js.map +1 -0
- package/lib/views/index.d.ts +1 -0
- package/lib/views/index.d.ts.map +1 -1
- package/lib/views/index.js +1 -0
- package/lib/views/index.js.map +1 -1
- package/package.json +4 -4
- package/src/base/container-modules.ts +2 -2
- package/src/features/context-menu/selection-service-aware-context-menu-mouse-listener.ts +19 -25
- package/src/features/hover/hover.ts +2 -24
- package/src/features/mouse-tool/mouse-tool.ts +0 -4
- package/src/features/select/select-mouse-listener.ts +81 -1
- package/src/features/{model-source-watcher → source-model-watcher}/di.config.ts +5 -5
- package/src/features/{model-source-watcher/model-source-changed-action-handler.ts → source-model-watcher/source-model-changed-action-handler.ts} +12 -12
- package/src/features/validation/issue-marker.ts +34 -12
- package/src/features/validation/validate.ts +6 -4
- package/src/index.ts +3 -3
- package/src/views/glsp-projection-view.tsx +166 -0
- package/src/views/index.ts +2 -0
- package/lib/features/model-source-watcher/di.config.d.ts +0 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-
|
|
1
|
+
{"version":3,"file":"source-model-changed-action-handler.js","sourceRoot":"","sources":["../../../src/features/source-model-watcher/source-model-changed-action-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAmH;AACnH,yCAAyD;AAEzD,4CAAyC;AAEzC;;;;;GAKG;AAEH,IAAsB,iCAAiC,GAAvD,MAAsB,iCAAiC;CAMtD,CAAA;AANqB,iCAAiC;IADtD,IAAA,sBAAU,GAAE;GACS,iCAAiC,CAMtD;AANqB,8EAAiC;AASvD,IAAa,+BAA+B,GAA5C,MAAa,+BAA+B;IAWxC,MAAM,CAAC,MAAc;QACjB,IAAI,mCAAwB,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE;YACrC,IAAI,IAAI,CAAC,iCAAiC,EAAE;gBACxC,IAAI,CAAC,iCAAiC;qBACjC,uBAAuB,CAAC,MAAM,CAAC,eAAe,EAAE,IAAI,CAAC,OAAO,CAAC;qBAC7D,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC;gBAC3D,OAAO;aACV;YACD,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;SACvC;IACL,CAAC;IAES,sBAAsB,CAAC,MAAgC;QAC7D,MAAM,OAAO,GAAG,oBAAoB,MAAM,CAAC,eAAe,qDAAqD,CAAC;QAChH,MAAM,OAAO,GAAG,CAAC,CAAC;QAClB,MAAM,QAAQ,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC;YACxB,6BAAkB,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;YACzD,8BAAmB,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;SAC7D,CAAC,CAAC;IACP,CAAC;CACJ,CAAA;AA9BG;IADC,IAAA,kBAAM,EAAC,aAAK,CAAC,iBAAiB,CAAC;;mEACQ;AAGxC;IADC,IAAA,kBAAM,EAAC,aAAK,CAAC,aAAa,CAAC;;gEACK;AAIjC;IAFC,IAAA,kBAAM,EAAC,iCAAiC,CAAC;IACzC,IAAA,oBAAQ,GAAE;8BACmC,iCAAiC;0FAAC;AATvE,+BAA+B;IAD3C,IAAA,sBAAU,GAAE;GACA,+BAA+B,CAgC3C;AAhCY,0EAA+B"}
|
|
@@ -13,10 +13,15 @@
|
|
|
13
13
|
*
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
|
-
import { Marker } from '@eclipse-glsp/protocol';
|
|
17
|
-
import { SIssue, SIssueMarker, SParentElement } from 'sprotty';
|
|
18
|
-
export declare class GIssueMarker extends SIssueMarker {
|
|
16
|
+
import { Bounds, Marker } from '@eclipse-glsp/protocol';
|
|
17
|
+
import { Projectable, SIssue, SIssueMarker, SIssueSeverity, SParentElement } from 'sprotty';
|
|
18
|
+
export declare class GIssueMarker extends SIssueMarker implements Projectable {
|
|
19
19
|
constructor();
|
|
20
|
+
projectionCssClasses: string[];
|
|
21
|
+
projectedBounds?: Bounds;
|
|
22
|
+
issues: SIssue[];
|
|
23
|
+
type: string;
|
|
24
|
+
computeProjectionCssClasses(): void;
|
|
20
25
|
}
|
|
21
26
|
/**
|
|
22
27
|
* Retrieves the `SIssueMarker` contained by the provided model element as
|
|
@@ -32,12 +37,13 @@ export declare function getOrCreateSIssueMarker(modelElement: SParentElement): S
|
|
|
32
37
|
* @param modelElement for which the `SIssueMarker` should be retrieved.
|
|
33
38
|
* @returns the child `SIssueMarker` or `undefined` if no such child exists.
|
|
34
39
|
*/
|
|
35
|
-
export declare function getSIssueMarker(modelElement: SParentElement):
|
|
40
|
+
export declare function getSIssueMarker(modelElement: SParentElement): GIssueMarker | undefined;
|
|
36
41
|
/**
|
|
37
42
|
* Creates an `SIssue` with `severity` and `message` set according to
|
|
38
43
|
* the `kind` and `description` of the provided `Marker`.
|
|
39
44
|
* @param marker `Marker` for that an `SIssue` should be created.
|
|
40
45
|
* @returns the created `SIssue`.
|
|
41
46
|
*/
|
|
42
|
-
export declare function createSIssue(marker: Marker): SIssue;
|
|
47
|
+
export declare function createSIssue(marker: Marker, parent?: SParentElement): SIssue;
|
|
48
|
+
export declare function getSeverity(marker: SIssueMarker): SIssueSeverity;
|
|
43
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,EAAc,MAAM,wBAAwB,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
|
*
|
|
@@ -21,8 +21,14 @@ const sprotty_1 = require("sprotty");
|
|
|
21
21
|
class GIssueMarker extends sprotty_1.SIssueMarker {
|
|
22
22
|
constructor() {
|
|
23
23
|
super();
|
|
24
|
+
this.issues = [];
|
|
25
|
+
this.type = 'marker';
|
|
24
26
|
this.features = new Set(sprotty_1.SDecoration.DEFAULT_FEATURES);
|
|
25
27
|
}
|
|
28
|
+
computeProjectionCssClasses() {
|
|
29
|
+
const severityCss = getSeverity(this);
|
|
30
|
+
this.projectionCssClasses = ['sprotty-issue', 'sprotty-' + severityCss];
|
|
31
|
+
}
|
|
26
32
|
}
|
|
27
33
|
exports.GIssueMarker = GIssueMarker;
|
|
28
34
|
/**
|
|
@@ -37,8 +43,9 @@ function getOrCreateSIssueMarker(modelElement) {
|
|
|
37
43
|
issueMarker = getSIssueMarker(modelElement);
|
|
38
44
|
if (issueMarker === undefined) {
|
|
39
45
|
issueMarker = new GIssueMarker();
|
|
40
|
-
|
|
41
|
-
|
|
46
|
+
if ((0, sprotty_1.isBoundsAware)(modelElement)) {
|
|
47
|
+
issueMarker.projectedBounds = modelElement.parentToLocal(modelElement.bounds);
|
|
48
|
+
}
|
|
42
49
|
modelElement.add(issueMarker);
|
|
43
50
|
}
|
|
44
51
|
return issueMarker;
|
|
@@ -53,7 +60,7 @@ exports.getOrCreateSIssueMarker = getOrCreateSIssueMarker;
|
|
|
53
60
|
function getSIssueMarker(modelElement) {
|
|
54
61
|
let issueMarker;
|
|
55
62
|
for (const child of modelElement.children) {
|
|
56
|
-
if (child instanceof
|
|
63
|
+
if (child instanceof GIssueMarker) {
|
|
57
64
|
issueMarker = child;
|
|
58
65
|
}
|
|
59
66
|
}
|
|
@@ -66,7 +73,7 @@ exports.getSIssueMarker = getSIssueMarker;
|
|
|
66
73
|
* @param marker `Marker` for that an `SIssue` should be created.
|
|
67
74
|
* @returns the created `SIssue`.
|
|
68
75
|
*/
|
|
69
|
-
function createSIssue(marker) {
|
|
76
|
+
function createSIssue(marker, parent) {
|
|
70
77
|
const issue = new sprotty_1.SIssue();
|
|
71
78
|
issue.message = marker.description;
|
|
72
79
|
switch (marker.kind) {
|
|
@@ -86,4 +93,17 @@ function createSIssue(marker) {
|
|
|
86
93
|
return issue;
|
|
87
94
|
}
|
|
88
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;
|
|
89
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,
|
|
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
|
/**
|
|
@@ -155,6 +154,9 @@ let ApplyMarkersCommand = class ApplyMarkersCommand extends model_1.FeedbackComm
|
|
|
155
154
|
const issueMarker = (0, issue_marker_1.getOrCreateSIssueMarker)(modelElement);
|
|
156
155
|
const issue = (0, issue_marker_1.createSIssue)(marker);
|
|
157
156
|
issueMarker.issues.push(issue);
|
|
157
|
+
if (issueMarker instanceof issue_marker_1.GIssueMarker) {
|
|
158
|
+
issueMarker.computeProjectionCssClasses();
|
|
159
|
+
}
|
|
158
160
|
addMaxSeverityCSSClassToIssueParent(modelElement, issueMarker);
|
|
159
161
|
}
|
|
160
162
|
});
|
|
@@ -169,7 +171,7 @@ ApplyMarkersCommand = __decorate([
|
|
|
169
171
|
], ApplyMarkersCommand);
|
|
170
172
|
exports.ApplyMarkersCommand = ApplyMarkersCommand;
|
|
171
173
|
function addMaxSeverityCSSClassToIssueParent(modelElement, issueMarker) {
|
|
172
|
-
const maxSeverityCSSClass = (0,
|
|
174
|
+
const maxSeverityCSSClass = (0, issue_marker_1.getSeverity)(issueMarker);
|
|
173
175
|
if (!modelElement.cssClasses) {
|
|
174
176
|
modelElement.cssClasses = [maxSeverityCSSClass];
|
|
175
177
|
}
|
|
@@ -179,7 +181,8 @@ function addMaxSeverityCSSClassToIssueParent(modelElement, issueMarker) {
|
|
|
179
181
|
}
|
|
180
182
|
}
|
|
181
183
|
function removeCSSClassFromIssueParent(modelElement, issueMarker) {
|
|
182
|
-
|
|
184
|
+
const severity = (0, issue_marker_1.getSeverity)(issueMarker);
|
|
185
|
+
(0, smodel_util_1.removeCssClasses)(modelElement, [severity]);
|
|
183
186
|
}
|
|
184
187
|
/**
|
|
185
188
|
* Command for handling `DeleteMarkersAction`
|
|
@@ -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/lib/index.d.ts
CHANGED
|
@@ -22,11 +22,11 @@ import glspEditLabelModule from './features/edit-label/di.config';
|
|
|
22
22
|
import modelHintsModule from './features/hints/di.config';
|
|
23
23
|
import glspHoverModule from './features/hover/di.config';
|
|
24
24
|
import layoutModule from './features/layout/di.config';
|
|
25
|
-
import modelSourceWatcherModule from './features/model-source-watcher/di.config';
|
|
26
25
|
import glspMouseToolModule from './features/mouse-tool/di.config';
|
|
27
26
|
import { navigationModule } from './features/navigation/di.config';
|
|
28
27
|
import saveModule from './features/save/di.config';
|
|
29
28
|
import glspSelectModule from './features/select/di.config';
|
|
29
|
+
import sourceModelWatcherModule from './features/source-model-watcher/di.config';
|
|
30
30
|
import toolFeedbackModule from './features/tool-feedback/di.config';
|
|
31
31
|
import paletteModule from './features/tool-palette/di.config';
|
|
32
32
|
import { enableDefaultToolsOnFocusLossModule, toolsModule } from './features/tools/di.config';
|
|
@@ -65,7 +65,6 @@ export * from './features/hints/model';
|
|
|
65
65
|
export * from './features/hints/type-hints';
|
|
66
66
|
export * from './features/hover/hover';
|
|
67
67
|
export * from './features/layout/layout-elements-action';
|
|
68
|
-
export * from './features/model-source-watcher/model-source-changed-action-handler';
|
|
69
68
|
export * from './features/mouse-tool/mouse-tool';
|
|
70
69
|
export * from './features/navigation/navigation-action-handler';
|
|
71
70
|
export * from './features/navigation/navigation-target-resolver';
|
|
@@ -73,6 +72,7 @@ export * from './features/rank/model';
|
|
|
73
72
|
export * from './features/reconnect/model';
|
|
74
73
|
export * from './features/save/model';
|
|
75
74
|
export * from './features/save/save-keylistener';
|
|
75
|
+
export * from './features/source-model-watcher/source-model-changed-action-handler';
|
|
76
76
|
export * from './features/tool-feedback/change-bounds-tool-feedback';
|
|
77
77
|
export * from './features/tool-feedback/creation-tool-feedback';
|
|
78
78
|
export * from './features/tool-feedback/css-feedback';
|
|
@@ -99,5 +99,5 @@ export * from './utils/marker';
|
|
|
99
99
|
export * from './utils/smodel-util';
|
|
100
100
|
export * from './utils/viewpoint-util';
|
|
101
101
|
export * from './views';
|
|
102
|
-
export { validationModule, saveModule, paletteModule, toolFeedbackModule, defaultGLSPModule, modelHintsModule, glspCommandPaletteModule, glspContextMenuModule, glspServerCopyPasteModule, copyPasteContextMenuModule, glspSelectModule, glspMouseToolModule, layoutModule, glspEditLabelModule, glspHoverModule, toolsModule, enableDefaultToolsOnFocusLossModule, navigationModule, markerNavigatorModule, glspDecorationModule, modelSourceWatcherModule, glspViewportModule };
|
|
102
|
+
export { validationModule, saveModule, paletteModule, toolFeedbackModule, defaultGLSPModule, modelHintsModule, glspCommandPaletteModule, glspContextMenuModule, glspServerCopyPasteModule, copyPasteContextMenuModule, glspSelectModule, glspMouseToolModule, layoutModule, glspEditLabelModule, glspHoverModule, toolsModule, enableDefaultToolsOnFocusLossModule, navigationModule, markerNavigatorModule, glspDecorationModule, sourceModelWatcherModule as modelSourceWatcherModule, glspViewportModule };
|
|
103
103
|
//# sourceMappingURL=index.d.ts.map
|
package/lib/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,iBAAiB,MAAM,kBAAkB,CAAC;AACjD,OAAO,wBAAwB,MAAM,sCAAsC,CAAC;AAC5E,OAAO,qBAAqB,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,0BAA0B,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AACxG,OAAO,oBAAoB,MAAM,iCAAiC,CAAC;AACnE,OAAO,mBAAmB,MAAM,iCAAiC,CAAC;AAClE,OAAO,gBAAgB,MAAM,4BAA4B,CAAC;AAC1D,OAAO,eAAe,MAAM,4BAA4B,CAAC;AACzD,OAAO,YAAY,MAAM,6BAA6B,CAAC;AACvD,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/lib/index.js
CHANGED
|
@@ -49,16 +49,16 @@ const di_config_8 = require("./features/hover/di.config");
|
|
|
49
49
|
exports.glspHoverModule = di_config_8.default;
|
|
50
50
|
const di_config_9 = require("./features/layout/di.config");
|
|
51
51
|
exports.layoutModule = di_config_9.default;
|
|
52
|
-
const di_config_10 = require("./features/
|
|
53
|
-
exports.
|
|
54
|
-
const di_config_11 = require("./features/
|
|
55
|
-
exports
|
|
56
|
-
const di_config_12 = require("./features/
|
|
57
|
-
|
|
58
|
-
const di_config_13 = require("./features/
|
|
59
|
-
exports.
|
|
60
|
-
const di_config_14 = require("./features/
|
|
61
|
-
exports.
|
|
52
|
+
const di_config_10 = require("./features/mouse-tool/di.config");
|
|
53
|
+
exports.glspMouseToolModule = di_config_10.default;
|
|
54
|
+
const di_config_11 = require("./features/navigation/di.config");
|
|
55
|
+
Object.defineProperty(exports, "navigationModule", { enumerable: true, get: function () { return di_config_11.navigationModule; } });
|
|
56
|
+
const di_config_12 = require("./features/save/di.config");
|
|
57
|
+
exports.saveModule = di_config_12.default;
|
|
58
|
+
const di_config_13 = require("./features/select/di.config");
|
|
59
|
+
exports.glspSelectModule = di_config_13.default;
|
|
60
|
+
const di_config_14 = require("./features/source-model-watcher/di.config");
|
|
61
|
+
exports.modelSourceWatcherModule = di_config_14.default;
|
|
62
62
|
const di_config_15 = require("./features/tool-feedback/di.config");
|
|
63
63
|
exports.toolFeedbackModule = di_config_15.default;
|
|
64
64
|
const di_config_16 = require("./features/tool-palette/di.config");
|
|
@@ -105,7 +105,6 @@ __exportStar(require("./features/hints/model"), exports);
|
|
|
105
105
|
__exportStar(require("./features/hints/type-hints"), exports);
|
|
106
106
|
__exportStar(require("./features/hover/hover"), exports);
|
|
107
107
|
__exportStar(require("./features/layout/layout-elements-action"), exports);
|
|
108
|
-
__exportStar(require("./features/model-source-watcher/model-source-changed-action-handler"), exports);
|
|
109
108
|
__exportStar(require("./features/mouse-tool/mouse-tool"), exports);
|
|
110
109
|
__exportStar(require("./features/navigation/navigation-action-handler"), exports);
|
|
111
110
|
__exportStar(require("./features/navigation/navigation-target-resolver"), exports);
|
|
@@ -113,6 +112,7 @@ __exportStar(require("./features/rank/model"), exports);
|
|
|
113
112
|
__exportStar(require("./features/reconnect/model"), exports);
|
|
114
113
|
__exportStar(require("./features/save/model"), exports);
|
|
115
114
|
__exportStar(require("./features/save/save-keylistener"), exports);
|
|
115
|
+
__exportStar(require("./features/source-model-watcher/source-model-changed-action-handler"), exports);
|
|
116
116
|
__exportStar(require("./features/tool-feedback/change-bounds-tool-feedback"), exports);
|
|
117
117
|
__exportStar(require("./features/tool-feedback/creation-tool-feedback"), exports);
|
|
118
118
|
__exportStar(require("./features/tool-feedback/css-feedback"), exports);
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,gDAAiD;AA4F7C,4BA5FG,mBAAiB,CA4FH;AA3FrB,oEAA4E;AA6FxE,mCA7FG,mBAAwB,CA6FH;AA5F5B,iEAAsE;AA6FlE,gCA7FG,mBAAqB,CA6FH;AA5FzB,+DAAwG;AA8FpG,2GA9FK,sCAA0B,OA8FL;AAD1B,0GA7FiC,qCAAyB,OA6FjC;AA5F7B,+DAAmE;AAuG/D,+BAvGG,mBAAoB,CAuGH;AAtGxB,+DAAkE;AAgG9D,8BAhGG,mBAAmB,CAgGH;AA/FvB,0DAA0D;AAuFtD,2BAvFG,mBAAgB,CAuFH;AAtFpB,0DAAyD;AA+FrD,0BA/FG,mBAAe,CA+FH;AA9FnB,2DAAuD;AA4FnD,uBA5FG,mBAAY,CA4FH;AA3FhB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,gDAAiD;AA4F7C,4BA5FG,mBAAiB,CA4FH;AA3FrB,oEAA4E;AA6FxE,mCA7FG,mBAAwB,CA6FH;AA5F5B,iEAAsE;AA6FlE,gCA7FG,mBAAqB,CA6FH;AA5FzB,+DAAwG;AA8FpG,2GA9FK,sCAA0B,OA8FL;AAD1B,0GA7FiC,qCAAyB,OA6FjC;AA5F7B,+DAAmE;AAuG/D,+BAvGG,mBAAoB,CAuGH;AAtGxB,+DAAkE;AAgG9D,8BAhGG,mBAAmB,CAgGH;AA/FvB,0DAA0D;AAuFtD,2BAvFG,mBAAgB,CAuFH;AAtFpB,0DAAyD;AA+FrD,0BA/FG,mBAAe,CA+FH;AA9FnB,2DAAuD;AA4FnD,uBA5FG,mBAAY,CA4FH;AA3FhB,gEAAkE;AA0F9D,8BA1FG,oBAAmB,CA0FH;AAzFvB,gEAAmE;AA+F/D,iGA/FK,6BAAgB,OA+FL;AA9FpB,0DAAmD;AA8E/C,qBA9EG,oBAAU,CA8EH;AA7Ed,4DAA2D;AAsFvD,2BAtFG,oBAAgB,CAsFH;AArFpB,0EAAiF;AA+FjD,mCA/FzB,oBAAwB,CA+FyB;AA9FxD,mEAAoE;AA6EhE,6BA7EG,oBAAkB,CA6EH;AA5EtB,kEAA8D;AA2E1D,wBA3EG,oBAAa,CA2EH;AA1EjB,2DAA8F;AAwF1F,oHAxFK,gDAAmC,OAwFL;AADnC,4FAvF0C,wBAAW,OAuF1C;AAtFf,gEAA0F;AAyFtF,sGAzFK,kCAAqB,OAyFL;AAlBrB,iGAvE4B,6BAAgB,OAuE5B;AAtEpB,8DAA+D;AA2F3D,6BA3FG,oBAAkB,CA2FH;AAzFtB,2DAAyC;AACzC,qEAAmD;AACnD,sDAAoC;AACpC,6EAA2D;AAC3D,4EAA0D;AAC1D,4EAA0D;AAC1D,uDAAqC;AACrC,2DAAyC;AACzC,+CAA0D;AAAjD,oHAAA,sBAAsB,OAAA;AAC/B,mEAAiD;AACjD,gEAA8C;AAC9C,uDAAqC;AACrC,yEAAuD;AACvD,8DAA4C;AAC5C,oEAAkD;AAClD,2EAAyD;AACzD,0DAAwC;AACxC,mEAAiD;AACjD,+CAA6B;AAC7B,4DAA0C;AAC1C,iEAA+C;AAC/C,+EAA6D;AAC7D,gEAA8C;AAC9C,6FAA2E;AAC3E,sFAAoE;AACpE,2EAAyD;AACzD,0EAAwD;AACxD,wEAAsD;AACtD,6EAA2D;AAC3D,yDAAuC;AACvC,8DAA4C;AAC5C,yDAAuC;AACvC,2EAAyD;AACzD,mEAAiD;AACjD,kFAAgE;AAChE,mFAAiE;AACjE,wDAAsC;AACtC,6DAA2C;AAC3C,wDAAsC;AACtC,mEAAiD;AACjD,sGAAoF;AACpF,uFAAqE;AACrE,kFAAgE;AAChE,wEAAsD;AACtD,mFAAiE;AACjE,sFAAoE;AACpE,iEAA+C;AAC/C,uEAAqD;AACrD,kEAAgD;AAChD,sEAAoD;AACpD,+DAA6C;AAC7C,sEAAoD;AACpD,kEAAgD;AAChD,oEAAkD;AAClD,sEAAoD;AACpD,qEAAmD;AACnD,yEAAuD;AACvD,iEAA+C;AAC/C,iFAA+D;AAC/D,8CAA4B;AAC5B,qEAAmD;AACnD,qDAAmC;AACnC,yDAAuC;AACvC,iDAA+B;AAC/B,sDAAoC;AACpC,yDAAuC;AACvC,0CAAwB"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
/********************************************************************************
|
|
2
|
+
* Copyright (c) 2017-2018 TypeFox and others.
|
|
3
|
+
*
|
|
4
|
+
* This program and the accompanying materials are made available under the
|
|
5
|
+
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
6
|
+
* http://www.eclipse.org/legal/epl-2.0.
|
|
7
|
+
*
|
|
8
|
+
* This Source Code may also be made available under the following Secondary
|
|
9
|
+
* Licenses when the conditions for such availability set forth in the Eclipse
|
|
10
|
+
* Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
11
|
+
* with the GNU Classpath Exception which is available at
|
|
12
|
+
* https://www.gnu.org/software/classpath/license.html.
|
|
13
|
+
*
|
|
14
|
+
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
|
+
********************************************************************************/
|
|
16
|
+
/** @jsx html */
|
|
17
|
+
import { Bounds } from '@eclipse-glsp/protocol';
|
|
18
|
+
import { VNode } from 'snabbdom';
|
|
19
|
+
import { IViewArgs, ProjectedViewportView, ProjectionParams, RenderingContext, ViewportRootElement, ViewProjection } from 'sprotty';
|
|
20
|
+
/**
|
|
21
|
+
* Special viewport root view that renders horizontal and vertical projection bars for quick navigation.
|
|
22
|
+
*/
|
|
23
|
+
export declare class GLSPProjectionView extends ProjectedViewportView {
|
|
24
|
+
render(model: Readonly<ViewportRootElement>, context: RenderingContext, args?: IViewArgs): VNode;
|
|
25
|
+
protected renderSvg(model: Readonly<ViewportRootElement>, context: RenderingContext, args?: IViewArgs): VNode;
|
|
26
|
+
protected renderProjectionBar(projections: ViewProjection[], model: Readonly<ViewportRootElement>, modelBounds: Bounds, orientation: 'horizontal' | 'vertical'): VNode;
|
|
27
|
+
protected renderViewport(model: Readonly<ViewportRootElement>, params: ProjectionParams): VNode;
|
|
28
|
+
protected renderProjection(projection: ViewProjection, model: Readonly<ViewportRootElement>, params: ProjectionParams): VNode;
|
|
29
|
+
}
|
|
30
|
+
//# sourceMappingURL=glsp-projection-view.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"glsp-projection-view.d.ts","sourceRoot":"","sources":["../../src/views/glsp-projection-view.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,gBAAgB;AAChB,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAEhD,OAAO,EAAK,KAAK,EAAc,MAAM,UAAU,CAAC;AAChD,OAAO,EAGH,SAAS,EACT,qBAAqB,EACrB,gBAAgB,EAChB,gBAAgB,EAEhB,mBAAmB,EACnB,cAAc,EACjB,MAAM,SAAS,CAAC;AAEjB;;GAEG;AACH,qBACa,kBAAmB,SAAQ,qBAAqB;IAChD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,OAAO,EAAE,gBAAgB,EAAE,IAAI,CAAC,EAAE,SAAS,GAAG,KAAK;cAStF,SAAS,CAAC,KAAK,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,OAAO,EAAE,gBAAgB,EAAE,IAAI,CAAC,EAAE,SAAS,GAAG,KAAK;cAOnG,mBAAmB,CAClC,WAAW,EAAE,cAAc,EAAE,EAC7B,KAAK,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EACpC,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,YAAY,GAAG,UAAU,GACvC,KAAK;cAoBW,cAAc,CAAC,KAAK,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,MAAM,EAAE,gBAAgB,GAAG,KAAK;cAwCrF,gBAAgB,CAAC,UAAU,EAAE,cAAc,EAAE,KAAK,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,MAAM,EAAE,gBAAgB,GAAG,KAAK;CA+CzI"}
|
|
@@ -0,0 +1,142 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/********************************************************************************
|
|
3
|
+
* Copyright (c) 2017-2018 TypeFox and others.
|
|
4
|
+
*
|
|
5
|
+
* This program and the accompanying materials are made available under the
|
|
6
|
+
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
7
|
+
* http://www.eclipse.org/legal/epl-2.0.
|
|
8
|
+
*
|
|
9
|
+
* This Source Code may also be made available under the following Secondary
|
|
10
|
+
* Licenses when the conditions for such availability set forth in the Eclipse
|
|
11
|
+
* Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
12
|
+
* with the GNU Classpath Exception which is available at
|
|
13
|
+
* https://www.gnu.org/software/classpath/license.html.
|
|
14
|
+
*
|
|
15
|
+
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
16
|
+
********************************************************************************/
|
|
17
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
18
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
19
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
20
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
21
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
22
|
+
};
|
|
23
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
24
|
+
exports.GLSPProjectionView = void 0;
|
|
25
|
+
const inversify_1 = require("inversify");
|
|
26
|
+
const snabbdom_1 = require("snabbdom");
|
|
27
|
+
const sprotty_1 = require("sprotty");
|
|
28
|
+
/**
|
|
29
|
+
* Special viewport root view that renders horizontal and vertical projection bars for quick navigation.
|
|
30
|
+
*/
|
|
31
|
+
let GLSPProjectionView = class GLSPProjectionView extends sprotty_1.ProjectedViewportView {
|
|
32
|
+
render(model, context, args) {
|
|
33
|
+
return ((0, sprotty_1.html)("div", { "class-sprotty-graph": true, style: { width: '100%' } },
|
|
34
|
+
this.renderSvg(model, context, args),
|
|
35
|
+
this.renderProjections(model, context, args)));
|
|
36
|
+
}
|
|
37
|
+
renderSvg(model, context, args) {
|
|
38
|
+
const transform = `scale(${model.zoom}) translate(${-model.scroll.x},${-model.scroll.y})`;
|
|
39
|
+
const ns = 'http://www.w3.org/2000/svg';
|
|
40
|
+
const svg = (0, snabbdom_1.h)('svg', { ns, style: { height: '100%' } }, (0, snabbdom_1.h)('g', { ns, attrs: { transform } }, context.renderChildren(model)));
|
|
41
|
+
return svg;
|
|
42
|
+
}
|
|
43
|
+
renderProjectionBar(projections, model, modelBounds, orientation) {
|
|
44
|
+
const params = { modelBounds, orientation };
|
|
45
|
+
// NOTE: Here we assume that the projection bars have the same size as the diagram canvas,
|
|
46
|
+
// i.e. they are drawn as overlay above the canvas.
|
|
47
|
+
params.factor =
|
|
48
|
+
orientation === 'horizontal' ? model.canvasBounds.width / modelBounds.width : model.canvasBounds.height / modelBounds.height;
|
|
49
|
+
params.zoomedFactor = params.factor / model.zoom;
|
|
50
|
+
return ((0, sprotty_1.html)("div", { "class-sprotty-projection-bar": true, "class-horizontal": orientation === 'horizontal', "class-vertical": orientation === 'vertical', "class-bordered-projection-bar": true },
|
|
51
|
+
this.renderViewport(model, params),
|
|
52
|
+
projections.map(p => this.renderProjection(p, model, params))));
|
|
53
|
+
}
|
|
54
|
+
renderViewport(model, params) {
|
|
55
|
+
let canvasSize;
|
|
56
|
+
let viewportPos;
|
|
57
|
+
if (params.orientation === 'horizontal') {
|
|
58
|
+
canvasSize = model.canvasBounds.width;
|
|
59
|
+
viewportPos = (model.scroll.x - params.modelBounds.x) * params.factor;
|
|
60
|
+
}
|
|
61
|
+
else {
|
|
62
|
+
canvasSize = model.canvasBounds.height;
|
|
63
|
+
viewportPos = (model.scroll.y - params.modelBounds.y) * params.factor;
|
|
64
|
+
}
|
|
65
|
+
let viewportSize = canvasSize * params.zoomedFactor;
|
|
66
|
+
if (viewportPos < 0) {
|
|
67
|
+
viewportSize += viewportPos;
|
|
68
|
+
viewportPos = 0;
|
|
69
|
+
}
|
|
70
|
+
else if (viewportPos > canvasSize) {
|
|
71
|
+
viewportPos = canvasSize;
|
|
72
|
+
}
|
|
73
|
+
if (viewportSize < 0) {
|
|
74
|
+
viewportSize = 0;
|
|
75
|
+
}
|
|
76
|
+
else if (viewportPos + viewportSize > canvasSize) {
|
|
77
|
+
viewportSize = canvasSize - viewportPos;
|
|
78
|
+
}
|
|
79
|
+
if (Math.abs(viewportSize - canvasSize) < 1) {
|
|
80
|
+
viewportSize = 0;
|
|
81
|
+
}
|
|
82
|
+
const style = params.orientation === 'horizontal'
|
|
83
|
+
? {
|
|
84
|
+
left: `${viewportPos}px`,
|
|
85
|
+
width: `${viewportSize}px`,
|
|
86
|
+
border: 'none'
|
|
87
|
+
}
|
|
88
|
+
: {
|
|
89
|
+
top: `${viewportPos}px`,
|
|
90
|
+
height: `${viewportSize}px`,
|
|
91
|
+
border: 'none'
|
|
92
|
+
};
|
|
93
|
+
return (0, sprotty_1.html)("div", { "class-sprotty-viewport": viewportSize !== 0, "class-projection-scroll-bar": true, style: style });
|
|
94
|
+
}
|
|
95
|
+
renderProjection(projection, model, params) {
|
|
96
|
+
let canvasSize;
|
|
97
|
+
let projPos;
|
|
98
|
+
let projSize;
|
|
99
|
+
if (params.orientation === 'horizontal') {
|
|
100
|
+
canvasSize = model.canvasBounds.width;
|
|
101
|
+
projPos = (projection.projectedBounds.x - params.modelBounds.x) * params.factor;
|
|
102
|
+
projSize = projection.projectedBounds.width * params.factor;
|
|
103
|
+
}
|
|
104
|
+
else {
|
|
105
|
+
canvasSize = model.canvasBounds.height;
|
|
106
|
+
projPos = (projection.projectedBounds.y - params.modelBounds.y) * params.factor;
|
|
107
|
+
projSize = projection.projectedBounds.height * params.factor;
|
|
108
|
+
}
|
|
109
|
+
if (projPos < 0) {
|
|
110
|
+
projSize += projPos;
|
|
111
|
+
projPos = 0;
|
|
112
|
+
}
|
|
113
|
+
else if (projPos > canvasSize) {
|
|
114
|
+
projPos = canvasSize;
|
|
115
|
+
}
|
|
116
|
+
if (projSize < 0) {
|
|
117
|
+
projSize = 0;
|
|
118
|
+
}
|
|
119
|
+
else if (projPos + projSize > canvasSize) {
|
|
120
|
+
projSize = canvasSize - projPos;
|
|
121
|
+
}
|
|
122
|
+
const style = params.orientation === 'horizontal'
|
|
123
|
+
? {
|
|
124
|
+
left: `${projPos}px`,
|
|
125
|
+
width: `${projSize}px`,
|
|
126
|
+
height: '60%'
|
|
127
|
+
}
|
|
128
|
+
: {
|
|
129
|
+
top: `${projPos}px`,
|
|
130
|
+
height: `${projSize}px`,
|
|
131
|
+
width: '60%'
|
|
132
|
+
};
|
|
133
|
+
const result = ((0, sprotty_1.html)("div", { id: `${params.orientation}-projection:${projection.elementId}`, "class-sprotty-projection": true, "class-glsp-projection": true, style: style }));
|
|
134
|
+
projection.cssClasses.forEach(cl => (0, sprotty_1.setClass)(result, cl, true));
|
|
135
|
+
return result;
|
|
136
|
+
}
|
|
137
|
+
};
|
|
138
|
+
GLSPProjectionView = __decorate([
|
|
139
|
+
(0, inversify_1.injectable)()
|
|
140
|
+
], GLSPProjectionView);
|
|
141
|
+
exports.GLSPProjectionView = GLSPProjectionView;
|
|
142
|
+
//# sourceMappingURL=glsp-projection-view.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"glsp-projection-view.js","sourceRoot":"","sources":["../../src/views/glsp-projection-view.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;AAIlF,yCAAuC;AACvC,uCAAgD;AAChD,qCAUiB;AAEjB;;GAEG;AAEH,IAAa,kBAAkB,GAA/B,MAAa,kBAAmB,SAAQ,+BAAqB;IAChD,MAAM,CAAC,KAAoC,EAAE,OAAyB,EAAE,IAAgB;QAC7F,OAAO,CACH,oDAA0B,IAAI,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE;YACnD,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC;YACpC,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,CAC3C,CACT,CAAC;IACN,CAAC;IAEkB,SAAS,CAAC,KAAoC,EAAE,OAAyB,EAAE,IAAgB;QAC1G,MAAM,SAAS,GAAG,SAAS,KAAK,CAAC,IAAI,eAAe,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC;QAC1F,MAAM,EAAE,GAAG,4BAA4B,CAAC;QACxC,MAAM,GAAG,GAAG,IAAA,YAAC,EAAC,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,IAAA,YAAC,EAAC,GAAG,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC7H,OAAO,GAAG,CAAC;IACf,CAAC;IAEkB,mBAAmB,CAClC,WAA6B,EAC7B,KAAoC,EACpC,WAAmB,EACnB,WAAsC;QAEtC,MAAM,MAAM,GAAqB,EAAE,WAAW,EAAE,WAAW,EAAsB,CAAC;QAClF,0FAA0F;QAC1F,mDAAmD;QACnD,MAAM,CAAC,MAAM;YACT,WAAW,KAAK,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC;QACjI,MAAM,CAAC,YAAY,GAAG,MAAM,CAAC,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC;QACjD,OAAO,CACH,6DACkC,IAAI,sBAChB,WAAW,KAAK,YAAY,oBAC9B,WAAW,KAAK,UAAU,mCACX,IAAI;YAElC,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC;YAClC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAC5D,CACT,CAAC;IACN,CAAC;IAEkB,cAAc,CAAC,KAAoC,EAAE,MAAwB;QAC5F,IAAI,UAAU,CAAC;QACf,IAAI,WAAmB,CAAC;QACxB,IAAI,MAAM,CAAC,WAAW,KAAK,YAAY,EAAE;YACrC,UAAU,GAAG,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC;YACtC,WAAW,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC;SACzE;aAAM;YACH,UAAU,GAAG,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC;YACvC,WAAW,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC;SACzE;QACD,IAAI,YAAY,GAAG,UAAU,GAAG,MAAM,CAAC,YAAY,CAAC;QACpD,IAAI,WAAW,GAAG,CAAC,EAAE;YACjB,YAAY,IAAI,WAAW,CAAC;YAC5B,WAAW,GAAG,CAAC,CAAC;SACnB;aAAM,IAAI,WAAW,GAAG,UAAU,EAAE;YACjC,WAAW,GAAG,UAAU,CAAC;SAC5B;QACD,IAAI,YAAY,GAAG,CAAC,EAAE;YAClB,YAAY,GAAG,CAAC,CAAC;SACpB;aAAM,IAAI,WAAW,GAAG,YAAY,GAAG,UAAU,EAAE;YAChD,YAAY,GAAG,UAAU,GAAG,WAAW,CAAC;SAC3C;QACD,IAAI,IAAI,CAAC,GAAG,CAAC,YAAY,GAAG,UAAU,CAAC,GAAG,CAAC,EAAE;YACzC,YAAY,GAAG,CAAC,CAAC;SACpB;QACD,MAAM,KAAK,GACP,MAAM,CAAC,WAAW,KAAK,YAAY;YAC/B,CAAC,CAAC;gBACI,IAAI,EAAE,GAAG,WAAW,IAAI;gBACxB,KAAK,EAAE,GAAG,YAAY,IAAI;gBAC1B,MAAM,EAAE,MAAM;aACjB;YACH,CAAC,CAAC;gBACI,GAAG,EAAE,GAAG,WAAW,IAAI;gBACvB,MAAM,EAAE,GAAG,YAAY,IAAI;gBAC3B,MAAM,EAAE,MAAM;aACjB,CAAC;QACZ,OAAO,uDAA6B,YAAY,KAAK,CAAC,iCAA+B,IAAI,EAAE,KAAK,EAAE,KAAK,GAAI,CAAC;IAChH,CAAC;IAEkB,gBAAgB,CAAC,UAA0B,EAAE,KAAoC,EAAE,MAAwB;QAC1H,IAAI,UAAU,CAAC;QACf,IAAI,OAAO,CAAC;QACZ,IAAI,QAAgB,CAAC;QACrB,IAAI,MAAM,CAAC,WAAW,KAAK,YAAY,EAAE;YACrC,UAAU,GAAG,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC;YACtC,OAAO,GAAG,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC;YAChF,QAAQ,GAAG,UAAU,CAAC,eAAe,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC;SAC/D;aAAM;YACH,UAAU,GAAG,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC;YACvC,OAAO,GAAG,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC;YAChF,QAAQ,GAAG,UAAU,CAAC,eAAe,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;SAChE;QACD,IAAI,OAAO,GAAG,CAAC,EAAE;YACb,QAAQ,IAAI,OAAO,CAAC;YACpB,OAAO,GAAG,CAAC,CAAC;SACf;aAAM,IAAI,OAAO,GAAG,UAAU,EAAE;YAC7B,OAAO,GAAG,UAAU,CAAC;SACxB;QACD,IAAI,QAAQ,GAAG,CAAC,EAAE;YACd,QAAQ,GAAG,CAAC,CAAC;SAChB;aAAM,IAAI,OAAO,GAAG,QAAQ,GAAG,UAAU,EAAE;YACxC,QAAQ,GAAG,UAAU,GAAG,OAAO,CAAC;SACnC;QACD,MAAM,KAAK,GACP,MAAM,CAAC,WAAW,KAAK,YAAY;YAC/B,CAAC,CAAC;gBACI,IAAI,EAAE,GAAG,OAAO,IAAI;gBACpB,KAAK,EAAE,GAAG,QAAQ,IAAI;gBACtB,MAAM,EAAE,KAAK;aAChB;YACH,CAAC,CAAC;gBACI,GAAG,EAAE,GAAG,OAAO,IAAI;gBACnB,MAAM,EAAE,GAAG,QAAQ,IAAI;gBACvB,KAAK,EAAE,KAAK;aACf,CAAC;QACZ,MAAM,MAAM,GAAG,CACX,6BACI,EAAE,EAAE,GAAG,MAAM,CAAC,WAAW,eAAe,UAAU,CAAC,SAAS,EAAE,8BACpC,IAAI,2BACP,IAAI,EAC3B,KAAK,EAAE,KAAK,GACd,CACL,CAAC;QACF,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,IAAA,kBAAQ,EAAC,MAAM,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC;QAChE,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ,CAAA;AAjIY,kBAAkB;IAD9B,IAAA,sBAAU,GAAE;GACA,kBAAkB,CAiI9B;AAjIY,gDAAkB"}
|
package/lib/views/index.d.ts
CHANGED
|
@@ -16,6 +16,7 @@
|
|
|
16
16
|
export * from './base-view-module';
|
|
17
17
|
export * from './compartments';
|
|
18
18
|
export * from './glsp-edge-view';
|
|
19
|
+
export * from './glsp-projection-view';
|
|
19
20
|
export * from './issue-marker-view';
|
|
20
21
|
export * from './rounded-corner';
|
|
21
22
|
export * from './rounded-corner-view';
|
package/lib/views/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/views/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/views/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,wBAAwB,CAAC;AACvC,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC"}
|
package/lib/views/index.js
CHANGED
|
@@ -32,6 +32,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
32
32
|
__exportStar(require("./base-view-module"), exports);
|
|
33
33
|
__exportStar(require("./compartments"), exports);
|
|
34
34
|
__exportStar(require("./glsp-edge-view"), exports);
|
|
35
|
+
__exportStar(require("./glsp-projection-view"), exports);
|
|
35
36
|
__exportStar(require("./issue-marker-view"), exports);
|
|
36
37
|
__exportStar(require("./rounded-corner"), exports);
|
|
37
38
|
__exportStar(require("./rounded-corner-view"), exports);
|
package/lib/views/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/views/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAmC;AACnC,iDAA+B;AAC/B,mDAAiC;AACjC,sDAAoC;AACpC,mDAAiC;AACjC,wDAAsC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/views/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAmC;AACnC,iDAA+B;AAC/B,mDAAiC;AACjC,yDAAuC;AACvC,sDAAoC;AACpC,mDAAiC;AACjC,wDAAsC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eclipse-glsp/client",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "1.0.0",
|
|
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,9 +34,9 @@
|
|
|
34
34
|
"css"
|
|
35
35
|
],
|
|
36
36
|
"dependencies": {
|
|
37
|
-
"@eclipse-glsp/protocol": "0.
|
|
37
|
+
"@eclipse-glsp/protocol": "^1.0.0",
|
|
38
38
|
"autocompleter": "5.1.0",
|
|
39
|
-
"sprotty": "
|
|
39
|
+
"sprotty": "0.12.0"
|
|
40
40
|
},
|
|
41
41
|
"devDependencies": {
|
|
42
42
|
"@vscode/codicons": "^0.0.25",
|
|
@@ -57,5 +57,5 @@
|
|
|
57
57
|
},
|
|
58
58
|
"main": "lib/index",
|
|
59
59
|
"types": "lib/index",
|
|
60
|
-
"gitHead": "
|
|
60
|
+
"gitHead": "fe0b29761e9844d8541ce4cafeaf7e00976157e1"
|
|
61
61
|
}
|
|
@@ -38,10 +38,10 @@ import glspEditLabelModule from '../features/edit-label/di.config';
|
|
|
38
38
|
import modelHintsModule from '../features/hints/di.config';
|
|
39
39
|
import glspHoverModule from '../features/hover/di.config';
|
|
40
40
|
import layoutModule from '../features/layout/di.config';
|
|
41
|
-
import modelSourceWatcherModule from '../features/model-source-watcher/di.config';
|
|
42
41
|
import glspMouseToolModule from '../features/mouse-tool/di.config';
|
|
43
42
|
import { navigationModule } from '../features/navigation/di.config';
|
|
44
43
|
import glspSelectModule from '../features/select/di.config';
|
|
44
|
+
import sourceModelWatcherModule from '../features/source-model-watcher/di.config';
|
|
45
45
|
import toolFeedbackModule from '../features/tool-feedback/di.config';
|
|
46
46
|
import toolPaletteModule from '../features/tool-palette/di.config';
|
|
47
47
|
import { enableDefaultToolsOnFocusLossModule, toolsModule } from '../features/tools/di.config';
|
|
@@ -73,7 +73,7 @@ export const DEFAULT_MODULES = [
|
|
|
73
73
|
markerNavigatorModule,
|
|
74
74
|
modelHintsModule,
|
|
75
75
|
modelSourceModule,
|
|
76
|
-
|
|
76
|
+
sourceModelWatcherModule,
|
|
77
77
|
navigationModule,
|
|
78
78
|
openModule,
|
|
79
79
|
toolPaletteModule,
|