From cfafbb7e14870c4ddde38b8963384d36c60d9c16 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Fri, 26 Apr 2024 23:12:38 -0700
Subject: [PATCH] Revert "Cleanup"

This reverts commit 2a35d6ab9ddb01c89c290e11f25564fb09a09a28.
---
 lua/argonaut/types.lua | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lua/argonaut/types.lua b/lua/argonaut/types.lua
index aea59ed..b0e609f 100644
--- a/lua/argonaut/types.lua
+++ b/lua/argonaut/types.lua
@@ -431,9 +431,7 @@ function WrapContext:unwrap(opt)
     local cursor = nil
     for i, param in ipairs(self.params.parsed) do
         if param:is_active() then
-            cursor = Cursor.get_current()
-            cursor.row = cursor.row - 1
-            cursor.col = #line + param.offset
+            cursor = Cursor.new(0, #line + param.offset)
         end
 
         line = line .. param.text
@@ -447,6 +445,12 @@ function WrapContext:unwrap(opt)
     vim.fn.setline(self.range.start.row, line)
     vim.fn.execute(string.format('%d,%dd_', self.range.start.row + 1, self.range.stop.row))
 
+    for _, param in ipairs(self.params.parsed) do
+        if param:is_active() then
+            cursor.row = Cursor:get_current().row - 1
+        end
+    end
+
     if cursor then
         cursor:set_current()
     end