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

Merge remote-tracking branch 'origin/main' into tyriar/profile_api

Browse Source
This commit is contained in:
Daniel Imms
2021-05-26 11:09:35 -07:00
parent e29194ad0d 7f21b1af48
commit 3ff91e7621
290 changed files with 4606 additions and 2990 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/vs/workbench/api/common/extHost.api.impl.ts
View File

@@ -219,7 +219,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
})();
const authentication: typeof vscode.authentication = {
getSession(providerId: string, scopes: string[], options?: vscode.AuthenticationGetSessionOptions) {
getSession(providerId: string, scopes: readonly string[], options?: vscode.AuthenticationGetSessionOptions) {
return extHostAuthentication.getSession(extension, providerId, scopes, options as any);
},
get onDidChangeSessions(): Event<vscode.AuthenticationSessionsChangeEvent> {
@@ -316,16 +316,20 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
allowContributedOpeners: options?.allowContributedOpeners,
});
},
asExternalUri(uri: URI) {
async asExternalUri(uri: URI) {
if (uri.scheme === initData.environment.appUriScheme) {
return extHostUrls.createAppUri(uri);
}
if (!matchesScheme(uri.scheme, Schemas.http) && !matchesScheme(uri.scheme, Schemas.https)) {
if (!matchesScheme(uri, Schemas.http) && !matchesScheme(uri, Schemas.https)) {
checkProposedApiEnabled(extension); // https://github.com/microsoft/vscode/issues/124263
}
return extHostWindow.asExternalUri(uri, { allowTunneling: !!initData.remote.authority });
try {
return await extHostWindow.asExternalUri(uri, { allowTunneling: !!initData.remote.authority });
} catch {
return uri;
}
},
get remoteName() {
return getRemoteName(initData.remote.authority);
@@ -1001,10 +1005,10 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
stopDebugging(session?: vscode.DebugSession) {
return extHostDebugService.stopDebugging(session);
},
addBreakpoints(breakpoints: vscode.Breakpoint[]) {
addBreakpoints(breakpoints: readonly vscode.Breakpoint[]) {
return extHostDebugService.addBreakpoints(breakpoints);
},
removeBreakpoints(breakpoints: vscode.Breakpoint[]) {
removeBreakpoints(breakpoints: readonly vscode.Breakpoint[]) {
return extHostDebugService.removeBreakpoints(breakpoints);
},
asDebugSourceUri(source: vscode.DebugProtocolSource, session?: vscode.DebugSession): vscode.Uri {