diff --git a/src/vs/workbench/contrib/accessibility/browser/editorAccessibilityHelp.ts b/src/vs/workbench/contrib/accessibility/browser/editorAccessibilityHelp.ts index 9a004312088..b4c25bbba1e 100644 --- a/src/vs/workbench/contrib/accessibility/browser/editorAccessibilityHelp.ts +++ b/src/vs/workbench/contrib/accessibility/browser/editorAccessibilityHelp.ts @@ -19,7 +19,7 @@ import { CommentContextKeys } from '../../comments/common/commentContextKeys.js' import { NEW_UNTITLED_FILE_COMMAND_ID } from '../../files/browser/fileConstants.js'; import { IAccessibleViewService, IAccessibleViewContentProvider, AccessibleViewProviderId, IAccessibleViewOptions, AccessibleViewType } from '../../../../platform/accessibility/browser/accessibleView.js'; import { AccessibilityVerbositySettingId } from './accessibilityConfiguration.js'; -import { ctxHasEditorModification, ctxHasRequestInProgress } from '../../chat/browser/chatEditorController.js'; +import { ctxHasEditorModification, ctxHasRequestInProgress } from '../../chat/browser/chatEditing/chatEditingEditorController.js'; export class EditorAccessibilityHelpContribution extends Disposable { static ID: 'editorAccessibilityHelpContribution'; diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts index 04ed62ec3f7..57a57061aed 100644 --- a/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts +++ b/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts @@ -19,7 +19,7 @@ import { ChatAgentLocation } from '../../common/chatAgents.js'; import { ChatContextKeys } from '../../common/chatContextKeys.js'; import { hasAppliedChatEditsContextKey, hasUndecidedChatEditingResourceContextKey, IChatEditingService, WorkingSetEntryState } from '../../common/chatEditingService.js'; import { ChatViewId, EditsViewId, IChatWidgetService } from '../chat.js'; -import { ctxIsGlobalEditingSession } from '../chatEditorController.js'; +import { ctxIsGlobalEditingSession } from '../chatEditing/chatEditingEditorController.js'; import { ChatEditorInput } from '../chatEditorInput.js'; import { ChatViewPane } from '../chatViewPane.js'; import { CHAT_CATEGORY } from './chatActions.js'; diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts index f570cd3641d..e09865516b6 100644 --- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts +++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts @@ -56,8 +56,8 @@ import './chatAttachmentModel.js'; import { ChatMarkdownAnchorService, IChatMarkdownAnchorService } from './chatContentParts/chatMarkdownAnchorService.js'; import { ChatEditingService } from './chatEditing/chatEditingServiceImpl.js'; import { ChatEditor, IChatEditorOptions } from './chatEditor.js'; -import { registerChatEditorActions } from './chatEditorActions.js'; -import { ChatEditorController } from './chatEditorController.js'; +import { registerChatEditorActions } from './chatEditing/chatEditingEditorActions.js'; +import { ChatEditorController } from './chatEditing/chatEditingEditorController.js'; import { ChatEditorInput, ChatEditorInputSerializer } from './chatEditorInput.js'; import { ChatInputBoxContentProvider } from './chatEdinputInputContentProvider.js'; import { agentSlashCommandToMarkdown, agentToMarkdown } from './chatMarkdownDecorationsRenderer.js'; @@ -80,7 +80,7 @@ import { Extensions, IConfigurationMigrationRegistry } from '../../../common/con import { ChatRelatedFilesContribution } from './contrib/chatInputRelatedFilesContrib.js'; import { ChatQuotasService, ChatQuotasStatusBarEntry, IChatQuotasService } from './chatQuotasService.js'; import { ChatSetupContribution } from './chatSetup.js'; -import { ChatEditorOverlayController } from './chatEditorOverlay.js'; +import { ChatEditorOverlayController } from './chatEditing/chatEditingEditorOverlay.js'; import '../common/promptSyntax/languageFeatures/promptLinkProvider.js'; import { PromptFilesConfig } from '../common/promptSyntax/config.js'; import { BuiltinToolsContribution } from '../common/tools/tools.js'; diff --git a/src/vs/workbench/contrib/chat/browser/chatEditorActions.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorActions.ts similarity index 86% rename from src/vs/workbench/contrib/chat/browser/chatEditorActions.ts rename to src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorActions.ts index 681e61fb730..072855972ec 100644 --- a/src/vs/workbench/contrib/chat/browser/chatEditorActions.ts +++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorActions.ts @@ -2,24 +2,24 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { ICodeEditor, isCodeEditor, isDiffEditor } from '../../../../editor/browser/editorBrowser.js'; -import { localize, localize2 } from '../../../../nls.js'; -import { EditorAction2, ServicesAccessor } from '../../../../editor/browser/editorExtensions.js'; -import { Codicon } from '../../../../base/common/codicons.js'; -import { Action2, MenuId, MenuRegistry, registerAction2 } from '../../../../platform/actions/common/actions.js'; -import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js'; -import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js'; -import { CHAT_CATEGORY } from './actions/chatActions.js'; -import { ChatEditorController, ctxHasEditorModification, ctxReviewModeEnabled } from './chatEditorController.js'; -import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js'; -import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js'; -import { ACTIVE_GROUP, IEditorService } from '../../../services/editor/common/editorService.js'; -import { IChatEditingService } from '../common/chatEditingService.js'; -import { ChatContextKeys } from '../common/chatContextKeys.js'; -import { isEqual } from '../../../../base/common/resources.js'; -import { Range } from '../../../../editor/common/core/range.js'; -import { getNotebookEditorFromEditorPane } from '../../notebook/browser/notebookBrowser.js'; -import { ctxNotebookHasEditorModification } from '../../notebook/browser/contrib/chatEdit/notebookChatEditContext.js'; +import { ICodeEditor, isCodeEditor, isDiffEditor } from '../../../../../editor/browser/editorBrowser.js'; +import { localize, localize2 } from '../../../../../nls.js'; +import { EditorAction2, ServicesAccessor } from '../../../../../editor/browser/editorExtensions.js'; +import { Codicon } from '../../../../../base/common/codicons.js'; +import { Action2, MenuId, MenuRegistry, registerAction2 } from '../../../../../platform/actions/common/actions.js'; +import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js'; +import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js'; +import { CHAT_CATEGORY } from '../actions/chatActions.js'; +import { ChatEditorController, ctxHasEditorModification, ctxReviewModeEnabled } from './chatEditingEditorController.js'; +import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js'; +import { EditorContextKeys } from '../../../../../editor/common/editorContextKeys.js'; +import { ACTIVE_GROUP, IEditorService } from '../../../../services/editor/common/editorService.js'; +import { IChatEditingService } from '../../common/chatEditingService.js'; +import { ChatContextKeys } from '../../common/chatContextKeys.js'; +import { isEqual } from '../../../../../base/common/resources.js'; +import { Range } from '../../../../../editor/common/core/range.js'; +import { getNotebookEditorFromEditorPane } from '../../../notebook/browser/notebookBrowser.js'; +import { ctxNotebookHasEditorModification } from '../../../notebook/browser/contrib/chatEdit/notebookChatEditContext.js'; abstract class NavigateAction extends Action2 { diff --git a/src/vs/workbench/contrib/chat/browser/chatEditorController.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorController.ts similarity index 91% rename from src/vs/workbench/contrib/chat/browser/chatEditorController.ts rename to src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorController.ts index 13e98f95ec9..3f36f502b92 100644 --- a/src/vs/workbench/contrib/chat/browser/chatEditorController.ts +++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorController.ts @@ -3,41 +3,41 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import './media/chatEditorController.css'; -import { addStandardDisposableListener, getTotalWidth } from '../../../../base/browser/dom.js'; -import { Disposable, DisposableStore, dispose, toDisposable } from '../../../../base/common/lifecycle.js'; -import { autorun, autorunWithStore, derived, IObservable, observableFromEvent, observableFromEventOpts, observableValue } from '../../../../base/common/observable.js'; -import { themeColorFromId } from '../../../../base/common/themables.js'; -import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, IOverlayWidgetPositionCoordinates, IViewZone, MouseTargetType } from '../../../../editor/browser/editorBrowser.js'; -import { LineSource, renderLines, RenderOptions } from '../../../../editor/browser/widget/diffEditor/components/diffEditorViewZones/renderLines.js'; -import { diffAddDecoration, diffDeleteDecoration, diffWholeLineAddDecoration } from '../../../../editor/browser/widget/diffEditor/registrations.contribution.js'; -import { EditorOption, IEditorOptions } from '../../../../editor/common/config/editorOptions.js'; -import { Range } from '../../../../editor/common/core/range.js'; -import { IDocumentDiff } from '../../../../editor/common/diff/documentDiffProvider.js'; -import { IEditorContribution, ScrollType } from '../../../../editor/common/editorCommon.js'; -import { IModelDeltaDecoration, MinimapPosition, OverviewRulerLane, TrackedRangeStickiness } from '../../../../editor/common/model.js'; -import { ModelDecorationOptions } from '../../../../editor/common/model/textModel.js'; -import { InlineDecoration, InlineDecorationType } from '../../../../editor/common/viewModel.js'; -import { localize } from '../../../../nls.js'; -import { IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js'; -import { ChatEditingSessionState, IChatEditingService, IModifiedFileEntry, WorkingSetEntryState } from '../common/chatEditingService.js'; -import { Event } from '../../../../base/common/event.js'; -import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js'; -import { MenuId } from '../../../../platform/actions/common/actions.js'; -import { IEditorService } from '../../../services/editor/common/editorService.js'; -import { Position } from '../../../../editor/common/core/position.js'; -import { Selection } from '../../../../editor/common/core/selection.js'; -import { HiddenItemStrategy, MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js'; -import { observableCodeEditor } from '../../../../editor/browser/observableCodeEditor.js'; -import { minimapGutterAddedBackground, minimapGutterDeletedBackground, minimapGutterModifiedBackground, overviewRulerAddedForeground, overviewRulerDeletedForeground, overviewRulerModifiedForeground } from '../../scm/common/quickDiff.js'; -import { DetailedLineRangeMapping } from '../../../../editor/common/diff/rangeMapping.js'; -import { isDiffEditorForEntry } from './chatEditing/chatEditing.js'; -import { basename, isEqual } from '../../../../base/common/resources.js'; -import { ChatAgentLocation, IChatAgentService } from '../common/chatAgents.js'; -import { EditorsOrder, IEditorIdentifier, isDiffEditorInput } from '../../../common/editor.js'; -import { ChatEditorOverlayController } from './chatEditorOverlay.js'; -import { IChatService } from '../common/chatService.js'; -import { StableEditorScrollState } from '../../../../editor/browser/stableEditorScroll.js'; +import '../media/chatEditorController.css'; +import { addStandardDisposableListener, getTotalWidth } from '../../../../../base/browser/dom.js'; +import { Disposable, DisposableStore, dispose, toDisposable } from '../../../../../base/common/lifecycle.js'; +import { autorun, autorunWithStore, derived, IObservable, observableFromEvent, observableFromEventOpts, observableValue } from '../../../../../base/common/observable.js'; +import { themeColorFromId } from '../../../../../base/common/themables.js'; +import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, IOverlayWidgetPositionCoordinates, IViewZone, MouseTargetType } from '../../../../../editor/browser/editorBrowser.js'; +import { LineSource, renderLines, RenderOptions } from '../../../../../editor/browser/widget/diffEditor/components/diffEditorViewZones/renderLines.js'; +import { diffAddDecoration, diffDeleteDecoration, diffWholeLineAddDecoration } from '../../../../../editor/browser/widget/diffEditor/registrations.contribution.js'; +import { EditorOption, IEditorOptions } from '../../../../../editor/common/config/editorOptions.js'; +import { Range } from '../../../../../editor/common/core/range.js'; +import { IDocumentDiff } from '../../../../../editor/common/diff/documentDiffProvider.js'; +import { IEditorContribution, ScrollType } from '../../../../../editor/common/editorCommon.js'; +import { IModelDeltaDecoration, MinimapPosition, OverviewRulerLane, TrackedRangeStickiness } from '../../../../../editor/common/model.js'; +import { ModelDecorationOptions } from '../../../../../editor/common/model/textModel.js'; +import { InlineDecoration, InlineDecorationType } from '../../../../../editor/common/viewModel.js'; +import { localize } from '../../../../../nls.js'; +import { IContextKey, IContextKeyService, RawContextKey } from '../../../../../platform/contextkey/common/contextkey.js'; +import { ChatEditingSessionState, IChatEditingService, IModifiedFileEntry, WorkingSetEntryState } from '../../common/chatEditingService.js'; +import { Event } from '../../../../../base/common/event.js'; +import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js'; +import { MenuId } from '../../../../../platform/actions/common/actions.js'; +import { IEditorService } from '../../../../services/editor/common/editorService.js'; +import { Position } from '../../../../../editor/common/core/position.js'; +import { Selection } from '../../../../../editor/common/core/selection.js'; +import { HiddenItemStrategy, MenuWorkbenchToolBar } from '../../../../../platform/actions/browser/toolbar.js'; +import { observableCodeEditor } from '../../../../../editor/browser/observableCodeEditor.js'; +import { minimapGutterAddedBackground, minimapGutterDeletedBackground, minimapGutterModifiedBackground, overviewRulerAddedForeground, overviewRulerDeletedForeground, overviewRulerModifiedForeground } from '../../../scm/common/quickDiff.js'; +import { DetailedLineRangeMapping } from '../../../../../editor/common/diff/rangeMapping.js'; +import { isDiffEditorForEntry } from './chatEditing.js'; +import { basename, isEqual } from '../../../../../base/common/resources.js'; +import { ChatAgentLocation, IChatAgentService } from '../../common/chatAgents.js'; +import { EditorsOrder, IEditorIdentifier, isDiffEditorInput } from '../../../../common/editor.js'; +import { ChatEditorOverlayController } from './chatEditingEditorOverlay.js'; +import { IChatService } from '../../common/chatService.js'; +import { StableEditorScrollState } from '../../../../../editor/browser/stableEditorScroll.js'; export const ctxIsGlobalEditingSession = new RawContextKey('chat.isGlobalEditingSession', undefined, localize('chat.ctxEditSessionIsGlobal', "The current editor is part of the global edit session")); export const ctxHasEditorModification = new RawContextKey('chat.hasEditorModifications', undefined, localize('chat.hasEditorModifications', "The current editor contains chat modifications")); diff --git a/src/vs/workbench/contrib/chat/browser/chatEditorOverlay.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorOverlay.ts similarity index 86% rename from src/vs/workbench/contrib/chat/browser/chatEditorOverlay.ts rename to src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorOverlay.ts index acf876c17c4..0db38aaf8bb 100644 --- a/src/vs/workbench/contrib/chat/browser/chatEditorOverlay.ts +++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorOverlay.ts @@ -3,32 +3,32 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js'; -import { autorun, IObservable, observableFromEvent, observableValue, transaction } from '../../../../base/common/observable.js'; -import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, OverlayWidgetPositionPreference } from '../../../../editor/browser/editorBrowser.js'; -import { HiddenItemStrategy, MenuWorkbenchToolBar, WorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js'; -import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js'; -import { IChatEditingSession, IModifiedFileEntry } from '../common/chatEditingService.js'; -import { MenuId } from '../../../../platform/actions/common/actions.js'; -import { ActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js'; -import { ACTIVE_GROUP, IEditorService } from '../../../services/editor/common/editorService.js'; -import { Range } from '../../../../editor/common/core/range.js'; -import { IActionRunner } from '../../../../base/common/actions.js'; -import { $, addDisposableGenericMouseMoveListener, append, EventLike, reset } from '../../../../base/browser/dom.js'; -import { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js'; -import { ThemeIcon } from '../../../../base/common/themables.js'; -import { Codicon } from '../../../../base/common/codicons.js'; -import { assertType } from '../../../../base/common/types.js'; -import { localize } from '../../../../nls.js'; -import { AcceptAction, navigationBearingFakeActionId, RejectAction } from './chatEditorActions.js'; -import { ChatEditorController } from './chatEditorController.js'; -import './media/chatEditorOverlay.css'; -import { findDiffEditorContainingCodeEditor } from '../../../../editor/browser/widget/diffEditor/commands.js'; -import { IChatService } from '../common/chatService.js'; -import { IEditorContribution } from '../../../../editor/common/editorCommon.js'; -import { rcut } from '../../../../base/common/strings.js'; -import { IHoverService } from '../../../../platform/hover/browser/hover.js'; -import { Lazy } from '../../../../base/common/lazy.js'; +import { DisposableStore, MutableDisposable } from '../../../../../base/common/lifecycle.js'; +import { autorun, IObservable, observableFromEvent, observableValue, transaction } from '../../../../../base/common/observable.js'; +import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, OverlayWidgetPositionPreference } from '../../../../../editor/browser/editorBrowser.js'; +import { HiddenItemStrategy, MenuWorkbenchToolBar, WorkbenchToolBar } from '../../../../../platform/actions/browser/toolbar.js'; +import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js'; +import { IChatEditingSession, IModifiedFileEntry } from '../../common/chatEditingService.js'; +import { MenuId } from '../../../../../platform/actions/common/actions.js'; +import { ActionViewItem } from '../../../../../base/browser/ui/actionbar/actionViewItems.js'; +import { ACTIVE_GROUP, IEditorService } from '../../../../services/editor/common/editorService.js'; +import { Range } from '../../../../../editor/common/core/range.js'; +import { IActionRunner } from '../../../../../base/common/actions.js'; +import { $, addDisposableGenericMouseMoveListener, append, EventLike, reset } from '../../../../../base/browser/dom.js'; +import { renderIcon } from '../../../../../base/browser/ui/iconLabel/iconLabels.js'; +import { ThemeIcon } from '../../../../../base/common/themables.js'; +import { Codicon } from '../../../../../base/common/codicons.js'; +import { assertType } from '../../../../../base/common/types.js'; +import { localize } from '../../../../../nls.js'; +import { AcceptAction, navigationBearingFakeActionId, RejectAction } from './chatEditingEditorActions.js'; +import { ChatEditorController } from './chatEditingEditorController.js'; +import '../media/chatEditorOverlay.css'; +import { findDiffEditorContainingCodeEditor } from '../../../../../editor/browser/widget/diffEditor/commands.js'; +import { IChatService } from '../../common/chatService.js'; +import { IEditorContribution } from '../../../../../editor/common/editorCommon.js'; +import { rcut } from '../../../../../base/common/strings.js'; +import { IHoverService } from '../../../../../platform/hover/browser/hover.js'; +import { Lazy } from '../../../../../base/common/lazy.js'; class ChatEditorOverlayWidget implements IOverlayWidget { diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatController2.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatController2.ts index 78b47cf777d..23bb36062f4 100644 --- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatController2.ts +++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatController2.ts @@ -26,8 +26,8 @@ import { IInstantiationService } from '../../../../platform/instantiation/common import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js'; import { ILogService } from '../../../../platform/log/common/log.js'; import { IEditorService } from '../../../services/editor/common/editorService.js'; -import { ctxIsGlobalEditingSession } from '../../chat/browser/chatEditorController.js'; -import { ChatEditorOverlayController } from '../../chat/browser/chatEditorOverlay.js'; +import { ctxIsGlobalEditingSession } from '../../chat/browser/chatEditing/chatEditingEditorController.js'; +import { ChatEditorOverlayController } from '../../chat/browser/chatEditing/chatEditingEditorOverlay.js'; import { IChatWidgetLocationOptions } from '../../chat/browser/chatWidget.js'; import { ChatAgentLocation } from '../../chat/common/chatAgents.js'; import { WorkingSetEntryState } from '../../chat/common/chatEditingService.js'; diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatActionsOverlay.ts b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatActionsOverlay.ts index 8aa7a2c4c9d..f9c9ed3a545 100644 --- a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatActionsOverlay.ts +++ b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatActionsOverlay.ts @@ -18,7 +18,7 @@ import { autorun, autorunWithStore, IObservable, ISettableObservable, observable import { isEqual } from '../../../../../../base/common/resources.js'; import { CellDiffInfo } from '../../diff/notebookDiffViewModel.js'; import { INotebookDeletedCellDecorator } from './notebookCellDecorators.js'; -import { AcceptAction, navigationBearingFakeActionId, RejectAction } from '../../../../chat/browser/chatEditorActions.js'; +import { AcceptAction, navigationBearingFakeActionId, RejectAction } from '../../../../chat/browser/chatEditing/chatEditingEditorActions.js'; export class NotebookChatActionsOverlayController extends Disposable { constructor(