@eclipse-glsp/server 2.8.0-next.1 → 2.8.0-next.10
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/browser/launch/worker-server-launcher.js +3 -5
- package/lib/browser/launch/worker-server-launcher.js.map +1 -1
- package/lib/common/actions/action-dispatcher.js +5 -8
- package/lib/common/actions/action-dispatcher.js.map +1 -1
- package/lib/common/actions/action-handler-registry.js +1 -1
- package/lib/common/actions/action-handler-registry.js.map +1 -1
- package/lib/common/actions/global-action-provider.js +1 -2
- package/lib/common/actions/global-action-provider.js.map +1 -1
- package/lib/common/command/command.js +1 -2
- package/lib/common/command/command.js.map +1 -1
- package/lib/common/command/recording-command.js +3 -6
- package/lib/common/command/recording-command.js.map +1 -1
- package/lib/common/di/diagram-module.js +5 -6
- package/lib/common/di/diagram-module.js.map +1 -1
- package/lib/common/di/glsp-module.js +1 -1
- package/lib/common/di/glsp-module.js.map +1 -1
- package/lib/common/di/server-module.js +1 -1
- package/lib/common/di/server-module.js.map +1 -1
- package/lib/common/features/directediting/context-edit-validator.js +3 -3
- package/lib/common/features/directediting/context-edit-validator.js.map +1 -1
- package/lib/common/features/directediting/label-edit-validator.js +1 -1
- package/lib/common/features/directediting/label-edit-validator.js.map +1 -1
- package/lib/common/features/layout/computed-bounds-action-handler.d.ts +16 -1
- package/lib/common/features/layout/computed-bounds-action-handler.d.ts.map +1 -1
- package/lib/common/features/layout/computed-bounds-action-handler.js +41 -4
- package/lib/common/features/layout/computed-bounds-action-handler.js.map +1 -1
- package/lib/common/features/layout/layout-operation-handler.js +1 -2
- package/lib/common/features/layout/layout-operation-handler.js.map +1 -1
- package/lib/common/features/model/gmodel-index.js +3 -5
- package/lib/common/features/model/gmodel-index.js.map +1 -1
- package/lib/common/features/model/gmodel-serializer.js +1 -2
- package/lib/common/features/model/gmodel-serializer.js.map +1 -1
- package/lib/common/features/model/model-submission-handler.d.ts +1 -2
- package/lib/common/features/model/model-submission-handler.d.ts.map +1 -1
- package/lib/common/features/model/model-submission-handler.js +3 -6
- package/lib/common/features/model/model-submission-handler.js.map +1 -1
- package/lib/common/features/model/request-model-action-handler.js +4 -6
- package/lib/common/features/model/request-model-action-handler.js.map +1 -1
- package/lib/common/features/navigation/navigation-target-resolution.js +1 -1
- package/lib/common/features/navigation/navigation-target-resolution.js.map +1 -1
- package/lib/common/features/progress/progress-service.d.ts.map +1 -1
- package/lib/common/features/progress/progress-service.js +1 -2
- package/lib/common/features/progress/progress-service.js.map +1 -1
- package/lib/common/features/validation/request-markers-handler.js +1 -2
- package/lib/common/features/validation/request-markers-handler.js.map +1 -1
- package/lib/common/gmodel/change-routing-points-operation-handler.js +1 -2
- package/lib/common/gmodel/change-routing-points-operation-handler.js.map +1 -1
- package/lib/common/gmodel/gmodel-create-node-operation-handler.js +3 -5
- package/lib/common/gmodel/gmodel-create-node-operation-handler.js.map +1 -1
- package/lib/common/gmodel/paste-operation-handler.d.ts +1 -1
- package/lib/common/gmodel/paste-operation-handler.d.ts.map +1 -1
- package/lib/common/gmodel/paste-operation-handler.js +8 -11
- package/lib/common/gmodel/paste-operation-handler.js.map +1 -1
- package/lib/common/launch/glsp-server-launcher.d.ts +8 -1
- package/lib/common/launch/glsp-server-launcher.d.ts.map +1 -1
- package/lib/common/launch/glsp-server-launcher.js +11 -1
- package/lib/common/launch/glsp-server-launcher.js.map +1 -1
- package/lib/common/launch/jsonrpc-server-launcher.d.ts +51 -2
- package/lib/common/launch/jsonrpc-server-launcher.d.ts.map +1 -1
- package/lib/common/launch/jsonrpc-server-launcher.js +82 -3
- package/lib/common/launch/jsonrpc-server-launcher.js.map +1 -1
- package/lib/common/operations/compound-operation-handler.js +1 -1
- package/lib/common/operations/compound-operation-handler.js.map +1 -1
- package/lib/common/operations/json-operation-handler.js +2 -3
- package/lib/common/operations/json-operation-handler.js.map +1 -1
- package/lib/common/protocol/glsp-server.js +6 -7
- package/lib/common/protocol/glsp-server.js.map +1 -1
- package/lib/common/session/client-session-manager.js +3 -5
- package/lib/common/session/client-session-manager.js.map +1 -1
- package/lib/common/utils/action-queue.js +2 -4
- package/lib/common/utils/action-queue.js.map +1 -1
- package/lib/common/utils/client-options-util.js +2 -2
- package/lib/common/utils/client-options-util.js.map +1 -1
- package/lib/common/utils/glsp-server-error.d.ts +2 -3
- package/lib/common/utils/glsp-server-error.d.ts.map +1 -1
- package/lib/common/utils/glsp-server-error.js +1 -1
- package/lib/common/utils/glsp-server-error.js.map +1 -1
- package/lib/common/utils/layout-util.d.ts +5 -5
- package/lib/common/utils/layout-util.d.ts.map +1 -1
- package/lib/common/utils/layout-util.js +17 -19
- package/lib/common/utils/layout-util.js.map +1 -1
- package/lib/common/utils/logger.js +1 -2
- package/lib/common/utils/logger.js.map +1 -1
- package/lib/node/abstract-json-model-storage.js +2 -4
- package/lib/node/abstract-json-model-storage.js.map +1 -1
- package/lib/node/launch/socket-server-launcher.d.ts +39 -2
- package/lib/node/launch/socket-server-launcher.d.ts.map +1 -1
- package/lib/node/launch/socket-server-launcher.js +50 -31
- package/lib/node/launch/socket-server-launcher.js.map +1 -1
- package/lib/node/launch/websocket-server-launcher.d.ts +36 -5
- package/lib/node/launch/websocket-server-launcher.d.ts.map +1 -1
- package/lib/node/launch/websocket-server-launcher.js +54 -13
- package/lib/node/launch/websocket-server-launcher.js.map +1 -1
- package/package.json +17 -21
- package/src/common/features/directediting/context-edit-validator.ts +2 -2
- package/src/common/features/layout/computed-bounds-action-handler.ts +52 -4
- package/src/common/features/model/model-submission-handler.ts +3 -2
- package/src/common/features/progress/progress-service.ts +2 -3
- package/src/common/gmodel/paste-operation-handler.ts +6 -6
- package/src/common/launch/glsp-server-launcher.ts +12 -1
- package/src/common/launch/jsonrpc-server-launcher.ts +89 -2
- package/src/common/utils/glsp-server-error.ts +3 -5
- package/src/common/utils/layout-util.ts +13 -12
- package/src/node/launch/socket-server-launcher.ts +54 -31
- package/src/node/launch/websocket-server-launcher.ts +72 -14
- package/src/browser/di/browser-action-dispatch-scope.spec.ts +0 -75
- package/src/common/actions/action-handler-registry.spec.ts +0 -52
- package/src/common/actions/global-action-provider.spec.ts +0 -68
- package/src/common/command/command-stack.spec.ts +0 -239
- package/src/common/command/command.spec.ts +0 -92
- package/src/common/command/recording-command.spec.ts +0 -86
- package/src/common/di/binding-target.spec.ts +0 -147
- package/src/common/di/multi-bindings.spec.ts +0 -133
- package/src/common/features/contextactions/context-actions-provider-registry.spec.ts +0 -69
- package/src/common/features/contextactions/request-context-actions-handler.spec.ts +0 -75
- package/src/common/features/contextactions/tool-palette-item-provider.spec.ts +0 -46
- package/src/common/features/directediting/context-edit-validator-registry.spec.ts +0 -54
- package/src/common/features/directediting/request-edit-validation-handler.spec.ts +0 -131
- package/src/common/features/model/gmodel-serializer.spec.ts +0 -141
- package/src/common/features/type-hints/request-type-hints-action-handler.spec.ts +0 -59
- package/src/common/operations/operation-handler-registry.spec.ts +0 -50
- package/src/common/protocol/glsp-server.spec.ts +0 -154
- package/src/common/session/client-session-factory.spec.ts +0 -60
- package/src/common/session/client-session-manager.spec.ts +0 -83
- package/src/common/test/mock-util.ts +0 -281
- package/src/common/utils/action-queue.spec.ts +0 -133
- package/src/common/utils/promise-queue.spec.ts +0 -142
- package/src/common/utils/registry.spec.ts +0 -225
- package/src/node/actions/action-dispatcher.spec.ts +0 -678
- package/src/node/launch/cli-parser.spec.ts +0 -61
- package/src/node/launch/socket-cli-parser.spec.ts +0 -73
- package/src/node/launch/socket-server-launcher.spec.ts +0 -74
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gmodel-index.js","sourceRoot":"","sources":["../../../../src/common/features/model/gmodel-index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,+CAAiG;AAEjG,yCAAuC;AACvC,qEAA4E;AAE5E;;;GAGG;AAEI,IAAM,WAAW,GAAjB,MAAM,WAAW;IAIpB;QACI,IAAI,CAAC,WAAW,GAAG,IAAI,GAAG,EAAE,CAAC;QAC7B,IAAI,CAAC,cAAc,GAAG,IAAI,GAAG,EAAE,CAAC;IACpC,CAAC;IAED,KAAK;QACD,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;IAChC,CAAC;IAED,SAAS,CAAC,IAAgB;QACtB,IAAI,CAAC,KAAK,EAAE,CAAC;QACb,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC;IAES,OAAO,CAAC,OAAsB
|
|
1
|
+
{"version":3,"file":"gmodel-index.js","sourceRoot":"","sources":["../../../../src/common/features/model/gmodel-index.ts"],"names":[],"mappings":"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"}
|
|
@@ -75,7 +75,6 @@ let DefaultGModelSerializer = class DefaultGModelSerializer {
|
|
|
75
75
|
throw new glsp_server_error_1.GLSPServerError(`No constructor is configured in DiagramConfiguration for type ${schema.type}`);
|
|
76
76
|
}
|
|
77
77
|
createSchema(element) {
|
|
78
|
-
var _a;
|
|
79
78
|
const schema = {};
|
|
80
79
|
for (const key in element) {
|
|
81
80
|
if (!this.isReserved(element, key)) {
|
|
@@ -85,7 +84,7 @@ let DefaultGModelSerializer = class DefaultGModelSerializer {
|
|
|
85
84
|
}
|
|
86
85
|
}
|
|
87
86
|
}
|
|
88
|
-
schema['children'] = (
|
|
87
|
+
schema['children'] = (element.children ?? []).map(child => this.createSchema(child));
|
|
89
88
|
return schema;
|
|
90
89
|
}
|
|
91
90
|
initializeRoot(root, schema) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gmodel-serializer.js","sourceRoot":"","sources":["../../../../src/common/features/model/gmodel-serializer.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,6HAA6H;AAC7H,+CAA0F;AAE1F,yCAA+C;AAC/C,+EAA2E;AAC3E,qEAAgE;AAEnD,QAAA,gBAAgB,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAC;AAyCpD,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAA7B;QAGH,iBAAY,GAAG,CAAC,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;IA4GvE,CAAC;IA3GG,UAAU,CAAC,MAA2B;QAClC,MAAM,WAAW,GAAG,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAC;QAC1D,IAAI,WAAW,EAAE,CAAC;YACd,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;YAClC,IAAI,CAAC,CAAC,OAAO,YAAY,kBAAU,CAAC,EAAE,CAAC;gBACnC,MAAM,IAAI,mCAAe,CAAC,sBAAsB,MAAM,CAAC,IAAI,mCAAmC,CAAC,CAAC;YACpG,CAAC;YACD,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAChD,CAAC;QACD,MAAM,IAAI,mCAAe,CAAC,iEAAiE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;IAC9G,CAAC;IAED,wBAAwB,CAAC,MAA2B;QAChD,IAAI,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC;QACtB,OAAO,CAAC,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACrD,MAAM,CAAC,GAAG,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;YAC/B,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;gBACR,GAAG,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAC9B,CAAC;iBAAM,CAAC;gBACJ,OAAO,SAAS,CAAC;YACrB,CAAC;QACL,CAAC;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC;QACpE,IAAI,GAAG,KAAK,MAAM,CAAC,IAAI,EAAE,CAAC;YACtB,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QAChE,CAAC;QACD,OAAO,WAAW,CAAC;IACvB,CAAC;IAED,aAAa,CAAC,MAA2B,EAAE,MAAsB;QAC7D,MAAM,WAAW,GAAG,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAC;QAC1D,IAAI,WAAW,EAAE,CAAC;YACd,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;YAClC,IAAI,OAAO,YAAY,kBAAU,EAAE,CAAC;gBAChC,MAAM,IAAI,mCAAe,CACrB,sBAAsB,MAAM,CAAC,IAAI,iFAAiF,CACrH,CAAC;YACN,CAAC;YACD,OAAO,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QACzD,CAAC;QACD,MAAM,IAAI,mCAAe,CAAC,iEAAiE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;IAC9G,CAAC;IAED,YAAY,CAAC,OAAsB
|
|
1
|
+
{"version":3,"file":"gmodel-serializer.js","sourceRoot":"","sources":["../../../../src/common/features/model/gmodel-serializer.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,8 +13,7 @@
|
|
|
13
13
|
*
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
|
-
import { Action, DirtyStateChangeReason, GModelRootSchema, LayoutOperation, MaybePromise, RequestModelAction, SetModelAction } from '@eclipse-glsp/protocol';
|
|
17
|
-
import { DebouncedFunc } from 'lodash';
|
|
16
|
+
import { Action, DebouncedFunc, DirtyStateChangeReason, GModelRootSchema, LayoutOperation, MaybePromise, RequestModelAction, SetModelAction } from '@eclipse-glsp/protocol';
|
|
18
17
|
import { ActionDispatcher } from '../../actions/action-dispatcher';
|
|
19
18
|
import { CommandStack } from '../../command/command-stack';
|
|
20
19
|
import { DiagramConfiguration } from '../../diagram/diagram-configuration';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-submission-handler.d.ts","sourceRoot":"","sources":["../../../../src/common/features/model/model-submission-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,MAAM,EACN,sBAAsB,EACtB,gBAAgB,EAChB,eAAe,EAEf,YAAY,EAEZ,kBAAkB,EAGlB,cAAc,
|
|
1
|
+
{"version":3,"file":"model-submission-handler.d.ts","sourceRoot":"","sources":["../../../../src/common/features/model/model-submission-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,MAAM,EACN,aAAa,EACb,sBAAsB,EACtB,gBAAgB,EAChB,eAAe,EAEf,YAAY,EAEZ,kBAAkB,EAGlB,cAAc,EAIjB,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAoB,MAAM,qCAAqC,CAAC;AAC7F,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C;;;;;;;;GAQG;AACH,qBACa,sBAAsB;IAE/B,SAAS,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IAGrD,SAAS,CAAC,UAAU,EAAE,gBAAgB,CAAC;IAGvC,SAAS,CAAC,YAAY,EAAE,aAAa,CAAC;IAGtC,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC;IAIjC,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;IAGrC,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;IAIrC,SAAS,CAAC,SAAS,CAAC,EAAE,cAAc,CAAC;IAGrC,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAE7C,SAAS,CAAC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IAElD,mBAAmB,SAAO;IAC1B,SAAS,CAAC,uBAAuB,CAAC,EAAE,aAAa,CAAC,CAAC,SAAS,EAAE,cAAc,KAAK,IAAI,CAAC,CAAC;IAEvF;;;;;;;;;;;;;OAaG;IACH,kBAAkB,CAAC,aAAa,EAAE,kBAAkB,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC;IAU7E;;;;;;;;;OASG;IACH,WAAW,CAAC,MAAM,CAAC,EAAE,sBAAsB,EAAE,MAAM,CAAC,EAAE,eAAe,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC;IAa9F;;;;;;;;;;;;;;OAcG;IACG,mBAAmB,CAAC,MAAM,CAAC,EAAE,sBAAsB,EAAE,MAAM,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAuBvG,SAAS,CAAC,aAAa,CAAC,SAAS,EAAE,cAAc,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC;IAM1E,SAAS,CAAC,sBAAsB,CAAC,SAAS,EAAE,cAAc,GAAG,IAAI;cAMjD,qBAAqB,CAAC,SAAS,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAS/E,SAAS,CAAC,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,GAAG,cAAc;IAOxE,SAAS,CAAC,eAAe,IAAI,gBAAgB;CAGhD"}
|
|
@@ -26,7 +26,6 @@ exports.ModelSubmissionHandler = void 0;
|
|
|
26
26
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
27
27
|
********************************************************************************/
|
|
28
28
|
const protocol_1 = require("@eclipse-glsp/protocol");
|
|
29
|
-
const lodash_1 = require("lodash");
|
|
30
29
|
const inversify_1 = require("inversify");
|
|
31
30
|
const action_dispatcher_1 = require("../../actions/action-dispatcher");
|
|
32
31
|
const command_stack_1 = require("../../command/command-stack");
|
|
@@ -131,9 +130,8 @@ let ModelSubmissionHandler = class ModelSubmissionHandler {
|
|
|
131
130
|
return [];
|
|
132
131
|
}
|
|
133
132
|
scheduleLiveValidation(validator) {
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
this.debouncedLiveValidation = (0, lodash_1.debounce)(validator => this.performLiveValidation(validator), this.liveValidationDelay);
|
|
133
|
+
this.debouncedLiveValidation?.cancel();
|
|
134
|
+
this.debouncedLiveValidation = (0, protocol_1.debounce)(validator => this.performLiveValidation(validator), this.liveValidationDelay);
|
|
137
135
|
this.debouncedLiveValidation(validator);
|
|
138
136
|
}
|
|
139
137
|
async performLiveValidation(validator) {
|
|
@@ -142,8 +140,7 @@ let ModelSubmissionHandler = class ModelSubmissionHandler {
|
|
|
142
140
|
return this.actionDispatcher.dispatchAll(protocol_1.SetMarkersAction.create(markers, { reason: protocol_1.MarkersReason.LIVE }), protocol_1.StatusAction.create('', { severity: 'NONE' }));
|
|
143
141
|
}
|
|
144
142
|
createSetModeAction(newRoot) {
|
|
145
|
-
|
|
146
|
-
const responseId = (_b = (_a = this.requestModelAction) === null || _a === void 0 ? void 0 : _a.requestId) !== null && _b !== void 0 ? _b : '';
|
|
143
|
+
const responseId = this.requestModelAction?.requestId ?? '';
|
|
147
144
|
const response = protocol_1.SetModelAction.create(newRoot, { responseId });
|
|
148
145
|
this.requestModelAction = undefined;
|
|
149
146
|
return response;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-submission-handler.js","sourceRoot":"","sources":["../../../../src/common/features/model/model-submission-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,
|
|
1
|
+
{"version":3,"file":"model-submission-handler.js","sourceRoot":"","sources":["../../../../src/common/features/model/model-submission-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,9 +39,8 @@ let RequestModelActionHandler = class RequestModelActionHandler {
|
|
|
39
39
|
this.actionKinds = [protocol_1.RequestModelAction.KIND];
|
|
40
40
|
}
|
|
41
41
|
async execute(action) {
|
|
42
|
-
var _a;
|
|
43
42
|
this.logger.debug('Execute RequestModelAction:', action);
|
|
44
|
-
this.modelState.setAll(
|
|
43
|
+
this.modelState.setAll(action.options ?? {});
|
|
45
44
|
const isReconnecting = client_options_util_1.ClientOptionsUtil.isReconnecting(action.options);
|
|
46
45
|
const progress = this.reportModelLoading('Model loading in progress');
|
|
47
46
|
try {
|
|
@@ -59,12 +58,11 @@ let RequestModelActionHandler = class RequestModelActionHandler {
|
|
|
59
58
|
return this.submissionHandler.submitInitialModel(action);
|
|
60
59
|
}
|
|
61
60
|
async handleReconnect(action) {
|
|
62
|
-
var _a;
|
|
63
61
|
const oldModelRoot = this.modelState.root;
|
|
64
62
|
if (oldModelRoot) {
|
|
65
63
|
// decrease revision by one, as each submit will increase it by one;
|
|
66
64
|
// the next save would produce warning that source model was changed otherwise
|
|
67
|
-
this.modelState.root.revision = (
|
|
65
|
+
this.modelState.root.revision = (this.modelState.root.revision ?? 0) - 1;
|
|
68
66
|
}
|
|
69
67
|
else {
|
|
70
68
|
await this.sourceModelStorage.loadSourceModel(action);
|
|
@@ -76,12 +74,12 @@ let RequestModelActionHandler = class RequestModelActionHandler {
|
|
|
76
74
|
}
|
|
77
75
|
reportModelLoadingFinished(monitor) {
|
|
78
76
|
this.actionDispatcher.dispatch(protocol_1.StatusAction.create('', { severity: 'NONE' }));
|
|
79
|
-
monitor
|
|
77
|
+
monitor?.end();
|
|
80
78
|
}
|
|
81
79
|
handleModelLoadingError(error, monitor) {
|
|
82
80
|
// In case of an error we end progress reporting and rethrow the error so
|
|
83
81
|
// that it can be handled by the default error handler
|
|
84
|
-
monitor
|
|
82
|
+
monitor?.end();
|
|
85
83
|
throw error;
|
|
86
84
|
}
|
|
87
85
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-model-action-handler.js","sourceRoot":"","sources":["../../../../src/common/features/model/request-model-action-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAkF;AAClF,yCAA+C;AAC/C,uEAAmE;AAEnE,yEAAoE;AACpE,+CAA4C;AAC5C,mEAAgF;AAChF,+CAA2C;AAC3C,yEAAoE;AACpE,iEAA4D;AAGrD,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IAA/B;QACH,gBAAW,GAAG,CAAC,6BAAkB,CAAC,IAAI,CAAC,CAAC;IAsE5C,CAAC;IAlDG,KAAK,CAAC,OAAO,CAAC,MAA0B
|
|
1
|
+
{"version":3,"file":"request-model-action-handler.js","sourceRoot":"","sources":["../../../../src/common/features/model/request-model-action-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,11 +2,11 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.NavigationTargetResolution = void 0;
|
|
4
4
|
class NavigationTargetResolution {
|
|
5
|
+
static { this.EMPTY = new NavigationTargetResolution([]); }
|
|
5
6
|
constructor(elementIds, args) {
|
|
6
7
|
this.elementIds = elementIds;
|
|
7
8
|
this.args = args;
|
|
8
9
|
}
|
|
9
10
|
}
|
|
10
11
|
exports.NavigationTargetResolution = NavigationTargetResolution;
|
|
11
|
-
NavigationTargetResolution.EMPTY = new NavigationTargetResolution([]);
|
|
12
12
|
//# sourceMappingURL=navigation-target-resolution.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"navigation-target-resolution.js","sourceRoot":"","sources":["../../../../src/common/features/navigation/navigation-target-resolution.ts"],"names":[],"mappings":";;;AAiBA,MAAa,0BAA0B;
|
|
1
|
+
{"version":3,"file":"navigation-target-resolution.js","sourceRoot":"","sources":["../../../../src/common/features/navigation/navigation-target-resolution.ts"],"names":[],"mappings":";;;AAiBA,MAAa,0BAA0B;aACnB,UAAK,GAAG,IAAI,0BAA0B,CAAC,EAAE,CAAC,CAAC;IAE3D,YACa,UAAoB,EACpB,IAAW;QADX,eAAU,GAAV,UAAU,CAAU;QACpB,SAAI,GAAJ,IAAI,CAAO;IACrB,CAAC;;AANR,gEAOC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"progress-service.d.ts","sourceRoot":"","sources":["../../../../src/common/features/progress/progress-service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"progress-service.d.ts","sourceRoot":"","sources":["../../../../src/common/features/progress/progress-service.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnE,eAAO,MAAM,eAAe,eAA4B,CAAC;AAEzD;;GAEG;AACH,MAAM,WAAW,eAAe;IAC5B;;;;;OAKG;IACH,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,eAAe,CAAC;CACpE;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC5B,iCAAiC;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC5B;;;OAGG;IACH,MAAM,CAAC,OAAO,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IACjE;;OAEG;IACH,GAAG,IAAI,IAAI,CAAC;CACf;AAED,qBACa,sBAAuB,YAAW,eAAe;IAE1D,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAE7C,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,eAAe;CAQnE"}
|
|
@@ -27,12 +27,11 @@ exports.DefaultProgressService = exports.ProgressService = void 0;
|
|
|
27
27
|
********************************************************************************/
|
|
28
28
|
const protocol_1 = require("@eclipse-glsp/protocol");
|
|
29
29
|
const inversify_1 = require("inversify");
|
|
30
|
-
const uuid = require("uuid");
|
|
31
30
|
const action_dispatcher_1 = require("../../actions/action-dispatcher");
|
|
32
31
|
exports.ProgressService = Symbol('ProgressService');
|
|
33
32
|
let DefaultProgressService = class DefaultProgressService {
|
|
34
33
|
start(title, options) {
|
|
35
|
-
const progressId =
|
|
34
|
+
const progressId = (0, protocol_1.generateUuid)();
|
|
36
35
|
this.actionDispatcher.dispatch(protocol_1.StartProgressAction.create({ progressId, title, ...options }));
|
|
37
36
|
return {
|
|
38
37
|
update: updateOptions => this.actionDispatcher.dispatch(protocol_1.UpdateProgressAction.create(progressId, updateOptions)),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"progress-service.js","sourceRoot":"","sources":["../../../../src/common/features/progress/progress-service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,
|
|
1
|
+
{"version":3,"file":"progress-service.js","sourceRoot":"","sources":["../../../../src/common/features/progress/progress-service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAoH;AACpH,yCAA+C;AAC/C,uEAAmE;AAEtD,QAAA,eAAe,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;AAyClD,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAI/B,KAAK,CAAC,KAAa,EAAE,OAAyB;QAC1C,MAAM,UAAU,GAAG,IAAA,uBAAY,GAAE,CAAC;QAClC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,8BAAmB,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC,CAAC;QAC9F,OAAO;YACH,MAAM,EAAE,aAAa,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,+BAAoB,CAAC,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;YAC/G,GAAG,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,4BAAiB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;SAClF,CAAC;IACN,CAAC;CACJ,CAAA;AAZY,wDAAsB;AAErB;IADT,IAAA,kBAAM,EAAC,oCAAgB,CAAC;;gEACoB;iCAFpC,sBAAsB;IADlC,IAAA,sBAAU,GAAE;GACA,sBAAsB,CAYlC"}
|
|
@@ -35,7 +35,6 @@ let RequestMarkersHandler = class RequestMarkersHandler {
|
|
|
35
35
|
this.actionKinds = [protocol_1.RequestMarkersAction.KIND];
|
|
36
36
|
}
|
|
37
37
|
async execute(action) {
|
|
38
|
-
var _a;
|
|
39
38
|
let elementIDs = action.elementsIDs;
|
|
40
39
|
if (!this.validator) {
|
|
41
40
|
throw new glsp_server_error_1.GLSPServerError('Cannot compute markers! No implementation for ModelValidator has been bound');
|
|
@@ -44,7 +43,7 @@ let RequestMarkersHandler = class RequestMarkersHandler {
|
|
|
44
43
|
elementIDs = [this.modelState.root.id];
|
|
45
44
|
}
|
|
46
45
|
const modelElements = this.modelState.index.getAll(elementIDs);
|
|
47
|
-
const markers = await this.validator.validate(modelElements,
|
|
46
|
+
const markers = await this.validator.validate(modelElements, action.reason ?? protocol_1.MarkersReason.BATCH);
|
|
48
47
|
return [protocol_1.SetMarkersAction.create(markers)];
|
|
49
48
|
}
|
|
50
49
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-markers-handler.js","sourceRoot":"","sources":["../../../../src/common/features/validation/request-markers-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAuG;AACvG,yCAAyD;AAEzD,qEAAgE;AAChE,sDAAkD;AAClD,uDAAmD;AAG5C,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAA3B;QACH,gBAAW,GAAG,CAAC,+BAAoB,CAAC,IAAI,CAAC,CAAC;IAoB9C,CAAC;IAfG,KAAK,CAAC,OAAO,CAAC,MAA4B
|
|
1
|
+
{"version":3,"file":"request-markers-handler.js","sourceRoot":"","sources":["../../../../src/common/features/validation/request-markers-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAuG;AACvG,yCAAyD;AAEzD,qEAAgE;AAChE,sDAAkD;AAClD,uDAAmD;AAG5C,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAA3B;QACH,gBAAW,GAAG,CAAC,+BAAoB,CAAC,IAAI,CAAC,CAAC;IAoB9C,CAAC;IAfG,KAAK,CAAC,OAAO,CAAC,MAA4B;QACtC,IAAI,UAAU,GAAG,MAAM,CAAC,WAAW,CAAC;QACpC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YAClB,MAAM,IAAI,mCAAe,CAAC,6EAA6E,CAAC,CAAC;QAC7G,CAAC;QAED,IAAI,CAAC,UAAU,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,EAAE,CAAC;YACnG,UAAU,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC3C,CAAC;QAED,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAC/D,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC,MAAM,IAAI,wBAAa,CAAC,KAAK,CAAC,CAAC;QAEnG,OAAO,CAAC,2BAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;IAC9C,CAAC;CACJ,CAAA;AArBY,sDAAqB;AAGM;IAAnC,IAAA,kBAAM,EAAC,gCAAc,CAAC;IAAE,IAAA,oBAAQ,GAAE;;wDAA2B;AAC1C;IAAnB,IAAA,kBAAM,EAAC,wBAAU,CAAC;;yDAAwB;gCAJlC,qBAAqB;IADjC,IAAA,sBAAU,GAAE;GACA,qBAAqB,CAqBjC"}
|
|
@@ -40,9 +40,8 @@ let GModelChangeRoutingPointsOperationHandler = class GModelChangeRoutingPointsO
|
|
|
40
40
|
return this.commandOf(() => this.executeChangeRoutingPoints({ ...operation, newRoutingPoints }));
|
|
41
41
|
}
|
|
42
42
|
hasChanged(element) {
|
|
43
|
-
var _a;
|
|
44
43
|
const knownElement = this.modelState.index.findByClass(element.elementId, graph_1.GEdge);
|
|
45
|
-
if (!knownElement || knownElement.routingPoints.length !==
|
|
44
|
+
if (!knownElement || knownElement.routingPoints.length !== element.newRoutingPoints?.length) {
|
|
46
45
|
return true;
|
|
47
46
|
}
|
|
48
47
|
for (let i = 0; i < knownElement.routingPoints.length; i++) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"change-routing-points-operation-handler.js","sourceRoot":"","sources":["../../../src/common/gmodel/change-routing-points-operation-handler.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;AAElF,+CAA4C;AAC5C,qDAAoH;AACpH,yCAAuC;AAEvC,sDAA0D;AAC1D,yEAAoE;AAG7D,IAAM,yCAAyC,GAA/C,MAAM,yCAA0C,SAAQ,iDAAsB;IAA9E;;QACH,kBAAa,GAAG,uCAA4B,CAAC,IAAI,CAAC;IA2BtD,CAAC;IAzBG,aAAa,CAAC,SAAuC;QACjD,MAAM,gBAAgB,GAAG,SAAS,CAAC,gBAAgB,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAClH,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAChC,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,0BAA0B,CAAC,EAAE,GAAG,SAAS,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC;IACrG,CAAC;IAES,UAAU,CAAC,OAAgC
|
|
1
|
+
{"version":3,"file":"change-routing-points-operation-handler.js","sourceRoot":"","sources":["../../../src/common/gmodel/change-routing-points-operation-handler.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;AAElF,+CAA4C;AAC5C,qDAAoH;AACpH,yCAAuC;AAEvC,sDAA0D;AAC1D,yEAAoE;AAG7D,IAAM,yCAAyC,GAA/C,MAAM,yCAA0C,SAAQ,iDAAsB;IAA9E;;QACH,kBAAa,GAAG,uCAA4B,CAAC,IAAI,CAAC;IA2BtD,CAAC;IAzBG,aAAa,CAAC,SAAuC;QACjD,MAAM,gBAAgB,GAAG,SAAS,CAAC,gBAAgB,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAClH,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAChC,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,0BAA0B,CAAC,EAAE,GAAG,SAAS,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC;IACrG,CAAC;IAES,UAAU,CAAC,OAAgC;QACjD,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,EAAE,aAAK,CAAC,CAAC;QACjF,IAAI,CAAC,YAAY,IAAI,YAAY,CAAC,aAAa,CAAC,MAAM,KAAK,OAAO,CAAC,gBAAgB,EAAE,MAAM,EAAE,CAAC;YAC1F,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACzD,IAAI,CAAC,gBAAK,CAAC,MAAM,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC5E,OAAO,IAAI,CAAC;YAChB,CAAC;QACL,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,0BAA0B,CAAC,SAAuC;QAC9D,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;QACpC,SAAS,CAAC,gBAAgB,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC,IAAA,gCAAkB,EAAC,aAAa,EAAE,KAAK,CAAC,CAAC,CAAC;IAClG,CAAC;CACJ,CAAA;AA5BY,8FAAyC;oDAAzC,yCAAyC;IADrD,IAAA,sBAAU,GAAE;GACA,yCAAyC,CA4BrD"}
|
|
@@ -44,8 +44,7 @@ let GModelCreateNodeOperationHandler = class GModelCreateNodeOperationHandler ex
|
|
|
44
44
|
return this.commandOf(() => this.executeCreation(operation));
|
|
45
45
|
}
|
|
46
46
|
executeCreation(operation) {
|
|
47
|
-
|
|
48
|
-
const container = (_a = this.getContainer(operation)) !== null && _a !== void 0 ? _a : this.modelState.root;
|
|
47
|
+
const container = this.getContainer(operation) ?? this.modelState.root;
|
|
49
48
|
const relativeLocation = this.getRelativeLocation(operation);
|
|
50
49
|
const element = this.createNode(operation, relativeLocation);
|
|
51
50
|
if (element) {
|
|
@@ -95,9 +94,8 @@ let GModelCreateNodeOperationHandler = class GModelCreateNodeOperationHandler ex
|
|
|
95
94
|
* @returns The relative position or `undefined`.
|
|
96
95
|
*/
|
|
97
96
|
getRelativeLocation(operation) {
|
|
98
|
-
|
|
99
|
-
const
|
|
100
|
-
const absoluteLocation = (_b = this.getLocation(operation)) !== null && _b !== void 0 ? _b : protocol_1.Point.ORIGIN;
|
|
97
|
+
const container = this.getContainer(operation) ?? this.modelState.root;
|
|
98
|
+
const absoluteLocation = this.getLocation(operation) ?? protocol_1.Point.ORIGIN;
|
|
101
99
|
return (0, layout_util_1.getRelativeLocation)(absoluteLocation, container);
|
|
102
100
|
}
|
|
103
101
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gmodel-create-node-operation-handler.js","sourceRoot":"","sources":["../../../src/common/gmodel/gmodel-create-node-operation-handler.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAGlF,qDAQgC;AAChC,yCAA+C;AAC/C,oEAAgE;AAGhE,sDAA2D;AAC3D,yEAAoE;AAEpE;;;;GAIG;AAEI,IAAe,gCAAgC,GAA/C,MAAe,gCAAiC,SAAQ,iDAAsB;IAA9E;;QAQe,kBAAa,GAAG,8BAAmB,CAAC,IAAI,CAAC;IAsE/D,CAAC;IApEY,aAAa,CAAC,SAA8B;QACjD,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC;IACjE,CAAC;IAED,eAAe,CAAC,SAA8B
|
|
1
|
+
{"version":3,"file":"gmodel-create-node-operation-handler.js","sourceRoot":"","sources":["../../../src/common/gmodel/gmodel-create-node-operation-handler.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAGlF,qDAQgC;AAChC,yCAA+C;AAC/C,oEAAgE;AAGhE,sDAA2D;AAC3D,yEAAoE;AAEpE;;;;GAIG;AAEI,IAAe,gCAAgC,GAA/C,MAAe,gCAAiC,SAAQ,iDAAsB;IAA9E;;QAQe,kBAAa,GAAG,8BAAmB,CAAC,IAAI,CAAC;IAsE/D,CAAC;IApEY,aAAa,CAAC,SAA8B;QACjD,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC;IACjE,CAAC;IAED,eAAe,CAAC,SAA8B;QAC1C,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QACvE,MAAM,gBAAgB,GAAG,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;QAC7D,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;QAC7D,IAAI,OAAO,EAAE,CAAC;YACV,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACjC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;YAC3B,IAAI,CAAC,gBAAgB,CAAC,uBAAuB,CAAC,uBAAY,CAAC,MAAM,CAAC,EAAE,mBAAmB,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAC9G,CAAC;IACL,CAAC;IAED,iBAAiB;QACb,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC,IAAI,CAAC,+BAA+B,CAAC,aAAa,CAAC,CAAC,CAAC;IACzG,CAAC;IAES,+BAA+B,CAAC,aAAqB;QAC3D,OAAO,oCAAyB,CAAC,MAAM,CAAC,aAAa,EAAE;YACnD,YAAY,EAAE,IAAI,CAAC,yBAAyB,CAAC,aAAa,CAAC;YAC3D,IAAI,EAAE,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC;SAC9C,CAAC,CAAC;IACP,CAAC;IAES,yBAAyB,CAAC,aAAqB;QACrD,OAAO,SAAS,CAAC;IACrB,CAAC;IAES,iBAAiB,CAAC,aAAqB;QAC7C,OAAO,SAAS,CAAC;IACrB,CAAC;IAED;;;;;;;OAOG;IACH,YAAY,CAAC,SAA8B;QACvC,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;QACpC,OAAO,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAChF,CAAC;IAED,WAAW,CAAC,SAA8B;QACtC,OAAO,SAAS,CAAC,QAAQ,CAAC;IAC9B,CAAC;IAED;;;;;;;;;OASG;IACH,mBAAmB,CAAC,SAA8B;QAC9C,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QACvE,MAAM,gBAAgB,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI,gBAAK,CAAC,MAAM,CAAC;QACrE,OAAO,IAAA,iCAAmB,EAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;IAC5D,CAAC;CAGJ,CAAA;AA9EqB,4EAAgC;AAExC;IADT,IAAA,kBAAM,EAAC,oCAAgB,CAAC;;0EACoB;2CAF3B,gCAAgC;IADrD,IAAA,sBAAU,GAAE;GACS,gCAAgC,CA8ErD"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2022-
|
|
2
|
+
* Copyright (c) 2022-2026 STMicroelectronics and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paste-operation-handler.d.ts","sourceRoot":"","sources":["../../../src/common/gmodel/paste-operation-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,YAAY,EAAS,aAAa,EAAkB,MAAM,qBAAqB,CAAC;AACzF,OAAO,EAAE,aAAa,EAAuB,YAAY,EAAE,cAAc,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"paste-operation-handler.d.ts","sourceRoot":"","sources":["../../../src/common/gmodel/paste-operation-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,YAAY,EAAS,aAAa,EAAkB,MAAM,qBAAqB,CAAC;AACzF,OAAO,EAAE,aAAa,EAAuB,YAAY,EAAE,cAAc,EAAE,KAAK,EAAgB,MAAM,wBAAwB,CAAC;AAE/H,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AACvE,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAEpE,qBACa,2BAA4B,SAAQ,sBAAsB;IACnE,aAAa,SAAuB;IAEpC,SAAS,CAAC,QAAQ,CAAC,cAAc,MAAM;IAGvC,SAAS,CAAC,eAAe,EAAE,gBAAgB,CAAC;IAE5C,aAAa,CAAC,SAAS,EAAE,cAAc,GAAG,YAAY,CAAC,OAAO,GAAG,SAAS,CAAC;IAO3E,SAAS,CAAC,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,aAAa,EAAE;IAKhE,SAAS,CAAC,YAAY,CAAC,QAAQ,EAAE,aAAa,EAAE,EAAE,OAAO,EAAE,aAAa,GAAG,YAAY,CAAC,IAAI,CAAC;IAU7F,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,aAAa,EAAE,EAAE,iBAAiB,CAAC,EAAE,KAAK,GAAG,KAAK;IAapF,SAAS,CAAC,iCAAiC,CAAC,QAAQ,EAAE,aAAa,EAAE,GAAG,YAAY,GAAG,SAAS;IAehG,SAAS,CAAC,WAAW,CAAC,QAAQ,EAAE,aAAa,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IAcrE,SAAS,CAAC,cAAc,CAAC,QAAQ,EAAE,aAAa,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI;IAIrF,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO;IAI3F,SAAS,CAAC,WAAW,CAAC,QAAQ,EAAE,aAAa,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI;CAarF;AAED,wBAAgB,KAAK,CAAC,QAAQ,EAAE,aAAa,EAAE,EAAE,MAAM,EAAE,KAAK,GAAG,IAAI,CAQpE"}
|
|
@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.GModelPasteOperationHandler = void 0;
|
|
13
13
|
exports.shift = shift;
|
|
14
14
|
/********************************************************************************
|
|
15
|
-
* Copyright (c) 2022-
|
|
15
|
+
* Copyright (c) 2022-2026 STMicroelectronics and others.
|
|
16
16
|
*
|
|
17
17
|
* This program and the accompanying materials are made available under the
|
|
18
18
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -29,7 +29,6 @@ exports.shift = shift;
|
|
|
29
29
|
const graph_1 = require("@eclipse-glsp/graph");
|
|
30
30
|
const protocol_1 = require("@eclipse-glsp/protocol");
|
|
31
31
|
const inversify_1 = require("inversify");
|
|
32
|
-
const uuid = require("uuid");
|
|
33
32
|
const gmodel_serializer_1 = require("../features/model/gmodel-serializer");
|
|
34
33
|
const gmodel_operation_handler_1 = require("./gmodel-operation-handler");
|
|
35
34
|
let GModelPasteOperationHandler = class GModelPasteOperationHandler extends gmodel_operation_handler_1.GModelOperationHandler {
|
|
@@ -56,12 +55,11 @@ let GModelPasteOperationHandler = class GModelPasteOperationHandler extends gmod
|
|
|
56
55
|
this.modelState.root.children.push(...elements);
|
|
57
56
|
}
|
|
58
57
|
computeOffset(elements, lastMousePosition) {
|
|
59
|
-
var _a;
|
|
60
58
|
const offset = { x: this.DEFAULT_OFFSET, y: this.DEFAULT_OFFSET };
|
|
61
59
|
if (lastMousePosition) {
|
|
62
60
|
const referenceElement = this.getReferenceElementForPasteOffset(elements);
|
|
63
61
|
if (referenceElement) {
|
|
64
|
-
const position =
|
|
62
|
+
const position = referenceElement.position ?? protocol_1.Point.ORIGIN;
|
|
65
63
|
offset.x = lastMousePosition.x - position.x;
|
|
66
64
|
offset.y = lastMousePosition.y - position.y;
|
|
67
65
|
}
|
|
@@ -69,23 +67,23 @@ let GModelPasteOperationHandler = class GModelPasteOperationHandler extends gmod
|
|
|
69
67
|
return offset;
|
|
70
68
|
}
|
|
71
69
|
getReferenceElementForPasteOffset(elements) {
|
|
72
|
-
var _a;
|
|
73
70
|
let minY = Number.MAX_VALUE;
|
|
71
|
+
let referenceElement;
|
|
74
72
|
for (const element of elements) {
|
|
75
73
|
if ((0, graph_1.isGBoundsAware)(element)) {
|
|
76
|
-
const position =
|
|
74
|
+
const position = element.position ?? protocol_1.Point.ORIGIN;
|
|
77
75
|
if (minY > position.y) {
|
|
78
76
|
minY = position.y;
|
|
79
|
-
|
|
77
|
+
referenceElement = element;
|
|
80
78
|
}
|
|
81
79
|
}
|
|
82
80
|
}
|
|
83
|
-
return
|
|
81
|
+
return referenceElement;
|
|
84
82
|
}
|
|
85
83
|
reassignIds(elements) {
|
|
86
84
|
const idMap = new Map();
|
|
87
85
|
elements.forEach(element => {
|
|
88
|
-
const newId =
|
|
86
|
+
const newId = (0, protocol_1.generateUuid)();
|
|
89
87
|
idMap.set(element.id, newId);
|
|
90
88
|
element.id = newId;
|
|
91
89
|
const childMap = this.reassignIds(element.children);
|
|
@@ -128,8 +126,7 @@ function shift(elements, offset) {
|
|
|
128
126
|
.filter(element => (0, graph_1.isGBoundsAware)(element))
|
|
129
127
|
.map(element => element)
|
|
130
128
|
.forEach(gBoundsAware => {
|
|
131
|
-
|
|
132
|
-
const position = (_a = gBoundsAware.position) !== null && _a !== void 0 ? _a : protocol_1.Point.ORIGIN;
|
|
129
|
+
const position = gBoundsAware.position ?? protocol_1.Point.ORIGIN;
|
|
133
130
|
gBoundsAware.position = { x: position.x + offset.x, y: position.y + offset.y };
|
|
134
131
|
});
|
|
135
132
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paste-operation-handler.js","sourceRoot":"","sources":["../../../src/common/gmodel/paste-operation-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAsHA,sBAQC;AA9HD;;;;;;;;;;;;;;kFAckF;AAClF,+CAAyF;AACzF,
|
|
1
|
+
{"version":3,"file":"paste-operation-handler.js","sourceRoot":"","sources":["../../../src/common/gmodel/paste-operation-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAsHA,sBAQC;AA9HD;;;;;;;;;;;;;;kFAckF;AAClF,+CAAyF;AACzF,qDAA+H;AAC/H,yCAA+C;AAE/C,2EAAuE;AACvE,yEAAoE;AAG7D,IAAM,2BAA2B,GAAjC,MAAM,2BAA4B,SAAQ,iDAAsB;IAAhE;;QACH,kBAAa,GAAG,yBAAc,CAAC,IAAI,CAAC;QAEjB,mBAAc,GAAG,EAAE,CAAC;IA0F3C,CAAC;IArFG,aAAa,CAAC,SAAyB;QACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAC,CAAC;QACrF,OAAO,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE;YACzB,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,SAAS,CAAC,aAAa,CAAC,CAAC;YAC5E,CAAC,CAAC,SAAS,CAAC;IACpB,CAAC;IAES,iBAAiB,CAAC,UAAkB;QAC1C,MAAM,OAAO,GAA0B,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAC9D,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;IACnG,CAAC;IAES,YAAY,CAAC,QAAyB,EAAE,OAAsB;QACpE,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC;QAEzE,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QACzC,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QACrC,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QAElC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;IACpD,CAAC;IAES,aAAa,CAAC,QAAyB,EAAE,iBAAyB;QACxE,MAAM,MAAM,GAAG,EAAE,CAAC,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC;QAClE,IAAI,iBAAiB,EAAE,CAAC;YACpB,MAAM,gBAAgB,GAAG,IAAI,CAAC,iCAAiC,CAAC,QAAQ,CAAC,CAAC;YAC1E,IAAI,gBAAgB,EAAE,CAAC;gBACnB,MAAM,QAAQ,GAAG,gBAAgB,CAAC,QAAQ,IAAI,gBAAK,CAAC,MAAM,CAAC;gBAC3D,MAAM,CAAC,CAAC,GAAG,iBAAiB,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC;gBAC5C,MAAM,CAAC,CAAC,GAAG,iBAAiB,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC;YAChD,CAAC;QACL,CAAC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAES,iCAAiC,CAAC,QAAyB;QACjE,IAAI,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC;QAC5B,IAAI,gBAA0C,CAAC;QAC/C,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC7B,IAAI,IAAA,sBAAc,EAAC,OAAO,CAAC,EAAE,CAAC;gBAC1B,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,gBAAK,CAAC,MAAM,CAAC;gBAClD,IAAI,IAAI,GAAG,QAAQ,CAAC,CAAC,EAAE,CAAC;oBACpB,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC;oBAClB,gBAAgB,GAAG,OAAO,CAAC;gBAC/B,CAAC;YACL,CAAC;QACL,CAAC;QACD,OAAO,gBAAgB,CAAC;IAC5B,CAAC;IAES,WAAW,CAAC,QAAyB;QAC3C,MAAM,KAAK,GAAG,IAAI,GAAG,EAAkB,CAAC;QACxC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YACvB,MAAM,KAAK,GAAG,IAAA,uBAAY,GAAE,CAAC;YAC7B,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;YAC7B,OAAO,CAAC,EAAE,GAAG,KAAK,CAAC;YACnB,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YACpD,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;gBAC5B,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YAC1B,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QACH,OAAO,KAAK,CAAC;IACjB,CAAC;IAES,cAAc,CAAC,QAAyB,EAAE,KAA0B;QAC1E,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;IAC/D,CAAC;IAES,oBAAoB,CAAC,OAAsB,EAAE,KAA0B;QAC7E,OAAO,KAAK,CAAC;IACjB,CAAC;IAES,WAAW,CAAC,QAAyB,EAAE,KAA0B;QACvE,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,YAAY,aAAK,CAAY,CAAC;QAC9E,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACjB,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC1C,IAAI,QAAQ,EAAE,CAAC;gBACX,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;YAC7B,CAAC;YACD,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC1C,IAAI,QAAQ,EAAE,CAAC;gBACX,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;YAC7B,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;CACJ,CAAA;AA7FY,kEAA2B;AAM1B;IADT,IAAA,kBAAM,EAAC,oCAAgB,CAAC;;oEACmB;sCANnC,2BAA2B;IADvC,IAAA,sBAAU,GAAE;GACA,2BAA2B,CA6FvC;AAED,SAAgB,KAAK,CAAC,QAAyB,EAAE,MAAa;IAC1D,QAAQ;SACH,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,IAAA,sBAAc,EAAC,OAAO,CAAC,CAAC;SAC1C,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,OAAkC,CAAC;SAClD,OAAO,CAAC,YAAY,CAAC,EAAE;QACpB,MAAM,QAAQ,GAAG,YAAY,CAAC,QAAQ,IAAI,gBAAK,CAAC,MAAM,CAAC;QACvD,YAAY,CAAC,QAAQ,GAAG,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,EAAE,CAAC;IACnF,CAAC,CAAC,CAAC;AACX,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2022-
|
|
2
|
+
* Copyright (c) 2022-2026 STMicroelectronics and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -26,6 +26,13 @@ export declare abstract class GLSPServerLauncher<T> implements Disposable {
|
|
|
26
26
|
configure(serverModule: ServerModule, ...additionalModules: ContainerModule[]): void;
|
|
27
27
|
createContainer(...additionalModules: ContainerModule[]): Container;
|
|
28
28
|
start(startParams: T): MaybePromise<void>;
|
|
29
|
+
/**
|
|
30
|
+
* Registers what {@link shutdown} has to release for the launch that is about to start.
|
|
31
|
+
*
|
|
32
|
+
* Called once per launch, because {@link dispose} empties the collection it registers into. A subclass that holds
|
|
33
|
+
* resources for the duration of a launch overrides this instead of registering them in its constructor.
|
|
34
|
+
*/
|
|
35
|
+
protected registerDisposables(): void;
|
|
29
36
|
protected abstract run(startParams: T): MaybePromise<void>;
|
|
30
37
|
shutdown(): MaybePromise<void>;
|
|
31
38
|
protected stop(): MaybePromise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"glsp-server-launcher.d.ts","sourceRoot":"","sources":["../../../src/common/launch/glsp-server-launcher.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACxF,OAAO,EAAE,SAAS,EAAE,eAAe,EAAgC,MAAM,WAAW,CAAC;AACrF,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,8BACsB,kBAAkB,CAAC,CAAC,CAAE,YAAW,UAAU;IAC7C,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IAEzC,SAAS,CAAC,QAAQ,EAAE,eAAe,EAAE,CAAM;IAC3C,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC;IAC3B,SAAS,CAAC,SAAS,uBAA8B;IAET,SAAS,CAAC,eAAe,CAAC,EAAE,SAAS,CAAC;IAE9E,SAAS,CAAC,YAAY,EAAE,YAAY,EAAE,GAAG,iBAAiB,EAAE,eAAe,EAAE,GAAG,IAAI;IAIpF,eAAe,CAAC,GAAG,iBAAiB,EAAE,eAAe,EAAE,GAAG,SAAS;IAMnE,KAAK,CAAC,WAAW,EAAE,CAAC,GAAG,YAAY,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"glsp-server-launcher.d.ts","sourceRoot":"","sources":["../../../src/common/launch/glsp-server-launcher.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACxF,OAAO,EAAE,SAAS,EAAE,eAAe,EAAgC,MAAM,WAAW,CAAC;AACrF,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,8BACsB,kBAAkB,CAAC,CAAC,CAAE,YAAW,UAAU;IAC7C,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IAEzC,SAAS,CAAC,QAAQ,EAAE,eAAe,EAAE,CAAM;IAC3C,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC;IAC3B,SAAS,CAAC,SAAS,uBAA8B;IAET,SAAS,CAAC,eAAe,CAAC,EAAE,SAAS,CAAC;IAE9E,SAAS,CAAC,YAAY,EAAE,YAAY,EAAE,GAAG,iBAAiB,EAAE,eAAe,EAAE,GAAG,IAAI;IAIpF,eAAe,CAAC,GAAG,iBAAiB,EAAE,eAAe,EAAE,GAAG,SAAS;IAMnE,KAAK,CAAC,WAAW,EAAE,CAAC,GAAG,YAAY,CAAC,IAAI,CAAC;IASzC;;;;;OAKG;IACH,SAAS,CAAC,mBAAmB,IAAI,IAAI;IAIrC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,GAAG,YAAY,CAAC,IAAI,CAAC;IAE1D,QAAQ,IAAI,YAAY,CAAC,IAAI,CAAC;IAU9B,SAAS,CAAC,IAAI,IAAI,YAAY,CAAC,IAAI,CAAC;IAIpC,OAAO,IAAI,IAAI;IAIf,IAAI,OAAO,IAAI,eAAe,EAAE,CAK/B;CACJ"}
|
|
@@ -11,7 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.GLSPServerLauncher = void 0;
|
|
13
13
|
/********************************************************************************
|
|
14
|
-
* Copyright (c) 2022-
|
|
14
|
+
* Copyright (c) 2022-2026 STMicroelectronics and others.
|
|
15
15
|
*
|
|
16
16
|
* This program and the accompanying materials are made available under the
|
|
17
17
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -45,10 +45,20 @@ let GLSPServerLauncher = class GLSPServerLauncher {
|
|
|
45
45
|
start(startParams) {
|
|
46
46
|
if (!this.running) {
|
|
47
47
|
this.running = true;
|
|
48
|
+
this.registerDisposables();
|
|
48
49
|
return this.run(startParams);
|
|
49
50
|
}
|
|
50
51
|
this.logger.warn('Could not start launcher. Launcher is already running!');
|
|
51
52
|
}
|
|
53
|
+
/**
|
|
54
|
+
* Registers what {@link shutdown} has to release for the launch that is about to start.
|
|
55
|
+
*
|
|
56
|
+
* Called once per launch, because {@link dispose} empties the collection it registers into. A subclass that holds
|
|
57
|
+
* resources for the duration of a launch overrides this instead of registering them in its constructor.
|
|
58
|
+
*/
|
|
59
|
+
registerDisposables() {
|
|
60
|
+
// nothing to release by default
|
|
61
|
+
}
|
|
52
62
|
shutdown() {
|
|
53
63
|
if (this.running) {
|
|
54
64
|
this.logger.info('Shutdown GLSPServerLauncher');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"glsp-server-launcher.js","sourceRoot":"","sources":["../../../src/common/launch/glsp-server-launcher.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAwF;AACxF,yCAAqF;AAErF,mEAA+D;AAC/D,4CAAyC;AAGlC,IAAe,kBAAkB,GAAjC,MAAe,kBAAkB;IAAjC;QAGO,aAAQ,GAAsB,EAAE,CAAC;QAEjC,cAAS,GAAG,IAAI,+BAAoB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"glsp-server-launcher.js","sourceRoot":"","sources":["../../../src/common/launch/glsp-server-launcher.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAwF;AACxF,yCAAqF;AAErF,mEAA+D;AAC/D,4CAAyC;AAGlC,IAAe,kBAAkB,GAAjC,MAAe,kBAAkB;IAAjC;QAGO,aAAQ,GAAsB,EAAE,CAAC;QAEjC,cAAS,GAAG,IAAI,+BAAoB,EAAE,CAAC;IA2DrD,CAAC;IAvDG,SAAS,CAAC,YAA0B,EAAE,GAAG,iBAAoC;QACzE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,EAAE,GAAG,iBAAiB,CAAC,CAAC;IAC3D,CAAC;IAED,eAAe,CAAC,GAAG,iBAAoC;QACnD,MAAM,SAAS,GAAG,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,IAAI,qBAAS,EAAE,CAAC;QAC9F,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,EAAE,GAAG,iBAAiB,CAAC,CAAC;QACvD,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,WAAc;QAChB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAChB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;YACpB,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC3B,OAAO,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QACjC,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,wDAAwD,CAAC,CAAC;IAC/E,CAAC;IAED;;;;;OAKG;IACO,mBAAmB;QACzB,gCAAgC;IACpC,CAAC;IAID,QAAQ;QACJ,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;YAChD,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;YAC3B,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;YACrB,OAAO,MAAM,CAAC;QAClB,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mDAAmD,CAAC,CAAC;IAC1E,CAAC;IAES,IAAI;QACV,IAAI,CAAC,OAAO,EAAE,CAAC;IACnB,CAAC;IAED,OAAO;QACH,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAED,IAAI,OAAO;QACP,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;QAC1E,CAAC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;CACJ,CAAA;AAhEqB,gDAAkB;AACV;IAAzB,IAAA,kBAAM,EAAC,eAAM,CAAC;8BAAmB,eAAM;kDAAC;AAMS;IAAjD,IAAA,kBAAM,EAAC,wCAAkB,CAAC;IAAE,IAAA,oBAAQ,GAAE;8BAA6B,qBAAS;2DAAC;6BAP5D,kBAAkB;IADvC,IAAA,sBAAU,GAAE;GACS,kBAAkB,CAgEvC"}
|
|
@@ -13,8 +13,9 @@
|
|
|
13
13
|
*
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
|
-
import { GLSPClientProxy, GLSPServer } from '@eclipse-glsp/protocol';
|
|
16
|
+
import { Deferred, GLSPClientProxy, GLSPServer } from '@eclipse-glsp/protocol';
|
|
17
17
|
import { Container, ContainerModule } from 'inversify';
|
|
18
|
+
import * as net from 'net';
|
|
18
19
|
import * as jsonrpc from 'vscode-jsonrpc';
|
|
19
20
|
import { Logger } from '../utils/logger';
|
|
20
21
|
import { GLSPServerLauncher } from './glsp-server-launcher';
|
|
@@ -28,7 +29,55 @@ export declare abstract class JsonRpcGLSPServerLauncher<T> extends GLSPServerLau
|
|
|
28
29
|
protected logger: Logger;
|
|
29
30
|
protected serverInstances: Map<jsonrpc.MessageConnection, JsonRpcServerInstance>;
|
|
30
31
|
protected startupCompleteMessage: string;
|
|
31
|
-
|
|
32
|
+
protected listeningAddress: Deferred<net.AddressInfo>;
|
|
33
|
+
/**
|
|
34
|
+
* Resolves with the address the server bound to once it is listening, and rejects if it never gets there.
|
|
35
|
+
*
|
|
36
|
+
* Launching with port `0` lets the operating system pick a free port, so the bound address is not necessarily the
|
|
37
|
+
* requested one. Settles once per launch and keeps that value, so use {@link port} for the current state. Reading
|
|
38
|
+
* this before {@link start} is fine, the promise handed out is the one that launch settles.
|
|
39
|
+
*/
|
|
40
|
+
get listening(): Promise<net.AddressInfo>;
|
|
41
|
+
/**
|
|
42
|
+
* The port the server is currently listening on, or `undefined` if it is not.
|
|
43
|
+
*
|
|
44
|
+
* Await {@link listening} rather than polling this while the server is still starting up.
|
|
45
|
+
*/
|
|
46
|
+
get port(): number | undefined;
|
|
47
|
+
/**
|
|
48
|
+
* The socket that {@link port} reports on, or `undefined` before the first launch.
|
|
49
|
+
*
|
|
50
|
+
* A launcher that binds a socket overrides this, the default reports no address at all.
|
|
51
|
+
*/
|
|
52
|
+
protected getServerSocket(): net.Server | undefined;
|
|
53
|
+
/**
|
|
54
|
+
* Arms {@link listening} for a launch.
|
|
55
|
+
*
|
|
56
|
+
* An unresolved promise is kept, so a caller that grabbed {@link listening} before {@link start} gets the one this
|
|
57
|
+
* launch settles. A settled one is replaced, so a restart is not handed the previous result.
|
|
58
|
+
*/
|
|
59
|
+
protected resetListening(): void;
|
|
60
|
+
/**
|
|
61
|
+
* Resolves {@link listening} with the address the given server bound to.
|
|
62
|
+
*
|
|
63
|
+
* @param server The server that reported itself as listening.
|
|
64
|
+
* @returns The bound address, or `undefined` if it cannot be used, in which case the launcher is shut down.
|
|
65
|
+
*/
|
|
66
|
+
protected settleListening(server: net.Server): net.AddressInfo | undefined;
|
|
67
|
+
/**
|
|
68
|
+
* Invoked when the server socket fails, e.g. because the requested port is already in use.
|
|
69
|
+
*
|
|
70
|
+
* @param error The reason the socket failed.
|
|
71
|
+
*/
|
|
72
|
+
protected handleError(error: Error): void;
|
|
73
|
+
/**
|
|
74
|
+
* Reports that the server will not accept requests, rejects {@link listening} and shuts the launcher down.
|
|
75
|
+
*
|
|
76
|
+
* @param message The reason the server is not usable.
|
|
77
|
+
* @param cause The underlying error, if the reason was one.
|
|
78
|
+
*/
|
|
79
|
+
protected failToListen(message: string, cause?: Error): void;
|
|
80
|
+
protected registerDisposables(): void;
|
|
32
81
|
protected disposeServerInstance(instance: JsonRpcServerInstance): void;
|
|
33
82
|
protected createServerInstance(clientConnection: jsonrpc.MessageConnection): void;
|
|
34
83
|
protected createJsonRpcModule(clientConnection: jsonrpc.MessageConnection): ContainerModule;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jsonrpc-server-launcher.d.ts","sourceRoot":"","sources":["../../../src/common/launch/jsonrpc-server-launcher.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,
|
|
1
|
+
{"version":3,"file":"jsonrpc-server-launcher.d.ts","sourceRoot":"","sources":["../../../src/common/launch/jsonrpc-server-launcher.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EACH,QAAQ,EAER,eAAe,EACf,UAAU,EAIb,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,eAAe,EAAsB,MAAM,WAAW,CAAC;AAC3E,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D,eAAO,MAAM,qBAAqB,iEAAiE,CAAC;AAEpG,MAAM,WAAW,qBAAqB;IAClC,MAAM,EAAE,UAAU,CAAC;IACnB,gBAAgB,EAAE,OAAO,CAAC,iBAAiB,CAAC;IAC5C,SAAS,EAAE,SAAS,CAAC;CACxB;AAED,8BACsB,yBAAyB,CAAC,CAAC,CAAE,SAAQ,kBAAkB,CAAC,CAAC,CAAC;IAC5E,UACmB,MAAM,EAAE,MAAM,CAAC;IAElC,SAAS,CAAC,eAAe,wDAA+D;IACxF,SAAS,CAAC,sBAAsB,SAAyB;IAEzD,SAAS,CAAC,gBAAgB,4BAAmC;IAE7D;;;;;;OAMG;IACH,IAAI,SAAS,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAExC;IAED;;;;OAIG;IACH,IAAI,IAAI,IAAI,MAAM,GAAG,SAAS,CAG7B;IAED;;;;OAIG;IACH,SAAS,CAAC,eAAe,IAAI,GAAG,CAAC,MAAM,GAAG,SAAS;IAInD;;;;;OAKG;IACH,SAAS,CAAC,cAAc,IAAI,IAAI;IAMhC;;;;;OAKG;IACH,SAAS,CAAC,eAAe,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,WAAW,GAAG,SAAS;IAc1E;;;;OAIG;IACH,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAIzC;;;;;OAKG;IACH,SAAS,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI;cAMzC,mBAAmB,IAAI,IAAI;IAS9C,SAAS,CAAC,qBAAqB,CAAC,QAAQ,EAAE,qBAAqB,GAAG,IAAI;IAOtE,SAAS,CAAC,oBAAoB,CAAC,gBAAgB,EAAE,OAAO,CAAC,iBAAiB,GAAG,IAAI;IAQjF,SAAS,CAAC,mBAAmB,CAAC,gBAAgB,EAAE,OAAO,CAAC,iBAAiB,GAAG,eAAe;IAU3F,SAAS,CAAC,yBAAyB,CAAC,cAAc,EAAE,qBAAqB,GAAG,IAAI;IAahF,SAAS,CAAC,iBAAiB,CAAC,cAAc,EAAE,qBAAqB,GAAG,eAAe;CAKtF"}
|