Ensure sent code is run

Author: edvilme

src/client/common/terminal/service.ts

@@ -90,7 +90,7 @@ export class TerminalService implements ITerminalService, Disposable {
     ): Promise<TerminalShellExecution | undefined> {
         if (isPythonShell) {
             if (this.isReplReady) {
-                this.terminal?.sendText(commandLine);
+                this.sendPythonShellCommand(commandLine);
                 traceVerbose(`Python REPL sendText: ${commandLine}`);
             } else {
                 // Queue command to run once REPL is ready.
@@ -156,11 +156,21 @@ export class TerminalService implements ITerminalService, Disposable {
             const commandLine = this.pythonReplCommandQueue.shift();
             if (commandLine) {
                 traceVerbose(`Executing queued REPL command: ${commandLine}`);
-                this.terminal?.sendText(commandLine);
+                this.sendPythonShellCommand(commandLine);
             }
         }
     }
 
+    // PyREPL requires Enter to arrive after the bracketed-paste sequence has been fully processed.
+    private sendPythonShellCommand(commandLine: string): void {
+        if (commandLine.startsWith('\u001b[200~') && commandLine.endsWith('\u001b[201~')) {
+            this.terminal?.sendText(commandLine, false);
+            this.terminal?.sendText('', true);
+        } else {
+            this.terminal?.sendText(commandLine);
+        }
+    }
+
     private async executeCommandInternal(commandLine: string): Promise<TerminalShellExecution | undefined> {
         const terminal = this.terminal;
         if (!terminal) {

src/test/common/terminals/service.unit.test.ts

@@ -338,6 +338,27 @@ suite('Terminal Service', () => {
         terminal.verify((t) => t.sendText(TypeMoq.It.isValue(textToSend)), TypeMoq.Times.once());
     });
 
+    test('Ensure bracketed paste and Enter are sent separately to the Python shell', async () => {
+        terminalHelper
+            .setup((helper) => helper.getEnvironmentActivationCommands(TypeMoq.It.isAny(), TypeMoq.It.isAny()))
+            .returns(() => Promise.resolve(undefined));
+        service = new TerminalService(mockServiceContainer.object);
+        const textToSend = '\u001b[200~print("hello")\u001b[201~';
+        terminalHelper.setup((h) => h.identifyTerminalShell(TypeMoq.It.isAny())).returns(() => TerminalShellType.bash);
+        terminalManager.setup((t) => t.createTerminal(TypeMoq.It.isAny())).returns(() => terminal.object);
+
+        await service.ensureTerminal();
+        const executePromise = service.executeCommand(textToSend, true);
+        onDidWriteTerminalDataEmitter.fire({ terminal: terminal.object, data: '>>> ' });
+        await executePromise;
+
+        terminal.verify(
+            (t) => t.sendText(TypeMoq.It.isValue(textToSend), TypeMoq.It.isValue(false)),
+            TypeMoq.Times.once(),
+        );
+        terminal.verify((t) => t.sendText(TypeMoq.It.isValue(''), TypeMoq.It.isValue(true)), TypeMoq.Times.once());
+    });
+
     test('Ensure sendText IS called even when Python shell integration and terminal shell integration are both enabled - Window', async () => {
         isWindowsStub.returns(true);
         pythonConfig