Skip to content

Commit 8b0c8d5

Browse files
committed
chore: import signature help types from atom-ide-base
1 parent ff8ba98 commit 8b0c8d5

File tree

3 files changed

+5
-58
lines changed

3 files changed

+5
-58
lines changed

lib/adapters/signature-help-adapter.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as atomIde from 'atom-ide';
1+
import type { SignatureHelpRegistry } from "atom-ide-base";
22
import assert = require('assert');
33
import Convert from '../convert';
44
import { ActiveServer } from '../server-manager';
@@ -37,7 +37,7 @@ export default class SignatureHelpAdapter {
3737
this._disposables.dispose();
3838
}
3939

40-
public attach(register: atomIde.SignatureHelpRegistry): void {
40+
public attach(register: SignatureHelpRegistry): void {
4141
const { signatureHelpProvider } = this._capabilities;
4242
assert(signatureHelpProvider != null);
4343

lib/auto-languageclient.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import * as ls from './languageclient';
33
import * as rpc from 'vscode-jsonrpc';
44
import * as path from 'path';
55
import * as atomIde from 'atom-ide';
6-
import type { OutlineProvider, Outline, DefinitionProvider, DefinitionQueryResult, FindReferencesProvider, FindReferencesReturn, Datatip, DatatipService, TextEdit, RangeCodeFormatProvider, FileCodeFormatProvider, OnSaveCodeFormatProvider, OnTypeCodeFormatProvider, CodeAction, CodeHighlightProvider, CodeActionProvider, Diagnostic, RefactorProvider, BusySignalService } from 'atom-ide-base';
6+
import type { OutlineProvider, Outline, DefinitionProvider, DefinitionQueryResult, FindReferencesProvider, FindReferencesReturn, Datatip, DatatipService, TextEdit, RangeCodeFormatProvider, FileCodeFormatProvider, OnSaveCodeFormatProvider, OnTypeCodeFormatProvider, CodeAction, CodeHighlightProvider, CodeActionProvider, Diagnostic, RefactorProvider, BusySignalService, SignatureHelpRegistry } from 'atom-ide-base';
77
import * as linter from 'atom/linter';
88
import Convert from './convert.js';
99
import ApplyEditAdapter from './adapters/apply-edit-adapter';
@@ -66,7 +66,7 @@ export default class AutoLanguageClient {
6666
private _serverManager!: ServerManager;
6767
private _consoleDelegate?: atomIde.ConsoleService;
6868
private _linterDelegate?: linter.IndieDelegate;
69-
private _signatureHelpRegistry?: atomIde.SignatureHelpRegistry;
69+
private _signatureHelpRegistry?: SignatureHelpRegistry;
7070
private _lastAutocompleteRequest?: ac.SuggestionsRequestedEvent;
7171
private _isDeactivating: boolean = false;
7272
private _serverAdapters = new WeakMap<ActiveServer, ServerAdapters>();
@@ -788,7 +788,7 @@ export default class AutoLanguageClient {
788788
);
789789
}
790790

791-
public consumeSignatureHelp(registry: atomIde.SignatureHelpRegistry): Disposable {
791+
public consumeSignatureHelp(registry: SignatureHelpRegistry): Disposable {
792792
this._signatureHelpRegistry = registry;
793793
for (const server of this._serverManager.getActiveServers()) {
794794
const signatureHelpAdapter = this.getServerAdapter(server, 'signatureHelpAdapter');

typings/atom-ide/index.d.ts

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,8 @@
11
declare module 'atom-ide' {
2-
import { Disposable, Point, TextEditor } from 'atom';
32
import * as ac from 'atom/autocomplete-plus';
43

54
export type IdeUri = string;
65

7-
export type SignatureHelpRegistry = (provider: SignatureHelpProvider) => Disposable;
8-
9-
/**
10-
* Signature help is activated when:
11-
* - upon keystroke, any provider with a matching grammar scope contains
12-
* the pressed key inside its triggerCharacters set
13-
* - the signature-help:show command is manually activated
14-
*
15-
* Once signature help has been triggered, the provider will be queried immediately
16-
* with the current cursor position, and then repeatedly upon cursor movements
17-
* until a null/empty signature is returned.
18-
*
19-
* Returned signatures will be displayed in a small datatip at the current cursor.
20-
* The highest-priority provider with a non-null result will be used.
21-
*/
22-
export interface SignatureHelpProvider {
23-
priority: number;
24-
grammarScopes: string[];
25-
26-
/**
27-
* A set of characters that will trigger signature help when typed.
28-
* If a null/empty set is provided, only manual activation of the command works.
29-
*/
30-
triggerCharacters?: Set<string>;
31-
32-
getSignatureHelp(editor: TextEditor, point: Point): Promise<SignatureHelp | null>;
33-
}
34-
35-
export interface SignatureHelp {
36-
signatures: SignatureInformation[];
37-
activeSignature: number | null;
38-
activeParameter: number | null;
39-
}
40-
41-
export interface SignatureInformation {
42-
label: string;
43-
documentation?: string | MarkupContent;
44-
parameters?: ParameterInformation[];
45-
}
46-
47-
export interface MarkupContent {
48-
kind: MarkupKind;
49-
value: string;
50-
}
51-
52-
export type MarkupKind = 'plaintext' | 'markdown';
53-
54-
export interface ParameterInformation {
55-
label: string | [number, number];
56-
documentation?: string | MarkupContent;
57-
}
58-
596
export interface SourceInfo {
607
id: string;
618
name: string;

0 commit comments

Comments
 (0)