Fix up merge issues

microsoft · May 13, 2021 · 659175f · 659175f
1 parent ea39e2b
commit 659175f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/vs/workbench/browser/parts/banner/bannerPart.ts b/src/vs/workbench/browser/parts/banner/bannerPart.ts
@@ -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);
 			}

diff --git a/src/vs/workbench/services/search/common/search.ts b/src/vs/workbench/services/search/common/search.ts
@@ -209,7 +209,7 @@ export function isProgressMessage(p: ISearchProgressItem | ISerializedSearchProg
 export interface ITextSearchCompleteMessage {
 	text: string;
 	type: TextSearchCompleteMessageType;
-	trusted: boolean;
+	trusted?: boolean;
 }
 
 export interface ISearchCompleteStats {

diff --git a/src/vs/workbench/services/search/common/searchExtTypes.ts b/src/vs/workbench/services/search/common/searchExtTypes.ts
@@ -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.
 	 */