Skip to content

Commit e887b8e

Browse files
authored
Remove builtin terminal variables (microsoft#239871)
1 parent 5e5183a commit e887b8e

File tree

2 files changed

+21
-113
lines changed

2 files changed

+21
-113
lines changed

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

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,40 @@ import * as nls from '../../../../nls.js';
1414
import { AccessibleViewRegistry } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
1515
import { ICommandService } from '../../../../platform/commands/common/commands.js';
1616
import { Extensions as ConfigurationExtensions, ConfigurationScope, IConfigurationNode, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
17+
import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
1718
import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
1819
import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
1920
import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
21+
import { IProductService } from '../../../../platform/product/common/productService.js';
2022
import { Registry } from '../../../../platform/registry/common/platform.js';
2123
import { EditorPaneDescriptor, IEditorPaneRegistry } from '../../../browser/editor.js';
24+
import { Extensions, IConfigurationMigrationRegistry } from '../../../common/configuration.js';
2225
import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
2326
import { EditorExtensions, IEditorFactoryRegistry } from '../../../common/editor.js';
27+
import { IWorkbenchAssignmentService } from '../../../services/assignment/common/assignmentService.js';
2428
import { IEditorResolverService, RegisteredEditorPriority } from '../../../services/editor/common/editorResolverService.js';
2529
import { ChatAgentLocation, ChatAgentNameService, ChatAgentService, IChatAgentNameService, IChatAgentService } from '../common/chatAgents.js';
2630
import { CodeMapperService, ICodeMapperService } from '../common/chatCodeMapperService.js';
2731
import '../common/chatColors.js';
32+
import { ChatContextKeys } from '../common/chatContextKeys.js';
2833
import { IChatEditingService } from '../common/chatEditingService.js';
2934
import { chatVariableLeader } from '../common/chatParserTypes.js';
3035
import { IChatService } from '../common/chatService.js';
3136
import { ChatService } from '../common/chatServiceImpl.js';
3237
import { ChatSlashCommandService, IChatSlashCommandService } from '../common/chatSlashCommands.js';
3338
import { IChatVariablesService } from '../common/chatVariables.js';
3439
import { ChatWidgetHistoryService, IChatWidgetHistoryService } from '../common/chatWidgetHistoryService.js';
40+
import { ILanguageModelIgnoredFilesService, LanguageModelIgnoredFilesService } from '../common/ignoredFiles.js';
3541
import { ILanguageModelsService, LanguageModelsService } from '../common/languageModels.js';
3642
import { ILanguageModelStatsService, LanguageModelStatsService } from '../common/languageModelStats.js';
3743
import { ILanguageModelToolsService } from '../common/languageModelToolsService.js';
44+
import { PromptFilesConfig } from '../common/promptSyntax/config.js';
45+
import '../common/promptSyntax/languageFeatures/promptLinkProvider.js';
46+
import '../common/promptSyntax/languageFeatures/promptPathAutocompletion.js';
47+
import { PromptSyntaxService } from '../common/promptSyntax/service/promptSyntaxService.js';
48+
import { IPromptSyntaxService } from '../common/promptSyntax/service/types.js';
3849
import { LanguageModelToolsExtensionPointHandler } from '../common/tools/languageModelToolsContribution.js';
50+
import { BuiltinToolsContribution } from '../common/tools/tools.js';
3951
import { IVoiceChatService, VoiceChatService } from '../common/voiceChatService.js';
4052
import { EditsChatAccessibilityHelp, PanelChatAccessibilityHelp, QuickChatAccessibilityHelp } from './actions/chatAccessibilityHelp.js';
4153
import { ChatCommandCenterRendering, registerChatActions } from './actions/chatActions.js';
@@ -46,6 +58,7 @@ import { registerChatCopyActions } from './actions/chatCopyActions.js';
4658
import { registerChatDeveloperActions } from './actions/chatDeveloperActions.js';
4759
import { ChatSubmitAction, registerChatExecuteActions } from './actions/chatExecuteActions.js';
4860
import { registerChatFileTreeActions } from './actions/chatFileTreeActions.js';
61+
import { ChatGettingStartedContribution } from './actions/chatGettingStarted.js';
4962
import { registerChatExportActions } from './actions/chatImportExport.js';
5063
import { registerMoveActions } from './actions/chatMoveActions.js';
5164
import { registerQuickChatActions } from './actions/chatQuickInputActions.js';
@@ -54,44 +67,30 @@ import { IChatAccessibilityService, IChatCodeBlockContextProviderService, IChatW
5467
import { ChatAccessibilityService } from './chatAccessibilityService.js';
5568
import './chatAttachmentModel.js';
5669
import { ChatMarkdownAnchorService, IChatMarkdownAnchorService } from './chatContentParts/chatMarkdownAnchorService.js';
57-
import { ChatEditingService } from './chatEditing/chatEditingServiceImpl.js';
58-
import { ChatEditor, IChatEditorOptions } from './chatEditor.js';
70+
import { ChatInputBoxContentProvider } from './chatEdinputInputContentProvider.js';
5971
import { registerChatEditorActions } from './chatEditing/chatEditingEditorActions.js';
6072
import { ChatEditorController } from './chatEditing/chatEditingEditorController.js';
73+
import { ChatEditorOverlayController } from './chatEditing/chatEditingEditorOverlay.js';
74+
import { ChatEditingService } from './chatEditing/chatEditingServiceImpl.js';
75+
import { ChatEditor, IChatEditorOptions } from './chatEditor.js';
6176
import { ChatEditorInput, ChatEditorInputSerializer } from './chatEditorInput.js';
62-
import { ChatInputBoxContentProvider } from './chatEdinputInputContentProvider.js';
6377
import { agentSlashCommandToMarkdown, agentToMarkdown } from './chatMarkdownDecorationsRenderer.js';
6478
import { ChatCompatibilityNotifier, ChatExtensionPointHandler } from './chatParticipant.contribution.js';
6579
import { ChatPasteProvidersFeature } from './chatPasteProviders.js';
6680
import { QuickChatService } from './chatQuick.js';
81+
import { ChatQuotasService, ChatQuotasStatusBarEntry, IChatQuotasService } from './chatQuotasService.js';
6782
import { ChatResponseAccessibleView } from './chatResponseAccessibleView.js';
83+
import { ChatSetupContribution } from './chatSetup.js';
6884
import { ChatVariablesService } from './chatVariables.js';
6985
import { ChatWidgetService } from './chatWidget.js';
7086
import { ChatCodeBlockContextProviderService } from './codeBlockContextProviderService.js';
87+
import { ChatImplicitContextContribution } from './contrib/chatImplicitContext.js';
7188
import './contrib/chatInputCompletions.js';
7289
import './contrib/chatInputEditorContrib.js';
7390
import './contrib/chatInputEditorHover.js';
74-
import { ChatImplicitContextContribution } from './contrib/chatImplicitContext.js';
91+
import { ChatRelatedFilesContribution } from './contrib/chatInputRelatedFilesContrib.js';
7592
import { LanguageModelToolsService } from './languageModelToolsService.js';
7693
import { ChatViewsWelcomeHandler } from './viewsWelcome/chatViewsWelcomeHandler.js';
77-
import { ILanguageModelIgnoredFilesService, LanguageModelIgnoredFilesService } from '../common/ignoredFiles.js';
78-
import { ChatGettingStartedContribution } from './actions/chatGettingStarted.js';
79-
import { Extensions, IConfigurationMigrationRegistry } from '../../../common/configuration.js';
80-
import { ChatRelatedFilesContribution } from './contrib/chatInputRelatedFilesContrib.js';
81-
import { ChatQuotasService, ChatQuotasStatusBarEntry, IChatQuotasService } from './chatQuotasService.js';
82-
import { ChatSetupContribution } from './chatSetup.js';
83-
import { ChatEditorOverlayController } from './chatEditing/chatEditingEditorOverlay.js';
84-
import '../common/promptSyntax/languageFeatures/promptLinkProvider.js';
85-
import '../common/promptSyntax/languageFeatures/promptPathAutocompletion.js';
86-
import { PromptFilesConfig } from '../common/promptSyntax/config.js';
87-
import { BuiltinToolsContribution } from '../common/tools/tools.js';
88-
import { IWorkbenchAssignmentService } from '../../../services/assignment/common/assignmentService.js';
89-
import { IProductService } from '../../../../platform/product/common/productService.js';
90-
import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
91-
import { ChatContextKeys } from '../common/chatContextKeys.js';
92-
import { IPromptSyntaxService } from '../common/promptSyntax/service/types.js';
93-
import { PromptSyntaxService } from '../common/promptSyntax/service/promptSyntaxService.js';
94-
import { BuiltinVariablesContribution } from './variables/variables.js';
9594

9695
// Register configuration
9796
const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
@@ -393,7 +392,6 @@ registerWorkbenchContribution2(ChatGettingStartedContribution.ID, ChatGettingSta
393392
registerWorkbenchContribution2(ChatSetupContribution.ID, ChatSetupContribution, WorkbenchPhase.BlockRestore);
394393
registerWorkbenchContribution2(ChatQuotasStatusBarEntry.ID, ChatQuotasStatusBarEntry, WorkbenchPhase.Eventually);
395394
registerWorkbenchContribution2(BuiltinToolsContribution.ID, BuiltinToolsContribution, WorkbenchPhase.Eventually);
396-
registerWorkbenchContribution2(BuiltinVariablesContribution.ID, BuiltinVariablesContribution, WorkbenchPhase.Eventually);
397395
registerWorkbenchContribution2(ChatAgentSettingContribution.ID, ChatAgentSettingContribution, WorkbenchPhase.BlockRestore);
398396

399397
registerChatActions();

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

Lines changed: 0 additions & 90 deletions
This file was deleted.

0 commit comments

Comments
 (0)