Adopt latest monaco-editor-core, update to TS 4.0.3

This commit is contained in:
Alex Dima 2020-09-19 01:36:03 +02:00
parent ee6d058e66
commit 4ec20bbd1f
No known key found for this signature in database
GPG key ID: 6E58D7B045760DA0
6 changed files with 45 additions and 43 deletions

View file

@ -387,6 +387,7 @@ interface MyCompletionItem extends languages.CompletionItem {
label: string;
uri: Uri;
position: Position;
offset: number;
}
export class SuggestAdapter extends Adapter implements languages.CompletionItemProvider {
@ -433,6 +434,7 @@ export class SuggestAdapter extends Adapter implements languages.CompletionItemP
return {
uri: resource,
position: position,
offset: offset,
range: range,
label: entry.name,
insertText: entry.name,
@ -448,15 +450,13 @@ export class SuggestAdapter extends Adapter implements languages.CompletionItemP
}
public async resolveCompletionItem(
model: editor.ITextModel,
_position: Position,
item: languages.CompletionItem,
token: CancellationToken
): Promise<languages.CompletionItem> {
const myItem = <MyCompletionItem>item;
const resource = myItem.uri;
const position = myItem.position;
const offset = model.getOffsetAt(position);
const offset = myItem.offset;
const worker = await this._worker(resource);
const details = await worker.getCompletionEntryDetails(
@ -464,7 +464,7 @@ export class SuggestAdapter extends Adapter implements languages.CompletionItemP
offset,
myItem.label
);
if (!details || model.isDisposed()) {
if (!details) {
return myItem;
}
return <MyCompletionItem>{