diff --git a/extensions/typescript-language-features/src/configuration/fileSchemes.ts b/extensions/typescript-language-features/src/configuration/fileSchemes.ts index ca268e29e0b..9d54f0b67a7 100644 --- a/extensions/typescript-language-features/src/configuration/fileSchemes.ts +++ b/extensions/typescript-language-features/src/configuration/fileSchemes.ts @@ -21,21 +21,24 @@ export const officeScript = 'office-script'; /** Used for code blocks in chat by vs code core */ export const chatCodeBlock = 'vscode-chat-code-block'; -/** Used for code blocks in chat by copilot. */ -export const chatBackingCodeBlock = 'vscode-copilot-chat-code-block'; - export function getSemanticSupportedSchemes() { - if (isWeb() && vscode.workspace.workspaceFolders) { - return vscode.workspace.workspaceFolders.map(folder => folder.uri.scheme); - } - - return [ - file, + const alwaysSupportedSchemes = [ untitled, walkThroughSnippet, vscodeNotebookCell, chatCodeBlock, - chatBackingCodeBlock, + ]; + + if (isWeb()) { + return [ + ...(vscode.workspace.workspaceFolders ?? []).map(folder => folder.uri.scheme), + ...alwaysSupportedSchemes, + ]; + } + + return [ + file, + ...alwaysSupportedSchemes, ]; } diff --git a/extensions/typescript-language-features/src/languageFeatures/workspaceSymbols.ts b/extensions/typescript-language-features/src/languageFeatures/workspaceSymbols.ts index 3240c524781..24fb7068b74 100644 --- a/extensions/typescript-language-features/src/languageFeatures/workspaceSymbols.ts +++ b/extensions/typescript-language-features/src/languageFeatures/workspaceSymbols.ts @@ -94,7 +94,7 @@ class TypeScriptWorkspaceSymbolProvider implements vscode.WorkspaceSymbolProvide } const uri = this.client.toResource(item.file); - if (fileSchemes.isOfScheme(uri, fileSchemes.chatCodeBlock, fileSchemes.chatBackingCodeBlock)) { + if (fileSchemes.isOfScheme(uri, fileSchemes.chatCodeBlock)) { return; } diff --git a/extensions/typescript-language-features/src/tsServer/bufferSyncSupport.ts b/extensions/typescript-language-features/src/tsServer/bufferSyncSupport.ts index 356c1703831..56d2896fa33 100644 --- a/extensions/typescript-language-features/src/tsServer/bufferSyncSupport.ts +++ b/extensions/typescript-language-features/src/tsServer/bufferSyncSupport.ts @@ -197,7 +197,7 @@ class SyncedBuffer { return tsRoot?.startsWith(inMemoryResourcePrefix) ? undefined : tsRoot; } - return fileSchemes.isOfScheme(resource, fileSchemes.officeScript, fileSchemes.chatCodeBlock, fileSchemes.chatBackingCodeBlock) ? '/' : undefined; + return fileSchemes.isOfScheme(resource, fileSchemes.officeScript, fileSchemes.chatCodeBlock) ? '/' : undefined; } public get resource(): vscode.Uri { @@ -752,7 +752,7 @@ export default class BufferSyncSupport extends Disposable { } private shouldValidate(buffer: SyncedBuffer): boolean { - if (fileSchemes.isOfScheme(buffer.resource, fileSchemes.chatCodeBlock, fileSchemes.chatBackingCodeBlock)) { + if (fileSchemes.isOfScheme(buffer.resource, fileSchemes.chatCodeBlock)) { return false; }