Skip to content

Commit f65b5e9

Browse files
committed
[880] linting
1 parent 4e476a8 commit f65b5e9

File tree

8 files changed

+1352
-2780
lines changed

8 files changed

+1352
-2780
lines changed

packages/jupyterlab-lsp/src/connection.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ export class LSPConnection extends LspWsConnection {
452452
method,
453453
message: params
454454
});
455-
this.connection.sendNotification(method, params).catch(console.error);
455+
this.connection.sendNotification(method, params);
456456
});
457457
}
458458

@@ -618,9 +618,10 @@ export class LSPConnection extends LspWsConnection {
618618
} as lsp.VersionedTextDocumentIdentifier,
619619
contentChanges: changeEvents
620620
};
621-
this.connection
622-
.sendNotification('textDocument/didChange', textDocumentChange)
623-
.catch(console.error);
621+
this.connection.sendNotification(
622+
'textDocument/didChange',
623+
textDocumentChange
624+
);
624625
documentInfo.version++;
625626
}
626627

packages/jupyterlab-lsp/src/connection_manager.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { PageConfig, URLExt } from '@jupyterlab/coreutils';
2-
import { ServerConnection } from '@jupyterlab/services';
32
import { Signal } from '@lumino/signaling';
43
import type * as protocol from 'vscode-languageserver-protocol';
54

