@codingame/monaco-vscode-api 4.5.2 → 5.0.0

package/vscode/src/vs/workbench/contrib/files/browser/views/openEditorsView.js

@@ -52,6 +52,7 @@ import { Schemas } from '../../../../../base/common/network.js';
 import { extUriIgnorePathCase } from '../../../../../base/common/resources.js';
 import { mainWindow } from '../../../../../base/browser/window.js';
 import { EditorGroupView } from '../../../../browser/parts/editor/editorGroupView.js';
+import { IHoverService } from '../../../../../platform/hover/browser/hover.service.js';
 var OpenEditorsView_1;
 const _moduleId = "vs/workbench/contrib/files/browser/views/openEditorsView";
 const $ = $$1;
@@ -61,8 +62,8 @@ let OpenEditorsView = class OpenEditorsView extends ViewPane {
     static { this.DEFAULT_MIN_VISIBLE_OPEN_EDITORS = 0; }
     static { this.ID = 'workbench.explorer.openEditorsView'; }
     static { this.NAME = ( localize2WithPath(_moduleId, 0, "Open Editors")); }
-    constructor(options, instantiationService, viewDescriptorService, contextMenuService, editorGroupService, configurationService, keybindingService, contextKeyService, themeService, telemetryService, workingCopyService, filesConfigurationService, openerService) {
-        super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
+    constructor(options, instantiationService, viewDescriptorService, contextMenuService, editorGroupService, configurationService, keybindingService, contextKeyService, themeService, telemetryService, hoverService, workingCopyService, filesConfigurationService, openerService) {
+        super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
         this.editorGroupService = editorGroupService;
         this.workingCopyService = workingCopyService;
         this.filesConfigurationService = filesConfigurationService;
@@ -166,9 +167,7 @@ let OpenEditorsView = class OpenEditorsView extends ViewPane {
         ], {
             identityProvider: { getId: (element) => element instanceof OpenEditor ? element.getId() : ( (element.id.toString())) },
             dnd: this.dnd,
-            overrideStyles: {
-                listBackground: this.getBackgroundColor()
-            },
+            overrideStyles: this.getLocationBasedColors().listOverrideStyles,
             accessibilityProvider: ( (new OpenEditorsAccessibilityProvider()))
         });
         this._register(this.list);
@@ -456,9 +455,10 @@ OpenEditorsView = OpenEditorsView_1 = ( (__decorate([
     ( (__param(7, IContextKeyService))),
     ( (__param(8, IThemeService))),
     ( (__param(9, ITelemetryService))),
-    ( (__param(10, IWorkingCopyService))),
-    ( (__param(11, IFilesConfigurationService))),
-    ( (__param(12, IOpenerService)))
+    ( (__param(10, IHoverService))),
+    ( (__param(11, IWorkingCopyService))),
+    ( (__param(12, IFilesConfigurationService))),
+    ( (__param(13, IOpenerService)))
 ], OpenEditorsView)));
 class OpenEditorActionRunner extends ActionRunner {
     async run(action) {

package/vscode/src/vs/workbench/contrib/files/browser/workspaceWatcher.js

@@ -12,10 +12,12 @@ import { IOpenerService } from '../../../../platform/opener/common/opener.servic
 import { isAbsolute } from '../../../../base/common/path.js';
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.service.js';
 import { IHostService } from '../../../services/host/browser/host.service.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
 import Severity$1 from '../../../../base/common/severity.js';
 const _moduleId = "vs/workbench/contrib/files/browser/workspaceWatcher";
 let WorkspaceWatcher = class WorkspaceWatcher extends Disposable {
-    constructor(fileService, configurationService, contextService, notificationService, openerService, uriIdentityService, hostService) {
+    static { this.ID = 'workbench.contrib.workspaceWatcher'; }
+    constructor(fileService, configurationService, contextService, notificationService, openerService, uriIdentityService, hostService, telemetryService) {
         super();
         this.fileService = fileService;
         this.configurationService = configurationService;
@@ -24,6 +26,7 @@ let WorkspaceWatcher = class WorkspaceWatcher extends Disposable {
         this.openerService = openerService;
         this.uriIdentityService = uriIdentityService;
         this.hostService = hostService;
+        this.telemetryService = telemetryService;
         this.watchedWorkspaces = ( (new ResourceMap(resource => this.uriIdentityService.extUri.getComparisonKey(resource))));
         this.registerListeners();
         this.refresh();
@@ -52,7 +55,9 @@ let WorkspaceWatcher = class WorkspaceWatcher extends Disposable {
     }
     onDidWatchError(error) {
         const msg = ( (error.toString()));
+        let reason = undefined;
         if (msg.indexOf('ENOSPC') >= 0) {
+            reason = 'ENOSPC';
             this.notificationService.prompt(Severity$1.Warning, ( localizeWithPath(
                 _moduleId,
                 0,
@@ -66,6 +71,7 @@ let WorkspaceWatcher = class WorkspaceWatcher extends Disposable {
             });
         }
         else if (msg.indexOf('EUNKNOWN') >= 0) {
+            reason = 'EUNKNOWN';
             this.notificationService.prompt(Severity$1.Warning, ( localizeWithPath(
                 _moduleId,
                 2,
@@ -78,6 +84,12 @@ let WorkspaceWatcher = class WorkspaceWatcher extends Disposable {
                 priority: NotificationPriority.SILENT
             });
         }
+        else if (msg.indexOf('ETERM') >= 0) {
+            reason = 'ETERM';
+        }
+        if (reason) {
+            this.telemetryService.publicLog2('fileWatcherError', { reason });
+        }
     }
     watchWorkspace(workspace) {
         const excludes = [];
@@ -144,6 +156,7 @@ WorkspaceWatcher = ( (__decorate([
     ( (__param(3, INotificationService))),
     ( (__param(4, IOpenerService))),
     ( (__param(5, IUriIdentityService))),
-    ( (__param(6, IHostService)))
+    ( (__param(6, IHostService))),
+    ( (__param(7, ITelemetryService)))
 ], WorkspaceWatcher)));
 export { WorkspaceWatcher };

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.js

@@ -6,9 +6,9 @@ import { EmbeddedDiffEditorWidget } from '../../../../editor/browser/widget/diff
 import { EmbeddedCodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/embeddedCodeEditorWidget.js';
 import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
 import { InlineChatController, InlineChatRunOptions } from './inlineChatController.js';
-import { ACTION_ACCEPT_CHANGES, CTX_INLINE_CHAT_HAS_PROVIDER, MENU_INLINE_CHAT_WIDGET_STATUS, MENU_INLINE_CHAT_WIDGET_DISCARD, CTX_INLINE_CHAT_EDIT_MODE, CTX_INLINE_CHAT_RESPONSE_TYPES, CTX_INLINE_CHAT_RESPONSE_FOCUSED, CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_HAS_STASHED_SESSION, ACTION_REGENERATE_RESPONSE, CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_EMPTY, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, CTX_INLINE_CHAT_USER_DID_EDIT, CTX_INLINE_CHAT_DID_EDIT, ACTION_TOGGLE_DIFF, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF, MENU_INLINE_CHAT_WIDGET_FEEDBACK, CTX_INLINE_CHAT_SUPPORT_ISSUE_REPORTING, CTX_INLINE_CHAT_DOCUMENT_CHANGED, MENU_INLINE_CHAT_WIDGET, ACTION_VIEW_IN_CHAT } from '../common/inlineChat.js';
+import { ACTION_ACCEPT_CHANGES, CTX_INLINE_CHAT_HAS_PROVIDER, MENU_INLINE_CHAT_WIDGET_STATUS, MENU_INLINE_CHAT_WIDGET_DISCARD, CTX_INLINE_CHAT_EDIT_MODE, CTX_INLINE_CHAT_RESPONSE_TYPES, CTX_INLINE_CHAT_RESPONSE_FOCUSED, CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_HAS_STASHED_SESSION, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, CTX_INLINE_CHAT_USER_DID_EDIT, CTX_INLINE_CHAT_DID_EDIT, ACTION_TOGGLE_DIFF, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF, CTX_INLINE_CHAT_DOCUMENT_CHANGED, MENU_INLINE_CHAT_WIDGET, ACTION_VIEW_IN_CHAT } from '../common/inlineChat.js';
 import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
-import { MenuId, MenuRegistry } from '../../../../platform/actions/common/actions.js';
+import { MenuRegistry } from '../../../../platform/actions/common/actions.js';
 import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.service.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import '../../../../platform/instantiation/common/instantiation.js';
@@ -26,8 +26,6 @@ import { AccessibilityHelpAction } from '../../accessibility/browser/accessibleV
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 import { IPreferencesService } from '../../../services/preferences/common/preferences.service.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
-import { CONTEXT_RESPONSE, CONTEXT_CHAT_LOCATION, CONTEXT_RESPONSE_DETECTED_AGENT_COMMAND } from '../../chat/common/chatContextKeys.js';
-import { ChatAgentLocation } from '../../chat/common/chatAgents.js';
 const _moduleId = "vs/workbench/contrib/inlineChat/browser/inlineChatActions";
 CommandsRegistry.registerCommandAlias('interactiveEditor.start', 'inlineChat.start');
 CommandsRegistry.registerCommandAlias('interactive.acceptChanges', ACTION_ACCEPT_CHANGES);
@@ -132,72 +130,11 @@ class AbstractInlineChatAction extends EditorAction2 {
         this.runInlineChatCommand(accessor, ctrl, editor, ..._args);
     }
 }
-const CHAT_REGENERATE_MENU = MenuId.for('inlineChat.response.rerun');
-MenuRegistry.appendMenuItem(MenuId.ChatMessageTitle, {
-    submenu: CHAT_REGENERATE_MENU,
-    title: ( localizeWithPath(_moduleId, 4, "Regenerate...")),
-    icon: Codicon.refresh,
-    group: 'navigation',
-    order: -10,
-    when: ( (ContextKeyExpr.and(
-        CONTEXT_RESPONSE,
-         (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Editor))
-    )))
-});
-class ReRunRequestAction extends AbstractInlineChatAction {
-    constructor() {
-        super({
-            id: ACTION_REGENERATE_RESPONSE,
-            title: ( localizeWithPath(_moduleId, 5, 'Regenerate Response')),
-            shortTitle: ( localizeWithPath(_moduleId, 6, 'Regenerate')),
-            icon: Codicon.refresh,
-            precondition: ( (ContextKeyExpr.and(
-                CTX_INLINE_CHAT_VISIBLE,
-                 (CTX_INLINE_CHAT_EMPTY.negate()),
-                 (CTX_INLINE_CHAT_RESPONSE_TYPES.notEqualsTo("empty" ))
-            ))),
-            menu: [{
-                    id: CHAT_REGENERATE_MENU,
-                    group: 'navigation',
-                    order: -120,
-                    when: ( (ContextKeyExpr.and(
-                        CONTEXT_RESPONSE,
-                         (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Editor))
-                    )))
-                }]
-        });
-    }
-    runInlineChatCommand(_accessor, ctrl) {
-        ctrl.rerun({ retry: true });
-    }
-}
-class ReRunRequestWithIntentDetectionAction extends AbstractInlineChatAction {
-    constructor() {
-        super({
-            id: 'inlineChat.rerunWithIntentDetection',
-            title: ( localizeWithPath(_moduleId, 7, 'Regenerate without Command Detection')),
-            icon: Codicon.debugRestartFrame,
-            menu: {
-                id: CHAT_REGENERATE_MENU,
-                group: 'navigation',
-                order: -100,
-                when: ( (ContextKeyExpr.and(
-                    CONTEXT_RESPONSE_DETECTED_AGENT_COMMAND,
-                    CONTEXT_RESPONSE,
-                     (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Editor))
-                )))
-            }
-        });
-    }
-    runInlineChatCommand(_accessor, ctrl) {
-        ctrl.rerun({ withoutIntentDetection: true });
-    }
-}
 class ArrowOutUpAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: 'inlineChat.arrowOutUp',
-            title: ( localizeWithPath(_moduleId, 8, 'Cursor Up')),
+            title: ( localizeWithPath(_moduleId, 4, 'Cursor Up')),
             precondition: ( (ContextKeyExpr.and(
                 CTX_INLINE_CHAT_FOCUSED,
                 CTX_INLINE_CHAT_INNER_CURSOR_FIRST,
@@ -218,7 +155,7 @@ class ArrowOutDownAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: 'inlineChat.arrowOutDown',
-            title: ( localizeWithPath(_moduleId, 9, 'Cursor Down')),
+            title: ( localizeWithPath(_moduleId, 5, 'Cursor Down')),
             precondition: ( (ContextKeyExpr.and(
                 CTX_INLINE_CHAT_FOCUSED,
                 CTX_INLINE_CHAT_INNER_CURSOR_LAST,
@@ -239,7 +176,7 @@ class FocusInlineChat extends EditorAction2 {
     constructor() {
         super({
             id: 'inlineChat.focus',
-            title: ( localize2WithPath(_moduleId, 10, "Focus Input")),
+            title: ( localize2WithPath(_moduleId, 6, "Focus Input")),
             f1: true,
             category: AbstractInlineChatAction.category,
             precondition: ( (ContextKeyExpr.and(
@@ -273,13 +210,14 @@ class DiscardHunkAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: 'inlineChat.discardHunkChange',
-            title: ( localizeWithPath(_moduleId, 11, 'Discard')),
+            title: ( localizeWithPath(_moduleId, 7, 'Discard')),
             icon: Codicon.clearAll,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             menu: {
                 id: MENU_INLINE_CHAT_WIDGET_STATUS,
                 when: ( (ContextKeyExpr.and(
                      (CTX_INLINE_CHAT_RESPONSE_TYPES.notEqualsTo("onlyMessages" )),
+                     (CTX_INLINE_CHAT_RESPONSE_TYPES.notEqualsTo("empty" )),
                      (CTX_INLINE_CHAT_EDIT_MODE.isEqualTo("live" ))
                 ))),
                 group: '0_main',
@@ -293,7 +231,7 @@ class DiscardHunkAction extends AbstractInlineChatAction {
 }
 MenuRegistry.appendMenuItem(MENU_INLINE_CHAT_WIDGET_STATUS, {
     submenu: MENU_INLINE_CHAT_WIDGET_DISCARD,
-    title: ( localizeWithPath(_moduleId, 12, "Discard...")),
+    title: ( localizeWithPath(_moduleId, 8, "Discard...")),
     icon: Codicon.discard,
     group: '0_main',
     order: 2,
@@ -308,7 +246,7 @@ class DiscardAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: 'inlineChat.discard',
-            title: ( localizeWithPath(_moduleId, 11, 'Discard')),
+            title: ( localizeWithPath(_moduleId, 7, 'Discard')),
             icon: Codicon.discard,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             keybinding: {
@@ -331,7 +269,7 @@ class DiscardToClipboardAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: 'inlineChat.discardToClipboard',
-            title: ( localizeWithPath(_moduleId, 13, 'Discard to Clipboard')),
+            title: ( localizeWithPath(_moduleId, 9, 'Discard to Clipboard')),
             precondition: ( (ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_DID_EDIT))),
             menu: {
                 id: MENU_INLINE_CHAT_WIDGET_DISCARD,
@@ -352,7 +290,7 @@ class DiscardUndoToNewFileAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: 'inlineChat.discardToFile',
-            title: ( localizeWithPath(_moduleId, 14, 'Discard to New File')),
+            title: ( localizeWithPath(_moduleId, 10, 'Discard to New File')),
             precondition: ( (ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_DID_EDIT))),
             menu: {
                 id: MENU_INLINE_CHAT_WIDGET_DISCARD,
@@ -379,7 +317,7 @@ class ToggleDiffForChange extends AbstractInlineChatAction {
                  (CTX_INLINE_CHAT_EDIT_MODE.isEqualTo("live" )),
                 CTX_INLINE_CHAT_CHANGE_HAS_DIFF
             ))),
-            title: ( localize2WithPath(_moduleId, 15, 'Toggle Changes')),
+            title: ( localize2WithPath(_moduleId, 11, 'Toggle Changes')),
             icon: Codicon.diffSingle,
             toggled: {
                 condition: CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF,
@@ -400,37 +338,12 @@ class ToggleDiffForChange extends AbstractInlineChatAction {
         ctrl.toggleDiff();
     }
 }
-class ReportIssueForBugCommand extends AbstractInlineChatAction {
-    constructor() {
-        super({
-            id: 'inlineChat.reportIssueForBug',
-            title: ( localizeWithPath(_moduleId, 16, 'Report Issue')),
-            icon: Codicon.report,
-            precondition: ( (ContextKeyExpr.and(
-                CTX_INLINE_CHAT_VISIBLE,
-                 (CTX_INLINE_CHAT_RESPONSE_TYPES.notEqualsTo("empty" ))
-            ))),
-            menu: [{
-                    id: MENU_INLINE_CHAT_WIDGET_FEEDBACK,
-                    when: ( (ContextKeyExpr.and(
-                        CTX_INLINE_CHAT_SUPPORT_ISSUE_REPORTING,
-                         (CTX_INLINE_CHAT_RESPONSE_TYPES.notEqualsTo("empty" ))
-                    ))),
-                    group: '2_feedback',
-                    order: 3
-                }]
-        });
-    }
-    runInlineChatCommand(_accessor, ctrl) {
-        ctrl.feedbackLast(4 );
-    }
-}
 class AcceptChanges extends AbstractInlineChatAction {
     constructor() {
         super({
             id: ACTION_ACCEPT_CHANGES,
-            title: ( localize2WithPath(_moduleId, 17, "Accept Changes")),
-            shortTitle: ( localizeWithPath(_moduleId, 18, 'Accept')),
+            title: ( localize2WithPath(_moduleId, 12, "Accept Changes")),
+            shortTitle: ( localizeWithPath(_moduleId, 13, 'Accept')),
             icon: Codicon.check,
             f1: true,
             precondition: ( (ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE,  (ContextKeyExpr.or(
@@ -443,7 +356,8 @@ class AcceptChanges extends AbstractInlineChatAction {
                 }],
             menu: {
                 when: ( (ContextKeyExpr.and(
-                     (CTX_INLINE_CHAT_RESPONSE_TYPES.notEqualsTo("onlyMessages" ))
+                     (CTX_INLINE_CHAT_RESPONSE_TYPES.notEqualsTo("onlyMessages" )),
+                     (CTX_INLINE_CHAT_RESPONSE_TYPES.notEqualsTo("empty" ))
                 ))),
                 id: MENU_INLINE_CHAT_WIDGET_STATUS,
                 group: '0_main',
@@ -459,7 +373,7 @@ class CancelSessionAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: 'inlineChat.cancel',
-            title: ( localizeWithPath(_moduleId, 19, 'Cancel')),
+            title: ( localizeWithPath(_moduleId, 14, 'Cancel')),
             icon: Codicon.clearAll,
             precondition: ( (ContextKeyExpr.and(
                 CTX_INLINE_CHAT_VISIBLE,
@@ -471,7 +385,10 @@ class CancelSessionAction extends AbstractInlineChatAction {
             },
             menu: {
                 id: MENU_INLINE_CHAT_WIDGET_STATUS,
-                when: ( (CTX_INLINE_CHAT_EDIT_MODE.isEqualTo("preview" ))),
+                when: ( (ContextKeyExpr.and(
+                     (CTX_INLINE_CHAT_EDIT_MODE.isEqualTo("preview" )),
+                     (CTX_INLINE_CHAT_RESPONSE_TYPES.notEqualsTo("empty" ))
+                ))),
                 group: '0_main',
                 order: 3
             }
@@ -485,7 +402,7 @@ class CloseAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: 'inlineChat.close',
-            title: ( localizeWithPath(_moduleId, 20, 'Close')),
+            title: ( localizeWithPath(_moduleId, 15, 'Close')),
             icon: Codicon.close,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             keybinding: {
@@ -508,7 +425,7 @@ class ConfigureInlineChatAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: 'inlineChat.configure',
-            title: ( localizeWithPath(_moduleId, 21, 'Configure ')),
+            title: ( localizeWithPath(_moduleId, 16, 'Configure ')),
             icon: Codicon.settingsGear,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             menu: {
@@ -526,7 +443,7 @@ class MoveToNextHunk extends AbstractInlineChatAction {
     constructor() {
         super({
             id: 'inlineChat.moveToNextHunk',
-            title: ( localize2WithPath(_moduleId, 22, 'Move to Next Change')),
+            title: ( localize2WithPath(_moduleId, 17, 'Move to Next Change')),
             precondition: CTX_INLINE_CHAT_VISIBLE,
             f1: true,
             keybinding: {
@@ -543,7 +460,7 @@ class MoveToPreviousHunk extends AbstractInlineChatAction {
     constructor() {
         super({
             id: 'inlineChat.moveToPreviousHunk',
-            title: ( localize2WithPath(_moduleId, 23, 'Move to Previous Change')),
+            title: ( localize2WithPath(_moduleId, 18, 'Move to Previous Change')),
             f1: true,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             keybinding: {
@@ -561,7 +478,7 @@ class CopyRecordings extends AbstractInlineChatAction {
         super({
             id: 'inlineChat.copyRecordings',
             f1: true,
-            title: ( localize2WithPath(_moduleId, 24, "(Developer) Write Exchange to Clipboard"))
+            title: ( localize2WithPath(_moduleId, 19, "(Developer) Write Exchange to Clipboard"))
         });
     }
     async runInlineChatCommand(accessor) {
@@ -577,7 +494,7 @@ class CopyRecordings extends AbstractInlineChatAction {
                 rec,
                 label: ( localizeWithPath(
                     _moduleId,
-                    25,
+                    20,
                     "'{0}' and {1} follow ups ({2})",
                     rec.exchanges[0].prompt,
                     rec.exchanges.length - 1,
@@ -596,7 +513,7 @@ class ViewInChatAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: ACTION_VIEW_IN_CHAT,
-            title: ( localizeWithPath(_moduleId, 26, 'View in Chat')),
+            title: ( localizeWithPath(_moduleId, 21, 'View in Chat')),
             icon: Codicon.commentDiscussion,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             menu: {
@@ -623,4 +540,4 @@ class InlineAccessibilityHelpContribution extends Disposable {
         }, ( (ContextKeyExpr.or(CTX_INLINE_CHAT_RESPONSE_FOCUSED, CTX_INLINE_CHAT_FOCUSED)))));
     }
 }
-export { AbstractInlineChatAction, AcceptChanges, ArrowOutDownAction, ArrowOutUpAction, CancelSessionAction, CloseAction, ConfigureInlineChatAction, CopyRecordings, DiscardAction, DiscardHunkAction, DiscardToClipboardAction, DiscardUndoToNewFileAction, FocusInlineChat, InlineAccessibilityHelpContribution, LOCALIZED_START_INLINE_CHAT_STRING, MoveToNextHunk, MoveToPreviousHunk, ReRunRequestAction, ReRunRequestWithIntentDetectionAction, ReportIssueForBugCommand, START_INLINE_CHAT, StartSessionAction, ToggleDiffForChange, UnstashSessionAction, ViewInChatAction };
+export { AbstractInlineChatAction, AcceptChanges, ArrowOutDownAction, ArrowOutUpAction, CancelSessionAction, CloseAction, ConfigureInlineChatAction, CopyRecordings, DiscardAction, DiscardHunkAction, DiscardToClipboardAction, DiscardUndoToNewFileAction, FocusInlineChat, InlineAccessibilityHelpContribution, LOCALIZED_START_INLINE_CHAT_STRING, MoveToNextHunk, MoveToPreviousHunk, START_INLINE_CHAT, StartSessionAction, ToggleDiffForChange, UnstashSessionAction, ViewInChatAction };

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatContentWidget.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import './media/inlineChatContentWidget.css.js';
-import { Dimension, reset, trackFocus } from '../../../../base/browser/dom.js';
+import { reset, trackFocus } from '../../../../base/browser/dom.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { Position } from '../../../../editor/common/core/position.js';
@@ -37,7 +37,7 @@ let InlineChatContentWidget = class InlineChatContentWidget {
         this.onDidBlur = this._onDidBlur.event;
         this._visible = false;
         this._focusNext = false;
-        this._defaultChatModel = this._store.add(instaService.createInstance(ChatModel, `inlineChatDefaultModel/editorContentWidgetPlaceholder`, undefined));
+        this._defaultChatModel = this._store.add(instaService.createInstance(ChatModel, undefined, ChatAgentLocation.Editor));
         const scopedInstaService = instaService.createChild(( new ServiceCollection([
             IContextKeyService,
             this._store.add(contextKeyService.createScoped(this._domNode))
@@ -47,6 +47,7 @@ let InlineChatContentWidget = class InlineChatContentWidget {
             editorOverflowWidgetsDomNode: _editor.getOverflowWidgetsDomNode(),
             renderStyle: 'compact',
             renderInputOnTop: true,
+            renderFollowups: true,
             supportsFileReferences: false,
             menus: {
                 telemetrySource: 'inlineChat-content'
@@ -96,8 +97,8 @@ let InlineChatContentWidget = class InlineChatContentWidget {
     }
     beforeRender() {
         const maxHeight = this._widget.input.inputEditor.getOption(67 ) * 5;
-        const inputEditorHeight = this._widget.inputEditor.getContentHeight();
-        this._widget.inputEditor.layout(new Dimension(360, Math.min(maxHeight, inputEditorHeight)));
+        const inputEditorHeight = this._widget.contentHeight;
+        this._widget.layout(Math.min(maxHeight, inputEditorHeight), 360);
         return null;
     }
     afterRender() {
@@ -141,9 +142,11 @@ let InlineChatContentWidget = class InlineChatContentWidget {
         this._updateMessage(session.session.message ?? '');
     }
     _updateMessage(message) {
-        this._messageContainer.classList.toggle('hidden', !message);
-        const renderedMessage = renderLabelWithIcons(message);
-        reset(this._messageContainer, ...renderedMessage);
+        if (message) {
+            const renderedMessage = renderLabelWithIcons(message);
+            reset(this._messageContainer, ...renderedMessage);
+        }
+        this._messageContainer.style.display = message ? 'inherit' : 'none';
         this._editor.layoutContentWidget(this);
     }
 };