@jupyterlab/lsp 4.0.0-alpha.13 → 4.0.0-alpha.15

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.
@@ -1,17 +1,16 @@
1
- import { IDisposable } from '@lumino/disposable';
2
- import { CodeEditor } from '@jupyterlab/codeeditor';
3
1
  import { DocumentRegistry, IDocumentWidget } from '@jupyterlab/docregistry';
4
2
  import { ITranslator, TranslationBundle } from '@jupyterlab/translation';
3
+ import { IDisposable } from '@lumino/disposable';
5
4
  import { ISignal, Signal } from '@lumino/signaling';
6
5
  import { LanguageIdentifier } from '../lsp';
7
6
  import { IVirtualPosition } from '../positioning';
8
- import { IDocumentConnectionData, ILSPCodeExtractorsManager, ILSPDocumentConnectionManager, ILSPFeatureManager } from '../tokens';
9
- import { IForeignContext, VirtualDocument } from '../virtual/document';
7
+ import { Document, IDocumentConnectionData, ILSPCodeExtractorsManager, ILSPDocumentConnectionManager, ILSPFeatureManager } from '../tokens';
8
+ import { VirtualDocument } from '../virtual/document';
10
9
  export interface IEditorChangedData {
11
10
  /**
12
11
  * The CM editor invoking the change event.
13
12
  */
14
- editor: CodeEditor.IEditor;
13
+ editor: Document.IEditor;
15
14
  }
