Skip to content

[WIP] Resolve completions within LspServer.completion() #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[WIP] Resolve completions within LspServer.completion() #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion server/src/completion.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ import { asRange, toTextEdit, asPlainText, asTagsDocumentation, asDocumentation
import { Commands } from './commands';

export interface TSCompletionItem extends lsp.CompletionItem {
data: tsp.CompletionDetailsRequestArgs
data: tsp.CompletionDetailsRequestArgs;
hasAction?: true;
}

export function asCompletionItem(entry: import('typescript/lib/protocol').CompletionEntry, file: string, position: lsp.Position, document: LspDocument): TSCompletionItem {
Expand All @@ -22,6 +23,7 @@ export function asCompletionItem(entry: import('typescript/lib/protocol').Comple
kind: asCompletionItemKind(entry.kind),
sortText: entry.sortText,
commitCharacters: asCommitCharacters(entry.kind),
hasAction: entry.hasAction,
data: {
file,
line: position.line + 1,
Expand Down
27 changes: 25 additions & 2 deletions server/src/lsp-server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,8 @@ export class LspServer {
includeInsertTextCompletions: true
}));
const body = result.body || [];
return body.map(entry => asCompletionItem(entry, file, params.position, document));

return this.additionalTextEditsResolve(body.map((entry) => asCompletionItem(entry, file, params.position, document)));
} catch (error) {
if (error.message === "No content available.") {
this.logger.info('No content was available for completion request');
Expand All @@ -444,7 +445,29 @@ export class LspServer {
}
}

async completionResolve(item: TSCompletionItem): Promise<lsp.CompletionItem> {
async additionalTextEditsResolve(items: TSCompletionItem[]): Promise<TSCompletionItem[]> {
this.logger.log("completions/additionalTextEditsResolve", items);
return this.interuptDiagnostics(async () => {
return Promise.all(
items.map(async (item) => {
if (!item.hasAction) {
return item;
}
const { body } = await this.tspClient.request(
CommandTypes.CompletionDetails,
item.data
);
const details = body && body.length && body[0];
if (!details) {
return item;
}
return asResolvedCompletionItem(item, details);
})
);
});
}

async completionResolve(item: TSCompletionItem): Promise<TSCompletionItem> {
this.logger.log('completion/resolve', item);
const { body } = await this.interuptDiagnostics(() => this.tspClient.request(CommandTypes.CompletionDetails, item.data));
const details = body && body.length && body[0];
Expand Down