Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 18:49:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

add resolveDocumentLink method to the API

Browse Source
This commit is contained in:
Johannes Rieken
2016-08-03 17:32:07 +02:00
parent 07a53e91d0
commit 90172cec0a
6 changed files with 38 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vs/workbench/api/node/extHost.protocol.ts
View File

@@ -269,8 +269,8 @@ export abstract class ExtHostLanguageFeaturesShape {
$provideCompletionItems(handle: number, resource: URI, position: editorCommon.IPosition): TPromise<modes.ISuggestResult[]> { throw ni(); }
$resolveCompletionItem(handle: number, resource: URI, position: editorCommon.IPosition, suggestion: modes.ISuggestion): TPromise<modes.ISuggestion> { throw ni(); }
$provideSignatureHelp(handle: number, resource: URI, position: editorCommon.IPosition): TPromise<modes.SignatureHelp> { throw ni(); }
$providDocumentLinks(handle: number, resource: URI): TPromise<modes.ILink[]> { throw ni(); }
$provideDocumentLinks(handle: number, resource: URI): TPromise<modes.ILink[]> { throw ni(); }
$resolveDocumentLink(handle: number, link: modes.ILink): TPromise<modes.ILink> { throw ni(); }
}
export abstract class ExtHostQuickOpenShape {

16
src/vs/workbench/api/node/extHostLanguageFeatures.ts
View File

@@ -636,6 +636,16 @@ class LinkProviderAdapter {
}
});
}
resolveLink(link: modes.ILink): TPromise<modes.ILink> {
if (typeof this._provider.resolveDocumentLink === 'function') {
return asWinJsPromise(token => this._provider.resolveDocumentLink(TypeConverters.DocumentLink.to(link), token)).then(value => {
if (value) {
return TypeConverters.DocumentLink.from(value);
}
});
}
}
}
type Adapter = OutlineAdapter | CodeLensAdapter | DefinitionAdapter | HoverAdapter
@@ -884,10 +894,14 @@ export class ExtHostLanguageFeatures extends ExtHostLanguageFeaturesShape {
return this._createDisposable(handle);
}
$providDocumentLinks(handle: number, resource: URI): TPromise<modes.ILink[]> {
$provideDocumentLinks(handle: number, resource: URI): TPromise<modes.ILink[]> {
return this._withAdapter(handle, LinkProviderAdapter, adapter => adapter.provideLinks(resource));
}
$resolveDocumentLink(handle: number, link: modes.ILink): TPromise<modes.ILink> {
return this._withAdapter(handle, LinkProviderAdapter, adapter => adapter.resolveLink(link));
}
// --- configuration
setLanguageConfiguration(languageId:string, configuration: vscode.LanguageConfiguration): vscode.Disposable {

4
src/vs/workbench/api/node/extHostTypeConverters.ts
View File

@@ -319,14 +319,14 @@ export namespace SignatureHelp {
export namespace DocumentLink {
export function from(link: types.DocumentLink): modes.ILink {
export function from(link: vscode.DocumentLink): modes.ILink {
return {
range: fromRange(link.range),
url: link.target && link.target.toString()
};
}
export function to(link: modes.ILink):types.DocumentLink {
export function to(link: modes.ILink): vscode.DocumentLink {
return new types.DocumentLink(toRange(link.range), link.url && URI.parse(link.url));
}
}

5
src/vs/workbench/api/node/mainThreadLanguageFeatures.ts
View File

@@ -209,7 +209,10 @@ export class MainThreadLanguageFeatures extends MainThreadLanguageFeaturesShape
$registerDocumentLinkProvider(handle: number, selector: vscode.DocumentSelector): TPromise<any> {
this._registrations[handle] = modes.LinkProviderRegistry.register(selector, <modes.LinkProvider>{
provideLinks: (model, token) => {
return wireCancellationToken(token, this._proxy.$providDocumentLinks(handle, model.uri));
return wireCancellationToken(token, this._proxy.$provideDocumentLinks(handle, model.uri));
},
resolveLink: (link, token) => {
return wireCancellationToken(token, this._proxy.$resolveDocumentLink(handle, link));
}
});
return undefined;