Skip to content

Commit

Permalink
Fix microsoft/monaco-editor#1576 update dependency to core
Browse files Browse the repository at this point in the history
* Update dependency to monaco-editor-core to 0.18.0
* Fix typing errors:
    * SignatureHelpAdapter#provideSignatureHelp return a wrapped SignatureHelpResult
    * monaco.languages.DocumentSymbol has got a new property: tags

The tags are an array SymbolTags, and the only existing SymbolTag is "Deprecated".
I did not find any information about that in the ts.NavigationBarItem, so the tags
are always an empty array for now.
  • Loading branch information
blutorange committed Sep 6, 2019
1 parent c9f75d5 commit 37f6c64
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
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

0 comments on commit 37f6c64

Please sign in to comment.