Skip to content

Commit cd6dc14

Browse files
authored
Get rid of extension icon fallback for chat providers, to fix codicon for copilot (microsoft#196651)
1 parent 57b1f2e commit cd6dc14

File tree

2 files changed

+4
-12
lines changed

2 files changed

+4
-12
lines changed

src/vs/workbench/api/browser/mainThreadChat.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,8 @@ export class MainThreadChat extends Disposable implements MainThreadChatShape {
7070
return undefined;
7171
}
7272

73-
const responderAvatarIconUri = session.responderAvatarIconUri ?
74-
URI.revive(session.responderAvatarIconUri) :
75-
registration.extensionIcon;
73+
const responderAvatarIconUri = session.responderAvatarIconUri &&
74+
URI.revive(session.responderAvatarIconUri);
7675

7776
const emitter = new Emitter<any>();
7877
this._stateEmitters.set(session.id, emitter);

src/vs/workbench/contrib/chat/browser/chatContributionServiceImpl.ts

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@
55

66
import { Codicon } from 'vs/base/common/codicons';
77
import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
8-
import * as resources from 'vs/base/common/resources';
98
import { localize, localize2 } from 'vs/nls';
109
import { registerAction2 } from 'vs/platform/actions/common/actions';
1110
import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
1211
import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
1312
import { Registry } from 'vs/platform/registry/common/platform';
1413
import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
15-
import { Extensions as WorkbenchExtensions, IWorkbenchContribution, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
14+
import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
1615
import { IViewContainersRegistry, IViewDescriptor, IViewsRegistry, ViewContainer, ViewContainerLocation, Extensions as ViewExtensions } from 'vs/workbench/common/views';
1716
import { getHistoryAction, getOpenChatEditorAction } from 'vs/workbench/contrib/chat/browser/actions/chatActions';
1817
import { getClearAction } from 'vs/workbench/contrib/chat/browser/actions/chatClearActions';
@@ -79,13 +78,7 @@ export class ChatExtensionPointHandler implements IWorkbenchContribution {
7978
const extensionDisposable = new DisposableStore();
8079
for (const providerDescriptor of extension.value) {
8180
this.registerChatProvider(providerDescriptor);
82-
const extensionIcon = extension.description.icon ?
83-
resources.joinPath(extension.description.extensionLocation, extension.description.icon) :
84-
undefined;
85-
this._chatContributionService.registerChatProvider({
86-
...providerDescriptor,
87-
extensionIcon
88-
});
81+
this._chatContributionService.registerChatProvider(providerDescriptor);
8982
}
9083
this._registrationDisposables.set(extension.description.identifier.value, extensionDisposable);
9184
}

0 commit comments

Comments
 (0)