From c6c4228b1d8ae828752f0ea2c52d341b66977689 Mon Sep 17 00:00:00 2001
From: utubo <utbutb@gmail.com>
Date: Thu, 19 Dec 2024 16:13:00 +0900
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8feat:=20vim-headtail?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vim/autoload/vimrc/ezpack.vim           |  1 +
 .vim/autoload/vimrc/lazyload.vim         | 25 ++++-------------------
 src/.vim/autoload/vimrc/ezpack.src.vim   |  1 +
 src/.vim/autoload/vimrc/lazyload.src.vim | 26 ++++--------------------
 4 files changed, 10 insertions(+), 43 deletions(-)

diff --git a/.vim/autoload/vimrc/ezpack.vim b/.vim/autoload/vimrc/ezpack.vim
index fb7e588..1e4142b 100644
--- a/.vim/autoload/vimrc/ezpack.vim
+++ b/.vim/autoload/vimrc/ezpack.vim
@@ -48,6 +48,7 @@ EzpackO ctrlpvim/ctrlp.vim
 EzpackO mattn/ctrlp-matchfuzzy
 EzpackL sheerun/vim-polyglot
 EzpackO utubo/vim-ezpack
+EzpackL utubo/vim-headtail
 EzpackL utubo/vim-hlpairs
 EzpackL utubo/vim-minviml
 EzpackO utubo/vim-reformatdate
diff --git a/.vim/autoload/vimrc/lazyload.vim b/.vim/autoload/vimrc/lazyload.vim
index a222786..c50f0ba 100644
--- a/.vim/autoload/vimrc/lazyload.vim
+++ b/.vim/autoload/vimrc/lazyload.vim
@@ -405,28 +405,11 @@ nn <script> g9 :<C-u>vim9cmd <SID>(exec_line)
 xn g: "vy:<C-u><C-r>=@v<CR><CR>
 xn g9 "vy:<C-u>vim9cmd <C-r>=@v<CR><CR>
 nn <expr> <Space>hl $'<Cmd>hi {synID(line('.'), col('.'), 1)->synIDattr('name')->substitute('^$', 'Normal', '')}<CR>'
-export def ToTail(a: string)
-getpos("']")->setpos('.')
-enddef
-no <SID>(ToTail) <ScriptCmd>set operatorfunc=vimrc#lazyload#ToTail<CR>g@
-nm Ga <SID>(ToTail)a
-nm Gi <SID>(ToTail)i
-no GG G
-export def ToHead(a: string)
-const p = getpos("'[")
-setpos('.', p)
-if p[2] <= 1
-normal ^
-elseif getline(p[1])->len() <= p[2]
-normal j^
-endif
-enddef
-no <SID>(ToHead) <ScriptCmd>set operatorfunc=vimrc#lazyload#ToHead<CR>g@
-nm ga <SID>(ToHead)a
-nm gi <SID>(ToHead)i
 no <Leader>ga ga
-nm g% gi%
-nm G% Gi%
+packadd vim-headtail
+HeadTailMap g G
+Each nmap,xmap g% gi%
+Each nmap,xmap G% Gi%
 if has('clipboard')
 au vimrc FocusGained * @" = @+
 au vimrc FocusLost * @+ = @"
diff --git a/src/.vim/autoload/vimrc/ezpack.src.vim b/src/.vim/autoload/vimrc/ezpack.src.vim
index 0353662..60e7f33 100644
--- a/src/.vim/autoload/vimrc/ezpack.src.vim
+++ b/src/.vim/autoload/vimrc/ezpack.src.vim
@@ -68,6 +68,7 @@ EzpackL sheerun/vim-polyglot       # 色んなファイルタイプに対応
 
 # 🐶🍚
 EzpackO utubo/vim-ezpack           # 自作プラグインマネージャ
+EzpackL utubo/vim-headtail         # Textobjの先頭や末尾に移動
 EzpackL utubo/vim-hlpairs          # 括弧をハイライト強化版
 EzpackL utubo/vim-minviml          # vimscriptをminify
 EzpackO utubo/vim-reformatdate     # <C-a>で日付と曜日をインクリメントとか
diff --git a/src/.vim/autoload/vimrc/lazyload.src.vim b/src/.vim/autoload/vimrc/lazyload.src.vim
index 6631144..53eafd9 100644
--- a/src/.vim/autoload/vimrc/lazyload.src.vim
+++ b/src/.vim/autoload/vimrc/lazyload.src.vim
@@ -595,29 +595,11 @@ nnoremap <expr> <Space>hl $'<Cmd>hi {synID(line('.'), col('.'), 1)->synIDattr('n
 
 # ------------------------------------------------------
 # テキストオブジェクトの末尾や先頭に移動 {{{
-export def ToTail(type: string)
-	getpos("']")->setpos('.')
-enddef
-noremap <SID>(ToTail) <ScriptCmd>set operatorfunc=vimrc#lazyload#ToTail<CR>g@
-nmap Ga <SID>(ToTail)a
-nmap Gi <SID>(ToTail)i
-noremap GG G
-
-export def ToHead(type: string)
-	const p = getpos("'[")
-	setpos('.', p)
-	if p[2] <= 1
-		normal ^
-	elseif getline(p[1])->len() <= p[2]
-		normal j^
-	endif
-enddef
-noremap <SID>(ToHead) <ScriptCmd>set operatorfunc=vimrc#lazyload#ToHead<CR>g@
-nmap ga <SID>(ToHead)a
-nmap gi <SID>(ToHead)i
 noremap <Leader>ga ga
-nmap g% gi%
-nmap G% Gi%
+packadd vim-headtail
+HeadTailMap g G
+Each nmap,xmap g% gi%
+Each nmap,xmap G% Gi%
 # }}}
 
 # ------------------------------------------------------