Rebase against the upstream 862fa13

vscode-upstream-sha1: 862fa13
che-incubator · Jul 26, 2023 · ca63324 · ca63324
2 parents 2d6674a + 862fa13
commit ca63324
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/code/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts b/code/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
@@ -14,6 +14,7 @@ import { IChatService } from 'vs/workbench/contrib/chat/common/chatService';
 
 export interface IChatExecuteActionContext {
 	widget: IChatWidget;
+	inputValue?: string;
 }
 
 function isExecuteActionContext(thing: unknown): thing is IChatExecuteActionContext {
@@ -48,7 +49,7 @@ export class SubmitAction extends Action2 {
 			return;
 		}
 
-		context.widget.acceptInput();
+		context.widget.acceptInput(context.inputValue);
 	}
 }
 

diff --git a/code/src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorContrib.ts b/code/src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorContrib.ts
@@ -229,12 +229,12 @@ class SlashCommandCompletions extends Disposable {
 						const withSlash = `/${c.command}`;
 						return <CompletionItem>{
 							label: withSlash,
-							insertText: `${withSlash} `,
+							insertText: c.executeImmediately ? '' : `${withSlash} `,
 							detail: c.detail,
 							range: new Range(1, 1, 1, 1),
 							sortText: c.sortText ?? c.command,
 							kind: CompletionItemKind.Text, // The icons are disabled here anyway,
-							command: c.executeImmediately ? { id: SubmitAction.ID, title: withSlash, arguments: [{ widget }] } : undefined,
+							command: c.executeImmediately ? { id: SubmitAction.ID, title: withSlash, arguments: [{ widget, inputValue: withSlash }] } : undefined,
 						};
 					})
 				};