@eclipse-glsp/client 0.10.0-next.5dad48d.159 → 0.10.0-next.6715f8e.162

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.
Files changed (13) hide show
  1. package/lib/base/model-initialization-constraint.d.ts +2 -2
  2. package/lib/base/model-initialization-constraint.d.ts.map +1 -1
  3. package/lib/base/model-initialization-constraint.js +7 -8
  4. package/lib/base/model-initialization-constraint.js.map +1 -1
  5. package/lib/features/tool-feedback/feedback-action-dispatcher.d.ts +2 -2
  6. package/lib/features/tools/base-glsp-tool.d.ts +3 -3
  7. package/lib/features/tools/base-glsp-tool.d.ts.map +1 -1
  8. package/lib/features/tools/base-glsp-tool.js +5 -5
  9. package/lib/features/tools/base-glsp-tool.js.map +1 -1
  10. package/package.json +3 -3
  11. package/src/base/model-initialization-constraint.ts +8 -9
  12. package/src/features/tool-feedback/feedback-action-dispatcher.ts +2 -2
  13. package/src/features/tools/base-glsp-tool.ts +7 -7
package/lib/base/model-initialization-constraint.d.ts CHANGED
@@ -47,8 +47,8 @@ export declare abstract class ModelInitializationConstraint {
47
47
  * and a subsequent `InitializeCanvasBoundsAction`.
48
48
  */
49
49
  export declare class DefaultModelInitializationConstraint extends ModelInitializationConstraint {
50
- protected seenNonEmptyUpdateModel: boolean;
50
+ protected seenNonEmptyModelAction: boolean;
51
51
  isInitializedAfter(action: Action): boolean;
52
- protected isNonEmptyUpdateModel(action: Action): boolean;
52
+ protected isNonEmptyModelAction(action: Action): boolean;
53
53
  }
54
54
  //# sourceMappingURL=model-initialization-constraint.d.ts.map
package/lib/base/model-initialization-constraint.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"model-initialization-constraint.d.ts","sourceRoot":"","sources":["../../src/base/model-initialization-constraint.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAqB,MAAM,wBAAwB,CAAC;AAGnE,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAEnD;;;;;;;;;;;;;;;;;GAiBG;AACH,8BACsB,6BAA6B;IAC/C,SAAS,CAAC,UAAU,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAkB;IACtD,SAAS,CAAC,SAAS,UAAS;IAE5B,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED,SAAS,CAAC,YAAY,CAAC,WAAW,EAAE,OAAO,GAAG,IAAI;IAOlD,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAStC,QAAQ,CAAC,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;CACvD;AAED;;;GAGG;AACH,qBACa,oCAAqC,SAAQ,6BAA6B;IACnF,SAAS,CAAC,uBAAuB,UAAS;IAE1C,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAS3C,SAAS,CAAC,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;CAO3D"}
1
+ {"version":3,"file":"model-initialization-constraint.d.ts","sourceRoot":"","sources":["../../src/base/model-initialization-constraint.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAyC,MAAM,wBAAwB,CAAC;AAGvF,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAEnD;;;;;;;;;;;;;;;;;GAiBG;AACH,8BACsB,6BAA6B;IAC/C,SAAS,CAAC,UAAU,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAkB;IACtD,SAAS,CAAC,SAAS,UAAS;IAE5B,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED,SAAS,CAAC,YAAY,CAAC,WAAW,EAAE,OAAO,GAAG,IAAI;IAOlD,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAStC,QAAQ,CAAC,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;CACvD;AAED;;;GAGG;AACH,qBACa,oCAAqC,SAAQ,6BAA6B;IACnF,SAAS,CAAC,uBAAuB,UAAS;IAE1C,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAS3C,SAAS,CAAC,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;CAM3D"}
package/lib/base/model-initialization-constraint.js CHANGED
@@ -81,21 +81,20 @@ exports.ModelInitializationConstraint = ModelInitializationConstraint;
81
81
  let DefaultModelInitializationConstraint = class DefaultModelInitializationConstraint extends ModelInitializationConstraint {
82
82
  constructor() {
83
83
  super(...arguments);
84
- this.seenNonEmptyUpdateModel = false;
84
+ this.seenNonEmptyModelAction = false;
85
85
  }
86
86
  isInitializedAfter(action) {
87
- if (this.isNonEmptyUpdateModel(action)) {
88
- this.seenNonEmptyUpdateModel = true;
87
+ if (this.isNonEmptyModelAction(action)) {
88
+ this.seenNonEmptyModelAction = true;
89
89
  }
90
- else if (this.seenNonEmptyUpdateModel && action.kind === sprotty_1.InitializeCanvasBoundsAction.KIND) {
90
+ else if (this.seenNonEmptyModelAction && action.kind === sprotty_1.InitializeCanvasBoundsAction.KIND) {
91
91
  return true;
92
92
  }
93
93
  return false;
94
94
  }
95
- isNonEmptyUpdateModel(action) {
96
- if (action && action.kind === protocol_1.UpdateModelAction.KIND) {
97
- const updateModelAction = action;
98
- return updateModelAction.newRoot !== undefined && updateModelAction.newRoot.type !== 'NONE';
95
+ isNonEmptyModelAction(action) {
96
+ if (protocol_1.isSetModelAction(action) || protocol_1.isUpdateModelAction(action)) {
97
+ return action.newRoot.type !== 'NONE';
99
98
  }
100
99
  return false;
101
100
  }
package/lib/base/model-initialization-constraint.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"model-initialization-constraint.js","sourceRoot":"","sources":["../../src/base/model-initialization-constraint.ts"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAmE;AACnE,yCAAuC;AACvC,qCAAuD;AACvD,mDAAmD;AAEnD;;;;;;;;;;;;;;;;;GAiBG;AAEH,IAAsB,6BAA6B,GAAnD,MAAsB,6BAA6B;IAAnD;QACc,eAAU,GAAmB,IAAI,gBAAQ,EAAE,CAAC;QAC5C,cAAS,GAAG,KAAK,CAAC;IA2BhC,CAAC;IAzBG,IAAI,WAAW;QACX,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAES,YAAY,CAAC,WAAoB;QACvC,IAAI,CAAC,SAAS,GAAG,WAAW,CAAC;QAC7B,IAAI,WAAW,EAAE;YACb,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;SAC7B;IACL,CAAC;IAED,aAAa;QACT,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;IACnC,CAAC;IAED,gBAAgB,CAAC,MAAc;QAC3B,IAAI,IAAI,CAAC,WAAW,EAAE;YAClB,OAAO;SACV;QACD,IAAI,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE;YACjC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;SAC3B;IACL,CAAC;CAGJ,CAAA;AA7BqB,6BAA6B;IADlD,sBAAU,EAAE;GACS,6BAA6B,CA6BlD;AA7BqB,sEAA6B;AA+BnD;;;GAGG;AAEH,IAAa,oCAAoC,GAAjD,MAAa,oCAAqC,SAAQ,6BAA6B;IAAvF;;QACc,4BAAuB,GAAG,KAAK,CAAC;IAkB9C,CAAC;IAhBG,kBAAkB,CAAC,MAAc;QAC7B,IAAI,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE;YACpC,IAAI,CAAC,uBAAuB,GAAG,IAAI,CAAC;SACvC;aAAM,IAAI,IAAI,CAAC,uBAAuB,IAAI,MAAM,CAAC,IAAI,KAAK,sCAA4B,CAAC,IAAI,EAAE;YAC1F,OAAO,IAAI,CAAC;SACf;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAES,qBAAqB,CAAC,MAAc;QAC1C,IAAI,MAAM,IAAI,MAAM,CAAC,IAAI,KAAK,4BAAiB,CAAC,IAAI,EAAE;YAClD,MAAM,iBAAiB,GAAG,MAA2B,CAAC;YACtD,OAAO,iBAAiB,CAAC,OAAO,KAAK,SAAS,IAAI,iBAAiB,CAAC,OAAO,CAAC,IAAI,KAAK,MAAM,CAAC;SAC/F;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ,CAAA;AAnBY,oCAAoC;IADhD,sBAAU,EAAE;GACA,oCAAoC,CAmBhD;AAnBY,oFAAoC"}
1
+ {"version":3,"file":"model-initialization-constraint.js","sourceRoot":"","sources":["../../src/base/model-initialization-constraint.ts"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAuF;AACvF,yCAAuC;AACvC,qCAAuD;AACvD,mDAAmD;AAEnD;;;;;;;;;;;;;;;;;GAiBG;AAEH,IAAsB,6BAA6B,GAAnD,MAAsB,6BAA6B;IAAnD;QACc,eAAU,GAAmB,IAAI,gBAAQ,EAAE,CAAC;QAC5C,cAAS,GAAG,KAAK,CAAC;IA2BhC,CAAC;IAzBG,IAAI,WAAW;QACX,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAES,YAAY,CAAC,WAAoB;QACvC,IAAI,CAAC,SAAS,GAAG,WAAW,CAAC;QAC7B,IAAI,WAAW,EAAE;YACb,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;SAC7B;IACL,CAAC;IAED,aAAa;QACT,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;IACnC,CAAC;IAED,gBAAgB,CAAC,MAAc;QAC3B,IAAI,IAAI,CAAC,WAAW,EAAE;YAClB,OAAO;SACV;QACD,IAAI,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE;YACjC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;SAC3B;IACL,CAAC;CAGJ,CAAA;AA7BqB,6BAA6B;IADlD,sBAAU,EAAE;GACS,6BAA6B,CA6BlD;AA7BqB,sEAA6B;AA+BnD;;;GAGG;AAEH,IAAa,oCAAoC,GAAjD,MAAa,oCAAqC,SAAQ,6BAA6B;IAAvF;;QACc,4BAAuB,GAAG,KAAK,CAAC;IAiB9C,CAAC;IAfG,kBAAkB,CAAC,MAAc;QAC7B,IAAI,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE;YACpC,IAAI,CAAC,uBAAuB,GAAG,IAAI,CAAC;SACvC;aAAM,IAAI,IAAI,CAAC,uBAAuB,IAAI,MAAM,CAAC,IAAI,KAAK,sCAA4B,CAAC,IAAI,EAAE;YAC1F,OAAO,IAAI,CAAC;SACf;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAES,qBAAqB,CAAC,MAAc;QAC1C,IAAI,2BAAgB,CAAC,MAAM,CAAC,IAAI,8BAAmB,CAAC,MAAM,CAAC,EAAE;YACzD,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,KAAK,MAAM,CAAC;SACzC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ,CAAA;AAlBY,oCAAoC;IADhD,sBAAU,EAAE;GACA,oCAAoC,CAkBhD;AAlBY,oFAAoC"}
package/lib/features/tool-feedback/feedback-action-dispatcher.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  /********************************************************************************
2
- * Copyright (c) 2019-2021 EclipseSource and others.
2
+ * Copyright (c) 2019-2022 EclipseSource 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
@@ -28,7 +28,7 @@ export interface IFeedbackEmitter {
28
28
  * extending the `SModelRoot`. Therefore, tools can register themselves
29
29
  * as feedback emitters with actions they want to place for showing
30
30
  * feedback. This dispatcher will then re-establish all feedback actions
31
- * of the registered tools, whenever the `SModelRoot` has been set or updated.
31
+ * of the registered emitters, whenever the `SModelRoot` has been set or updated.
32
32
  */
33
33
  export interface IFeedbackActionDispatcher {
34
34
  /**
package/lib/features/tools/base-glsp-tool.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  /********************************************************************************
2
- * Copyright (c) 2020-2021 EclipseSource and others.
2
+ * Copyright (c) 2020-2022 EclipseSource 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
@@ -29,8 +29,8 @@ export declare abstract class BaseGLSPTool implements GLSPTool {
29
29
  abstract disable(): void;
30
30
  abstract id: string;
31
31
  get isEditTool(): boolean;
32
- dispatchFeedback(actions: Action[], feedbackeEmitter?: IFeedbackEmitter): void;
33
32
  dispatchActions(actions: Action[]): void;
34
- deregisterFeedback(actions: Action[], feedbackeEmitter?: IFeedbackEmitter): void;
33
+ dispatchFeedback(actions: Action[], feedbackEmitter?: IFeedbackEmitter): void;
34
+ deregisterFeedback(actions: Action[], feedbackEmitter?: IFeedbackEmitter): void;
35
35
  }
36
36
  //# sourceMappingURL=base-glsp-tool.d.ts.map
package/lib/features/tools/base-glsp-tool.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"base-glsp-tool.d.ts","sourceRoot":"","sources":["../../../src/features/tools/base-glsp-tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAEhD,OAAO,EAAE,iBAAiB,EAAE,OAAO,EAAS,MAAM,SAAS,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AAErE,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,yBAAyB,EAAE,gBAAgB,EAAE,MAAM,6CAA6C,CAAC;AAE1G,8BACsB,YAAa,YAAW,QAAQ;IACJ,SAAS,CAAC,kBAAkB,EAAE,yBAAyB,CAAC;IACrE,SAAS,CAAC,gBAAgB,EAAE,iBAAiB,CAAC;IACjD,SAAS,CAAC,SAAS,EAAE,UAAU,CAAC;IAC7C,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC;IACd,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,oBAAoB,CAAC;IAErF,QAAQ,CAAC,MAAM,IAAI,IAAI;IACvB,QAAQ,CAAC,OAAO,IAAI,IAAI;IAExB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IAEpB,IAAI,UAAU,IAAI,OAAO,CAExB;IAED,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,IAAI;IAI9E,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI;IAIxC,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,IAAI;CAGnF"}
1
+ {"version":3,"file":"base-glsp-tool.d.ts","sourceRoot":"","sources":["../../../src/features/tools/base-glsp-tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAEhD,OAAO,EAAE,iBAAiB,EAAE,OAAO,EAAS,MAAM,SAAS,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AAErE,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,yBAAyB,EAAE,gBAAgB,EAAE,MAAM,6CAA6C,CAAC;AAE1G,8BACsB,YAAa,YAAW,QAAQ;IACJ,SAAS,CAAC,kBAAkB,EAAE,yBAAyB,CAAC;IACrE,SAAS,CAAC,gBAAgB,EAAE,iBAAiB,CAAC;IACjD,SAAS,CAAC,SAAS,EAAE,UAAU,CAAC;IAC7C,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC;IACd,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,oBAAoB,CAAC;IAErF,QAAQ,CAAC,MAAM,IAAI,IAAI;IACvB,QAAQ,CAAC,OAAO,IAAI,IAAI;IAExB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IAEpB,IAAI,UAAU,IAAI,OAAO,CAExB;IAED,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI;IAIxC,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,eAAe,CAAC,EAAE,gBAAgB,GAAG,IAAI;IAI7E,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,eAAe,CAAC,EAAE,gBAAgB,GAAG,IAAI;CAGlF"}
package/lib/features/tools/base-glsp-tool.js CHANGED
@@ -18,14 +18,14 @@ let BaseGLSPTool = class BaseGLSPTool {
18
18
  get isEditTool() {
19
19
  return true;
20
20
  }
21
- dispatchFeedback(actions, feedbackeEmitter) {
22
- this.feedbackDispatcher.registerFeedback(feedbackeEmitter ? feedbackeEmitter : this, actions);
23
- }
24
21
  dispatchActions(actions) {
25
22
  this.actionDispatcher.dispatchAll(actions);
26
23
  }
27
- deregisterFeedback(actions, feedbackeEmitter) {
28
- this.feedbackDispatcher.deregisterFeedback(feedbackeEmitter ? feedbackeEmitter : this, actions);
24
+ dispatchFeedback(actions, feedbackEmitter) {
25
+ this.feedbackDispatcher.registerFeedback(feedbackEmitter !== null && feedbackEmitter !== void 0 ? feedbackEmitter : this, actions);
26
+ }
27
+ deregisterFeedback(actions, feedbackEmitter) {
28
+ this.feedbackDispatcher.deregisterFeedback(feedbackEmitter !== null && feedbackEmitter !== void 0 ? feedbackEmitter : this, actions);
29
29
  }
30
30
  };
31
31
  __decorate([
package/lib/features/tools/base-glsp-tool.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"base-glsp-tool.js","sourceRoot":"","sources":["../../../src/features/tools/base-glsp-tool.ts"],"names":[],"mappings":";;;;;;;;;;;;AAgBA,yCAA+C;AAC/C,qCAA4D;AAC5D,8EAAyE;AAEzE,4CAA8C;AAK9C,IAAsB,YAAY,GAAlC,MAAsB,YAAY;IAY9B,IAAI,UAAU;QACV,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,gBAAgB,CAAC,OAAiB,EAAE,gBAAmC;QACnE,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAClG,CAAC;IAED,eAAe,CAAC,OAAiB;QAC7B,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;IAED,kBAAkB,CAAC,OAAiB,EAAE,gBAAmC;QACrE,IAAI,CAAC,kBAAkB,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACpG,CAAC;CACJ,CAAA;AA1BiD;IAA7C,kBAAM,CAAC,kBAAU,CAAC,yBAAyB,CAAC;;wDAAyD;AACrE;IAAhC,kBAAM,CAAC,eAAK,CAAC,iBAAiB,CAAC;;sDAA+C;AACjD;IAA7B,kBAAM,CAAC,kBAAU,CAAC,SAAS,CAAC;;+CAAiC;AAC7C;IAAhB,kBAAM,CAAC,iBAAO,CAAC;8BAAoB,iBAAO;6CAAC;AACd;IAA7B,kBAAM,CAAC,6CAAoB,CAAC;8BAAmC,6CAAoB;mDAAC;AALnE,YAAY;IADjC,sBAAU,EAAE;GACS,YAAY,CA2BjC;AA3BqB,oCAAY"}
1
+ {"version":3,"file":"base-glsp-tool.js","sourceRoot":"","sources":["../../../src/features/tools/base-glsp-tool.ts"],"names":[],"mappings":";;;;;;;;;;;;AAgBA,yCAA+C;AAC/C,qCAA4D;AAC5D,8EAAyE;AAEzE,4CAA8C;AAK9C,IAAsB,YAAY,GAAlC,MAAsB,YAAY;IAY9B,IAAI,UAAU;QACV,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,eAAe,CAAC,OAAiB;QAC7B,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;IAED,gBAAgB,CAAC,OAAiB,EAAE,eAAkC;QAClE,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,IAAI,EAAE,OAAO,CAAC,CAAC;IAC/E,CAAC;IAED,kBAAkB,CAAC,OAAiB,EAAE,eAAkC;QACpE,IAAI,CAAC,kBAAkB,CAAC,kBAAkB,CAAC,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,IAAI,EAAE,OAAO,CAAC,CAAC;IACjF,CAAC;CACJ,CAAA;AA1BiD;IAA7C,kBAAM,CAAC,kBAAU,CAAC,yBAAyB,CAAC;;wDAAyD;AACrE;IAAhC,kBAAM,CAAC,eAAK,CAAC,iBAAiB,CAAC;;sDAA+C;AACjD;IAA7B,kBAAM,CAAC,kBAAU,CAAC,SAAS,CAAC;;+CAAiC;AAC7C;IAAhB,kBAAM,CAAC,iBAAO,CAAC;8BAAoB,iBAAO;6CAAC;AACd;IAA7B,kBAAM,CAAC,6CAAoB,CAAC;8BAAmC,6CAAoB;mDAAC;AALnE,YAAY;IADjC,sBAAU,EAAE;GACS,YAAY,CA2BjC;AA3BqB,oCAAY"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@eclipse-glsp/client",
3
- "version": "0.10.0-next.5dad48d.159+5dad48d",
3
+ "version": "0.10.0-next.6715f8e.162+6715f8e",
4
4
  "description": "A sprotty-based client for GLSP",
5
5
  "license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)",
6
6
  "keywords": [
@@ -34,7 +34,7 @@
34
34
  "css"
35
35
  ],
36
36
  "dependencies": {
37
- "@eclipse-glsp/protocol": "0.10.0-next.5dad48d.159+5dad48d",
37
+ "@eclipse-glsp/protocol": "0.10.0-next.6715f8e.162+6715f8e",
38
38
  "autocompleter": "5.1.0",
39
39
  "sprotty": "0.10.0"
40
40
  },
@@ -67,5 +67,5 @@
67
67
  },
68
68
  "main": "lib/index",
69
69
  "types": "lib/index",
70
- "gitHead": "5dad48da0281e489fd0d1dcffc097b3582e379b7"
70
+ "gitHead": "6715f8e6df688b67c1aebf75b093ee810ac879b3"
71
71
  }
package/src/base/model-initialization-constraint.ts CHANGED
@@ -13,7 +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, UpdateModelAction } from '@eclipse-glsp/protocol';
16
+ import { Action, isSetModelAction, isUpdateModelAction } from '@eclipse-glsp/protocol';
17
17
  import { injectable } from 'inversify';
18
18
  import { InitializeCanvasBoundsAction } from 'sprotty';
19
19
  import { Deferred } from 'sprotty/lib/utils/async';
@@ -74,21 +74,20 @@ export abstract class ModelInitializationConstraint {
74
74
  */
75
75
  @injectable()
76
76
  export class DefaultModelInitializationConstraint extends ModelInitializationConstraint {
77
- protected seenNonEmptyUpdateModel = false;
77
+ protected seenNonEmptyModelAction = false;
78
78
 
79
79
  isInitializedAfter(action: Action): boolean {
80
- if (this.isNonEmptyUpdateModel(action)) {
81
- this.seenNonEmptyUpdateModel = true;
82
- } else if (this.seenNonEmptyUpdateModel && action.kind === InitializeCanvasBoundsAction.KIND) {
80
+ if (this.isNonEmptyModelAction(action)) {
81
+ this.seenNonEmptyModelAction = true;
82
+ } else if (this.seenNonEmptyModelAction && action.kind === InitializeCanvasBoundsAction.KIND) {
83
83
  return true;
84
84
  }
85
85
  return false;
86
86
  }
87
87
 
88
- protected isNonEmptyUpdateModel(action: Action): boolean {
89
- if (action && action.kind === UpdateModelAction.KIND) {
90
- const updateModelAction = action as UpdateModelAction;
91
- return updateModelAction.newRoot !== undefined && updateModelAction.newRoot.type !== 'NONE';
88
+ protected isNonEmptyModelAction(action: Action): boolean {
89
+ if (isSetModelAction(action) || isUpdateModelAction(action)) {
90
+ return action.newRoot.type !== 'NONE';
92
91
  }
93
92
  return false;
94
93
  }
package/src/features/tool-feedback/feedback-action-dispatcher.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  /********************************************************************************
2
- * Copyright (c) 2019-2021 EclipseSource and others.
2
+ * Copyright (c) 2019-2022 EclipseSource 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
@@ -30,7 +30,7 @@ export interface IFeedbackEmitter {}
30
30
  * extending the `SModelRoot`. Therefore, tools can register themselves
31
31
  * as feedback emitters with actions they want to place for showing
32
32
  * feedback. This dispatcher will then re-establish all feedback actions
33
- * of the registered tools, whenever the `SModelRoot` has been set or updated.
33
+ * of the registered emitters, whenever the `SModelRoot` has been set or updated.
34
34
  */
35
35
  export interface IFeedbackActionDispatcher {
36
36
  /**
package/src/features/tools/base-glsp-tool.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  /********************************************************************************
2
- * Copyright (c) 2020-2021 EclipseSource and others.
2
+ * Copyright (c) 2020-2022 EclipseSource 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
@@ -39,15 +39,15 @@ export abstract class BaseGLSPTool implements GLSPTool {
39
39
  return true;
40
40
  }
41
41
 
42
- dispatchFeedback(actions: Action[], feedbackeEmitter?: IFeedbackEmitter): void {
43
- this.feedbackDispatcher.registerFeedback(feedbackeEmitter ? feedbackeEmitter : this, actions);
44
- }
45
-
46
42
  dispatchActions(actions: Action[]): void {
47
43
  this.actionDispatcher.dispatchAll(actions);
48
44
  }
49
45
 
50
- deregisterFeedback(actions: Action[], feedbackeEmitter?: IFeedbackEmitter): void {
51
- this.feedbackDispatcher.deregisterFeedback(feedbackeEmitter ? feedbackeEmitter : this, actions);
46
+ dispatchFeedback(actions: Action[], feedbackEmitter?: IFeedbackEmitter): void {
47
+ this.feedbackDispatcher.registerFeedback(feedbackEmitter ?? this, actions);
48
+ }
49
+
50
+ deregisterFeedback(actions: Action[], feedbackEmitter?: IFeedbackEmitter): void {
51
+ this.feedbackDispatcher.deregisterFeedback(feedbackEmitter ?? this, actions);
52
52
  }
53
53
  }