@difizen/libro-lsp 0.1.17 → 0.1.19

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.
@@ -78,7 +78,7 @@ export declare class NotebookAdapter extends WidgetLSPAdapter<LibroView> {
78
78
  * @param _session - Session context of changed kernel
79
79
  * @param change - Changed data
80
80
  */
81
- onKernelChanged(): Promise<void>;
81
+ onKernelChanged: () => Promise<void>;
82
82
  /**
83
83
  * Dispose the widget.
84
84
  */
@@ -1 +1 @@
1
- {"version":3,"file":"notebook-adapter.d.ts","sourceRoot":"","sources":["../../src/adapters/notebook-adapter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"notebook-adapter.d.ts","sourceRoot":"","sources":["../../src/adapters/notebook-adapter.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,KAAK,QAAQ,MAAM,uBAAuB,CAAC;AAEvD,OAAO,KAAK,EACV,QAAQ,EACR,cAAc,EACd,UAAU,EACV,SAAS,EACV,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAErE,OAAO,EAA4B,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAEvE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAE7C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAEhE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEhD,KAAK,qBAAqB,GAAG,QAAQ,CAAC,qBAAqB,CAAC;AAE5D,eAAO,MAAM,sBAAsB,eAAmC,CAAC;AACvE,MAAM,MAAM,sBAAsB,GAAG,CACnC,OAAO,EAAE,sBAAsB,KAC5B,eAAe,CAAC;AACrB,eAAO,MAAM,sBAAsB,eAAmC,CAAC;AACvE,MAAM,WAAW,sBAAuB,SAAQ,eAAe;IAC7D,YAAY,EAAE,SAAS,CAAC;CACzB;AAED,qBACa,eAAgB,SAAQ,gBAAgB,CAAC,SAAS,CAAC;IAC9B,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,sBAAsB,CAAC;gBAC1C,OAAO,EAAE,sBAAsB;IAe3E;;OAEG;IACH,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC;IAE3B,IAAI,aAAa,4BAEhB;IAED,IAAI,YAAY,mDAEf;IAED;;OAEG;IACH,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED;;OAEG;IACH,IAAI,QAAQ,IAAI,MAAM,CAUrB;IAED;;OAEG;IACH,IAAI,qBAAqB,IAAI,MAAM,GAAG,SAAS,CAM9C;IAED;;OAEG;IACH,IAAI,cAAc,IAAI,WAAW,CAGhC;IAED;;OAEG;IACH,IAAI,OAAO,IAAI,QAAQ,CAAC,iBAAiB,EAAE,CAgB1C;IAED;;OAEG;IACH,IAAI,YAAY,IAAI,QAAQ,CAAC,OAAO,GAAG,SAAS,CAI/C;IAED;;OAEG;IACH,IAAI,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAEzB;IAED;;;;;OAKG;IACH,gBAAgB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM;IAOpD;;;;OAIG;IACH,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,OAAO,GAAG,MAAM;IAOlD;;;;OAIG;IACH,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,CAAC,OAAO,GAAG,WAAW,GAAG,SAAS;IAKrE;;;;;;OAMG;IACH,eAAe,QAAa,QAAQ,IAAI,CAAC,CAwBvC;IAEF;;OAEG;IACM,OAAO,IAAI,IAAI;IAWxB;;OAEG;IACH,OAAO,IAAI,OAAO;IAUlB,sBAAsB,sBAEpB;IAEF;;;;;OAKG;IACH,gBAAgB,WAAkB,cAAc,KAAG,QAAQ,IAAI,CAAC,CAqD9D;IAEF;;OAEG;IACH,qBAAqB,IAAI,eAAe;IAaxC;;OAEG;IACH,SAAS,CAAC,aAAa,IAAI,qBAAqB;IAGhD;;;;OAIG;IACH,SAAS,CAAC,aAAa,QAAa,QAAQ,IAAI,CAAC,CAmB/C;IAEF;;;;OAIG;IACH,SAAS,CAAC,oBAAoB,CAAC,QAAQ,EAAE,SAAS;IAWlD;;OAEG;cACa,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAcpD;;;;OAIG;IACH,SAAS,CAAC,kBAAkB,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;IAY1D;;;OAGG;IACH,SAAS,CAAC,UAAU,CAAC,GAAG,EAAE,gBAAgB,GAAG,QAAQ;IAKrD;;;;;OAKG;IACH,aAAa,CAAC,IAAI,EAAE,QAAQ,GAAG,QAAQ,CAAC,OAAO,GAAG,SAAS;IAmC3D;;OAEG;IACH,SAAS,CAAC,aAAa,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAEzD;;OAEG;IACH,SAAS,CAAC,aAAa,EAAE,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;IAE7D;;OAEG;IACH,SAAS,CAAC,aAAa,EAAE,qBAAqB,CAAC;IAE/C,SAAS,CAAC,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAU;IAE5C,SAAS,CAAC,cAAc,iBAAwB;CACjD"}
@@ -28,6 +28,7 @@ function _initializerWarningHelper(descriptor, context) { throw new Error('Decor
28
28
  // Copyright (c) Jupyter Development Team.
29
29
  // Distributed under the terms of the Modified BSD License.
30
30
 
31
+ import { MIME } from '@difizen/libro-common';
31
32
  import { EditorCellView } from '@difizen/libro-core';
32
33
  import '@difizen/mana-app';
33
34
  import { inject, transient, watch, Deferred } from '@difizen/mana-app';
@@ -45,17 +46,59 @@ export var NotebookAdapter = (_dec = transient(), _dec2 = inject(VirtualDocument
45
46
  var editorWidget = options.editorWidget;
46
47
  _this = _super.call(this, editorWidget, options);
47
48
  _initializerDefineProperty(_this, "docFactory", _descriptor, _assertThisInitialized(_this));
48
- _this.handleCellSourceChange = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
49
+ /**
50
+ * Callback on kernel changed event, it will disconnect the
51
+ * document with the language server and then reconnect.
52
+ *
53
+ * @param _session - Session context of changed kernel
54
+ * @param change - Changed data
55
+ */
56
+ _this.onKernelChanged = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
57
+ var oldLanguageInfo, newLanguageInfo;
49
58
  return _regeneratorRuntime().wrap(function _callee$(_context) {
50
59
  while (1) switch (_context.prev = _context.next) {
51
60
  case 0:
52
- _context.next = 2;
61
+ _context.prev = 0;
62
+ // note: we need to wait until ready before updating language info
63
+ oldLanguageInfo = _this._languageInfo;
64
+ _context.next = 4;
65
+ return untilReady(_this.isReady, -1);
66
+ case 4:
67
+ _context.next = 6;
68
+ return _this._updateLanguageInfo();
69
+ case 6:
70
+ newLanguageInfo = _this._languageInfo;
71
+ if ((oldLanguageInfo === null || oldLanguageInfo === void 0 ? void 0 : oldLanguageInfo.name) !== newLanguageInfo.name || (oldLanguageInfo === null || oldLanguageInfo === void 0 ? void 0 : oldLanguageInfo.mimetype) !== (newLanguageInfo === null || newLanguageInfo === void 0 ? void 0 : newLanguageInfo.mimetype) || (oldLanguageInfo === null || oldLanguageInfo === void 0 ? void 0 : oldLanguageInfo.file_extension) !== (newLanguageInfo === null || newLanguageInfo === void 0 ? void 0 : newLanguageInfo.file_extension)) {
72
+ console.warn("Changed to ".concat(_this._languageInfo.name, " kernel, reconnecting"));
73
+ _this.reloadConnection();
74
+ } else {
75
+ console.warn('Keeping old LSP connection as the new kernel uses the same langauge');
76
+ }
77
+ _context.next = 14;
78
+ break;
79
+ case 10:
80
+ _context.prev = 10;
81
+ _context.t0 = _context["catch"](0);
82
+ console.warn(_context.t0);
83
+ // try to reconnect anyway
84
+ _this.reloadConnection();
85
+ case 14:
86
+ case "end":
87
+ return _context.stop();
88
+ }
89
+ }, _callee, null, [[0, 10]]);
90
+ }));
91
+ _this.handleCellSourceChange = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
92
+ return _regeneratorRuntime().wrap(function _callee2$(_context2) {
93
+ while (1) switch (_context2.prev = _context2.next) {
94
+ case 0:
95
+ _context2.next = 2;
53
96
  return _this.updateDocuments();
54
97
  case 2:
55
98
  case "end":
56
- return _context.stop();
99
+ return _context2.stop();
57
100
  }
58
- }, _callee);
101
+ }, _callee2);
59
102
  }));
