@eclipse-glsp/client 2.5.0-next.420 → 2.5.0-next.422
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/messages.json +5 -0
- package/lib/features/hover/hover.d.ts +17 -1
- package/lib/features/hover/hover.d.ts.map +1 -1
- package/lib/features/hover/hover.js +13 -2
- package/lib/features/hover/hover.js.map +1 -1
- package/package.json +3 -3
- package/src/base/messages.json +5 -0
- package/src/features/hover/hover.ts +20 -8
package/lib/base/messages.json
CHANGED
|
@@ -1,4 +1,19 @@
|
|
|
1
|
-
|
|
1
|
+
/********************************************************************************
|
|
2
|
+
* Copyright (c) 2020-2023 EclipseSource 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
|
+
import { Action, Bounds, GIssueSeverity, GModelElement, GModelElementSchema, GModelRootSchema, HoverMouseListener, IActionHandler, ICommand } from '@eclipse-glsp/sprotty';
|
|
2
17
|
import { GIssueMarker } from '../validation/issue-marker';
|
|
3
18
|
export declare class GlspHoverMouseListener extends HoverMouseListener implements IActionHandler {
|
|
4
19
|
protected enableHover: boolean;
|
|
@@ -17,6 +32,7 @@ export declare class GlspHoverMouseListener extends HoverMouseListener implement
|
|
|
17
32
|
protected createPopupModel(marker: GIssueMarker, bounds: Bounds): GModelRootSchema;
|
|
18
33
|
protected createMarkerIssuePopup(marker: GIssueMarker): GModelElementSchema;
|
|
19
34
|
protected createIssueMessage(marker: GIssueMarker): string;
|
|
35
|
+
protected getSeverityString(severity: GIssueSeverity): string;
|
|
20
36
|
protected modifyBounds(bounds: Bounds): Bounds;
|
|
21
37
|
}
|
|
22
38
|
//# sourceMappingURL=hover.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hover.d.ts","sourceRoot":"","sources":["../../../src/features/hover/hover.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"hover.d.ts","sourceRoot":"","sources":["../../../src/features/hover/hover.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,MAAM,EACN,MAAM,EAEN,cAAc,EACd,aAAa,EACb,mBAAmB,EACnB,gBAAgB,EAGhB,kBAAkB,EAClB,cAAc,EACd,QAAQ,EAGX,MAAM,uBAAuB,CAAC;AAM/B,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,iBAAiB,CAAC,QAAQ,EAAE,cAAc,GAAG,MAAM;IAW7D,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;CAGjD"}
|
|
@@ -22,9 +22,10 @@ exports.GlspHoverMouseListener = void 0;
|
|
|
22
22
|
*
|
|
23
23
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
24
24
|
********************************************************************************/
|
|
25
|
-
const inversify_1 = require("inversify");
|
|
26
25
|
const sprotty_1 = require("@eclipse-glsp/sprotty");
|
|
26
|
+
const inversify_1 = require("inversify");
|
|
27
27
|
const focus_state_change_action_1 = require("../../base/focus/focus-state-change-action");
|
|
28
|
+
const messages_1 = require("../../base/messages");
|
|
28
29
|
const tool_1 = require("../../base/tool-manager/tool");
|
|
29
30
|
const edge_creation_tool_1 = require("../tools/edge-creation/edge-creation-tool");
|
|
30
31
|
const issue_marker_1 = require("../validation/issue-marker");
|
|
@@ -100,7 +101,17 @@ let GlspHoverMouseListener = class GlspHoverMouseListener extends sprotty_1.Hove
|
|
|
100
101
|
};
|
|
101
102
|
}
|
|
102
103
|
createIssueMessage(marker) {
|
|
103
|
-
return '<ul>' + marker.issues.map(i => '<li>' + i.severity
|
|
104
|
+
return '<ul>' + marker.issues.map(i => '<li>' + this.getSeverityString(i.severity) + ': ' + i.message + '</li>').join('') + '</ul>';
|
|
105
|
+
}
|
|
106
|
+
getSeverityString(severity) {
|
|
107
|
+
switch (severity) {
|
|
108
|
+
case 'error':
|
|
109
|
+
return messages_1.messages.issue_marker.severity_error;
|
|
110
|
+
case 'warning':
|
|
111
|
+
return messages_1.messages.issue_marker.severity_warning;
|
|
112
|
+
case 'info':
|
|
113
|
+
return messages_1.messages.issue_marker.severity_info;
|
|
114
|
+
}
|
|
104
115
|
}
|
|
105
116
|
modifyBounds(bounds) {
|
|
106
117
|
return bounds;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hover.js","sourceRoot":"","sources":["../../../src/features/hover/hover.ts"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,
|
|
1
|
+
{"version":3,"file":"hover.js","sourceRoot":"","sources":["../../../src/features/hover/hover.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": "2.5.0-next.
|
|
3
|
+
"version": "2.5.0-next.422+99d426b",
|
|
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.5.0-next.
|
|
49
|
+
"@eclipse-glsp/sprotty": "2.5.0-next.422+99d426b",
|
|
50
50
|
"autocompleter": "^9.1.2",
|
|
51
51
|
"file-saver": "^2.0.5",
|
|
52
52
|
"lodash": "4.17.21",
|
|
@@ -63,5 +63,5 @@
|
|
|
63
63
|
"publishConfig": {
|
|
64
64
|
"access": "public"
|
|
65
65
|
},
|
|
66
|
-
"gitHead": "
|
|
66
|
+
"gitHead": "99d426b3109e31be91ab1f8bfeb255287ee62ed0"
|
|
67
67
|
}
|
package/src/base/messages.json
CHANGED
|
@@ -13,27 +13,28 @@
|
|
|
13
13
|
*
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
|
-
import { injectable } from 'inversify';
|
|
17
16
|
import {
|
|
18
17
|
Action,
|
|
19
18
|
Bounds,
|
|
20
19
|
EMPTY_ROOT,
|
|
20
|
+
GIssueSeverity,
|
|
21
|
+
GModelElement,
|
|
22
|
+
GModelElementSchema,
|
|
23
|
+
GModelRootSchema,
|
|
24
|
+
GPreRenderedElementSchema,
|
|
21
25
|
HoverFeedbackAction,
|
|
22
26
|
HoverMouseListener,
|
|
23
27
|
IActionHandler,
|
|
24
28
|
ICommand,
|
|
25
|
-
GPreRenderedElementSchema,
|
|
26
29
|
RequestPopupModelAction,
|
|
27
|
-
|
|
28
|
-
GModelElementSchema,
|
|
29
|
-
SetPopupModelAction,
|
|
30
|
-
GModelRootSchema
|
|
30
|
+
SetPopupModelAction
|
|
31
31
|
} from '@eclipse-glsp/sprotty';
|
|
32
|
+
import { injectable } from 'inversify';
|
|
32
33
|
import { FocusStateChangedAction } from '../../base/focus/focus-state-change-action';
|
|
34
|
+
import { messages } from '../../base/messages';
|
|
33
35
|
import { EnableDefaultToolsAction, EnableToolsAction } from '../../base/tool-manager/tool';
|
|
34
36
|
import { EdgeCreationTool } from '../tools/edge-creation/edge-creation-tool';
|
|
35
37
|
import { GIssueMarker, getSeverity } from '../validation/issue-marker';
|
|
36
|
-
|
|
37
38
|
@injectable()
|
|
38
39
|
export class GlspHoverMouseListener extends HoverMouseListener implements IActionHandler {
|
|
39
40
|
protected enableHover = true;
|
|
@@ -107,7 +108,18 @@ export class GlspHoverMouseListener extends HoverMouseListener implements IActio
|
|
|
107
108
|
}
|
|
108
109
|
|
|
109
110
|
protected createIssueMessage(marker: GIssueMarker): string {
|
|
110
|
-
return '<ul>' + marker.issues.map(i => '<li>' + i.severity
|
|
111
|
+
return '<ul>' + marker.issues.map(i => '<li>' + this.getSeverityString(i.severity) + ': ' + i.message + '</li>').join('') + '</ul>';
|
|
112
|
+
}
|
|
113
|
+
|
|
114
|
+
protected getSeverityString(severity: GIssueSeverity): string {
|
|
115
|
+
switch (severity) {
|
|
116
|
+
case 'error':
|
|
117
|
+
return messages.issue_marker.severity_error;
|
|
118
|
+
case 'warning':
|
|
119
|
+
return messages.issue_marker.severity_warning;
|
|
120
|
+
case 'info':
|
|
121
|
+
return messages.issue_marker.severity_info;
|
|
122
|
+
}
|
|
111
123
|
}
|
|
112
124
|
|
|
113
125
|
protected modifyBounds(bounds: Bounds): Bounds {
|