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

Merge branch 'master' into joh/completionOverwrite

Browse Source
This commit is contained in:
Johannes Rieken
2019-10-24 12:34:52 +02:00
committed by GitHub
parent 5d6a46cfb5 30886e2f67
commit 0bfdfa69bc
135 changed files with 1742 additions and 2265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vs/workbench/api/common/extHostLanguageFeatures.ts
View File

@@ -348,7 +348,7 @@ class CodeActionAdapter {
only: context.only ? new CodeActionKind(context.only) : undefined
};
return asPromise(() => this._provider.provideCodeActions(doc, ran, codeActionContext, token)).then(commandsOrActions => {
return asPromise(() => this._provider.provideCodeActions(doc, ran, codeActionContext, token)).then((commandsOrActions): extHostProtocol.ICodeActionListDto | undefined => {
if (!isNonEmptyArray(commandsOrActions) || token.isCancellationRequested) {
return undefined;
}
@@ -390,7 +390,7 @@ class CodeActionAdapter {
}
}
return <extHostProtocol.ICodeActionListDto>{ cacheId, actions };
return { cacheId, actions };
});
}

2
src/vs/workbench/api/common/extHostTypeConverters.ts
View File

@@ -260,7 +260,7 @@ export namespace MarkdownString {
const collectUri = (href: string): string => {
try {
let uri = URI.parse(href);
let uri = URI.parse(href, true);
uri = uri.with({ query: _uriMassage(uri.query, resUris) });
resUris[href] = uri;
} catch (e) {