Skip to content
This repository has been archived by the owner on Nov 5, 2021. It is now read-only.

Fix microsoft/monaco-editor#1576 update dependency to core #41

Merged
merged 1 commit into from Sep 18, 2019
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -21,7 +21,7 @@
"url": "https://github.com/Microsoft/monaco-typescript/issues"
},
"devDependencies": {
"monaco-editor-core": "^0.16.0",
"monaco-editor-core": "^0.18.0",
"monaco-languages": "^1.7.0",
"monaco-plugin-helpers": "^1.0.2",
"requirejs": "^2.3.6",
Expand Down
10 changes: 6 additions & 4 deletions src/languageFeatures.ts
Expand Up @@ -316,7 +316,7 @@ export class SignatureHelpAdapter extends Adapter implements monaco.languages.Si

public signatureHelpTriggerCharacters = ['(', ','];

provideSignatureHelp(model: monaco.editor.IReadOnlyModel, position: Position, token: CancellationToken): Thenable<monaco.languages.SignatureHelp> {
provideSignatureHelp(model: monaco.editor.IReadOnlyModel, position: Position, token: CancellationToken): Thenable<monaco.languages.SignatureHelpResult> {
let resource = model.uri;
return this._worker(resource).then(worker => worker.getSignatureHelpItems(resource.toString(), this._positionToOffset(resource, position))).then(info => {

Expand All @@ -334,7 +334,6 @@ export class SignatureHelpAdapter extends Adapter implements monaco.languages.Si

let signature: monaco.languages.SignatureInformation = {
label: '',
documentation: null,
parameters: []
};

Expand All @@ -355,8 +354,10 @@ export class SignatureHelpAdapter extends Adapter implements monaco.languages.Si
ret.signatures.push(signature);
});

return ret;

return {
value: ret,
dispose() {}
};
});
}
}
Expand Down Expand Up @@ -494,6 +495,7 @@ export class OutlineAdapter extends Adapter implements monaco.languages.Document
kind: <monaco.languages.SymbolKind>(outlineTypeTable[item.kind] || monaco.languages.SymbolKind.Variable),
range: this._textSpanToRange(resource, item.spans[0]),
selectionRange: this._textSpanToRange(resource, item.spans[0]),
tags: [],
containerName: containerLabel
};

Expand Down