development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-18 01:58:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix up merge issues

Browse source
This commit is contained in:
Jackson Kearl 2021-05-12 21:51:47 -07:00
parent ea39e2b66a
commit 659175fa39
No known key found for this signature in database
GPG key ID: DA09A59C409FC400
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vs/workbench/browser/parts/banner/bannerPart.ts
View file

@ -162,7 +162,7 @@ export class BannerPart extends Part implements IBannerService {
const actionContainer = append(this.element, $('div.message-actions-container'));
for (const action of item.actions) {
const actionLink = this._register(this.instantiationService.createInstance(Link, action));
const actionLink = this._register(this.instantiationService.createInstance(Link, action, {}));
this._register(attachLinkStyler(actionLink, this.themeService, { textLinkForeground: BANNER_FOREGROUND }));
actionContainer.appendChild(actionLink.el);
}

2
src/vs/workbench/services/search/common/search.ts
View file

@ -209,7 +209,7 @@ export function isProgressMessage(p: ISearchProgressItem | ISerializedSearchProg
export interface ITextSearchCompleteMessage {
text: string;
type: TextSearchCompleteMessageType;
trusted: boolean;
trusted?: boolean;
}
export interface ISearchCompleteStats {

2
src/vs/workbench/services/search/common/searchExtTypes.ts
View file

@ -235,7 +235,7 @@ export interface TextSearchCompleteMessage {
/**
* Whether the source of the message is trusted, command links are disabled for untrusted message sources.
*/
trusted: boolean,
trusted?: boolean,
/**
* The message type, this affects how the message will be rendered.
*/