Merge pull request microsoft#196786 from microsoft/roblou/shallow-lobster

roblourens · web-flow · commit f6ec2f18df46 · 2023-10-26T22:45:28.000-07:00
Fix empty chat icons after upgrade
diff --git a/src/vs/workbench/contrib/chat/common/chatModel.ts b/src/vs/workbench/contrib/chat/common/chatModel.ts
@@ -522,12 +522,12 @@ export class ChatModel extends Disposable implements IChatModel {
 
 	private readonly _initialRequesterAvatarIconUri: URI | undefined;
 	get requesterAvatarIconUri(): URI | undefined {
-		return this._session?.requesterAvatarIconUri ?? this._initialRequesterAvatarIconUri;
+		return this._session ? this._session.requesterAvatarIconUri : this._initialRequesterAvatarIconUri;
 	}
 
 	private readonly _initialResponderAvatarIconUri: URI | undefined;
 	get responderAvatarIconUri(): URI | undefined {
-		return this._session?.responderAvatarIconUri ?? this._initialResponderAvatarIconUri;
+		return this._session ? this._session.responderAvatarIconUri : this._initialResponderAvatarIconUri;
 	}
 
 	get initState(): ChatModelInitState {

Original file line number	Diff line number	Diff line change
`@@ -522,12 +522,12 @@ export class ChatModel extends Disposable implements IChatModel {`
`522`	`522`
`523`	`523`	`private readonly _initialRequesterAvatarIconUri: URI \| undefined;`
`524`	`524`	`get requesterAvatarIconUri(): URI \| undefined {`
`525`		`- return this._session?.requesterAvatarIconUri ?? this._initialRequesterAvatarIconUri;`
	`525`	`+ return this._session ? this._session.requesterAvatarIconUri : this._initialRequesterAvatarIconUri;`
`526`	`526`	`}`
`527`	`527`
`528`	`528`	`private readonly _initialResponderAvatarIconUri: URI \| undefined;`
`529`	`529`	`get responderAvatarIconUri(): URI \| undefined {`
`530`		`- return this._session?.responderAvatarIconUri ?? this._initialResponderAvatarIconUri;`
	`530`	`+ return this._session ? this._session.responderAvatarIconUri : this._initialResponderAvatarIconUri;`
`531`	`531`	`}`
`532`	`532`
`533`	`533`	`get initState(): ChatModelInitState {`