show message replies above button row

microsoft/vscode-copilot#314

Author: jrieken

src/vs/workbench/contrib/inlineChat/browser/inlineChat.css

@@ -143,7 +143,7 @@
 }
 
 .monaco-editor .inline-chat .markdownMessage {
-	padding-top: 10px;
+	padding: 10px 5px;
 }
 
 .monaco-editor .inline-chat .markdownMessage.hidden {
@@ -155,7 +155,6 @@
 }
 
 .monaco-editor .inline-chat .markdownMessage .message {
-	margin-left: 5px;
 	-webkit-line-clamp: initial;
 	-webkit-box-orient: vertical;
 	overflow: hidden;
@@ -172,10 +171,6 @@
 	-webkit-line-clamp: var(--vscode-inline-chat-expanded, 10);
 }
 
-.monaco-editor .inline-chat .markdownMessage .messageActions {
-	direction: rtl;
-}
-
 .monaco-editor .inline-chat .status .label A {
 	color: var(--vscode-textLink-foreground);
 	cursor: pointer;
@@ -213,7 +208,8 @@
 }
 
 .monaco-editor .inline-chat .status .actions .monaco-text-button {
-	padding: 2px 4px
+	padding: 2px 4px;
+	white-space: nowrap;
 }
 
 .monaco-editor .inline-chat .status .monaco-toolbar .action-item {

src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts

@@ -10,7 +10,7 @@ import { EditorAction2 } from 'vs/editor/browser/editorExtensions';
 import { EmbeddedCodeEditorWidget, EmbeddedDiffEditorWidget } from 'vs/editor/browser/widget/embeddedCodeEditorWidget';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { InlineChatController, InlineChatRunOptions } from 'vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_HAS_ACTIVE_REQUEST, CTX_INLINE_CHAT_HAS_PROVIDER, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, CTX_INLINE_CHAT_EMPTY, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, CTX_INLINE_CHAT_VISIBLE, MENU_INLINE_CHAT_WIDGET, MENU_INLINE_CHAT_WIDGET_DISCARD, MENU_INLINE_CHAT_WIDGET_STATUS, CTX_INLINE_CHAT_LAST_FEEDBACK, CTX_INLINE_CHAT_SHOWING_DIFF, CTX_INLINE_CHAT_EDIT_MODE, EditMode, CTX_INLINE_CHAT_LAST_RESPONSE_TYPE, MENU_INLINE_CHAT_WIDGET_MARKDOWN_MESSAGE, CTX_INLINE_CHAT_MESSAGE_CROP_STATE, CTX_INLINE_CHAT_DOCUMENT_CHANGED, CTX_INLINE_CHAT_DID_EDIT, CTX_INLINE_CHAT_HAS_STASHED_SESSION, MENU_INLINE_CHAT_WIDGET_FEEDBACK, ACTION_ACCEPT_CHANGES, ACTION_REGENERATE_RESPONSE } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
+import { CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_HAS_ACTIVE_REQUEST, CTX_INLINE_CHAT_HAS_PROVIDER, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, CTX_INLINE_CHAT_EMPTY, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, CTX_INLINE_CHAT_VISIBLE, MENU_INLINE_CHAT_WIDGET, MENU_INLINE_CHAT_WIDGET_DISCARD, MENU_INLINE_CHAT_WIDGET_STATUS, CTX_INLINE_CHAT_LAST_FEEDBACK, CTX_INLINE_CHAT_SHOWING_DIFF, CTX_INLINE_CHAT_EDIT_MODE, EditMode, CTX_INLINE_CHAT_LAST_RESPONSE_TYPE, MENU_INLINE_CHAT_WIDGET_MARKDOWN_MESSAGE, CTX_INLINE_CHAT_MESSAGE_CROP_STATE, CTX_INLINE_CHAT_DOCUMENT_CHANGED, CTX_INLINE_CHAT_DID_EDIT, CTX_INLINE_CHAT_HAS_STASHED_SESSION, MENU_INLINE_CHAT_WIDGET_FEEDBACK, ACTION_ACCEPT_CHANGES, ACTION_REGENERATE_RESPONSE, InlineChatResponseType } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
 import { localize } from 'vs/nls';
 import { IAction2Options, MenuRegistry } from 'vs/platform/actions/common/actions';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
@@ -313,7 +313,7 @@ MenuRegistry.appendMenuItem(MENU_INLINE_CHAT_WIDGET_STATUS, {
 	title: localize('discardMenu', "Discard..."),
 	icon: Codicon.discard,
 	group: '0_main',
-	order: 2,
+	order: 3,
 	when: CTX_INLINE_CHAT_EDIT_MODE.notEqualsTo(EditMode.Preview),
 	rememberDefaultAction: true
 });
@@ -564,10 +564,10 @@ export class ViewInChatAction extends AbstractInlineChatAction {
 			icon: Codicon.commentDiscussion,
 			precondition: CTX_INLINE_CHAT_VISIBLE,
 			menu: {
-				id: MENU_INLINE_CHAT_WIDGET_MARKDOWN_MESSAGE,
-				when: CTX_INLINE_CHAT_LAST_RESPONSE_TYPE.isEqualTo('message'),
-				group: '1_viewInChat',
-				order: 1
+				id: MENU_INLINE_CHAT_WIDGET_STATUS,
+				when: CTX_INLINE_CHAT_LAST_RESPONSE_TYPE.isEqualTo(InlineChatResponseType.Message),
+				group: '0_main',
+				order: 2
 			}
 		});
 	}
@@ -580,7 +580,7 @@ export class ExpandMessageAction extends AbstractInlineChatAction {
 	constructor() {
 		super({
 			id: 'inlineChat.expandMessageAction',
-			title: localize('expandMessage', 'Expand Message'),
+			title: localize('expandMessage', 'Show More'),
 			icon: Codicon.chevronDown,
 			precondition: CTX_INLINE_CHAT_VISIBLE,
 			menu: {
@@ -600,7 +600,7 @@ export class ContractMessageAction extends AbstractInlineChatAction {
 	constructor() {
 		super({
 			id: 'inlineChat.contractMessageAction',
-			title: localize('contractMessage', 'Contract Message'),
+			title: localize('contractMessage', 'Show Less'),
 			icon: Codicon.chevronUp,
 			precondition: CTX_INLINE_CHAT_VISIBLE,
 			menu: {

src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.ts

@@ -136,16 +136,16 @@ export class InlineChatWidget {
 			h('div.previewDiff.hidden@previewDiff'),
 			h('div.previewCreateTitle.show-file-icons@previewCreateTitle'),
 			h('div.previewCreate.hidden@previewCreate'),
+			h('div.markdownMessage.hidden@markdownMessage', [
+				h('div.message@message'),
+				h('div.messageActions@messageActions')
+			]),
 			h('div.status@status', [
 				h('div.label.info.hidden@infoLabel'),
 				h('div.actions.hidden@statusToolbar'),
 				h('div.label.status.hidden@statusLabel'),
 				h('div.actions.hidden@feedbackToolbar'),
 			]),
-			h('div.markdownMessage.hidden@markdownMessage', [
-				h('div.message@message'),
-				h('div.messageActions@messageActions')
-			]),
 		]
 	);