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

Merge remote-tracking branch 'origin/master' into rebornix/notebook

Browse Source
This commit is contained in:
rebornix
2020-02-10 11:58:29 -08:00
parent f53b0ebf57 5cb987119a
commit 2790c0b06e
166 changed files with 2186 additions and 1665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/vs/workbench/api/browser/mainThreadAuthentication.ts
View File

@@ -31,7 +31,13 @@ export class MainThreadAuthenticationProvider {
}
login(scopes: string[]): Promise<modes.AuthenticationSession> {
return this._proxy.$login(this.id, scopes);
return this._proxy.$login(this.id, scopes).then(session => {
return {
id: session.id,
accountName: session.accountName,
accessToken: () => this._proxy.$getSessionAccessToken(this.id, session.id)
};
});
}
logout(accountId: string): Promise<void> {

2
src/vs/workbench/api/browser/mainThreadDiagnostics.ts
View File

@@ -55,7 +55,7 @@ export class MainThreadDiagnostics implements MainThreadDiagnosticsShape {
}
}
if (marker.code && typeof marker.code !== 'string') {
marker.code.link = URI.revive(marker.code.link);
marker.code.target = URI.revive(marker.code.target);
}
}
}