ace-linters 1.0.1 → 1.0.3

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.
@@ -9513,6 +9513,7 @@ if (true) {
9513
9513
  /* harmony export */ Jm: () => (/* binding */ HoverMessage),
9514
9514
  /* harmony export */ L2: () => (/* binding */ DisposeMessage),
9515
9515
  /* harmony export */ Vr: () => (/* binding */ SignatureHelpMessage),
9516
+ /* harmony export */ Xl: () => (/* binding */ CloseDocumentMessage),
9516
9517
  /* harmony export */ bX: () => (/* binding */ ConfigureFeaturesMessage),
9517
9518
  /* harmony export */ g6: () => (/* binding */ GlobalOptionsMessage),
9518
9519
  /* harmony export */ ik: () => (/* binding */ ChangeMessage),
@@ -9637,9 +9638,15 @@ class ChangeOptionsMessage extends BaseMessage {
9637
9638
  this.merge = merge;
9638
9639
  }
9639
9640
  }
9640
- class DisposeMessage extends BaseMessage {
9641
+ class CloseDocumentMessage extends BaseMessage {
9641
9642
  constructor(sessionId){
9642
9643
  super(sessionId);
9644
+ _define_property(this, "type", MessageType.closeDocument);
9645
+ }
9646
+ }
9647
+ class DisposeMessage extends BaseMessage {
9648
+ constructor(){
9649
+ super("");
9643
9650
  _define_property(this, "type", MessageType.dispose);
9644
9651
  }
9645
9652
  }
@@ -9691,11 +9698,12 @@ var MessageType;
9691
9698
  MessageType[MessageType["applyDelta"] = 7] = "applyDelta";
9692
9699
  MessageType[MessageType["changeMode"] = 8] = "changeMode";
9693
9700
  MessageType[MessageType["changeOptions"] = 9] = "changeOptions";
9694
- MessageType[MessageType["dispose"] = 10] = "dispose";
9701
+ MessageType[MessageType["closeDocument"] = 10] = "closeDocument";
9695
9702
  MessageType[MessageType["globalOptions"] = 11] = "globalOptions";
9696
9703
  MessageType[MessageType["configureFeatures"] = 12] = "configureFeatures";
9697
9704
  MessageType[MessageType["signatureHelp"] = 13] = "signatureHelp";
9698
9705
  MessageType[MessageType["documentHighlight"] = 14] = "documentHighlight";
9706
+ MessageType[MessageType["dispose"] = 15] = "dispose";
9699
9707
  })(MessageType || (MessageType = {}));
9700
9708
 
9701
9709
 