60
103
  /**
61
104
  * Update the virtual document on cell changing event.
@@ -64,13 +107,13 @@ export var NotebookAdapter = (_dec = transient(), _dec2 = inject(VirtualDocument
64
107
  * @param change - Changed data
65
108
  */
66
109
  _this.handleCellChange = /*#__PURE__*/function () {
67
- var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(change) {
110
+ var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(change) {
68
111
  var _change$insert$cells, _change$insert;
69
112
  var _iterator, _step, cellView;
70
- return _regeneratorRuntime().wrap(function _callee2$(_context2) {
71
- while (1) switch (_context2.prev = _context2.next) {
113
+ return _regeneratorRuntime().wrap(function _callee3$(_context3) {
114
+ while (1) switch (_context3.prev = _context3.next) {
72
115
  case 0:
73
- _context2.next = 2;
116
+ _context3.next = 2;
74
117
  return _this.updateDocuments();
75
118
  case 2:
76
119
  // }
@@ -94,12 +137,12 @@ export var NotebookAdapter = (_dec = transient(), _dec2 = inject(VirtualDocument
94
137
  }
95
138
  case 4:
96
139
  case "end":
97
- return _context2.stop();
140
+ return _context3.stop();
98
141
  }
99
- }, _callee2);
142
+ }, _callee3);
100
143
  }));
101
144
  return function (_x) {
102
- return _ref2.apply(this, arguments);
145
+ return _ref3.apply(this, arguments);
103
146
  };
104
147
  }();
105
148
  /**
@@ -107,14 +150,14 @@ export var NotebookAdapter = (_dec = transient(), _dec2 = inject(VirtualDocument
107
150
  * manager is ready. This function will create the virtual document and
108
151
  * connect various signals.
109
152
  */
110
- _this.initOnceReady = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
111
- return _regeneratorRuntime().wrap(function _callee3$(_context3) {
112
- while (1) switch (_context3.prev = _context3.next) {
153
+ _this.initOnceReady = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
154
+ return _regeneratorRuntime().wrap(function _callee4$(_context4) {
155
+ while (1) switch (_context4.prev = _context4.next) {
113
156
  case 0:
114
- _context3.next = 2;
157
+ _context4.next = 2;
115
158
  return untilReady(_this.isReady.bind(_assertThisInitialized(_this)), -1);
116
159
  case 2:
117
- _context3.next = 4;
160
+ _context4.next = 4;
118
161
  return _this._updateLanguageInfo();
119
162
  case 4:
120
163
  _this.initVirtual();
@@ -127,36 +170,36 @@ export var NotebookAdapter = (_dec = transient(), _dec2 = inject(VirtualDocument
127
170
 
128
171
  // this.widget.context.sessionContext.kernelChanged.connect(this.onKernelChanged, this);
129
172
  watch(_this.notebookModel, 'kernelConnection', _this.onKernelChanged);
130
- watch(_this.notebookModel, 'active', function (_ref4) {
131
- var target = _ref4.target;
173
+ watch(_this.notebookModel, 'active', function (_ref5) {
174
+ var target = _ref5.target;
132
175
  return _this._activeCellChanged(target);
133
176
  });
134
177
  _this._connectModelSignals(_this.widget);
135
178
  case 9:
136
179
  case "end":
137
- return _context3.stop();
180
+ return _context4.stop();
138
181
  }
139
- }, _callee3);
182
+ }, _callee4);
140
183
  }));
141
184
  _this._type = 'code';
142
185
  _this._readyDelegate = new Deferred();
143
186
  _this._editorToCell = new Map();
144
187
  _this.editor = editorWidget;
145
188
  _this._cellToEditor = new WeakMap();
146
- Promise.all([_this.notebookModel.kcReady, _this.connectionManager.ready]).then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
147
- return _regeneratorRuntime().wrap(function _callee4$(_context4) {
148
- while (1) switch (_context4.prev = _context4.next) {
189
+ Promise.all([_this.notebookModel.kcReady, _this.connectionManager.ready]).then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
190
+ return _regeneratorRuntime().wrap(function _callee5$(_context5) {
191
+ while (1) switch (_context5.prev = _context5.next) {
149
192
  case 0:
150
- _context4.next = 2;
193
+ _context5.next = 2;
151
194
  return _this.initOnceReady();
152
195
  case 2:
153
196
  _this._readyDelegate.resolve();
154
- return _context4.abrupt("return");
197
+ return _context5.abrupt("return");
155
198
  case 4:
156
199
  case "end":
157
- return _context4.stop();
200
+ return _context5.stop();
158
201
  }
159
- }, _callee4);
202
+ }, _callee5);
160
203
  }))).catch(console.error);