@@ -392,7 +391,7 @@ export namespace DocumentConnectionManager {
392391
virtual_document: VirtualDocument,
393392
language: string
394393
): IURIs {
395-
const {settings} = Private.getLanguageServerManager();
394+
const { settings } = Private.getLanguageServerManager();
396395
const wsBase = settings.wsUrl;
397396
const rootUri = PageConfig.getOption('rootUri');
398397
const virtualDocumentsUri = PageConfig.getOption('virtualDocumentsUri');

packages/jupyterlab-lsp/src/manager.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ export class LanguageServerManager implements ILanguageServerManager {
169169
for (let key of Object.keys(sessions)) {
170170
let id: TLanguageServerId = key as TLanguageServerId;
171171
if (this._sessions.has(id)) {
172-
Object.assign(this._sessions.get(id), sessions[key]);
172+
Object.assign(this._sessions.get(id) || {}, sessions[key]);
173173
} else {
174174
this._sessions.set(id, sessions[key]);
175175
}

packages/lsp-ws-connection/src/test/connection.test.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,9 @@ describe('LspWsConnection', () => {
180180

181181
// Send the messages
182182
expect(mockSocket.send.callCount).equal(1);
183-
expect(JSON.parse(mockSocket.send.firstCall.args[0]).method).equal('initialize');
183+
expect(JSON.parse(mockSocket.send.firstCall.args[0]).method).equal(
184+
'initialize'
185+
);
184186
});
185187

186188
describe('register/unregister capability', () => {

packages/lsp-ws-connection/src/test/server-capability-registration.test.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,9 @@ describe('ServerCapabilities client registration', () => {
6767

6868
if (typeof capabilityOptions === 'boolean') {
6969
// eslint-disable-next-line jest/no-conditional-expect
70-
expect((newServerCapabilities as any)[capability]).equal(capabilityOptions);
70+
expect((newServerCapabilities as any)[capability]).equal(
71+
capabilityOptions
72+
);
7173
} else {
7274
// eslint-disable-next-line jest/no-conditional-expect
7375
expect((newServerCapabilities as any)[capability]).to.deep.equal(

packages/lsp-ws-connection/src/types.ts

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ export type AnyLocation =
2525
| undefined
2626
| null;
2727

28-
export type AnyCompletion = lsProtocol.CompletionList | lsProtocol.CompletionItem[];
28+
export type AnyCompletion =
29+
| lsProtocol.CompletionList
30+
| lsProtocol.CompletionItem[];
2931

3032
export enum CompletionTriggerKind {
3133
Invoked = 1,
@@ -45,7 +47,10 @@ type ConnectionEvent =
4547
| 'logging';
4648

4749
export interface ILspConnection {
48-
on(event: 'completion', callback: (items: lsProtocol.CompletionItem[]) => void): void;
50+
on(
51+
event: 'completion',
52+
callback: (items: lsProtocol.CompletionItem[]) => void
53+
): void;
4954
on(
5055
event: 'completionResolved',
5156
callback: (item: lsProtocol.CompletionItem) => void
@@ -60,7 +65,10 @@ export interface ILspConnection {
6065
): void;
6166
on(
6267
event: 'highlight',
63-
callback: (highlights: lsProtocol.DocumentHighlight[], documentUri: string) => void
68+
callback: (
69+
highlights: lsProtocol.DocumentHighlight[],
70+
documentUri: string
71+
) => void
6472
): void;
6573
on(
6674
event: 'signature',
@@ -70,7 +78,10 @@ export interface ILspConnection {
7078
event: 'goTo',
7179
callback: (location: AnyLocation, documentUri: string) => void
7280
): void;
73-
on(event: 'rename', callback: (edit: lsProtocol.WorkspaceEdit | null) => void): void;
81+
on(
82+
event: 'rename',
83+
callback: (edit: lsProtocol.WorkspaceEdit | null) => void
84+
): void;
7485
on(event: 'error', callback: (error: any) => void): void;
7586
on(event: 'logging', callback: (log: any) => void): void;
7687

packages/lsp-ws-connection/src/ws-connection.ts

Lines changed: 51 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@ import {
2929
* - initializeParams() was extracted, and can be modified by subclasses
3030
* - typescript 3.7 was adopted to clean up deep references
3131
*/
32-
export class LspWsConnection extends events.EventEmitter implements ILspConnection {
32+
export class LspWsConnection
33+
extends events.EventEmitter
34+
implements ILspConnection
35+
{
3336
public isConnected = false;
3437
public isInitialized = false;
3538
public documentInfo: ILspOptions;
@@ -164,14 +167,16 @@ export class LspWsConnection extends events.EventEmitter implements ILspConnecti
164167

165168
const message: protocol.InitializeParams = this.initializeParams();
166169

167-
this.connection.sendRequest<protocol.InitializeResult>('initialize', message).then(
168-
params => {
169-
this.onServerInitialized(params);
170-
},
171-
e => {
172-
console.warn('lsp-ws-connection initialization failure', e);
173-
}
174-
);
170+
this.connection
171+
.sendRequest<protocol.InitializeResult>('initialize', message)
172+
.then(
173+
params => {
174+
this.onServerInitialized(params);
175+
},
176+
e => {
177+
console.warn('lsp-ws-connection initialization failure', e);
178+
}
179+
);
175180
}
176181

177182
sendOpen(documentInfo: IDocumentInfo) {
@@ -183,7 +188,10 @@ export class LspWsConnection extends events.EventEmitter implements ILspConnecti
183188
version: documentInfo.version
184189
} as protocol.TextDocumentItem
185190
};
186-
this.connection.sendNotification('textDocument/didOpen', textDocumentMessage);
191+
this.connection.sendNotification(
192+
'textDocument/didOpen',
193+
textDocumentMessage
194+
);
187195
this.openedUris.set(documentInfo.uri, true);
188196
this.sendChange(documentInfo);
189197
}
@@ -203,7 +211,10 @@ export class LspWsConnection extends events.EventEmitter implements ILspConnecti
203211
} as protocol.VersionedTextDocumentIdentifier,
204212
contentChanges: [{ text: documentInfo.text }]
205213
};
206-
this.connection.sendNotification('textDocument/didChange', textDocumentChange);
214+
this.connection.sendNotification(
215+
'textDocument/didChange',
216+
textDocumentChange
217+
);
207218
documentInfo.version++;
208219
}
209220

@@ -219,15 +230,23 @@ export class LspWsConnection extends events.EventEmitter implements ILspConnecti
219230
} as protocol.VersionedTextDocumentIdentifier,
220231
text: documentInfo.text
221232
};
222-
this.connection.sendNotification('textDocument/didSave', textDocumentChange);
233+
this.connection.sendNotification(
234+
'textDocument/didSave',
235+
textDocumentChange
236+
);
223237
}
224238

225-
public sendConfigurationChange(settings: protocol.DidChangeConfigurationParams) {
239+
public sendConfigurationChange(
240+
settings: protocol.DidChangeConfigurationParams
241+
) {
226242
if (!this.isReady) {
227243
return;
228244
}
229245

230-
this.connection.sendNotification('workspace/didChangeConfiguration', settings);
246+
this.connection.sendNotification(
247+
'workspace/didChangeConfiguration',
248+
settings
249+
);
231250
}
232251

233252
public async getHoverTooltip(
@@ -305,7 +324,10 @@ export class LspWsConnection extends events.EventEmitter implements ILspConnecti
305324
return;
306325
}
307326
void this.connection
308-
.sendRequest<protocol.CompletionItem>('completionItem/resolve', completionItem)
327+
.sendRequest<protocol.CompletionItem>(
328+
'completionItem/resolve',
329+
completionItem
330+
)
309331
.then(result => {
310332
this.emit('completionResolved', result);
311333
});
@@ -368,18 +390,17 @@ export class LspWsConnection extends events.EventEmitter implements ILspConnecti
368390
return;
369391
}
370392

371-
const highlights = await this.connection.sendRequest<protocol.DocumentHighlight[]>(
372-
'textDocument/documentHighlight',
373-
{
374-
textDocument: {
375-
uri: documentInfo.uri
376-
},
377-
position: {
378-
line: location.line,
379-
character: location.ch
380-
}
381-
} as protocol.TextDocumentPositionParams
382-
);
393+
const highlights = await this.connection.sendRequest<
394+
protocol.DocumentHighlight[]
395+
>('textDocument/documentHighlight', {
396+
textDocument: {
397+
uri: documentInfo.uri
398+
},
399+
position: {
400+
line: location.line,
401+
character: location.ch
402+
}
403+
} as protocol.TextDocumentPositionParams);
383404

384405
if (emit) {
385406
this.emit('highlight', highlights, documentInfo.uri);
@@ -534,7 +555,9 @@ export class LspWsConnection extends events.EventEmitter implements ILspConnecti
534555
* The characters that trigger signature help automatically.
535556
*/
536557
public getLanguageSignatureCharacters(): string[] {
537-
return this.serverCapabilities?.signatureHelpProvider?.triggerCharacters || [];
558+
return (
559+
this.serverCapabilities?.signatureHelpProvider?.triggerCharacters || []
560+
);
538561
}
539562

540563
/**

0 commit comments

Comments
 (0)