@@ -9726,6 +9734,13 @@ function _define_property(obj, key, value) {
9726
9734
 
9727
9735
 
9728
9736
  class ServiceManager {
9737
+ async disposeAll() {
9738
+ var services = this.$services;
9739
+ for(let serviceName in services){
9740
+ var _services_serviceName_serviceInstance, _services_serviceName;
9741
+ await ((_services_serviceName = services[serviceName]) === null || _services_serviceName === void 0 ? void 0 : (_services_serviceName_serviceInstance = _services_serviceName.serviceInstance) === null || _services_serviceName_serviceInstance === void 0 ? void 0 : _services_serviceName_serviceInstance.dispose());
9742
+ }
9743
+ }
9729
9744
  static async $initServiceInstance(service, ctx) {
9730
9745
  let module;
9731
9746
  if ('type' in service) {
@@ -9984,7 +9999,7 @@ class ServiceManager {
9984
9999
  case _message_types__WEBPACK_IMPORTED_MODULE_0__/* .MessageType */ .Cs.changeMode:
9985
10000
  var _this1;
9986
10001
  postMessage["value"] = (_this1 = await this.changeDocumentMode(documentIdentifier, message.value, message.mode, message.options)) === null || _this1 === void 0 ? void 0 : _this1.map((el)=>el.serviceCapabilities);
9987
- await doValidation(documentIdentifier, serviceInstances);
10002
+ await doValidation(documentIdentifier);
9988
10003
  break;
9989
10004
  case _message_types__WEBPACK_IMPORTED_MODULE_0__/* .MessageType */ .Cs.changeOptions:
9990
10005
  serviceInstances.forEach((service)=>{
@@ -9992,10 +10007,13 @@ class ServiceManager {
9992
10007
  });
9993
10008
  await doValidation(documentIdentifier, serviceInstances);
9994
10009
  break;
9995
- case _message_types__WEBPACK_IMPORTED_MODULE_0__/* .MessageType */ .Cs.dispose:
10010
+ case _message_types__WEBPACK_IMPORTED_MODULE_0__/* .MessageType */ .Cs.closeDocument:
9996
10011
  this.removeDocument(documentIdentifier);
9997
10012
  await doValidation(documentIdentifier, serviceInstances);
9998
10013
  break;
10014
+ case _message_types__WEBPACK_IMPORTED_MODULE_0__/* .MessageType */ .Cs.dispose:
10015
+ await this.disposeAll();
10016
+ break;
9999
10017
  case _message_types__WEBPACK_IMPORTED_MODULE_0__/* .MessageType */ .Cs.globalOptions:
10000
10018
  this.setGlobalOptions(message.serviceName, message.options, message.merge);
10001
10019
  await provideValidationForServiceInstance(message.serviceName);
@@ -19398,8 +19416,11 @@ class MessageController extends (events_default()) {
19398
19416
  changeOptions(sessionId, options, callback, merge = false) {
19399
19417
  this.postMessage(new message_types/* ChangeOptionsMessage */.GC(sessionId, options, merge), callback);
19400
19418
  }
19401
- dispose(sessionId, callback) {
19402
- this.postMessage(new message_types/* DisposeMessage */.L2(sessionId), callback);
19419
+ closeDocument(sessionId, callback) {
19420
+ this.postMessage(new message_types/* CloseDocumentMessage */.Xl(sessionId), callback);
19421
+ }
19422
+ dispose(callback) {
19423
+ this.postMessage(new message_types/* DisposeMessage */.L2(), callback);
19403
19424
  }
19404
19425
  setGlobalOptions(serviceName, options, merge = false) {
19405
19426
  // @ts-ignore
@@ -19484,7 +19505,8 @@ function toPoint(position) {
19484
19505
  };
19485
19506
  }
19486
19507
  function toAnnotations(diagnostics) {
19487
- return diagnostics.map((el)=>{
19508
+ var _diagnostics;
19509
+ return (_diagnostics = diagnostics) === null || _diagnostics === void 0 ? void 0 : _diagnostics.map((el)=>{
19488
19510
  return {
19489
19511
  row: el.range.start.line,
19490
19512
  column: el.range.start.character,
@@ -20730,7 +20752,9 @@ class LanguageProvider {
20730
20752
  }
20731
20753
  }
20732
20754
  dispose() {
20733
- // this.$messageController.dispose(this.$fileName);
20755
+ this.$messageController.dispose(()=>{
20756
+ this.$messageController.$worker.terminate();
20757
+ });
20734
20758
  }
20735
20759
  /**
20736
20760
  * Removes document from all linked services by session id
@@ -20738,15 +20762,15 @@ class LanguageProvider {
20738
20762
  */ closeDocument(session, callback) {
20739
20763
  let sessionProvider = this.$getSessionLanguageProvider(session);
20740
20764
  if (sessionProvider) {
20741
- sessionProvider.dispose(callback);
20765
+ sessionProvider.closeDocument(callback);
20742
20766
  delete this.$sessionLanguageProviders[session["id"]];
20743
20767
  }
20744
20768
  }
20745
20769
  constructor(messageController, options){
20746
20770
  var _this_options, _this_options1;
20747
20771
  language_provider_define_property(this, "activeEditor", void 0);
20748
- language_provider_define_property(this, "$signatureTooltip", void 0);
20749
20772
  language_provider_define_property(this, "$messageController", void 0);
20773
+ language_provider_define_property(this, "$signatureTooltip", void 0);
20750
20774
  language_provider_define_property(this, "$sessionLanguageProviders", {});
20751
20775
  language_provider_define_property(this, "editors", []);
20752
20776
  language_provider_define_property(this, "options", void 0);
@@ -20804,8 +20828,8 @@ class SessionLanguageProvider {
20804
20828
  }
20805
20829
  this.$messageController.changeOptions(this.fileName, options);
20806
20830
  }
20807
- dispose(callback) {
20808
- this.$messageController.dispose(this.fileName, callback);
20831
+ closeDocument(callback) {
20832
+ this.$messageController.closeDocument(this.fileName, callback);
20809
20833
  }
20810
20834
  constructor(session, editor, messageController, options){
20811
20835
  language_provider_define_property(this, "session", void 0);
@@ -20828,7 +20852,6 @@ class SessionLanguageProvider {
20828
20852
  language_provider_define_property(this, "$connected", (capabilities)=>{
20829
20853
  this.$isConnected = true;
20830
20854
  // @ts-ignore
20831
- this.session.on("changeMode", this.$changeMode);
20832
20855
  this.setServerCapabilities(capabilities);
20833
20856
  if (this.$modeIsChanged) this.$changeMode();
20834
20857
  if (this.$deltaQueue) this.$sendDeltaQueue();
@@ -20883,6 +20906,10 @@ class SessionLanguageProvider {
20883
20906
  if (deltas.length) this.$messageController.change(this.fileName, deltas.map((delta)=>fromAceDelta(delta, this.session.doc.getNewLineCharacter())), this.session.doc, callback);
20884
20907
  });
20885
20908
  language_provider_define_property(this, "$showAnnotations", (diagnostics)=>{
20909
+ var _diagnostics;
20910
+ if (!diagnostics) {
20911
+ return;
20912
+ }
20886
20913
  this.session.clearAnnotations();
20887
20914
  let annotations = toAnnotations(diagnostics);
20888
20915
  if (annotations && annotations.length > 0) {
@@ -20891,7 +20918,7 @@ class SessionLanguageProvider {
20891
20918
  if (!this.state.diagnosticMarkers) {
20892
20919
  this.state.diagnosticMarkers = new MarkerGroup(this.session);
20893
20920
  }
20894
- this.state.diagnosticMarkers.setMarkers(diagnostics.map((el)=>toMarkerGroupItem(common_converters_CommonConverter.toRange(toRange(el.range)), "language_highlight_error", el.message)));
20921
+ this.state.diagnosticMarkers.setMarkers((_diagnostics = diagnostics) === null || _diagnostics === void 0 ? void 0 : _diagnostics.map((el)=>toMarkerGroupItem(common_converters_CommonConverter.toRange(toRange(el.range)), "language_highlight_error", el.message)));
20895
20922
  });
20896
20923
  language_provider_define_property(this, "validate", ()=>{
20897
20924
  this.$messageController.doValidation(this.fileName, this.$showAnnotations);
@@ -20939,6 +20966,8 @@ class SessionLanguageProvider {
20939
20966
  this.initFileName();
20940
20967
  session.doc["version"] = 0;
20941
20968
  session.doc.on("change", this.$changeListener, true);
20969
+ // @ts-ignore
20970
+ session.on("changeMode", this.$changeMode);
20942
20971
  this.$messageController.init(this.fileName, session.doc, this.$mode, options, this.$connected, this.$showAnnotations);
20943
20972
  }
20944
20973
  }
@@ -18920,9 +18920,15 @@ class ChangeOptionsMessage extends BaseMessage {
18920
18920
  this.merge = merge;
18921
18921
  }
18922
18922
  }
18923
- class DisposeMessage extends BaseMessage {
18923
+ class CloseDocumentMessage extends BaseMessage {
18924
18924
  constructor(sessionId){
18925
18925
  super(sessionId);
18926
+ message_types_define_property(this, "type", MessageType.closeDocument);
18927
+ }
18928
+ }
18929
+ class DisposeMessage extends BaseMessage {
18930
+ constructor(){
18931
+ super("");
18926
18932
  message_types_define_property(this, "type", MessageType.dispose);
18927
18933
  }
18928
18934
  }
@@ -18974,11 +18980,12 @@ var MessageType;
18974
18980
  MessageType[MessageType["applyDelta"] = 7] = "applyDelta";
18975
18981
  MessageType[MessageType["changeMode"] = 8] = "changeMode";
18976
18982
  MessageType[MessageType["changeOptions"] = 9] = "changeOptions";
18977
- MessageType[MessageType["dispose"] = 10] = "dispose";
18983
+ MessageType[MessageType["closeDocument"] = 10] = "closeDocument";
18978
18984
  MessageType[MessageType["globalOptions"] = 11] = "globalOptions";
18979
18985
  MessageType[MessageType["configureFeatures"] = 12] = "configureFeatures";
18980
18986
  MessageType[MessageType["signatureHelp"] = 13] = "signatureHelp";
18981
18987
  MessageType[MessageType["documentHighlight"] = 14] = "documentHighlight";
18988
+ MessageType[MessageType["dispose"] = 15] = "dispose";
18982
18989
  })(MessageType || (MessageType = {}));
18983
18990
 
18984
18991
  // EXTERNAL MODULE: ../../node_modules/events/events.js
@@ -19035,8 +19042,11 @@ class MessageController extends (events_default()) {
19035
19042
  changeOptions(sessionId, options, callback, merge = false) {
19036
19043
  this.postMessage(new ChangeOptionsMessage(sessionId, options, merge), callback);
19037
19044
  }
19038
- dispose(sessionId, callback) {
19039
- this.postMessage(new DisposeMessage(sessionId), callback);
19045
+ closeDocument(sessionId, callback) {
19046
+ this.postMessage(new CloseDocumentMessage(sessionId), callback);
19047
+ }
19048
+ dispose(callback) {
19049
+ this.postMessage(new DisposeMessage(), callback);
19040
19050
  }
19041
19051
  setGlobalOptions(serviceName, options, merge = false) {
19042
19052
  // @ts-ignore
@@ -19121,7 +19131,8 @@ function toPoint(position) {
19121
19131
  };
19122
19132
  }
19123
19133
  function toAnnotations(diagnostics) {
19124
- return diagnostics.map((el)=>{
19134
+ var _diagnostics;
19135
+ return (_diagnostics = diagnostics) === null || _diagnostics === void 0 ? void 0 : _diagnostics.map((el)=>{
19125
19136
  return {
19126
19137
  row: el.range.start.line,
19127
19138
  column: el.range.start.character,
@@ -20367,7 +20378,9 @@ class LanguageProvider {
20367
20378
  }
20368
20379
  }
20369
20380
  dispose() {
20370
- // this.$messageController.dispose(this.$fileName);
20381
+ this.$messageController.dispose(()=>{
20382
+ this.$messageController.$worker.terminate();
20383
+ });
20371
20384
  }
20372
20385
  /**
20373
20386
  * Removes document from all linked services by session id
@@ -20375,15 +20388,15 @@ class LanguageProvider {
20375
20388
  */ closeDocument(session, callback) {
20376
20389
  let sessionProvider = this.$getSessionLanguageProvider(session);
20377
20390
  if (sessionProvider) {
20378
- sessionProvider.dispose(callback);
20391
+ sessionProvider.closeDocument(callback);
20379
20392
  delete this.$sessionLanguageProviders[session["id"]];
20380
20393
  }
20381
20394
  }
20382
20395
  constructor(messageController, options){
20383
20396
  var _this_options, _this_options1;
20384
20397
  language_provider_define_property(this, "activeEditor", void 0);
20385
- language_provider_define_property(this, "$signatureTooltip", void 0);
20386
20398
  language_provider_define_property(this, "$messageController", void 0);
20399
+ language_provider_define_property(this, "$signatureTooltip", void 0);
20387
20400
  language_provider_define_property(this, "$sessionLanguageProviders", {});
20388
20401
  language_provider_define_property(this, "editors", []);
20389
20402
  language_provider_define_property(this, "options", void 0);
@@ -20441,8 +20454,8 @@ class SessionLanguageProvider {
20441
20454
  }
20442
20455
  this.$messageController.changeOptions(this.fileName, options);
20443
20456
  }
20444
- dispose(callback) {
20445
- this.$messageController.dispose(this.fileName, callback);
20457
+ closeDocument(callback) {
20458
+ this.$messageController.closeDocument(this.fileName, callback);
20446
20459
  }
20447
20460
  constructor(session, editor, messageController, options){
20448
20461
  language_provider_define_property(this, "session", void 0);
@@ -20465,7 +20478,6 @@ class SessionLanguageProvider {
20465
20478
  language_provider_define_property(this, "$connected", (capabilities)=>{
20466
20479
  this.$isConnected = true;
20467
20480
  // @ts-ignore
20468
- this.session.on("changeMode", this.$changeMode);
20469
20481
  this.setServerCapabilities(capabilities);
20470
20482
  if (this.$modeIsChanged) this.$changeMode();
20471
20483
  if (this.$deltaQueue) this.$sendDeltaQueue();
@@ -20520,6 +20532,10 @@ class SessionLanguageProvider {
20520
20532
  if (deltas.length) this.$messageController.change(this.fileName, deltas.map((delta)=>fromAceDelta(delta, this.session.doc.getNewLineCharacter())), this.session.doc, callback);
20521
20533
  });
20522
20534
  language_provider_define_property(this, "$showAnnotations", (diagnostics)=>{
20535
+ var _diagnostics;
20536
+ if (!diagnostics) {
20537
+ return;
20538
+ }
20523
20539
  this.session.clearAnnotations();
20524
20540
  let annotations = toAnnotations(diagnostics);
20525
20541
  if (annotations && annotations.length > 0) {
@@ -20528,7 +20544,7 @@ class SessionLanguageProvider {
20528
20544
  if (!this.state.diagnosticMarkers) {
20529
20545
  this.state.diagnosticMarkers = new MarkerGroup(this.session);
20530
20546
  }
20531
- this.state.diagnosticMarkers.setMarkers(diagnostics.map((el)=>toMarkerGroupItem(common_converters_CommonConverter.toRange(toRange(el.range)), "language_highlight_error", el.message)));
20547
+ this.state.diagnosticMarkers.setMarkers((_diagnostics = diagnostics) === null || _diagnostics === void 0 ? void 0 : _diagnostics.map((el)=>toMarkerGroupItem(common_converters_CommonConverter.toRange(toRange(el.range)), "language_highlight_error", el.message)));
20532
20548
  });
20533
20549
  language_provider_define_property(this, "validate", ()=>{
20534
20550
  this.$messageController.doValidation(this.fileName, this.$showAnnotations);
@@ -20576,6 +20592,8 @@ class SessionLanguageProvider {
20576
20592
  this.initFileName();
20577
20593
  session.doc["version"] = 0;
20578
20594
  session.doc.on("change", this.$changeListener, true);
20595
+ // @ts-ignore
20596
+ session.on("changeMode", this.$changeMode);
20579
20597
  this.$messageController.init(this.fileName, session.doc, this.$mode, options, this.$connected, this.$showAnnotations);
20580
20598
  }
20581
20599
  }
@@ -527,6 +527,9 @@ class BaseService {
527
527
  errorMessagesToTreatAsInfo: (_this_globalOptions_errorMessagesToTreatAsInfo = this.globalOptions.errorMessagesToTreatAsInfo) !== null && _this_globalOptions_errorMessagesToTreatAsInfo !== void 0 ? _this_globalOptions_errorMessagesToTreatAsInfo : []
528
528
  };
529
529
  }
530
+ dispose() {
531
+ return Promise.resolve();
532
+ }
530
533
  constructor(mode){
531
534
  _define_property(this, "mode", void 0);
532
535
  _define_property(this, "documents", {});
@@ -3934,6 +3934,9 @@ class BaseService {
3934
3934
  errorMessagesToTreatAsInfo: (_this_globalOptions_errorMessagesToTreatAsInfo = this.globalOptions.errorMessagesToTreatAsInfo) !== null && _this_globalOptions_errorMessagesToTreatAsInfo !== void 0 ? _this_globalOptions_errorMessagesToTreatAsInfo : []
3935
3935
  };
3936
3936
  }
3937
+ dispose() {
3938
+ return Promise.resolve();
3939
+ }
3937
3940
  constructor(mode){
3938
3941
  _define_property(this, "mode", void 0);
3939
3942
  _define_property(this, "documents", {});
@@ -52375,7 +52378,8 @@ function toPoint(position) {
52375
52378
  };
52376
52379
  }
52377
52380
  function toAnnotations(diagnostics) {
52378
- return diagnostics.map((el)=>{
52381
+ var _diagnostics;
52382
+ return (_diagnostics = diagnostics) === null || _diagnostics === void 0 ? void 0 : _diagnostics.map((el)=>{
52379
52383
  return {
52380
52384
  row: el.range.start.line,
52381
52385
  column: el.range.start.character,
@@ -5762,6 +5762,9 @@ class BaseService {
5762
5762
  errorMessagesToTreatAsInfo: (_this_globalOptions_errorMessagesToTreatAsInfo = this.globalOptions.errorMessagesToTreatAsInfo) !== null && _this_globalOptions_errorMessagesToTreatAsInfo !== void 0 ? _this_globalOptions_errorMessagesToTreatAsInfo : []
5763
5763
  };
5764
5764
  }
5765
+ dispose() {
5766
+ return Promise.resolve();
5767
+ }
5765
5768
  constructor(mode){
5766
5769
  _define_property(this, "mode", void 0);
5767
5770
  _define_property(this, "documents", {});
@@ -3934,6 +3934,9 @@ class BaseService {
3934
3934
  errorMessagesToTreatAsInfo: (_this_globalOptions_errorMessagesToTreatAsInfo = this.globalOptions.errorMessagesToTreatAsInfo) !== null && _this_globalOptions_errorMessagesToTreatAsInfo !== void 0 ? _this_globalOptions_errorMessagesToTreatAsInfo : []
3935
3935
  };
3936
3936
  }
3937
+ dispose() {
3938
+ return Promise.resolve();
3939
+ }
3937
3940
  constructor(mode){
3938
3941
  _define_property(this, "mode", void 0);
3939
3942
  _define_property(this, "documents", {});
@@ -3934,6 +3934,9 @@ class BaseService {
3934
3934
  errorMessagesToTreatAsInfo: (_this_globalOptions_errorMessagesToTreatAsInfo = this.globalOptions.errorMessagesToTreatAsInfo) !== null && _this_globalOptions_errorMessagesToTreatAsInfo !== void 0 ? _this_globalOptions_errorMessagesToTreatAsInfo : []
3935
3935
  };
3936
3936
  }
3937
+ dispose() {
3938
+ return Promise.resolve();
3939
+ }
3937
3940
  constructor(mode){
3938
3941
  _define_property(this, "mode", void 0);
3939
3942
  _define_property(this, "documents", {});
@@ -20481,7 +20484,8 @@ function toPoint(position) {
20481
20484
  };
20482
20485
  }
20483
20486
  function toAnnotations(diagnostics) {
20484
- return diagnostics.map((el)=>{
20487
+ var _diagnostics;
20488
+ return (_diagnostics = diagnostics) === null || _diagnostics === void 0 ? void 0 : _diagnostics.map((el)=>{
20485
20489
  return {
20486
20490
  row: el.range.start.line,
20487
20491
  column: el.range.start.character,
@@ -3934,6 +3934,9 @@ class BaseService {
3934
3934
  errorMessagesToTreatAsInfo: (_this_globalOptions_errorMessagesToTreatAsInfo = this.globalOptions.errorMessagesToTreatAsInfo) !== null && _this_globalOptions_errorMessagesToTreatAsInfo !== void 0 ? _this_globalOptions_errorMessagesToTreatAsInfo : []
3935
3935
  };
3936
3936
  }
3937
+ dispose() {
3938
+ return Promise.resolve();
3939
+ }
3937
3940
  constructor(mode){
3938
3941
  _define_property(this, "mode", void 0);
3939
3942
  _define_property(this, "documents", {});
@@ -16958,9 +16961,15 @@ class ChangeOptionsMessage extends (/* unused pure expression or super */ null &
16958
16961
  this.merge = merge;
16959
16962
  }
16960
16963
  }
16961
- class DisposeMessage extends (/* unused pure expression or super */ null && (BaseMessage)) {
16964
+ class CloseDocumentMessage extends (/* unused pure expression or super */ null && (BaseMessage)) {
16962
16965
  constructor(sessionId){
16963
16966
  super(sessionId);
16967
+ _define_property(this, "type", MessageType.closeDocument);
16968
+ }
16969
+ }
16970
+ class DisposeMessage extends (/* unused pure expression or super */ null && (BaseMessage)) {
16971
+ constructor(){
16972
+ super("");
16964
16973
  _define_property(this, "type", MessageType.dispose);
16965
16974
  }
16966
16975
  }
@@ -17012,11 +17021,12 @@ var MessageType;
17012
17021
  MessageType[MessageType["applyDelta"] = 7] = "applyDelta";
17013
17022
  MessageType[MessageType["changeMode"] = 8] = "changeMode";
17014
17023
  MessageType[MessageType["changeOptions"] = 9] = "changeOptions";
17015
- MessageType[MessageType["dispose"] = 10] = "dispose";
17024
+ MessageType[MessageType["closeDocument"] = 10] = "closeDocument";
17016
17025
  MessageType[MessageType["globalOptions"] = 11] = "globalOptions";
17017
17026
  MessageType[MessageType["configureFeatures"] = 12] = "configureFeatures";
17018
17027
  MessageType[MessageType["signatureHelp"] = 13] = "signatureHelp";
17019
17028
  MessageType[MessageType["documentHighlight"] = 14] = "documentHighlight";
17029
+ MessageType[MessageType["dispose"] = 15] = "dispose";
17020
17030
  })(MessageType || (MessageType = {}));
17021
17031
 
17022
17032
  ;// CONCATENATED MODULE: ./src/services/language-client.ts
@@ -17145,15 +17155,16 @@ class LanguageClient extends base_service.BaseService {
17145
17155
  }
17146
17156
  }));
17147
17157
  }
17148
- /*
17149
- close() {
17150
- if (this.connection) {
17151
- this.connection.dispose();
17152
- }
17153
- if (this.socket)
17154
- this.socket.close();
17155
- }
17156
- */ sendInitialize(initializationOptions) {
17158
+ async dispose() {
17159
+ if (this.connection) {
17160
+ this.isConnected = false;
17161
+ await this.connection.sendRequest("shutdown");
17162
+ this.connection.sendNotification('exit');
17163
+ this.connection.dispose();
17164
+ if (this.socket) this.socket.close();
17165
+ }
17166
+ }
17167
+ sendInitialize(initializationOptions) {
17157
17168
  if (!this.isConnected) {
17158
17169
  return;
17159
17170
  }
@@ -6675,6 +6675,9 @@ class BaseService {
6675
6675
  errorMessagesToTreatAsInfo: (_this_globalOptions_errorMessagesToTreatAsInfo = this.globalOptions.errorMessagesToTreatAsInfo) !== null && _this_globalOptions_errorMessagesToTreatAsInfo !== void 0 ? _this_globalOptions_errorMessagesToTreatAsInfo : []
6676
6676
  };
6677
6677
  }
6678
+ dispose() {
6679
+ return Promise.resolve();
6680
+ }
6678
6681
  constructor(mode){
6679
6682
  _define_property(this, "mode", void 0);
6680
6683
  _define_property(this, "documents", {});
@@ -16348,7 +16351,8 @@ function toPoint(position) {
16348
16351
  };
16349
16352
  }
16350
16353
  function toAnnotations(diagnostics) {
16351
- return diagnostics.map((el)=>{
16354
+ var _diagnostics;
16355
+ return (_diagnostics = diagnostics) === null || _diagnostics === void 0 ? void 0 : _diagnostics.map((el)=>{
16352
16356
  return {
16353
16357
  row: el.range.start.line,
16354
16358
  column: el.range.start.character,
@@ -3934,6 +3934,9 @@ class BaseService {
3934
3934
  errorMessagesToTreatAsInfo: (_this_globalOptions_errorMessagesToTreatAsInfo = this.globalOptions.errorMessagesToTreatAsInfo) !== null && _this_globalOptions_errorMessagesToTreatAsInfo !== void 0 ? _this_globalOptions_errorMessagesToTreatAsInfo : []
3935
3935
  };
3936
3936
  }
3937
+ dispose() {
3938
+ return Promise.resolve();
3939
+ }
3937
3940
  constructor(mode){
3938
3941
  _define_property(this, "mode", void 0);
3939
3942
  _define_property(this, "documents", {});
@@ -22671,7 +22674,8 @@ function toPoint(position) {
22671
22674
  };
22672
22675
  }
22673
22676
  function toAnnotations(diagnostics) {
22674
- return diagnostics.map((el)=>{
22677
+ var _diagnostics;
22678
+ return (_diagnostics = diagnostics) === null || _diagnostics === void 0 ? void 0 : _diagnostics.map((el)=>{
22675
22679
  return {
22676
22680
  row: el.range.start.line,
22677
22681
  column: el.range.start.character,
@@ -3934,6 +3934,9 @@ class BaseService {
3934
3934
  errorMessagesToTreatAsInfo: (_this_globalOptions_errorMessagesToTreatAsInfo = this.globalOptions.errorMessagesToTreatAsInfo) !== null && _this_globalOptions_errorMessagesToTreatAsInfo !== void 0 ? _this_globalOptions_errorMessagesToTreatAsInfo : []
3935
3935
  };
3936
3936
  }
3937
+ dispose() {
3938
+ return Promise.resolve();
3939
+ }
3937
3940
  constructor(mode){
3938
3941
  _define_property(this, "mode", void 0);
3939
3942
  _define_property(this, "documents", {});
@@ -18,7 +18,7 @@ return /******/ (() => { // webpackBootstrap
18
18
  /* harmony export */ __webpack_require__.d(__webpack_exports__, {
19
19
  /* harmony export */ Cs: () => (/* binding */ MessageType)
20
20
  /* harmony export */ });
21
- /* unused harmony exports BaseMessage, InitMessage, FormatMessage, CompleteMessage, ResolveCompletionMessage, HoverMessage, ValidateMessage, ChangeMessage, DeltasMessage, ChangeModeMessage, ChangeOptionsMessage, DisposeMessage, GlobalOptionsMessage, ConfigureFeaturesMessage, SignatureHelpMessage, DocumentHighlightMessage */
21
+ /* unused harmony exports BaseMessage, InitMessage, FormatMessage, CompleteMessage, ResolveCompletionMessage, HoverMessage, ValidateMessage, ChangeMessage, DeltasMessage, ChangeModeMessage, ChangeOptionsMessage, CloseDocumentMessage, DisposeMessage, GlobalOptionsMessage, ConfigureFeaturesMessage, SignatureHelpMessage, DocumentHighlightMessage */
22
22
  function _define_property(obj, key, value) {
23
23
  if (key in obj) {
24
24
  Object.defineProperty(obj, key, {
@@ -132,9 +132,15 @@ class ChangeOptionsMessage extends (/* unused pure expression or super */ null &
132
132
  this.merge = merge;
133
133
  }
134
134
  }
135
- class DisposeMessage extends (/* unused pure expression or super */ null && (BaseMessage)) {
135
+ class CloseDocumentMessage extends (/* unused pure expression or super */ null && (BaseMessage)) {
136
136
  constructor(sessionId){
137
137
  super(sessionId);
138
+ _define_property(this, "type", MessageType.closeDocument);
139
+ }
140
+ }
141
+ class DisposeMessage extends (/* unused pure expression or super */ null && (BaseMessage)) {
142
+ constructor(){
143
+ super("");
138
144
  _define_property(this, "type", MessageType.dispose);
139
145
  }
140
146
  }
@@ -186,11 +192,12 @@ var MessageType;
186
192
  MessageType[MessageType["applyDelta"] = 7] = "applyDelta";
187
193
  MessageType[MessageType["changeMode"] = 8] = "changeMode";
188
194
  MessageType[MessageType["changeOptions"] = 9] = "changeOptions";
189
- MessageType[MessageType["dispose"] = 10] = "dispose";
195
+ MessageType[MessageType["closeDocument"] = 10] = "closeDocument";
190
196
  MessageType[MessageType["globalOptions"] = 11] = "globalOptions";
191
197
  MessageType[MessageType["configureFeatures"] = 12] = "configureFeatures";
192
198
  MessageType[MessageType["signatureHelp"] = 13] = "signatureHelp";
193
199
  MessageType[MessageType["documentHighlight"] = 14] = "documentHighlight";
200
+ MessageType[MessageType["dispose"] = 15] = "dispose";
194
201
  })(MessageType || (MessageType = {}));
195
202
 
196
203
 
@@ -349,6 +356,13 @@ function _define_property(obj, key, value) {
349
356
 
350
357
 
351
358
  class ServiceManager {
359
+ async disposeAll() {
360
+ var services = this.$services;
361
+ for(let serviceName in services){
362
+ var _services_serviceName_serviceInstance, _services_serviceName;
363
+ await ((_services_serviceName = services[serviceName]) === null || _services_serviceName === void 0 ? void 0 : (_services_serviceName_serviceInstance = _services_serviceName.serviceInstance) === null || _services_serviceName_serviceInstance === void 0 ? void 0 : _services_serviceName_serviceInstance.dispose());
364
+ }
365
+ }
352
366
  static async $initServiceInstance(service, ctx) {
353
367
  let module;
354
368
  if ('type' in service) {
@@ -607,7 +621,7 @@ class ServiceManager {
607
621
  case _message_types__WEBPACK_IMPORTED_MODULE_0__/* .MessageType */ .Cs.changeMode:
608
622
  var _this1;
609
623
  postMessage["value"] = (_this1 = await this.changeDocumentMode(documentIdentifier, message.value, message.mode, message.options)) === null || _this1 === void 0 ? void 0 : _this1.map((el)=>el.serviceCapabilities);
610
- await doValidation(documentIdentifier, serviceInstances);
624
+ await doValidation(documentIdentifier);
611
625
  break;
612
626
  case _message_types__WEBPACK_IMPORTED_MODULE_0__/* .MessageType */ .Cs.changeOptions:
613
627
  serviceInstances.forEach((service)=>{
@@ -615,10 +629,13 @@ class ServiceManager {
615
629
  });
616
630
  await doValidation(documentIdentifier, serviceInstances);
617
631
  break;
618
- case _message_types__WEBPACK_IMPORTED_MODULE_0__/* .MessageType */ .Cs.dispose:
632
+ case _message_types__WEBPACK_IMPORTED_MODULE_0__/* .MessageType */ .Cs.closeDocument:
619
633
  this.removeDocument(documentIdentifier);
620
634
  await doValidation(documentIdentifier, serviceInstances);
621
635
  break;
636
+ case _message_types__WEBPACK_IMPORTED_MODULE_0__/* .MessageType */ .Cs.dispose:
637
+ await this.disposeAll();
638
+ break;
622
639
  case _message_types__WEBPACK_IMPORTED_MODULE_0__/* .MessageType */ .Cs.globalOptions:
623
640
  this.setGlobalOptions(message.serviceName, message.options, message.merge);
624
641
  await provideValidationForServiceInstance(message.serviceName);
@@ -3934,6 +3934,9 @@ class BaseService {
3934
3934
  errorMessagesToTreatAsInfo: (_this_globalOptions_errorMessagesToTreatAsInfo = this.globalOptions.errorMessagesToTreatAsInfo) !== null && _this_globalOptions_errorMessagesToTreatAsInfo !== void 0 ? _this_globalOptions_errorMessagesToTreatAsInfo : []
3935
3935
  };
3936
3936
  }
3937
+ dispose() {
3938
+ return Promise.resolve();
3939
+ }
3937
3940
  constructor(mode){
3938
3941
  _define_property(this, "mode", void 0);
3939
3942
  _define_property(this, "documents", {});
@@ -32137,6 +32137,9 @@ class BaseService {
32137
32137
  errorMessagesToTreatAsInfo: (_this_globalOptions_errorMessagesToTreatAsInfo = this.globalOptions.errorMessagesToTreatAsInfo) !== null && _this_globalOptions_errorMessagesToTreatAsInfo !== void 0 ? _this_globalOptions_errorMessagesToTreatAsInfo : []
32138
32138
  };
32139
32139
  }
32140
+ dispose() {
32141
+ return Promise.resolve();
32142
+ }
32140
32143
  constructor(mode){
32141
32144
  _define_property(this, "mode", void 0);
32142
32145
  _define_property(this, "documents", {});
@@ -6300,6 +6300,9 @@ class BaseService {
6300
6300
  errorMessagesToTreatAsInfo: (_this_globalOptions_errorMessagesToTreatAsInfo = this.globalOptions.errorMessagesToTreatAsInfo) !== null && _this_globalOptions_errorMessagesToTreatAsInfo !== void 0 ? _this_globalOptions_errorMessagesToTreatAsInfo : []
6301
6301
  };
6302
6302
  }
6303
+ dispose() {
6304
+ return Promise.resolve();
6305
+ }
6303
6306
  constructor(mode){
6304
6307
  _define_property(this, "mode", void 0);
6305
6308
  _define_property(this, "documents", {});
@@ -71038,7 +71041,8 @@ function toPoint(position) {
71038
71041
  };
71039
71042
  }
71040
71043
  function toAnnotations(diagnostics) {
71041
- return diagnostics.map((el)=>{
71044
+ var _diagnostics;
71045
+ return (_diagnostics = diagnostics) === null || _diagnostics === void 0 ? void 0 : _diagnostics.map((el)=>{
71042
71046
  return {
71043
71047
  row: el.range.start.line,
71044
71048
  column: el.range.start.character,
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "ace-linters",
3
3
  "author": "Azat Alimov <mkslanc@gmail.com>",
4
- "version": "1.0.1",
4
+ "version": "1.0.3",
5
5
  "scripts": {
6
6
  "clean": "rimraf build",
7
7
  "prebuild": "node prebuild.js",
@@ -4,8 +4,8 @@ import * as lsp from "vscode-languageserver-protocol";
4
4
  import { ProviderOptions, ServiceFeatures, ServiceOptions, ServiceOptionsMap, ServiceStruct, SupportedServices, Tooltip } from "./types/language-service";
5
5
  export declare class LanguageProvider {
6
6
  activeEditor: Ace.Editor;
7
- private $signatureTooltip;
8
7
  private readonly $messageController;
8
+ private $signatureTooltip;
9
9
  private $sessionLanguageProviders;
10
10
  editors: Ace.Editor[];
11
11
  options: ProviderOptions;
@@ -6,7 +6,7 @@ import * as lsp from "vscode-languageserver-protocol";
6
6
  import { CompletionService, ServiceFeatures, ServiceOptions, ServiceOptionsMap, SupportedServices } from "./types/language-service";
7
7
  import EventEmitter from "events";
8
8
  export declare class MessageController extends EventEmitter implements IMessageController {
9
- private $worker;
9
+ $worker: Worker;
10
10
  constructor(worker: Worker);
11
11
  init(sessionId: string, document: Ace.Document, mode: string, options: any, initCallback: (capabilities: any) => void, validationCallback: (annotations: lsp.Diagnostic[]) => void): void;
12
12
  doValidation(sessionId: string, callback?: (annotations: lsp.Diagnostic[]) => void): void;
@@ -17,7 +17,8 @@ export declare class MessageController extends EventEmitter implements IMessageC
17
17
  change(sessionId: string, deltas: any, document: Ace.Document, callback?: () => void): void;
18
18
  changeMode(sessionId: string, value: string, mode: string, callback?: (capabilities: any) => void): void;
19
19
  changeOptions(sessionId: string, options: ServiceOptions, callback?: () => void, merge?: boolean): void;
20
- dispose(sessionId: string, callback?: () => void): void;
20
+ closeDocument(sessionId: string, callback?: () => void): void;
21
+ dispose(callback: () => void): void;
21
22
  setGlobalOptions<T extends keyof ServiceOptionsMap>(serviceName: T, options: ServiceOptionsMap[T], merge?: boolean): void;
22
23
  provideSignatureHelp(sessionId: string, position: lsp.Position, callback?: (signatureHelp: lsp.SignatureHelp[]) => void): void;
23
24
  findDocumentHighlights(sessionId: string, position: lsp.Position, callback?: (documentHighlights: lsp.DocumentHighlight[]) => void): void;
@@ -68,10 +68,14 @@ export declare class ChangeOptionsMessage extends BaseMessage {
68
68
  merge: boolean;
69
69
  constructor(sessionId: string, options: ServiceOptions, merge?: boolean);
70
70
  }
71
- export declare class DisposeMessage extends BaseMessage {
71
+ export declare class CloseDocumentMessage extends BaseMessage {
72
72
  type: MessageType;
73
73
  constructor(sessionId: string);
74
74
  }
75
+ export declare class DisposeMessage extends BaseMessage {
76
+ type: MessageType;
77
+ constructor();
78
+ }
75
79
  export declare class GlobalOptionsMessage {
76
80
  type: MessageType;
77
81
  serviceName: SupportedServices;
@@ -106,9 +110,10 @@ export declare enum MessageType {
106
110
  applyDelta = 7,
107
111
  changeMode = 8,
108
112
  changeOptions = 9,
109
- dispose = 10,
113
+ closeDocument = 10,
110
114
  globalOptions = 11,
111
115
  configureFeatures = 12,
112
116
  signatureHelp = 13,
113
- documentHighlight = 14
117
+ documentHighlight = 14,
118
+ dispose = 15
114
119
  }
@@ -31,4 +31,5 @@ export declare abstract class BaseService<OptionsType extends ServiceOptions = S
31
31
  provideSignatureHelp(document: lsp.TextDocumentIdentifier, position: lsp.Position): Promise<lsp.SignatureHelp | null>;
32
32
  findDocumentHighlights(document: lsp.TextDocumentIdentifier, position: lsp.Position): Promise<lsp.DocumentHighlight[]>;
33
33
  get optionsToFilterDiagnostics(): FilterDiagnosticsOptions;
34
+ dispose(): Promise<void>;
34
35
  }
@@ -19,6 +19,7 @@ export declare class LanguageClient extends BaseService implements LanguageServi
19
19
  addDocument(document: lsp.TextDocumentItem): void;
20
20
  enqueueIfNotConnected(callback: () => void): void;
21
21
  removeDocument(document: lsp.TextDocumentIdentifier): void;
22
+ dispose(): Promise<void>;
22
23
  sendInitialize(initializationOptions: any): void;
23
24
  applyDeltas(identifier: lsp.VersionedTextDocumentIdentifier, deltas: lsp.TextDocumentContentChangeEvent[]): void;
24
25
  setValue(identifier: lsp.VersionedTextDocumentIdentifier, value: string): void;
@@ -16,6 +16,7 @@ export declare class ServiceManager {
16
16
  postMessage: any;
17
17
  addEventListener: any;
18
18
  });
19
+ disposeAll(): Promise<void>;
19
20
  private static $initServiceInstance;
20
21
  private $getServicesInstancesByMode;
21
22
  private initializeService;
@@ -28,6 +28,7 @@ export interface LanguageService {
28
28
  getDocumentValue(uri: string): string | undefined;
29
29
  provideSignatureHelp(document: lsp.TextDocumentIdentifier, position: lsp.Position): Promise<lsp.SignatureHelp | null>;
30
30
  findDocumentHighlights(document: lsp.TextDocumentIdentifier, position: lsp.Position): Promise<lsp.DocumentHighlight[]>;
31
+ dispose(): Promise<void>;
31
32
  }
32
33
  interface TooltipContent {
33
34
  type: CommonConverter.TooltipType;
@@ -2,6 +2,7 @@ import { Ace } from "ace-code";
2
2
  import * as lsp from "vscode-languageserver-protocol";
3
3
  import { CompletionService, ServiceFeatures, ServiceOptions, SupportedServices } from "./language-service";
4
4
  export interface IMessageController {
5
+ $worker: Worker;
5
6
  init(sessionId: string, document: Ace.Document, mode: string, options: any, initCallback: (capabilities: lsp.ServerCapabilities[]) => void, validationCallback: (annotations: lsp.Diagnostic[]) => void): void;
6
7
  doValidation(sessionId: string, callback?: (annotations: lsp.Diagnostic[]) => void): any;
7
8
  doComplete(sessionId: string, position: lsp.Position, callback?: (completions: CompletionService[]) => void): any;
@@ -11,7 +12,8 @@ export interface IMessageController {
11
12
  change(sessionId: string, deltas: lsp.TextDocumentContentChangeEvent[], document: Ace.Document, callback?: () => void): void;
12
13
  changeMode(sessionId: string, value: string, mode: string, callback?: (capabilities: lsp.ServerCapabilities[]) => void): any;
13
14
  changeOptions(sessionId: string, options: ServiceOptions, callback?: () => void): any;
14
- dispose(sessionId: string, callback?: () => void): void;
15
+ closeDocument(sessionId: string, callback?: () => void): void;
16
+ dispose(callback: () => void): void;
15
17
  setGlobalOptions(serviceName: string, options: any, merge?: boolean): void;
16
18
  configureFeatures(serviceName: SupportedServices, features: ServiceFeatures): void;
17
19
  provideSignatureHelp(sessionId: string, position: lsp.Position, callback?: (signatureHelp: lsp.SignatureHelp[]) => void): any;