From 3edca7854e66cbdb0c4baca25962a4f390fede55 Mon Sep 17 00:00:00 2001
From: Blaž Hrastnik
Date: Mon, 25 Oct 2021 11:03:18 +0900
Subject: completion: fully revert state before apply & insertText common
 prefix

---
 helix-core/src/transaction.rs | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'helix-core/src')

diff --git a/helix-core/src/transaction.rs b/helix-core/src/transaction.rs
index 0e49fbe3..dfc18fbe 100644
--- a/helix-core/src/transaction.rs
+++ b/helix-core/src/transaction.rs
@@ -468,6 +468,13 @@ impl Transaction {
         }
     }
 
+    pub fn compose(mut self, other: Self) -> Self {
+        self.changes = self.changes.compose(other.changes);
+        // Other selection takes precedence
+        self.selection = other.selection;
+        self
+    }
+
     pub fn with_selection(mut self, selection: Selection) -> Self {
         self.selection = Some(selection);
         self
-- 
cgit v1.2.3-70-g09d2