161
204
  return _this;
162
205
  }
@@ -239,7 +282,7 @@ export var NotebookAdapter = (_dec = transient(), _dec2 = inject(VirtualDocument
239
282
  }
240
283
  this._editorToCell.clear();
241
284
  return this.editor.model.cells.filter(function (item) {
242
- return EditorCellView.is(item) && item.model.mimeType === 'text/x-python';
285
+ return EditorCellView.is(item) && item.model.mimeType === MIME.python;
243
286
  }).map(function (cell) {
244
287
  return {
245
288
  ceEditor: _this2.getCellEditor(cell),
@@ -308,64 +351,13 @@ export var NotebookAdapter = (_dec = transient(), _dec2 = inject(VirtualDocument
308
351
  var cell = this._editorToCell.get(ceEditor);
309
352
  return EditorCellView.is(cell) ? (_cell$editor = cell.editor) === null || _cell$editor === void 0 ? void 0 : _cell$editor.host : undefined;
310
353
  }
311
-
312
- /**
313
- * Callback on kernel changed event, it will disconnect the
314
- * document with the language server and then reconnect.
315
- *
316
- * @param _session - Session context of changed kernel
317
- * @param change - Changed data
318
- */
319
354
  }, {
320
- key: "onKernelChanged",
321
- value: (function () {
322
- var _onKernelChanged = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
323
- var oldLanguageInfo, newLanguageInfo;
324
- return _regeneratorRuntime().wrap(function _callee5$(_context5) {
325
- while (1) switch (_context5.prev = _context5.next) {
326
- case 0:
327
- _context5.prev = 0;
328
- // note: we need to wait until ready before updating language info
329
- oldLanguageInfo = this._languageInfo;
330
- _context5.next = 4;
331
- return untilReady(this.isReady, -1);
332
- case 4:
333
- _context5.next = 6;
334
- return this._updateLanguageInfo();
335
- case 6:
336
- newLanguageInfo = this._languageInfo;
337
- if ((oldLanguageInfo === null || oldLanguageInfo === void 0 ? void 0 : oldLanguageInfo.name) !== newLanguageInfo.name || (oldLanguageInfo === null || oldLanguageInfo === void 0 ? void 0 : oldLanguageInfo.mimetype) !== (newLanguageInfo === null || newLanguageInfo === void 0 ? void 0 : newLanguageInfo.mimetype) || (oldLanguageInfo === null || oldLanguageInfo === void 0 ? void 0 : oldLanguageInfo.file_extension) !== (newLanguageInfo === null || newLanguageInfo === void 0 ? void 0 : newLanguageInfo.file_extension)) {
338
- console.warn("Changed to ".concat(this._languageInfo.name, " kernel, reconnecting"));
339
- this.reloadConnection();
340
- } else {
341
- console.warn('Keeping old LSP connection as the new kernel uses the same langauge');
342
- }
343
- _context5.next = 14;
344
- break;
345
- case 10:
346
- _context5.prev = 10;
347
- _context5.t0 = _context5["catch"](0);
348
- console.warn(_context5.t0);
349
- // try to reconnect anyway
350
- this.reloadConnection();
351
- case 14:
352
- case "end":
353
- return _context5.stop();
354
- }
355
- }, _callee5, this, [[0, 10]]);
356
- }));
357
- function onKernelChanged() {
358
- return _onKernelChanged.apply(this, arguments);
359
- }
360
- return onKernelChanged;
361
- }()
355
+ key: "dispose",
356
+ value:
362
357
  /**
363
358
  * Dispose the widget.
364
359
  */
365
- )
366
- }, {
367
- key: "dispose",
368
- value: function dispose() {
360
+ function dispose() {
369
361
  if (this.disposed) {
370
362
  return;
371
363
  }
@@ -496,9 +488,11 @@ export var NotebookAdapter = (_dec = transient(), _dec2 = inject(VirtualDocument
496
488
  if (!libroModel || ((_libroModel$active = libroModel.active) === null || _libroModel$active === void 0 ? void 0 : _libroModel$active.model.type) !== this._type) {
497
489
  return;
498
490
  }
499
- this._activeEditorChanged.fire({
500
- editor: this.getCellEditor(libroModel.active)
501
- });
491
+ if (libroModel.active) {
492
+ this._activeEditorChanged.fire({
493
+ editor: this.getCellEditor(libroModel.active)
494
+ });
495
+ }
502
496
  }
503
497
 
504
498
  /**
@@ -488,7 +488,7 @@ export var DocumentConnectionManager = (_dec = singleton({
488
488
  }, {
489
489
  key: "disconnect",
490
490
  value: function disconnect(languageId) {
491
- this.disconnect(languageId);
491
+ this.disconnectServer(languageId);
492
492
  }
493
493
 
494
494
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"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"}
package/es/connection.js CHANGED
@@ -252,9 +252,11 @@ export var LSPConnection = (_dec = transient(), _dec2 = inject(LSPMonitor), _dec
252
252
  if (this.isDisposed) {
253
253
  return;
254
254
  }
255
- Object.values(this.serverRequests).forEach(function (request) {
256
- return request.clearHandler();
257
- });
255
+ if (this.serverRequests) {
256
+ Object.values(this.serverRequests).forEach(function (request) {
257
+ return request.clearHandler();
258
+ });
259
+ }
258
260
  this.close();
259
261
  _get(_getPrototypeOf(LSPConnection.prototype), "dispose", this).call(this);
260
262
  }
package/es/manager.d.ts CHANGED
@@ -1,3 +1,4 @@
1
+ import { Poll } from '@difizen/libro-common';
1
2
  import type { ISettings } from '@difizen/libro-kernel';
2
3
  import { ServerConnection, ServerManager } from '@difizen/libro-kernel';
3
4
  import type { Event } from '@difizen/mana-app';
@@ -6,6 +7,7 @@ import type { ServerSpecProperties } from './schema.js';
6
7
  import { ILanguageServerManagerOptions } from './tokens.js';
7
8
  import type { IGetServerIdOptions, ILanguageServerManager, TLanguageServerConfigurations, TLanguageServerId, TSessionMap, TSpecsMap } from './tokens.js';
8
9
  export declare class LanguageServerManager implements ILanguageServerManager {
10
+ protected _pollSessions: Poll;
9
11
  serverConnection: ServerConnection;
10
12
  serverManager: ServerManager;
11
13
  constructor(options: ILanguageServerManagerOptions);
@@ -1 +1 @@
1
- {"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../src/manager.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAc,gBAAgB,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACpF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAGtD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,6BAA6B,EAAU,MAAM,aAAa,CAAC;AACpE,OAAO,KAAK,EACV,mBAAmB,EACnB,sBAAsB,EACtB,6BAA6B,EAC7B,iBAAiB,EACjB,WAAW,EACX,SAAS,EACV,MAAM,aAAa,CAAC;AAErB,qBACa,qBAAsB,YAAW,sBAAsB;IACxC,gBAAgB,EAAG,gBAAgB,CAAC;IACvC,aAAa,EAAG,aAAa,CAAC;gBAEZ,OAAO,EAAE,6BAA6B;IAU/E,IAAI;IASE,cAAc;IAIpB;;OAEG;IACH,IAAI,SAAS,IAAI,OAAO,CAEvB;IACD;;OAEG;IACH,IAAI,UAAU,IAAI,OAAO,CAExB;IAED;;OAEG;IACH,IAAI,KAAK,IAAI,SAAS,CAErB;IAED;;OAEG;IACH,IAAI,SAAS,IAAI,MAAM,CAGtB;IAED;;OAEG;IACH,IAAI,eAAe,IAAI,KAAK,CAAC,IAAI,CAAC,CAEjC;IAED;;OAEG;IACH,IAAI,QAAQ,IAAI,WAAW,CAE1B;IAED;;OAEG;IACH,IAAI,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAEzB;IAED;;OAEG;IACH,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAK7B;;OAEG;IACH,OAAO,IAAI,IAAI;IAMf;;OAEG;IACH,OAAO,IAAI,IAAI;IAOf;;OAEG;IACH,gBAAgB,CAAC,aAAa,EAAE,6BAA6B,GAAG,IAAI;IAIpE;;;;OAIG;IACH,kBAAkB,CAAC,OAAO,EAAE,mBAAmB,GAAG,iBAAiB,EAAE;IAmBrE;;OAEG;IACH,gBAAgB,CAAC,OAAO,EAAE,mBAAmB,GAAG,SAAS;IAWzD;;;OAGG;IACG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAwDpC;;OAEG;IACH,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC;IAE1B;;OAEG;IACH,SAAS,CAAC,cAAc,CACtB,OAAO,EAAE,mBAAmB,EAC5B,IAAI,EAAE,oBAAoB,GACzB,OAAO;IAUV;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAOrC;;OAEG;IACH,SAAS,CAAC,YAAY,CAAC,CAAC,EAAE,iBAAiB,EAAE,CAAC,EAAE,iBAAiB,GAAG,MAAM;IA6B1E;;OAEG;IACH,SAAS,CAAC,SAAS,EAAE,WAAW,CAAa;IAE7C;;OAEG;IACH,SAAS,CAAC,MAAM,EAAE,SAAS,CAAa;IAExC;;OAEG;IACH,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC;IAE/B;;OAEG;IACH,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE3B;;OAEG;IACH,SAAS,CAAC,WAAW,EAAE,MAAM,CAAC;IAE9B;;OAEG;IACH,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE3B;;OAEG;IACH,SAAS,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAEnC;;OAEG;IACH,SAAS,CAAC,cAAc,EAAE,6BAA6B,CAAC;IAExD;;OAEG;IACH,SAAS,CAAC,gBAAgB,cAAqB;IAE/C;;OAEG;IACH,SAAS,CAAC,MAAM,iBAAwB;IAExC;;OAEG;IACH,SAAS,CAAC,gBAAgB,gBAAuB;IAEjD,SAAS,CAAC,WAAW,UAAS;IAE9B;;OAEG;IACH,SAAS,CAAC,QAAQ,UAAQ;CAC3B"}
1
+ {"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../src/manager.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,EAAO,MAAM,uBAAuB,CAAC;AAClD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAc,gBAAgB,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACpF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAGtD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,6BAA6B,EAAU,MAAM,aAAa,CAAC;AACpE,OAAO,KAAK,EACV,mBAAmB,EACnB,sBAAsB,EACtB,6BAA6B,EAC7B,iBAAiB,EACjB,WAAW,EACX,SAAS,EACV,MAAM,aAAa,CAAC;AAErB,qBACa,qBAAsB,YAAW,sBAAsB;IAClE,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC;IAEJ,gBAAgB,EAAG,gBAAgB,CAAC;IACvC,aAAa,EAAG,aAAa,CAAC;gBAEZ,OAAO,EAAE,6BAA6B;IAU/E,IAAI;IAoBE,cAAc;IAKpB;;OAEG;IACH,IAAI,SAAS,IAAI,OAAO,CAEvB;IACD;;OAEG;IACH,IAAI,UAAU,IAAI,OAAO,CAExB;IAED;;OAEG;IACH,IAAI,KAAK,IAAI,SAAS,CAErB;IAED;;OAEG;IACH,IAAI,SAAS,IAAI,MAAM,CAGtB;IAED;;OAEG;IACH,IAAI,eAAe,IAAI,KAAK,CAAC,IAAI,CAAC,CAEjC;IAED;;OAEG;IACH,IAAI,QAAQ,IAAI,WAAW,CAE1B;IAED;;OAEG;IACH,IAAI,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAEzB;IAED;;OAEG;IACH,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAK7B;;OAEG;IACH,OAAO,IAAI,IAAI;IAMf;;OAEG;IACH,OAAO,IAAI,IAAI;IAQf;;OAEG;IACH,gBAAgB,CAAC,aAAa,EAAE,6BAA6B,GAAG,IAAI;IAIpE;;;;OAIG;IACH,kBAAkB,CAAC,OAAO,EAAE,mBAAmB,GAAG,iBAAiB,EAAE;IAmBrE;;OAEG;IACH,gBAAgB,CAAC,OAAO,EAAE,mBAAmB,GAAG,SAAS;IAWzD;;;OAGG;IACG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAwDpC;;OAEG;IACH,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC;IAE1B;;OAEG;IACH,SAAS,CAAC,cAAc,CACtB,OAAO,EAAE,mBAAmB,EAC5B,IAAI,EAAE,oBAAoB,GACzB,OAAO;IAUV;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAOrC;;OAEG;IACH,SAAS,CAAC,YAAY,CAAC,CAAC,EAAE,iBAAiB,EAAE,CAAC,EAAE,iBAAiB,GAAG,MAAM;IA6B1E;;OAEG;IACH,SAAS,CAAC,SAAS,EAAE,WAAW,CAAa;IAE7C;;OAEG;IACH,SAAS,CAAC,MAAM,EAAE,SAAS,CAAa;IAExC;;OAEG;IACH,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC;IAE/B;;OAEG;IACH,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE3B;;OAEG;IACH,SAAS,CAAC,WAAW,EAAE,MAAM,CAAC;IAE9B;;OAEG;IACH,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE3B;;OAEG;IACH,SAAS,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAEnC;;OAEG;IACH,SAAS,CAAC,cAAc,EAAE,6BAA6B,CAAC;IAExD;;OAEG;IACH,SAAS,CAAC,gBAAgB,cAAqB;IAE/C;;OAEG;IACH,SAAS,CAAC,MAAM,iBAAwB;IAExC;;OAEG;IACH,SAAS,CAAC,gBAAgB,gBAAuB;IAEjD,SAAS,CAAC,WAAW,UAAS;IAE9B;;OAEG;IACH,SAAS,CAAC,QAAQ,UAAQ;CAC3B"}
package/es/manager.js CHANGED
@@ -21,7 +21,7 @@ function _initializerWarningHelper(descriptor, context) { throw new Error('Decor
21
21
  // Copyright (c) Jupyter Development Team.
22
22
  // Distributed under the terms of the Modified BSD License.
23
23
 
24
- import { URL } from '@difizen/libro-common';
24
+ import { Poll, URL } from '@difizen/libro-common';
25
25
  import { PageConfig, ServerConnection, ServerManager } from '@difizen/libro-kernel';
26
26
  import { Deferred, Emitter } from '@difizen/mana-app';
27
27
  import { inject, postConstruct, transient } from '@difizen/mana-app';
@@ -67,24 +67,49 @@ export var LanguageServerManager = (_dec = transient(), _dec2 = inject(ServerCon
67
67
  key: "init",
68
68
  value: function init() {
69
69
  var _this = this;
70
- this.serverManager.ready.then(function () {
71
- _this.fetchSessions();
72
- return;
73
- }).catch(console.error);
70
+ this._pollSessions = new Poll({
71
+ auto: false,
72
+ factory: function factory() {
73
+ return _this.fetchSessions();
74
+ },
75
+ frequency: {
76
+ interval: 30 * 1000,
77
+ backoff: true,
78
+ max: 300 * 1000
79
+ },
80
+ name: "libro/fetch-lsp-sessions",
81
+ standby: 'when-hidden'
82
+ });
83
+ this.serverManager.ready.then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
84
+ return _regeneratorRuntime().wrap(function _callee$(_context) {
85
+ while (1) switch (_context.prev = _context.next) {
86
+ case 0:
87
+ _this._pollSessions.start();
88
+ return _context.abrupt("return");
89
+ case 2:
90
+ case "end":
91
+ return _context.stop();
92
+ }
93
+ }, _callee);
94
+ }))).catch(console.error);
74
95
  }
75
96
  }, {
76
97
  key: "refreshRunning",
77
98
  value: function () {
78
- var _refreshRunning = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
79
- return _regeneratorRuntime().wrap(function _callee$(_context) {
80
- while (1) switch (_context.prev = _context.next) {
99
+ var _refreshRunning = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
100
+ return _regeneratorRuntime().wrap(function _callee2$(_context2) {
101
+ while (1) switch (_context2.prev = _context2.next) {
81
102
  case 0:
82
- this.fetchSessions();
83
- case 1:
103
+ _context2.next = 2;
104
+ return this._pollSessions.refresh();
105
+ case 2:
106
+ _context2.next = 4;
107
+ return this._pollSessions.tick;
108
+ case 4:
84
109
  case "end":
85
- return _context.stop();
110
+ return _context2.stop();
86
111
  }
87
- }, _callee, this);
112
+ }, _callee2, this);
88
113
  }));
89
114
  function refreshRunning() {
90
115
  return _refreshRunning.apply(this, arguments);
@@ -170,18 +195,18 @@ export var LanguageServerManager = (_dec = transient(), _dec2 = inject(ServerCon
170
195
  }, {
171
196
  key: "enable",
172
197
  value: (function () {
173
- var _enable = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
174
- return _regeneratorRuntime().wrap(function _callee2$(_context2) {
175
- while (1) switch (_context2.prev = _context2.next) {
198
+ var _enable = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
199
+ return _regeneratorRuntime().wrap(function _callee3$(_context3) {
200
+ while (1) switch (_context3.prev = _context3.next) {
176
201
  case 0:
177
202
  this._enabled = true;
178
- _context2.next = 3;
203
+ _context3.next = 3;
179
204
  return this.fetchSessions();
180
205
  case 3:
181
206
  case "end":
182
- return _context2.stop();
207
+ return _context3.stop();
183
208
  }
184
- }, _callee2, this);
209
+ }, _callee3, this);
185
210
  }));
186
211
  function enable() {
187
212
  return _enable.apply(this, arguments);
@@ -209,6 +234,7 @@ export var LanguageServerManager = (_dec = transient(), _dec2 = inject(ServerCon
209
234
  if (this._isDisposed) {
210
235
  return;
211
236
  }
237
+ this._pollSessions.dispose();
212
238
  this._isDisposed = true;
213
239
  }
214
240
 
@@ -286,40 +312,40 @@ export var LanguageServerManager = (_dec = transient(), _dec2 = inject(ServerCon
286
312
  }, {
287
313
  key: "fetchSessions",
288
314
  value: (function () {
289
- var _fetchSessions = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
315
+ var _fetchSessions = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
290
316
  var sessions, response, data, _i, _Object$keys, key, id, oldKeys, oldKey, oldId;
291
- return _regeneratorRuntime().wrap(function _callee3$(_context3) {
292
- while (1) switch (_context3.prev = _context3.next) {
317
+ return _regeneratorRuntime().wrap(function _callee4$(_context4) {
318
+ while (1) switch (_context4.prev = _context4.next) {
293
319
  case 0:
294
320
  if (this._enabled) {
295
- _context3.next = 2;
321
+ _context4.next = 2;
296
322
  break;
297
323
  }
298
- return _context3.abrupt("return");
324
+ return _context4.abrupt("return");
299
325
  case 2:
300
- _context3.prev = 2;
301
- _context3.next = 5;
326
+ _context4.prev = 2;
327
+ _context4.next = 5;
302
328
  return this.serverConnection.makeRequest(this.statusUrl, {});
303
329
  case 5:
304
- response = _context3.sent;
330
+ response = _context4.sent;
305
331
  this._statusCode = response.status;
306
332
  if (response.ok) {
307
- _context3.next = 10;
333
+ _context4.next = 10;
308
334
  break;
309
335
  }
310
336
  if (this._retries > 0) {
311
337
  this._retries -= 1;
312
- setTimeout(this.fetchSessions.bind(this), this._retriesInterval);
338
+ // setTimeout(this.fetchSessions.bind(this), this._retriesInterval);
313
339
  } else {
314
340
  this._ready.resolve(undefined);
315
341
  console.warn('Missing jupyter_lsp server extension, skipping.');
316
342
  }
317
- return _context3.abrupt("return");
343
+ return _context4.abrupt("return");
318
344
  case 10:
319
- _context3.next = 12;
345
+ _context4.next = 12;
320
346
  return response.json();
321
347
  case 12:
322
- data = _context3.sent;
348
+ data = _context4.sent;
323
349
  sessions = data.sessions;
324
350
  try {
325
351
  this.version = data.version;
@@ -327,14 +353,14 @@ export var LanguageServerManager = (_dec = transient(), _dec2 = inject(ServerCon
327
353
  } catch (err) {
328
354
  console.warn(err);
329
355
  }
330
- _context3.next = 22;
356
+ _context4.next = 22;
331
357
  break;
332
358
  case 17:
333
- _context3.prev = 17;
334
- _context3.t0 = _context3["catch"](2);
335
- console.warn(_context3.t0);
359
+ _context4.prev = 17;
360
+ _context4.t0 = _context4["catch"](2);
361
+ console.warn(_context4.t0);
336
362
  this._ready.resolve(undefined);
337
- return _context3.abrupt("return");
363
+ return _context4.abrupt("return");
338
364
  case 22:
339
365
  for (_i = 0, _Object$keys = Object.keys(sessions); _i < _Object$keys.length; _i++) {
340
366
  key = _Object$keys[_i];
@@ -356,9 +382,9 @@ export var LanguageServerManager = (_dec = transient(), _dec2 = inject(ServerCon
356
382
  this._ready.resolve(undefined);
357
383
  case 27:
358
384
  case "end":
359
- return _context3.stop();
385
+ return _context4.stop();
360
386
  }
361
- }, _callee3, this, [[2, 17]]);
387
+ }, _callee4, this, [[2, 17]]);
362
388
  }));
363
389
  function fetchSessions() {
364
390
  return _fetchSessions.apply(this, arguments);
@@ -403,10 +429,10 @@ export var LanguageServerManager = (_dec = transient(), _dec2 = inject(ServerCon
403
429
  }, {
404
430
  key: "compareRanks",
405
431
  value: function compareRanks(a, b) {
406
- var _ref, _this$_configuration$, _this$_configuration$2, _ref2, _this$_configuration$3, _this$_configuration$4;
432
+ var _ref2, _this$_configuration$, _this$_configuration$2, _ref3, _this$_configuration$3, _this$_configuration$4;
407
433
  var DEFAULT_RANK = 50;
408
434
  var defaultServerRank = {
409
- 'pyright-extended': DEFAULT_RANK + 3,
435
+ 'libro-analyzer': DEFAULT_RANK + 3,
410
436
  pyright: DEFAULT_RANK + 2,
411
437
  pylsp: DEFAULT_RANK + 1,
412
438
  'bash-language-server': DEFAULT_RANK,
@@ -419,8 +445,8 @@ export var LanguageServerManager = (_dec = transient(), _dec2 = inject(ServerCon
419
445
  'yaml-language-server': DEFAULT_RANK,
420
446
  'r-languageserver': DEFAULT_RANK
421
447
  };
422
- var aRank = (_ref = (_this$_configuration$ = (_this$_configuration$2 = this._configuration[a]) === null || _this$_configuration$2 === void 0 ? void 0 : _this$_configuration$2.rank) !== null && _this$_configuration$ !== void 0 ? _this$_configuration$ : defaultServerRank[a]) !== null && _ref !== void 0 ? _ref : DEFAULT_RANK;
423
- var bRank = (_ref2 = (_this$_configuration$3 = (_this$_configuration$4 = this._configuration[b]) === null || _this$_configuration$4 === void 0 ? void 0 : _this$_configuration$4.rank) !== null && _this$_configuration$3 !== void 0 ? _this$_configuration$3 : defaultServerRank[b]) !== null && _ref2 !== void 0 ? _ref2 : DEFAULT_RANK;
448
+ var aRank = (_ref2 = (_this$_configuration$ = (_this$_configuration$2 = this._configuration[a]) === null || _this$_configuration$2 === void 0 ? void 0 : _this$_configuration$2.rank) !== null && _this$_configuration$ !== void 0 ? _this$_configuration$ : defaultServerRank[a]) !== null && _ref2 !== void 0 ? _ref2 : DEFAULT_RANK;
449
+ var bRank = (_ref3 = (_this$_configuration$3 = (_this$_configuration$4 = this._configuration[b]) === null || _this$_configuration$4 === void 0 ? void 0 : _this$_configuration$4.rank) !== null && _this$_configuration$3 !== void 0 ? _this$_configuration$3 : defaultServerRank[b]) !== null && _ref3 !== void 0 ? _ref3 : DEFAULT_RANK;
424
450
  if (aRank === bRank) {
425
451
  this.warnOnce("Two matching servers: ".concat(a, " and ").concat(b, " have the same rank; choose which one to use by changing the rank in Advanced Settings Editor"));
426
452
  return a.localeCompare(b);
@@ -1 +1 @@
1
- {"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../src/module.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AA4B/C,eAAO,MAAM,cAAc,YA+DG,CAAC"}
1
+ {"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../src/module.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AA2B/C,eAAO,MAAM,cAAc,YA+DG,CAAC"}
package/es/module.js CHANGED
@@ -5,12 +5,13 @@ import { DocumentConnectionManager } from "./connection-manager.js";
5
5
  import { LSPConnection, LSPConnectionFactory } from "./connection.js";
6
6
  import { CodeExtractorsManager } from "./extractors/index.js";
7
7
  import { FeatureManager } from "./feature.js";
8
- import { LSPAppContribution } from "./lsp-app-contribution.js";
9
8
  import { LanguageServerManager } from "./manager.js";
10
9
  import { LSPMonitor } from "./monitor.js";
11
10
  import { ILanguageServerManagerFactory, ILanguageServerManagerOptions, ILSPOptions } from "./tokens.js";
12
11
  import { IVirtualDocumentOptions, VirtualDocument, VirtualDocumentFactory, VirtualDocumentInfo, VirtualDocumentInfoFactory, VirtualDocumentInfoOptions } from "./virtual/document.js";
13
- export var LibroLSPModule = ManaModule.create().register(LSPAppContribution, DocumentConnectionManager, FeatureManager, CodeExtractorsManager, LanguageServerManager, {
12
+ export var LibroLSPModule = ManaModule.create().register(
13
+ // LSPAppContribution,
14
+ DocumentConnectionManager, FeatureManager, CodeExtractorsManager, LanguageServerManager, {
14
15
  token: ILanguageServerManagerFactory,
15
16
  useFactory: function useFactory(ctx) {
16
17
  return function (option) {
package/es/tokens.d.ts CHANGED
@@ -17,7 +17,7 @@ export { IDocumentInfo };
17
17
  * Custom server keys are allowed. Constraining the values helps avoid errors,
18
18
  * but at runtime any value is allowed.
19
19
  */
20
- export type TLanguageServerId = 'pyright-extended' | 'pyright' | 'pylsp' | 'bash-language-server' | 'dockerfile-language-server-nodejs' | 'javascript-typescript-langserver' | 'unified-language-server' | 'vscode-css-languageserver-bin' | 'vscode-html-languageserver-bin' | 'vscode-json-languageserver-bin' | 'yaml-language-server' | 'r-languageserver';
20
+ export type TLanguageServerId = 'libro-analyzer' | 'pyright' | 'pylsp' | 'bash-language-server' | 'dockerfile-language-server-nodejs' | 'javascript-typescript-langserver' | 'unified-language-server' | 'vscode-css-languageserver-bin' | 'vscode-html-languageserver-bin' | 'vscode-json-languageserver-bin' | 'yaml-language-server' | 'r-languageserver';
21
21
  /**
22
22
  * Type alias for the server ids.
23
23
  */
@@ -1 +1 @@
1
- {"version":3,"file":"tokens.d.ts","sourceRoot":"","sources":["../src/tokens.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tokens.d.ts","sourceRoot":"","sources":["../src/tokens.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@difizen/libro-lsp",
3
- "version": "0.1.17",
3
+ "version": "0.1.19",
4
4
  "description": "",
5
5
  "keywords": [
6
6
  "libro",
@@ -32,10 +32,10 @@
32
32
  "src"
33
33
  ],
34
34
  "dependencies": {
35
- "@difizen/libro-core": "^0.1.17",
36
- "@difizen/libro-kernel": "^0.1.17",
37
- "@difizen/libro-common": "^0.1.17",
38
- "@difizen/libro-code-editor": "^0.1.17",
35
+ "@difizen/libro-core": "^0.1.19",
36
+ "@difizen/libro-kernel": "^0.1.19",
37
+ "@difizen/libro-common": "^0.1.19",
38
+ "@difizen/libro-code-editor": "^0.1.19",
39
39
  "@difizen/mana-app": "latest",
40
40
  "lodash.mergewith": "^4.6.2",
41
41
  "uuid": "^9.0.0",
@@ -4,6 +4,7 @@
4
4
  // Distributed under the terms of the Modified BSD License.
5
5
 
6
6
  import type * as nbformat from '@difizen/libro-common';
7
+ import { MIME } from '@difizen/libro-common';
7
8
  import type {
8
9
  CellView,
9
10
  CellViewChange,
@@ -118,9 +119,7 @@ export class NotebookAdapter extends WidgetLSPAdapter<LibroView> {
118
119
  this._editorToCell.clear();
119
120
 
120
121
  return this.editor.model.cells
121
- .filter(
122
- (item) => EditorCellView.is(item) && item.model.mimeType === 'text/x-python',
123
- )
122
+ .filter((item) => EditorCellView.is(item) && item.model.mimeType === MIME.python)
124
123
  .map((cell) => {
125
124
  return {
126
125
  ceEditor: this.getCellEditor(cell)!,
@@ -188,7 +187,7 @@ export class NotebookAdapter extends WidgetLSPAdapter<LibroView> {
188
187
  * @param _session - Session context of changed kernel
189
188
  * @param change - Changed data
190
189
  */
191
- async onKernelChanged(): Promise<void> {
190
+ onKernelChanged = async (): Promise<void> => {
192
191
  try {
193
192
  // note: we need to wait until ready before updating language info
194
193
  const oldLanguageInfo = this._languageInfo;
@@ -212,7 +211,7 @@ export class NotebookAdapter extends WidgetLSPAdapter<LibroView> {
212
211
  // try to reconnect anyway
213
212
  this.reloadConnection();
214
213
  }
215
- }
214
+ };
216
215
 
217
216
  /**
218
217
  * Dispose the widget.
@@ -397,9 +396,11 @@ export class NotebookAdapter extends WidgetLSPAdapter<LibroView> {
397
396
  return;
398
397
  }
399
398
 
400
- this._activeEditorChanged.fire({
401
- editor: this.getCellEditor(libroModel.active)!,
402
- });
399
+ if (libroModel.active) {
400
+ this._activeEditorChanged.fire({
401
+ editor: this.getCellEditor(libroModel.active)!,
402
+ });
403
+ }
403
404
  }
404
405
 
405
406
  /**
@@ -427,7 +427,7 @@ export class DocumentConnectionManager implements ILSPDocumentConnectionManager
427
427
  * language.
428
428
  */
429
429
  disconnect(languageId: TLanguageServerId): void {
430
- this.disconnect(languageId);
430
+ this.disconnectServer(languageId);
431
431
  }
432
432
 
433
433
  /**
package/src/connection.ts CHANGED
@@ -254,7 +254,9 @@ export class LSPConnection extends LspWsConnection implements ILSPConnection {
254
254
  if (this.isDisposed) {
255
255
  return;
256
256
  }
257
- Object.values(this.serverRequests).forEach((request) => request.clearHandler());
257
+ if (this.serverRequests) {
258
+ Object.values(this.serverRequests).forEach((request) => request.clearHandler());
259
+ }
258
260
  this.close();
259
261
  super.dispose();
260
262
  }
package/src/manager.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  // Copyright (c) Jupyter Development Team.
2
2
  // Distributed under the terms of the Modified BSD License.
3
3
 
4
- import { URL } from '@difizen/libro-common';
4
+ import { Poll, URL } from '@difizen/libro-common';
5
5
  import type { ISettings } from '@difizen/libro-kernel';
6
6
  import { PageConfig, ServerConnection, ServerManager } from '@difizen/libro-kernel';
7
7
  import type { Event } from '@difizen/mana-app';
@@ -21,6 +21,8 @@ import type {
21
21
 
22
22
  @transient()
23
23
  export class LanguageServerManager implements ILanguageServerManager {
24
+ protected _pollSessions: Poll;
25
+
24
26
  @inject(ServerConnection) serverConnection!: ServerConnection;
25
27
  @inject(ServerManager) serverManager!: ServerManager;
26
28
  constructor(
@@ -35,16 +37,28 @@ export class LanguageServerManager implements ILanguageServerManager {
35
37
 
36
38
  @postConstruct()
37
39
  init() {
40
+ this._pollSessions = new Poll({
41
+ auto: false,
42
+ factory: () => this.fetchSessions(),
43
+ frequency: {
44
+ interval: 30 * 1000,
45
+ backoff: true,
46
+ max: 300 * 1000,
47
+ },
48
+ name: `libro/fetch-lsp-sessions`,
49
+ standby: 'when-hidden',
50
+ });
38
51
  this.serverManager.ready
39
- .then(() => {
40
- this.fetchSessions();
52
+ .then(async () => {
53
+ this._pollSessions.start();
41
54
  return;
42
55
  })
43
56
  .catch(console.error);
44
57
  }
45
58
 
46
59
  async refreshRunning() {
47
- this.fetchSessions();
60
+ await this._pollSessions.refresh();
61
+ await this._pollSessions.tick;
48
62
  }
49
63
 
50
64
  /**
@@ -127,6 +141,7 @@ export class LanguageServerManager implements ILanguageServerManager {
127
141
  if (this._isDisposed) {
128
142
  return;
129
143
  }
144
+ this._pollSessions.dispose();
130
145
  this._isDisposed = true;
131
146
  }
132
147
 
@@ -193,7 +208,7 @@ export class LanguageServerManager implements ILanguageServerManager {
193
208
  if (!response.ok) {
194
209
  if (this._retries > 0) {
195
210
  this._retries -= 1;
196
- setTimeout(this.fetchSessions.bind(this), this._retriesInterval);
211
+ // setTimeout(this.fetchSessions.bind(this), this._retriesInterval);
197
212
  } else {
198
213
  this._ready.resolve(undefined);
199
214
  console.warn('Missing jupyter_lsp server extension, skipping.');
@@ -272,7 +287,7 @@ export class LanguageServerManager implements ILanguageServerManager {
272
287
  protected compareRanks(a: TLanguageServerId, b: TLanguageServerId): number {
273
288
  const DEFAULT_RANK = 50;
274
289
  const defaultServerRank: Record<TLanguageServerId, number> = {
275
- 'pyright-extended': DEFAULT_RANK + 3,
290
+ 'libro-analyzer': DEFAULT_RANK + 3,
276
291
  pyright: DEFAULT_RANK + 2,
277
292
  pylsp: DEFAULT_RANK + 1,
278
293
  'bash-language-server': DEFAULT_RANK,
package/src/module.ts CHANGED
@@ -10,7 +10,6 @@ import { DocumentConnectionManager } from './connection-manager.js';
10
10
  import { LSPConnection, LSPConnectionFactory } from './connection.js';
11
11
  import { CodeExtractorsManager } from './extractors/index.js';
12
12
  import { FeatureManager } from './feature.js';
13
- import { LSPAppContribution } from './lsp-app-contribution.js';
14
13
  import { LanguageServerManager } from './manager.js';
15
14
  import { LSPMonitor } from './monitor.js';
16
15
  import {
@@ -29,7 +28,7 @@ import {
29
28
 
30
29
  export const LibroLSPModule = ManaModule.create()
31
30
  .register(
32
- LSPAppContribution,
31
+ // LSPAppContribution,
33
32
  DocumentConnectionManager,
34
33
  FeatureManager,
35
34
  CodeExtractorsManager,
package/src/tokens.ts CHANGED
@@ -36,7 +36,7 @@ export { IDocumentInfo };
36
36
  * but at runtime any value is allowed.
37
37
  */
38
38
  export type TLanguageServerId =
39
- | 'pyright-extended'
39
+ | 'libro-analyzer'
40
40
  | 'pyright'
41
41
  | 'pylsp'
42
42
  | 'bash-language-server'