16
15
  export interface IAdapterOptions {
17
16
  /**
@@ -96,39 +95,36 @@ export declare abstract class WidgetLSPAdapter<T extends IDocumentWidget> implem
96
95
  /**
97
96
  * Get the activated CM editor.
98
97
  */
99
- abstract get activeEditor(): CodeEditor.IEditor | undefined;
98
+ abstract get activeEditor(): Document.IEditor | undefined;
100
99
  /**
101
- * Get the list of CM editors in the document, there is only one editor
100
+ * Get the list of CM editors in the document, there is only one editor
102
101
  * in the case of file editor.
103
102
  */
104
- abstract get editors(): {
105
- ceEditor: CodeEditor.IEditor;
106
- type: string;
107
- }[];
103
+ abstract get editors(): Document.ICodeBlockOptions[];
104
+ /**
105
+ * Promise that resolves once the adapter is initialized
106
+ */
107
+ abstract get ready(): Promise<void>;
108
108
  /**
109
109
  * The virtual document is connected or not
110
110
  */
111
- isConnected: boolean;
111
+ get isConnected(): boolean;
112
112
  /**
113
113
  * The LSP document and connection manager instance.
114
114
  */
115
- connectionManager: ILSPDocumentConnectionManager;
115
+ get connectionManager(): ILSPDocumentConnectionManager;
116
116
  /**
117
117
  * The translator provider.
118
118
  */
119
- trans: TranslationBundle;
119
+ get trans(): TranslationBundle;
120
120
  /**
121
121
  * Promise that resolves once the document is updated
122
122
  */
123
- updateFinished: Promise<void>;
124
- /**
125
- * Promise that resolves once the adapter is initialized
126
- */
127
- ready: Promise<void>;
123
+ get updateFinished(): Promise<void>;
128
124
  /**
129
125
  * Internal virtual document of the adapter.
130
126
  */
131
- virtualDocument: VirtualDocument;
127
+ get virtualDocument(): VirtualDocument;
132
128
  /**
133
129
  * Callback on connection closed event.
134
130
  */
@@ -152,7 +148,7 @@ export declare abstract class WidgetLSPAdapter<T extends IDocumentWidget> implem
152
148
  /**
153
149
  * (re)create virtual document using current path and language
154
150
  */
155
- abstract createVirtualDocument(): VirtualDocument;
151
+ protected abstract createVirtualDocument(): VirtualDocument;
156
152
  /**
157
153
  * Get the index of editor from the cursor position in the virtual
158
154
  * document. Since there is only one editor, this method always return
@@ -167,19 +163,18 @@ export declare abstract class WidgetLSPAdapter<T extends IDocumentWidget> implem
167
163
  *
168
164
  * @param ceEditor - instance of the code editor
169
165
  */
170
- abstract getEditorIndex(ceEditor: CodeEditor.IEditor): number;
166
+ abstract getEditorIndex(ceEditor: Document.IEditor): number;
171
167
  /**
172
168
  * Get the wrapper of input editor.
173
169
  *
174
170
  * @param ceEditor
175
171
  */
176
- abstract getEditorWrapper(ceEditor: CodeEditor.IEditor): HTMLElement;
172
+ abstract getEditorWrapper(ceEditor: Document.IEditor): HTMLElement;
177
173
  protected reloadConnection(): void;
178
174
  /**
179
175
  * Callback on document saved event.
180
176
  */
181
177
  protected onSaveState(context: DocumentRegistry.IContext<DocumentRegistry.IModel>, state: DocumentRegistry.SaveState): void;
182
- protected _isDisposed: boolean;
183
178
  /**
184
179
  * Connect the virtual document with the language server.
185
180
  */
@@ -205,7 +200,7 @@ export declare abstract class WidgetLSPAdapter<T extends IDocumentWidget> implem
205
200
  * @param host the VirtualDocument that contains the VirtualDocument in another language
206
201
  * @param context information about the foreign VirtualDocument
207
202
  */
208
- protected onForeignDocumentOpened(_: VirtualDocument, context: IForeignContext): Promise<void>;
203
+ protected onForeignDocumentOpened(_: VirtualDocument, context: Document.IForeignContext): Promise<void>;
209
204
  /**
210
205
  * Signal emitted when the adapter is connected.
211
206
  */
@@ -226,6 +221,12 @@ export declare abstract class WidgetLSPAdapter<T extends IDocumentWidget> implem
226
221
  * Signal emitted when the adapter is disposed.
227
222
  */
228
223
  protected _disposed: Signal<WidgetLSPAdapter<T>, void>;
224
+ private _isDisposed;
225
+ private readonly _connectionManager;
226
+ private readonly _trans;
227
+ private _isConnected;
228
+ private _updateFinished;
229
+ private _virtualDocument;
229
230
  /**
230
231
  * Callback called when a foreign document is closed,
231
232
  * the associated signals with this virtual document
@@ -1,9 +1,9 @@
1
1
  // Copyright (c) Jupyter Development Team.
2
2
  // Distributed under the terms of the Modified BSD License.
3
+ import mergeWith from 'lodash.mergewith';
3
4
  import { Dialog, showDialog } from '@jupyterlab/apputils';
4
5
  import { nullTranslator } from '@jupyterlab/translation';
5
6
  import { Signal } from '@lumino/signaling';
6
- import mergeWith from 'lodash.mergewith';
7
7
  const createButton = Dialog.createButton;
8
8
  /**
9
9
  * The values should follow the https://microsoft.github.io/language-server-protocol/specification guidelines
@@ -27,7 +27,6 @@ export class WidgetLSPAdapter {
27
27
  constructor(widget, options) {
28
28
  this.widget = widget;
29
29
  this.options = options;
30
- this._isDisposed = false;
31
30
  /**
32
31
  * Signal emitted when the adapter is connected.
33
32
  */
@@ -48,9 +47,10 @@ export class WidgetLSPAdapter {
48
47
  * Signal emitted when the adapter is disposed.
49
48
  */
50
49
  this._disposed = new Signal(this);
51
- this.connectionManager = options.connectionManager;
52
- this.isConnected = false;
53
- this.trans = (options.translator || nullTranslator).load('jupyterlab');
50
+ this._isDisposed = false;
51
+ this._connectionManager = options.connectionManager;
52
+ this._isConnected = false;
53
+ this._trans = (options.translator || nullTranslator).load('jupyterlab');
54
54
  // set up signal connections
55
55
  this.widget.context.saveState.connect(this.onSaveState, this);
56
56
  this.connectionManager.closed.connect(this.onConnectionClosed, this);
@@ -88,7 +88,7 @@ export class WidgetLSPAdapter {
88
88
  let [type, subtype] = withoutParameters.split('/');
89
89
  if (type === 'application' || type === 'text') {
90
90
  if (subtype.startsWith('x-')) {
91
- return subtype.substr(2);
91
+ return subtype.substring(2);
92
92
  }
93
93
  else {
94
94
  return subtype;
@@ -129,6 +129,36 @@ export class WidgetLSPAdapter {
129
129
  get editorRemoved() {
130
130
  return this._editorRemoved;
131
131
  }
132
+ /**
133
+ * The virtual document is connected or not
134
+ */
135
+ get isConnected() {
136
+ return this._isConnected;
137
+ }
138
+ /**
139
+ * The LSP document and connection manager instance.
140
+ */
141
+ get connectionManager() {
142
+ return this._connectionManager;
143
+ }
144
+ /**
145
+ * The translator provider.
146
+ */
147
+ get trans() {
148
+ return this._trans;
149
+ }
150
+ /**
151
+ * Promise that resolves once the document is updated
152
+ */
153
+ get updateFinished() {
154
+ return this._updateFinished;
155
+ }
156
+ /**
157
+ * Internal virtual document of the adapter.
158
+ */
159
+ get virtualDocument() {
160
+ return this._virtualDocument;
161
+ }
132
162
  /**
133
163
  * Callback on connection closed event.
134
164
  */
@@ -141,27 +171,26 @@ export class WidgetLSPAdapter {
141
171
  * Dispose the adapter.
142
172
  */
143
173
  dispose() {
174
+ var _a;
144
175
  if (this._isDisposed) {
145
176
  return;
146
177
  }
147
178
  this._isDisposed = true;
179
+ (_a = this.virtualDocument) === null || _a === void 0 ? void 0 : _a.dispose();
148
180
  this.widget.context.saveState.disconnect(this.onSaveState, this);
149
181
  this.connectionManager.closed.disconnect(this.onConnectionClosed, this);
150
182
  this.widget.disposed.disconnect(this.dispose, this);
183
+ this.virtualDocument.changed.disconnect(this.documentChanged);
151
184
  this.disconnect();
152
185
  this._disposed.emit();
153
186
  Signal.clearData(this);
154
- // just to be sure
155
- this.widget = null;
156
- this.connectionManager = null;
157
- this.widget = null;
158
187
  }
159
188
  /**
160
189
  * Disconnect virtual document from the language server.
161
190
  */
162
191
  disconnect() {
163
192
  this.connectionManager.unregisterDocument(this.virtualDocument);
164
- this.widget.context.model.contentChanged.disconnect(this._onContentChanged, this);
193
+ this.widget.context.model.contentChanged.disconnect(this._onContentChanged);
165
194
  // pretend that all editors were removed to trigger the disconnection of even handlers
166
195
  // they will be connected again on new connection
167
196
  for (let { ceEditor: editor } of this.editors) {
@@ -179,13 +208,7 @@ export class WidgetLSPAdapter {
179
208
  console.warn('Cannot update documents: adapter disposed');
180
209
  return Promise.reject('Cannot update documents: adapter disposed');
181
210
  }
182
- return this.virtualDocument.updateManager.updateDocuments(this.editors.map(({ ceEditor, type }) => {
183
- return {
184
- ceEditor: ceEditor,
185
- value: ceEditor.model.value.text,
186
- type
187
- };
188
- }));
211
+ return this.virtualDocument.updateManager.updateDocuments(this.editors);
189
212
  }
190
213
  /**
191
214
  * Callback called on the document changed event.
@@ -252,7 +275,7 @@ export class WidgetLSPAdapter {
252
275
  async onConnected(data) {
253
276
  let { virtualDocument } = data;
254
277
  this._adapterConnected.emit(data);
255
- this.isConnected = true;
278
+ this._isConnected = true;
256
279
  try {
257
280
  await this.updateDocuments();
258
281
  }
@@ -262,16 +285,11 @@ export class WidgetLSPAdapter {
262
285
  }
263
286
  // refresh the document on the LSP server
264
287
  this.documentChanged(virtualDocument, virtualDocument, true);
265
- // Note: the logger extension behaves badly with non-default names
266
- // as it changes the source to the active file afterwards anyways
267
- // const loggerSourceName = virtualDocument.uri;
268
- let log;
269
- log = (text) => console.log(text);
270
288
  data.connection.serverNotifications['$/logTrace'].connect((connection, message) => {
271
289
  console.log(data.connection.serverIdentifier, 'trace', virtualDocument.uri, message);
272
290
  });
273
291
  data.connection.serverNotifications['window/logMessage'].connect((connection, message) => {
274
- log(connection.serverIdentifier + ': ' + message.message);
292
+ console.log(connection.serverIdentifier + ': ' + message.message);
275
293
  });
276
294
  data.connection.serverNotifications['window/showMessage'].connect((connection, message) => {
277
295
  void showDialog({
@@ -330,7 +348,10 @@ export class WidgetLSPAdapter {
330
348
  console.error('Could not initialize a VirtualDocument for adapter: ', this);
331
349
  return;
332
350
  }
333
- this.virtualDocument = virtualDocument;
351
+ if (this._virtualDocument) {
352
+ this._virtualDocument.dispose();
353
+ }
354
+ this._virtualDocument = virtualDocument;
334
355
  this._connectContentChangedSignal();
335
356
  }
336
357
  /**
@@ -420,7 +441,7 @@ export class WidgetLSPAdapter {
420
441
  console.warn('Could not update documents');
421
442
  return;
422
443
  }
423
- this.updateFinished = promise.catch(console.warn);
444
+ this._updateFinished = promise.catch(console.warn);
424
445
  await this.updateFinished;
425
446
  }
426
447
  }
@@ -1 +1 @@
1
- {"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../src/adapters/adapter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../src/adapters/adapter.ts"],"names":[],"mappings":"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"}
@@ -48,10 +48,6 @@ export declare class LSPConnection extends LspWsConnection implements ILSPConnec
48
48
  * Should log all communication?
49
49
  */
50
50
  logAllCommunication: boolean;
51
- /**
52
- * Check if the connection is disposed
53
- */
54
- get isDisposed(): boolean;
55
51
  /**
56
52
  * Signal emitted when the connection is closed.
57
53
  */
@@ -143,7 +139,6 @@ export declare class LSPConnection extends LspWsConnection implements ILSPConnec
143
139
  private _closeSignal;
144
140
  private _errorSignal;
145
141
  private _serverInitialized;
146
- private _isDisposed;
147
142
  /**
148
143
  * Send the document changed data to the server.
149
144
  */
package/lib/connection.js CHANGED
@@ -121,7 +121,6 @@ export class LSPConnection extends LspWsConnection {
121
121
  this._closeSignal = new Signal(this);
122
122
  this._errorSignal = new Signal(this);
123
123
  this._serverInitialized = new Signal(this);
124
- this._isDisposed = false;
125
124
  this._options = options;
126
125
  this.logAllCommunication = false;
127
126
  this.serverIdentifier = options.serverIdentifier;
@@ -132,12 +131,6 @@ export class LSPConnection extends LspWsConnection {
132
131
  this.serverNotifications =
133
132
  this.constructNotificationHandlers(Method.ServerNotification);
134
133
  }
135
- /**
136
- * Check if the connection is disposed
137
- */
138
- get isDisposed() {
139
- return this._isDisposed;
140
- }
141
134
  /**
142
135
  * Signal emitted when the connection is closed.
143
136
  */
@@ -161,12 +154,12 @@ export class LSPConnection extends LspWsConnection {
161
154
  * Dispose the connection.
162
155
  */
163
156
  dispose() {
164
- if (this._isDisposed) {
157
+ if (this.isDisposed) {
165
158
  return;
166
159
  }
167
- this._isDisposed = true;
160
+ Object.values(this.serverRequests).forEach(request => request.clearHandler());
168
161
  this.close();
169
- Signal.clearData(this);
162
+ super.dispose();
170
163
  }
171
164
  /**
172
165
  * Helper to print the logs to logger, for now we are using
@@ -228,10 +221,11 @@ export class LSPConnection extends LspWsConnection {
228
221
  return this.isConnected;
229
222
  }, -1)
230
223
  .then(() => {
231
- this.connection.onClose(() => {
224
+ const disposable = this.connection.onClose(() => {
232
225
  this._isConnected = false;
233
226
  this._closeSignal.emit(this._closingManually);
234
227
  });
228
+ this._disposables.push(disposable);
235
229
  })
236
230
  .catch(() => {
237
231
  console.error('Could not connect onClose signal');
@@ -251,7 +245,8 @@ export class LSPConnection extends LspWsConnection {
251
245
  * Generate the notification handlers
252
246
  */
253
247
  constructNotificationHandlers(methods) {
254
- return createMethodMap(methods, () => new Signal(this));
248
+ const factory = () => new Signal(this);
249
+ return createMethodMap(methods, factory);
255
250
  }
256
251
  /**
257
252
  * Generate the client request handler
@@ -270,7 +265,13 @@ export class LSPConnection extends LspWsConnection {
270
265
  * Subclasses can overload this when adding more features.
271
266
  */
272
267
  initializeParams() {
273
- return Object.assign(Object.assign({}, super.initializeParams()), { capabilities: this._options.capabilities, initializationOptions: null, processId: null, workspaceFolders: null });
268
+ return {
269
+ ...super.initializeParams(),
270
+ capabilities: this._options.capabilities,
271
+ initializationOptions: null,
272
+ processId: null,
273
+ workspaceFolders: null
274
+ };
274
275
  }
275
276
  /**
276
277
  * Callback called when the server is initialized.
@@ -288,16 +289,18 @@ export class LSPConnection extends LspWsConnection {
288
289
  * client and server handlers
289
290
  */
290
291
  afterInitialized() {
291
- this.connection.onError(e => this._errorSignal.emit(e));
292
+ const disposable = this.connection.onError(e => this._errorSignal.emit(e));
293
+ this._disposables.push(disposable);
292
294
  for (const method of Object.values(Method.ServerNotification)) {
293
295
  const signal = this.serverNotifications[method];
294
- this.connection.onNotification(method, params => {
296
+ const disposable = this.connection.onNotification(method, params => {
295
297
  this.log(MessageKind.serverNotifiedClient, {
296
298
  method,
297
299
  message: params
298
300
  });
299
301
  signal.emit(params);
300
302
  });
303
+ this._disposables.push(disposable);
301
304
  }
302
305
  for (const method of Object.values(Method.ClientNotification)) {
303
306
  const signal = this.clientNotifications[method];
@@ -1 +1 @@
1
- {"version":3,"file":"connection.js","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"connection.js","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAE3D,OAAO,EAAW,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAYL,MAAM,EAGP,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EACL,wBAAwB,EACxB,0BAA0B,EAC3B,MAAM,gDAAgD,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAMhE;;GAEG;AACH,MAAM,oBAAoB;IAIxB,YACY,UAA6B,EAC7B,MAAS,EACT,OAAsB;QAFtB,eAAU,GAAV,UAAU,CAAmB;QAC7B,WAAM,GAAN,MAAM,CAAG;QACT,YAAO,GAAP,OAAO,CAAe;IAC/B,CAAC;IACJ,OAAO,CAAC,MAA+B;QACrC,0BAA0B;QAC1B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,eAAe,EAAE;YAC5C,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,OAAO,EAAE,MAAM;SAChB,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,UAAU;aACnB,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC;aAChC,IAAI,CAAC,CAAC,MAAwB,EAAE,EAAE;YACjC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,eAAe,EAAE;gBAC5C,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,OAAO,EAAE,MAAM;aAChB,CAAC,CAAC;YACH,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC,CAAC;IACP,CAAC;CACF;AAED;;GAEG;AACH,MAAM,oBAAoB;IAIxB,YACY,UAA6B,EAC7B,MAAS,EACT,OAAsB;QAFtB,eAAU,GAAV,UAAU,CAAmB;QAC7B,WAAM,GAAN,MAAM,CAAG;QACT,YAAO,GAAP,OAAO,CAAe;QAEhC,gCAAgC;QAChC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3D,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;IACvB,CAAC;IAED,UAAU,CACR,OAG8B;QAE9B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC1B,CAAC;IAED,YAAY;QACV,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;IACvB,CAAC;IASO,OAAO,CACb,OAAgC;QAEhC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,eAAe,EAAE;YAC5C,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,OAAO,EAAE,OAAO;SACjB,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,OAAO,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;SACrC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YACxD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,iBAAiB,EAAE;gBAC9C,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,OAAO,EAAE,MAAM;aAChB,CAAC,CAAC;YACH,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAED,MAAM,CAAC,MAAM,QAAQ,GAAoD;IACvE,kBAAkB,EAAE,kBAAkB;IACtC,UAAU,EAAE,oBAAoB;IAChC,KAAK,EAAE,eAAe;IACtB,cAAc,EAAE,uBAAuB;IACvC,WAAW,EAAE,qBAAqB;IAClC,UAAU,EAAE,oBAAoB;IAChC,eAAe,EAAE,wBAAwB;IACzC,cAAc,EAAE,wBAAwB;IACxC,UAAU,EAAE,oBAAoB;IAChC,kBAAkB,EAAE,2BAA2B;IAC/C,eAAe,EAAE,wBAAwB;IACzC,WAAW,EAAE,oBAAoB;IACjC,SAAS,EAAE,kBAAkB;IAC7B,aAAa,EAAE,sBAAsB;IACrC,KAAK,EAAE,eAAe;IACtB,mBAAmB,EAAE,4BAA4B;IACjD,yBAAyB,EAAE,iCAAiC;IAC5D,2BAA2B,EAAE,kCAAkC;IAC/D,MAAM,EAAE,gBAAgB;IACxB,aAAa,EAAE,sBAAsB;IACrC,eAAe,EAAE,wBAAwB;IACzC,eAAe,EAAE,wBAAwB;IACzC,gBAAgB,EAAE,yBAAyB;IAC3C,SAAS,EAAE,WAAW;CACvB,CAAC;AAaF;;GAEG;AACH,SAAS,eAAe,CACtB,OAAsB,EACtB,cAAgC;IAEhC,MAAM,MAAM,GAAuB,EAAE,CAAC;IACtC,KAAK,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE;QACzC,MAAM,CAAC,MAAW,CAAC,GAAG,cAAc,CAAC,MAAW,CAAC,CAAC;KACnD;IACD,OAAO,MAAW,CAAC;AACrB,CAAC;AAED,IAAK,WAOJ;AAPD,WAAK,WAAW;IACd,6EAAoB,CAAA;IACpB,6EAAoB,CAAA;IACpB,mEAAe,CAAA;IACf,mEAAe,CAAA;IACf,mEAAe,CAAA;IACf,uEAAiB,CAAA;AACnB,CAAC,EAPI,WAAW,KAAX,WAAW,QAOf;AAOD,MAAM,OAAO,aAAc,SAAQ,eAAe;IAChD,YAAY,OAAoB;QAC9B,KAAK,CAAC,OAAO,CAAC,CAAC;QA0VjB;;WAEG;QACK,qBAAgB,GAAG,KAAK,CAAC;QAIzB,iBAAY,GAAoC,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC;QACjE,iBAAY,GAAgC,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC;QAC7D,uBAAkB,GAGtB,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC;QArWnB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,mBAAmB,GAAG,KAAK,CAAC;QACjC,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;QACjD,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,UAAU,CAAC;QACzC,IAAI,CAAC,eAAe,GAAG,EAAE,CAAC;QAC1B,IAAI,CAAC,mBAAmB;YACtB,IAAI,CAAC,6BAA6B,CAChC,MAAM,CAAC,kBAAkB,CAC1B,CAAC;QACJ,IAAI,CAAC,mBAAmB;YACtB,IAAI,CAAC,6BAA6B,CAChC,MAAM,CAAC,kBAAkB,CAC1B,CAAC;IACN,CAAC;IAqCD;;OAEG;IACH,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED;;;OAGG;IACH,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED;;OAEG;IACH,IAAI,iBAAiB;QAInB,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACjC,CAAC;IAED;;OAEG;IACH,OAAO;QACL,IAAI,IAAI,CAAC,UAAU,EAAE;YACnB,OAAO;SACR;QACD,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CACnD,OAAO,CAAC,YAAY,EAAE,CACvB,CAAC;QACF,IAAI,CAAC,KAAK,EAAE,CAAC;QACb,KAAK,CAAC,OAAO,EAAE,CAAC;IAClB,CAAC;IAED;;;OAGG;IACH,GAAG,CAAC,IAAiB,EAAE,OAAoB;QACzC,IAAI,IAAI,CAAC,mBAAmB,EAAE;YAC5B,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAC5B;IACH,CAAC;IAED;;;OAGG;IACH,iBAAiB,CAAC,YAA2B;QAC3C,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;SAC7B;aAAM;YACL,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;SACzC;IACH,CAAC;IAED;;OAEG;IACH,mBAAmB,CACjB,WAA+C,EAC/C,YAA2B;QAE3B,IAAI,CAAC,WAAW,CAAC,CAAC,WAAW,CAAC,EAAE,YAAY,CAAC,CAAC;IAChD,CAAC;IAED;;OAEG;IACH,kBAAkB,CAAC,IAAY,EAAE,YAA2B;QAC1D,IAAI,CAAC,WAAW,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,YAAY,CAAC,CAAC;IAC7C,CAAC;IAED;;OAEG;IACH,QAAQ,CAAC,QAAsC;QAC7C,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,kBAAkB,IAAI,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC1E,CAAC;IAED;;OAEG;IACH,KAAK;QACH,IAAI;YACF,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;YAC7B,KAAK,CAAC,KAAK,EAAE,CAAC;SACf;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,gBAAgB,GAAG,KAAK,CAAC;SAC/B;IACH,CAAC;IAED;;OAEG;IACH,OAAO,CAAC,MAAiB;QACvB,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACtB,UAAU,CAAC,GAAG,EAAE;YACd,OAAO,IAAI,CAAC,WAAW,CAAC;QAC1B,CAAC,EAAE,CAAC,CAAC,CAAC;aACH,IAAI,CAAC,GAAG,EAAE;YACT,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,EAAE;gBAC9C,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;gBAC1B,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YAChD,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACrC,CAAC,CAAC;aACD,KAAK,CAAC,GAAG,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,oBAAoB,CACxB,cAAkC;QAElC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,OAAO;SACR;QACD,OAAO,IAAI,CAAC,UAAU,CAAC,WAAW,CAChC,wBAAwB,EACxB,cAAc,CACf,CAAC;IACJ,CAAC;IAQD;;OAEG;IACO,6BAA6B,CAGrC,OAA4E;QAE5E,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,IAAI,MAAM,CAAW,IAAI,CAAC,CAAC;QACjD,OAAO,eAAe,CAAsB,OAAO,EAAE,OAAO,CAAC,CAAC;IAChE,CAAC;IAED;;OAEG;IACO,6BAA6B,CAGrC,OAAoC;QACpC,OAAO,eAAe,CACpB,OAAO,EACP,MAAM,CAAC,EAAE,CACP,IAAI,oBAAoB,CAAC,IAAI,CAAC,UAAU,EAAE,MAAkB,EAAE,IAAI,CAAC,CACtE,CAAC;IACJ,CAAC;IAED;;OAEG;IACO,6BAA6B,CAGrC,OAAoC;QACpC,OAAO,eAAe,CACpB,OAAO,EACP,MAAM,CAAC,EAAE,CACP,IAAI,oBAAoB,CAAC,IAAI,CAAC,UAAU,EAAE,MAAkB,EAAE,IAAI,CAAC,CACtE,CAAC;IACJ,CAAC;IAED;;;OAGG;IACO,gBAAgB;QACxB,OAAO;YACL,GAAG,KAAK,CAAC,gBAAgB,EAAE;YAC3B,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,YAAY;YACxC,qBAAqB,EAAE,IAAI;YAC3B,SAAS,EAAE,IAAI;YACf,gBAAgB,EAAE,IAAI;SACvB,CAAC;IACJ,CAAC;IAED;;OAEG;IACO,mBAAmB,CAAC,MAA4B;QACxD,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,KAAK,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;QAClC,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE;YAClC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,EAAG,CAAC,CAAC;SAC5C;QACD,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IACxD,CAAC;IAED;;;OAGG;IACO,gBAAgB;QACxB,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3E,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACnC,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,MAAM,CAChC,MAAM,CAAC,kBAAkB,CACO,EAAE;YAClC,MAAM,MAAM,GAAG,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAqB,CAAC;YACpE,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE;gBACjE,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,oBAAoB,EAAE;oBACzC,MAAM;oBACN,OAAO,EAAE,MAAM;iBAChB,CAAC,CAAC;gBACH,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACtB,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;SACpC;QAED,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,MAAM,CAChC,MAAM,CAAC,kBAAkB,CACO,EAAE;YAClC,MAAM,MAAM,GAAG,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAqB,CAAC;YACpE,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACjC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,oBAAoB,EAAE;oBACzC,MAAM;oBACN,OAAO,EAAE,MAAM;iBAChB,CAAC,CAAC;gBACH,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YACxE,CAAC,CAAC,CAAC;SACJ;QAED,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,6BAA6B,CACtD,MAAM,CAAC,aAAa,CACrB,CAAC;QACF,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,6BAA6B,CACtD,MAAM,CAAC,aAAa,CACrB,CAAC;QAEF,IAAI,CAAC,cAAc,CAAC,2BAA2B,CAAC,CAAC,UAAU,CACzD,KAAK,EAAE,MAA8B,EAAE,EAAE;YACvC,MAAM,CAAC,aAAa,CAAC,OAAO,CAC1B,CAAC,sBAAwC,EAAE,EAAE;gBAC3C,IAAI;oBACF,MAAM,mBAAmB,GAAG,wBAAwB,CAClD,IAAI,CAAC,kBAAkB,EACvB,sBAAsB,CACvB,CAAC;oBACF,IAAI,mBAAmB,KAAK,IAAI,EAAE;wBAChC,OAAO,CAAC,KAAK,CACX,yCAAyC,sBAAsB,EAAE,CAClE,CAAC;wBACF,OAAO;qBACR;oBACD,IAAI,CAAC,kBAAkB,GAAG,mBAAmB,CAAC;iBAC/C;gBAAC,OAAO,GAAG,EAAE;oBACZ,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;iBACpB;YACH,CAAC,CACF,CAAC;QACJ,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,cAAc,CAAC,6BAA6B,CAAC,CAAC,UAAU,CAC3D,KAAK,EAAE,MAAgC,EAAE,EAAE;YACzC,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAC7B,CAAC,wBAA4C,EAAE,EAAE;gBAC/C,IAAI,CAAC,kBAAkB,GAAG,0BAA0B,CAClD,IAAI,CAAC,kBAAkB,EACvB,wBAAwB,CACzB,CAAC;YACJ,CAAC,CACF,CAAC;QACJ,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,cAAc,CAAC,yBAAyB,CAAC,CAAC,UAAU,CAAC,KAAK,EAAC,MAAM,EAAC,EAAE;YACvE,OAAO,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;gBAC7B,8EAA8E;gBAC9E,0DAA0D;gBAE1D,4EAA4E;gBAC5E,uDAAuD;gBACvD,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAgBD;;OAEG;IACK,WAAW,CACjB,YAAkD,EAClD,YAA2B;QAE3B,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,OAAO;SACR;QACD,IAAI,YAAY,CAAC,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;YACjC,OAAO;SACR;QACD,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE;YAC1C,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;SAC7B;QACD,MAAM,kBAAkB,GAAoC;YAC1D,YAAY,EAAE;gBACZ,GAAG,EAAE,YAAY,CAAC,GAAG;gBACrB,OAAO,EAAE,YAAY,CAAC,OAAO;aACS;YACxC,cAAc,EAAE,YAAY;SAC7B,CAAC;QACF,IAAI,CAAC,UAAU;aACZ,gBAAgB,CAAC,wBAAwB,EAAE,kBAAkB,CAAC;aAC9D,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACxB,YAAY,CAAC,OAAO,EAAE,CAAC;IACzB,CAAC;CACF"}
@@ -3,8 +3,8 @@ import { ISignal } from '@lumino/signaling';
3
3
  import { WidgetLSPAdapter } from './adapters/adapter';
4
4
  import { LSPConnection } from './connection';
5
5
  import { AskServersToSendTraceNotifications } from './plugin';
6
- import { IDocumentConnectionData, ILanguageServerManager, ILSPConnection, ILSPDocumentConnectionManager, ISocketConnectionOptions, TLanguageServerConfigurations, TLanguageServerId } from './tokens';
7
- import { IForeignContext, VirtualDocument } from './virtual/document';
6
+ import { Document, IDocumentConnectionData, ILanguageServerManager, ILSPConnection, ILSPDocumentConnectionManager, ISocketConnectionOptions, TLanguageServerConfigurations, TLanguageServerId } from './tokens';
7
+ import { VirtualDocument } from './virtual/document';
8
8
  /**
9
9
  * Each Widget with a document (whether file or a notebook) has the same DocumentConnectionManager
10
10
  * (see JupyterLabWidgetAdapter). Using id_path instead of uri led to documents being overwritten
@@ -77,11 +77,11 @@ export declare class DocumentConnectionManager implements ILSPDocumentConnection
77
77
  /**
78
78
  * Handle foreign document opened event.
79
79
  */
80
- onForeignDocumentOpened(_host: VirtualDocument, context: IForeignContext): void;
80
+ onForeignDocumentOpened(_host: VirtualDocument, context: Document.IForeignContext): void;
81
81
  /**
82
82
  * Handle foreign document closed event.
83
83
  */
84
- onForeignDocumentClosed(_host: VirtualDocument, context: IForeignContext): void;
84
+ onForeignDocumentClosed(_host: VirtualDocument, context: Document.IForeignContext): void;
85
85
  /**
86
86
  * Register a widget adapter with this manager
87
87
  *
@@ -116,7 +116,7 @@ export declare class DocumentConnectionManager implements ILSPDocumentConnection
116
116
  * Retry to connect to the server each `reconnectDelay` seconds
117
117
  * and for `retrialsLeft` times.
118
118
  * TODO: presently no longer referenced. A failing connection would close
119
- * the socket, triggering the language server on the other end to exit
119
+ * the socket, triggering the language server on the other end to exit.
120
120
  */
121
121
  retryToConnect(options: ISocketConnectionOptions, reconnectDelay: number, retrialsLeft?: number): Promise<void>;
122
122
  /**
@@ -17,11 +17,9 @@ export class DocumentConnectionManager {
17
17
  * singletons).
18
18
  */
19
19
  this.onNewConnection = (connection) => {
20
- connection.errorSignal.connect((_, e) => {
20
+ const errorSignalSlot = (_, e) => {
21
21
  console.error(e);
22
- // TODO invalid now
23
22
  let error = e.length && e.length >= 1 ? e[0] : new Error();
24
- // TODO: those codes may be specific to my proxy client, need to investigate
25
23
  if (error.message.indexOf('code = 1005') !== -1) {
26
24
  console.error(`Connection failed for ${connection}`);
27
25
  this._forEachDocumentOfConnection(connection, virtualDocument => {
@@ -37,16 +35,18 @@ export class DocumentConnectionManager {
37
35
  else {
38
36
  console.error('Connection error:', e);
39
37
  }
40
- });
41
- connection.serverInitialized.connect(() => {
38
+ };
39
+ connection.errorSignal.connect(errorSignalSlot);
40
+ const serverInitializedSlot = () => {
42
41
  // Initialize using settings stored in the SettingRegistry
43
42
  this._forEachDocumentOfConnection(connection, virtualDocument => {
44
43
  // TODO: is this still necessary, e.g. for status bar to update responsively?
45
44
  this._initialized.emit({ connection, virtualDocument });
46
45
  });
47
46
  this.updateServerConfigurations(this.initialConfigurations);
48
- });
49
- connection.closeSignal.connect((_, closedManually) => {
47
+ };
48
+ connection.serverInitialized.connect(serverInitializedSlot);
49
+ const closeSignalSlot = (_, closedManually) => {
50
50
  if (!closedManually) {
51
51
  console.error('Connection unexpectedly disconnected');
52
52
  }
@@ -56,7 +56,8 @@ export class DocumentConnectionManager {
56
56
  this._closed.emit({ connection, virtualDocument });
57
57
  });
58
58
  }
59
- });
59
+ };
60
+ connection.closeSignal.connect(closeSignalSlot);
60
61
  };
61
62
  this._initialized = new Signal(this);
62
63
  this._connected = new Signal(this);
@@ -161,6 +162,7 @@ export class DocumentConnectionManager {
161
162
  registerAdapter(path, adapter) {
162
163
  this.adapters.set(path, adapter);
163
164
  adapter.disposed.connect(() => {
165
+ this.documents.delete(adapter.virtualDocument.uri);
164
166
  this.adapters.delete(path);
165
167
  });
166
168
  }
@@ -200,7 +202,7 @@ export class DocumentConnectionManager {
200
202
  * Retry to connect to the server each `reconnectDelay` seconds
201
203
  * and for `retrialsLeft` times.
202
204
  * TODO: presently no longer referenced. A failing connection would close
203
- * the socket, triggering the language server on the other end to exit
205
+ * the socket, triggering the language server on the other end to exit.
204
206
  */
205
207
  async retryToConnect(options, reconnectDelay, retrialsLeft = -1) {
206
208
  let { virtualDocument } = options;