Delete CHAT_WIDGET_VIEW_RESOURCE (microsoft#278397)

Author: roblourens

src/vs/workbench/contrib/chat/browser/chatSessions/localChatSessionsProvider.ts

@@ -7,9 +7,7 @@ import { Codicon } from '../../../../../base/common/codicons.js';
 import { Emitter, Event } from '../../../../../base/common/event.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
 import { ResourceSet } from '../../../../../base/common/map.js';
-import { Schemas } from '../../../../../base/common/network.js';
 import { IObservable } from '../../../../../base/common/observable.js';
-import { URI } from '../../../../../base/common/uri.js';
 import { IWorkbenchContribution } from '../../../../common/contributions.js';
 import { ModifiedFileEntryState } from '../../common/chatEditingService.js';
 import { IChatModel } from '../../common/chatModel.js';
@@ -22,7 +20,6 @@ import { ChatSessionItemWithProvider } from './common.js';
 export class LocalChatSessionsProvider extends Disposable implements IChatSessionItemProvider, IWorkbenchContribution {
 	static readonly ID = 'workbench.contrib.localChatSessionsProvider';
 	static readonly CHAT_WIDGET_VIEW_ID = 'workbench.panel.chat.view.copilot';
-	static readonly CHAT_WIDGET_VIEW_RESOURCE = URI.parse(`${Schemas.vscodeLocalChatSession}://widget`);
 	readonly chatSessionType = localChatSessionType;
 
 	private readonly _onDidChange = this._register(new Emitter<void>());

src/vs/workbench/contrib/chat/browser/chatSessions/view/sessionsViewPane.ts

@@ -10,11 +10,9 @@ import { IActionViewItem } from '../../../../../../base/browser/ui/actionbar/act
 import { IBaseActionViewItemOptions } from '../../../../../../base/browser/ui/actionbar/actionViewItems.js';
 import { ITreeContextMenuEvent } from '../../../../../../base/browser/ui/tree/tree.js';
 import { IAction, toAction } from '../../../../../../base/common/actions.js';
-import { coalesce } from '../../../../../../base/common/arrays.js';
 import { Codicon } from '../../../../../../base/common/codicons.js';
 import { FuzzyScore } from '../../../../../../base/common/filters.js';
 import { MarshalledId } from '../../../../../../base/common/marshallingIds.js';
-import { isEqual } from '../../../../../../base/common/resources.js';
 import { truncate } from '../../../../../../base/common/strings.js';
 import { URI } from '../../../../../../base/common/uri.js';
 import * as nls from '../../../../../../nls.js';
@@ -304,11 +302,7 @@ export class SessionsViewPane extends ViewPane {
 		const renderer = this.instantiationService.createInstance(SessionsRenderer, this.viewDescriptorService.getViewLocationById(this.viewId));
 		this._register(renderer);
 
-		const getResourceForElement = (element: ChatSessionItemWithProvider): URI | null => {
-			if (isEqual(element.resource, LocalChatSessionsProvider.CHAT_WIDGET_VIEW_RESOURCE)) {
-				return null;
-			}
-
+		const getResourceForElement = (element: ChatSessionItemWithProvider): URI => {
 			return element.resource;
 		};
 
@@ -324,14 +318,14 @@ export class SessionsViewPane extends ViewPane {
 					onDragStart: (data, originalEvent) => {
 						try {
 							const elements = data.getData() as ChatSessionItemWithProvider[];
-							const uris = coalesce(elements.map(getResourceForElement));
+							const uris = elements.map(getResourceForElement);
 							this.instantiationService.invokeFunction(accessor => fillEditorsDragData(accessor, uris, originalEvent));
 						} catch {
 							// noop
 						}
 					},
 					getDragURI: (element: ChatSessionItemWithProvider) => {
-						return getResourceForElement(element)?.toString() ?? null;
+						return getResourceForElement(element).toString();
 					},
 					getDragLabel: (elements: ChatSessionItemWithProvider[]) => {
 						if (elements.length === 1) {

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

@@ -17,7 +17,6 @@ import { ChatAgentLocation } from '../common/constants.js';
 import { ChatViewId, ChatViewPaneTarget, IChatWidget, IChatWidgetService, IQuickChatService, isIChatViewViewContext } from './chat.js';
 import { ChatEditor, IChatEditorOptions } from './chatEditor.js';
 import { findExistingChatEditorByUri } from './chatSessions/common.js';
-import { LocalChatSessionsProvider } from './chatSessions/localChatSessionsProvider.js';
 import { ChatViewPane } from './chatViewPane.js';
 
 export class ChatWidgetService extends Disposable implements IChatWidgetService {
@@ -95,15 +94,6 @@ export class ChatWidgetService extends Disposable implements IChatWidgetService
 	openSession(sessionResource: URI, target?: typeof ChatViewPaneTarget): Promise<IChatWidget | undefined>;
 	openSession(sessionResource: URI, target?: PreferredGroup, options?: IChatEditorOptions): Promise<IChatWidget | undefined>;
 	async openSession(sessionResource: URI, target?: typeof ChatViewPaneTarget | PreferredGroup, options?: IChatEditorOptions): Promise<IChatWidget | undefined> {
-		// TODO remove this, open the real resource
-		if (isEqual(sessionResource, LocalChatSessionsProvider.CHAT_WIDGET_VIEW_RESOURCE)) {
-			const chatViewPane = await this.viewsService.openView<ChatViewPane>(ChatViewId, true);
-			if (chatViewPane) {
-				chatViewPane.focusInput();
-			}
-			return chatViewPane?.widget;
-		}
-
 		const alreadyOpenWidget = await this.revealSessionIfAlreadyOpen(sessionResource);
 		if (alreadyOpenWidget) {
 			return alreadyOpenWidget;

src/vs/workbench/contrib/chat/common/chatServiceImpl.ts

@@ -404,7 +404,7 @@ export class ChatService extends Disposable implements IChatService {
 			});
 	}
 
-	shouldBeInHistory(entry: Partial<ChatModel>) {
+	private shouldBeInHistory(entry: Partial<ChatModel>) {
 		if (entry.sessionResource) {
 			return !entry.isImported && LocalChatSessionUri.parseLocalSessionId(entry.sessionResource) && entry.initialLocation !== ChatAgentLocation.EditorInline;
 		}