From 2bf0ef3c1a6ec490ee04eb881ae099730c34f84c Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Mon, 5 Sep 2022 00:47:43 +0200 Subject: [PATCH] only trim pasted text when it's a single line - fixes #7028, fixes #7064 --- tabby-terminal/src/api/baseTerminalTab.component.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tabby-terminal/src/api/baseTerminalTab.component.ts b/tabby-terminal/src/api/baseTerminalTab.component.ts index 10665ee1..de92390b 100644 --- a/tabby-terminal/src/api/baseTerminalTab.component.ts +++ b/tabby-terminal/src/api/baseTerminalTab.component.ts @@ -456,13 +456,12 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit data = data.replaceAll('\n', '\r') } - if (data.endsWith('\n')) { + if (data.indexOf('\n') === data.length - 1) { + // Ends with a newline and has no other line breaks data = data.substring(0, data.length - 1) } if (!this.alternateScreenActive) { - data = data.trim() - if (data.includes('\r') && this.config.store.terminal.warnOnMultilinePaste) { const buttons = [ this.translate.instant('Paste'), @@ -481,6 +480,8 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit if (result === 1) { return } + } else { + data = data.trim() } }