From ca51dd36abab59adc0156e54e0dc9a4cf59ded40 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Wed, 7 Aug 2024 10:49:26 -0700 Subject: [PATCH] Remove copilot code block scheme (#225071) This scheme is no longer used --- src/vs/base/common/network.ts | 5 ----- src/vs/editor/contrib/gotoSymbol/browser/goToSymbol.ts | 2 +- src/vs/platform/markers/common/markerService.ts | 1 - src/vs/workbench/contrib/chat/browser/chatWidget.ts | 10 ++-------- 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/src/vs/base/common/network.ts b/src/vs/base/common/network.ts index 2d5f856ba7a55..321348daf8a27 100644 --- a/src/vs/base/common/network.ts +++ b/src/vs/base/common/network.ts @@ -75,11 +75,6 @@ export namespace Schemas { /** Scheme used for code blocks in chat. */ export const vscodeChatCodeBlock = 'vscode-chat-code-block'; - /** - * Scheme used for backing documents created by copilot for chat. - */ - export const vscodeCopilotBackingChatCodeBlock = 'vscode-copilot-chat-code-block'; - /** Scheme used for LHS of code compare (aka diff) blocks in chat. */ export const vscodeChatCodeCompareBlock = 'vscode-chat-code-compare-block'; diff --git a/src/vs/editor/contrib/gotoSymbol/browser/goToSymbol.ts b/src/vs/editor/contrib/gotoSymbol/browser/goToSymbol.ts index 93d144c77f4dd..1477a3940363b 100644 --- a/src/vs/editor/contrib/gotoSymbol/browser/goToSymbol.ts +++ b/src/vs/editor/contrib/gotoSymbol/browser/goToSymbol.ts @@ -22,7 +22,7 @@ function shouldIncludeLocationLink(sourceModel: ITextModel, loc: LocationLink): } // Otherwise filter out locations from internal schemes - if (matchesSomeScheme(loc.uri, Schemas.walkThroughSnippet, Schemas.vscodeChatCodeBlock, Schemas.vscodeChatCodeCompareBlock, Schemas.vscodeCopilotBackingChatCodeBlock)) { + if (matchesSomeScheme(loc.uri, Schemas.walkThroughSnippet, Schemas.vscodeChatCodeBlock, Schemas.vscodeChatCodeCompareBlock)) { return false; } diff --git a/src/vs/platform/markers/common/markerService.ts b/src/vs/platform/markers/common/markerService.ts index 692f6ba5cb713..91120aab5b6b0 100644 --- a/src/vs/platform/markers/common/markerService.ts +++ b/src/vs/platform/markers/common/markerService.ts @@ -18,7 +18,6 @@ export const unsupportedSchemas = new Set([ Schemas.walkThrough, Schemas.walkThroughSnippet, Schemas.vscodeChatCodeBlock, - Schemas.vscodeCopilotBackingChatCodeBlock, ]); class DoubleResourceMap { diff --git a/src/vs/workbench/contrib/chat/browser/chatWidget.ts b/src/vs/workbench/contrib/chat/browser/chatWidget.ts index cdd87ce381e77..7b08b5f2aed15 100644 --- a/src/vs/workbench/contrib/chat/browser/chatWidget.ts +++ b/src/vs/workbench/contrib/chat/browser/chatWidget.ts @@ -9,7 +9,7 @@ import { disposableTimeout, timeout } from 'vs/base/common/async'; import { toErrorMessage } from 'vs/base/common/errorMessage'; import { Emitter, Event } from 'vs/base/common/event'; import { Disposable, DisposableStore, IDisposable, MutableDisposable, combinedDisposable, toDisposable } from 'vs/base/common/lifecycle'; -import { matchesScheme, Schemas } from 'vs/base/common/network'; +import { Schemas } from 'vs/base/common/network'; import { extUri, isEqual } from 'vs/base/common/resources'; import { isDefined } from 'vs/base/common/types'; import { URI } from 'vs/base/common/uri'; @@ -223,13 +223,7 @@ export class ChatWidget extends Disposable implements IChatWidget { this._codeBlockModelCollection = this._register(instantiationService.createInstance(CodeBlockModelCollection)); this._register(codeEditorService.registerCodeEditorOpenHandler(async (input: ITextResourceEditorInput, _source: ICodeEditor | null, _sideBySide?: boolean): Promise => { - let resource = input.resource; - - // if trying to open backing documents, actually open the real chat code block doc - if (matchesScheme(resource, Schemas.vscodeCopilotBackingChatCodeBlock)) { - resource = resource.with({ scheme: Schemas.vscodeChatCodeBlock }); - } - + const resource = input.resource; if (resource.scheme !== Schemas.vscodeChatCodeBlock) { return null; }