Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 autoload/ddc_vim_lsp.vim
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ function! ddc_vim_lsp#_callback(server, position, id, data) abort
\ 'response': a:data['response'],
\ }
let lspitems = lsp#omni#get_vim_completion_items(l:options)['items']
let isIncomplete = has_key(a:data['response']['result'], 'isIncomplete') ?
\ a:data['response']['result']['isIncomplete'] : v:false

call ddc#callback(a:id, lspitems)
call ddc#callback(a:id, {'items': lspitems, 'isIncomplete': isIncomplete})
endfunction

function! ddc_vim_lsp#request(server_name, id) abort
Expand Down
24 changes: 14 additions & 10 deletions denops/@ddc-sources/vim-lsp.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
import {
BaseSource,
Candidate,
} from "https://deno.land/x/ddc_vim@v1.2.0/types.ts#^";
Item,
DdcGatherItems,
} from "https://deno.land/x/ddc_vim@v2.0.0/types.ts#^";

import {
GatherCandidatesArguments,
} from "https://deno.land/x/ddc_vim@v1.2.0/base/source.ts#^";
GatherArguments,
} from "https://deno.land/x/ddc_vim@v2.0.0/base/source.ts#^";

// deno-lint-ignore ban-types
type Params = {};

export class Source extends BaseSource<Params> {
private counter = 0;
async gatherCandidates(
args: GatherCandidatesArguments<Params>,
): Promise<Candidate[]> {
async gather(
args: GatherArguments<Params>,
): Promise<DdcGatherItems> {
this.counter = (this.counter + 1) % 100;

const lspservers: string[] = await args.denops.call(
Expand All @@ -27,11 +28,14 @@ export class Source extends BaseSource<Params> {

const id = `source/${this.name}/${this.counter}`;

const [items] = await Promise.all([
args.onCallback(id) as Promise<Candidate[]>,
const [payload] = await Promise.all([
args.onCallback(id) as Promise<{
items: Item[];
isIncomplete: boolean;
}>,
args.denops.call("ddc_vim_lsp#request", lspservers[0], id),
]);
return items;
return { items: payload.items, isIncomplete: payload.isIncomplete };
}

params(): Params {
Expand Down