Skip to content

Commit 128d275

Browse files
committed
Lint typescript changes
1 parent 49bd4ee commit 128d275

File tree

9 files changed

+79
-72
lines changed

9 files changed

+79
-72
lines changed

packages/jupyterlab-lsp/src/adapters/codemirror/cm_adapter.spec.ts

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,8 @@ import {
77
} from '../jupyterlab/jl_adapter';
88
import { IRootPosition } from '../../positioning';
99
import * as CodeMirror from 'codemirror';
10-
import { CodeMirrorLSPFeature, IFeatureSettings } from './feature';
11-
import { FileEditorFeatureTestEnvironment } from './testutils';
12-
13-
export class DummySettings implements IFeatureSettings {
14-
get(setting: string): any {
15-
}
16-
17-
set(setting: string, value: any): void {
18-
}
19-
}
10+
import { CodeMirrorLSPFeature } from './feature';
11+
import { DummySettings, FileEditorFeatureTestEnvironment } from './testutils';
2012

2113
describe('CodeMirrorAdapter', () => {
2214
let env: FileEditorFeatureTestEnvironment;

packages/jupyterlab-lsp/src/adapters/codemirror/feature.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
import { CodeMirrorLSPFeature } from './feature';
99
import {
1010
code_cell,
11+
DummySettings,
1112
FeatureTestEnvironment,
1213
FileEditorFeatureTestEnvironment,
1314
getCellsJSON,
@@ -22,7 +23,6 @@ import { language_specific_overrides } from '../../magics/defaults';
2223
import { foreign_code_extractors } from '../../extractors/defaults';
2324
import { NotebookModel } from '@jupyterlab/notebook';
2425
import { PageConfig } from '@jupyterlab/coreutils';
25-
import { DummySettings } from "./cm_adapter.spec";
2626

2727
const js_fib_code = `function fib(n) {
2828
return n<2?n:fib(n-1)+fib(n-2);

packages/jupyterlab-lsp/src/adapters/codemirror/features/completion.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,14 @@ export class Completion extends CodeMirrorLSPFeature {
2323
afterChange(change: CodeMirror.EditorChange): void {
2424
// TODO: maybe the completer could be kicked off in the handleChange() method directly; signature help still
2525
// requires an up-to-date virtual document on the LSP side, so we need to wait for sync.
26-
if (change.text && change.text[0].length == 1 && this.settings.get('continuousHinting') as boolean) {
26+
if (
27+
change.text &&
28+
change.text[0].length == 1 &&
29+
(this.settings.get('continuousHinting') as boolean)
30+
) {
2731
this.jupyterlab_components.invoke_completer(
2832
CompletionTriggerKind.Invoked
29-
)
33+
);
3034
return;
3135
}
3236

packages/jupyterlab-lsp/src/adapters/codemirror/testutils.ts

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@ import {
33
CodeMirrorEditorFactory
44
} from '@jupyterlab/codemirror';
55
import { VirtualEditor } from '../../virtual/editor';
6-
import { CodeMirrorLSPFeature, ILSPFeatureConstructor } from './feature';
6+
import {
7+
CodeMirrorLSPFeature,
8+
IFeatureSettings,
9+
ILSPFeatureConstructor
10+
} from './feature';
711
import { LSPConnection } from '../../connection';
812
import { CodeEditor } from '@jupyterlab/codeeditor';
913
import { VirtualFileEditor } from '../../virtual/editors/file_editor';
@@ -19,11 +23,11 @@ import { IOverridesRegistry } from '../../magics/overrides';
1923
import { IForeignCodeExtractorsRegistry } from '../../extractors/types';
2024
import * as nbformat from '@jupyterlab/nbformat';
2125
import { ICellModel } from '@jupyterlab/cells';
22-
import createNotebook = NBTestUtils.createNotebook;
2326
import { CodeMirrorAdapter } from './cm_adapter';
2427
import { VirtualDocument } from '../../virtual/document';
2528
import { LanguageServerManager } from '../../manager';
2629
import { DocumentConnectionManager } from '../../connection_manager';
30+
import createNotebook = NBTestUtils.createNotebook;
2731

2832
interface IFeatureTestEnvironment {
2933
host: HTMLElement;
@@ -276,3 +280,13 @@ export async function synchronize_content(
276280
console.warn(e);
277281
}
278282
}
283+
284+
export class DummySettings implements IFeatureSettings {
285+
get(setting: string): any {
286+
return null;
287+
}
288+
289+
set(setting: string, value: any): void {
290+
return;
291+
}
292+
}

packages/jupyterlab-lsp/src/adapters/jupyterlab/components/completion.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import { LSPConnection } from '../../../connection';
2121
import { Session } from '@jupyterlab/services';
2222
import ICompletionItemsResponseType = CompletionHandler.ICompletionItemsResponseType;
2323
import { kernelIcon } from '@jupyterlab/ui-components';
24-
import { IFeatureSettings } from "../../codemirror/feature";
24+
import { IFeatureSettings } from '../../codemirror/feature';
2525

2626
/**
2727
* A LSP connector for completion handlers.
@@ -42,11 +42,11 @@ export class LSPConnector
4242
private trigger_kind: CompletionTriggerKind;
4343

4444
private get suppress_auto_invoke_in(): string[] {
45-
return this.options.settings.get("suppressInvokeIn")
45+
return this.options.settings.get('suppressInvokeIn');
4646
}
4747

4848
private get should_show_documentation(): boolean {
49-
return this.options.settings.get("showDocumentation")
49+
return this.options.settings.get('showDocumentation');
5050
}
5151

5252
/**
@@ -227,11 +227,11 @@ export class LSPConnector
227227
label: match.label,
228228
insertText: match.insertText,
229229
type: match.kind ? completionItemKindNames[match.kind] : '',
230-
documentation: show_documentation ? (
231-
lsProtocol.MarkupContent.is(match.documentation)
232-
? match.documentation.value
233-
: match.documentation
234-
) : null,
230+
documentation: show_documentation
231+
? lsProtocol.MarkupContent.is(match.documentation)
232+
? match.documentation.value
233+
: match.documentation
234+
: null,
235235
filterText: match.filterText,
236236
deprecated: match.deprecated,
237237
data: { ...match }

packages/jupyterlab-lsp/src/adapters/jupyterlab/file_editor.ts

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { CodeMirrorEditor } from '@jupyterlab/codemirror';
77
import { LSPConnector } from './components/completion';
88
import { CodeEditor } from '@jupyterlab/codeeditor';
99
import { VirtualFileEditor } from '../../virtual/editors/file_editor';
10-
import { LSPExtension } from "../../index";
10+
import { LSPExtension } from '../../index';
1111

1212
export class FileEditorAdapter extends JupyterLabWidgetAdapter {
1313
editor: FileEditor;
@@ -45,11 +45,7 @@ export class FileEditorAdapter extends JupyterLabWidgetAdapter {
4545
editor_widget: IDocumentWidget<FileEditor>,
4646
jumper: FileEditorJumper
4747
) {
48-
super(
49-
extension,
50-
editor_widget,
51-
'completer:invoke-file',
52-
);
48+
super(extension, editor_widget, 'completer:invoke-file');
5349
this.jumper = jumper;
5450
this.editor = editor_widget.content;
5551

@@ -77,7 +73,7 @@ export class FileEditorAdapter extends JupyterLabWidgetAdapter {
7773
editor: this.editor.editor,
7874
connections: this.connection_manager.connections,
7975
virtual_editor: this.virtual_editor,
80-
settings: this.completion_settings,
76+
settings: this.completion_settings
8177
});
8278
this.extension.completion_manager.register({
8379
connector: this.current_completion_connector,

packages/jupyterlab-lsp/src/adapters/jupyterlab/jl_adapter.ts

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@ import { Diagnostics } from '../codemirror/features/diagnostics';
2222
import { Highlights } from '../codemirror/features/highlights';
2323
import { Hover } from '../codemirror/features/hover';
2424
import { Signature } from '../codemirror/features/signature';
25-
import { ILSPFeatureConstructor, ILSPFeature, IFeatureSettings } from '../codemirror/feature';
25+
import {
26+
ILSPFeatureConstructor,
27+
ILSPFeature,
28+
IFeatureSettings
29+
} from '../codemirror/feature';
2630
import { JumpToDefinition } from '../codemirror/features/jump_to';
2731
import { ICommandContext } from '../../command_manager';
2832
import { JSONObject } from '@lumino/coreutils';
@@ -32,22 +36,25 @@ import {
3236
ISocketConnectionOptions
3337
} from '../../connection_manager';
3438
import { Rename } from '../codemirror/features/rename';
35-
import { LSPExtension } from "../../index";
36-
import { ISettingRegistry } from "@jupyterlab/settingregistry";
37-
39+
import { LSPExtension } from '../../index';
40+
import { ISettingRegistry } from '@jupyterlab/settingregistry';
3841

3942
class LabFeatureSettings implements IFeatureSettings {
40-
4143
private key = 'features';
4244

43-
constructor(private extension: LSPExtension, protected feature_name: string) {}
45+
constructor(
46+
private extension: LSPExtension,
47+
protected feature_name: string
48+
) {}
4449

4550
protected get lab_settings(): ISettingRegistry.ISettings {
4651
return this.extension.settings;
4752
}
4853

4954
protected get_obj(): any {
50-
return (this.lab_settings.get(this.key).composite as any)[this.feature_name.toLowerCase()];
55+
return (this.lab_settings.get(this.key).composite as any)[
56+
this.feature_name.toLowerCase()
57+
];
5158
}
5259

5360
get(setting: string) {
@@ -57,11 +64,10 @@ class LabFeatureSettings implements IFeatureSettings {
5764
set(setting: string, value: any) {
5865
let obj = this.get_obj();
5966
obj[setting] = value;
60-
this.lab_settings.set(this.key, obj).catch(console.warn)
67+
this.lab_settings.set(this.key, obj).catch(console.warn);
6168
}
6269
}
6370

64-
6571
export const lsp_features: Array<ILSPFeatureConstructor> = [
6672
Completion,
6773
Diagnostics,
@@ -160,7 +166,7 @@ export abstract class JupyterLabWidgetAdapter
160166
protected constructor(
161167
protected extension: LSPExtension,
162168
protected widget: IDocumentWidget,
163-
invoke: string,
169+
invoke: string
164170
) {
165171
this.app = extension.app;
166172
this.rendermime_registry = extension.rendermime_registry;
@@ -169,7 +175,10 @@ export abstract class JupyterLabWidgetAdapter
169175
this.invoke_command = invoke;
170176
this.adapters = new Map();
171177
this.status_message = new StatusMessage();
172-
this.completion_settings = new LabFeatureSettings(this.extension, 'completion')
178+
this.completion_settings = new LabFeatureSettings(
179+
this.extension,
180+
'completion'
181+
);
173182

174183
// set up signal connections
175184
this.widget.context.saveState.connect(this.on_save_state, this);

packages/jupyterlab-lsp/src/adapters/jupyterlab/notebook.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import * as nbformat from '@jupyterlab/nbformat';
1414
import ILanguageInfoMetadata = nbformat.ILanguageInfoMetadata;
1515
import { Session } from '@jupyterlab/services';
1616
import { SessionContext } from '@jupyterlab/apputils';
17-
import { LSPExtension } from "../../index";
17+
import { LSPExtension } from '../../index';
1818

1919
export class NotebookAdapter extends JupyterLabWidgetAdapter {
2020
editor: Notebook;
@@ -31,11 +31,7 @@ export class NotebookAdapter extends JupyterLabWidgetAdapter {
3131
editor_widget: NotebookPanel,
3232
jumper: NotebookJumper
3333
) {
34-
super(
35-
extension,
36-
editor_widget,
37-
'completer:invoke-notebook',
38-
);
34+
super(extension, editor_widget, 'completer:invoke-notebook');
3935
this.editor = editor_widget.content;
4036
this.jumper = jumper;
4137
this.init_once_ready().catch(console.warn);

packages/jupyterlab-lsp/src/index.ts

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,7 @@ export class LSPExtension {
121121

122122
if (fileEditor.editor instanceof CodeMirrorEditor) {
123123
let jumper = new FileEditorJumper(widget, documentManager);
124-
let adapter = new FileEditorAdapter(
125-
this,
126-
widget,
127-
jumper,
128-
);
124+
let adapter = new FileEditorAdapter(this, widget, jumper);
129125
file_editor_adapters.set(fileEditor.id, adapter);
130126

131127
const disconnect = () => {
@@ -165,11 +161,7 @@ export class LSPExtension {
165161
const connect_notebook = (widget: NotebookPanel) => {
166162
// NOTE: assuming that the default cells content factory produces CodeMirror editors(!)
167163
let jumper = new NotebookJumper(widget, documentManager);
168-
let adapter = new NotebookAdapter(
169-
this,
170-
widget,
171-
jumper,
172-
);
164+
let adapter = new NotebookAdapter(this, widget, jumper);
173165
notebook_adapters.set(widget.id, adapter);
174166

175167
const disconnect = () => {
@@ -222,9 +214,11 @@ export class LSPExtension {
222214

223215
const languageServerSettings = (options.language_servers ||
224216
{}) as TLanguageServerConfigurations;
225-
this.connection_manager.updateServerConfigurations(languageServerSettings);
217+
this.connection_manager.updateServerConfigurations(
218+
languageServerSettings
219+
);
226220
this.settings = settings;
227-
}
221+
};
228222

229223
this.setting_registry
230224
.load(plugin.id)
@@ -243,7 +237,6 @@ export class LSPExtension {
243237
console.error(reason.message);
244238
});
245239
}
246-
247240
}
248241

249242
/**
@@ -264,18 +257,21 @@ const plugin: JupyterFrontEndPlugin<void> = {
264257
IStatusBar
265258
],
266259
activate: (app, ...args) => {
267-
new LSPExtension(app, ...args as [
268-
IEditorTracker,
269-
INotebookTracker,
270-
ISettingRegistry,
271-
ICommandPalette,
272-
IDocumentManager,
273-
ICompletionManager,
274-
IRenderMimeRegistry,
275-
IPaths,
276-
ILabShell,
277-
IStatusBar
278-
]);
260+
new LSPExtension(
261+
app,
262+
...(args as [
263+
IEditorTracker,
264+
INotebookTracker,
265+
ISettingRegistry,
266+
ICommandPalette,
267+
IDocumentManager,
268+
ICompletionManager,
269+
IRenderMimeRegistry,
270+
IPaths,
271+
ILabShell,
272+
IStatusBar
273+
])
274+
);
279275
},
280276
autoStart: true
281277
};

0 commit comments

Comments
 (0)