From ab635dd7b4392751cc9744297e97ffb1971f7ad1 Mon Sep 17 00:00:00 2001
From: Atsushi NAGASE <a@ngs.io>
Date: Mon, 15 Jun 2026 08:26:59 +0900
Subject: [PATCH 1/3] fix(vim): resolve <Tab> mapping conflict between copilot
 and snipMate

copilot.vim maps <Tab> in insert mode by default, which collided with
vim-snipmate's `imap <unique> <Tab>` and raised E227 at startup. Set
g:copilot_no_tab_map before plug#end() so <Tab> stays with snipMate, and
accept Copilot suggestions with <C-L> instead.
---
 rc.d/vimrc | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/rc.d/vimrc b/rc.d/vimrc
index 9ea798ee..12e7c953 100644
--- a/rc.d/vimrc
+++ b/rc.d/vimrc
@@ -53,6 +53,13 @@ if v:version > 801 || (v:version == 801 && has( 'patch2269' ))
   Plug 'ycm-core/YouCompleteMe'
 endif
 
+" Reserve <Tab> for vim-snipmate. copilot.vim maps <Tab> in insert mode by
+" default, which collides with snipMate's `imap <unique> <Tab>` (E227). This
+" must be set before plug#end() because copilot installs its mapping while its
+" plugin is sourced there. Copilot suggestions are accepted with <C-L> instead
+" (see the Copilot section below).
+let g:copilot_no_tab_map = v:true
+
 " All of your Plugins must be added before the following line
 call plug#end()
 filetype plugin indent on    " required
@@ -233,6 +240,13 @@ endif
 " =================================================
 let g:goyo_width = 120
 
+" =================================================
+" Copilot
+" =================================================
+" <Tab> is reserved for snipMate (see g:copilot_no_tab_map before plug#end()).
+" Accept Copilot suggestions with <C-L> instead.
+imap <silent><script><expr> <C-L> copilot#Accept("\<CR>")
+
 " =================================================
 " Snipmate
 " =================================================

From f215832f02877d62f6f3e6d2fed5ceed2df9815c Mon Sep 17 00:00:00 2001
From: Atsushi NAGASE <a@ngs.io>
Date: Mon, 15 Jun 2026 08:35:49 +0900
Subject: [PATCH 2/3] ci(vim): verify vim-plug setup and guard the <Tab>
 mapping fix

Add a path-filtered Vim workflow that runs only when Vim files change. It
installs every declared plugin via vim-plug (excluding the heavy
YouCompleteMe native build) and asserts the vimrc sources without an E227
<Tab> mapping conflict, locking in the copilot/snipMate fix from this branch.
---
 .github/workflows/vim.yml | 86 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 86 insertions(+)
 create mode 100644 .github/workflows/vim.yml

diff --git a/.github/workflows/vim.yml b/.github/workflows/vim.yml
new file mode 100644
index 00000000..f3e333ad
--- /dev/null
+++ b/.github/workflows/vim.yml
@@ -0,0 +1,86 @@
+name: Vim
+
+# Only run when something Vim-related changes, so unrelated PRs don't pay for
+# a full plugin install.
+on:
+  push:
+    branches: [master]
+    paths:
+      - 'rc.d/vimrc'
+      - 'rc.d/vim/**'
+      - 'setup.d/vim.sh'
+      - '.github/workflows/vim.yml'
+  pull_request:
+    paths:
+      - 'rc.d/vimrc'
+      - 'rc.d/vim/**'
+      - 'setup.d/vim.sh'
+      - '.github/workflows/vim.yml'
+
+jobs:
+  vim-setup:
+    # Verify the Vim setup: vim-plug installs every declared plugin and the
+    # vimrc sources without a <Tab> mapping conflict (E227, copilot vs snipMate).
+    # YouCompleteMe is excluded here — its huge recursive clone and native
+    # compile (handled by setup.d/vim.sh) are too heavy for CI — but every other
+    # declared plugin is installed and checked.
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install Vim
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y vim
+
+      - name: Link Vim config into $HOME
+        run: |
+          ln -sfn "$PWD/rc.d/vimrc" "$HOME/.vimrc"
+          ln -sfn "$PWD/rc.d/vim"  "$HOME/.vim"
+
+      - name: Install vim-plug and plugins
+        run: |
+          curl -sfLo rc.d/vim/autoload/plug.vim --create-dirs \
+            https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
+          # Install every declared plugin except YouCompleteMe (see job comment).
+          # Some `do` hooks need toolchains not present here (go/yarn/npm); they
+          # may warn but don't block clones, and the assertions below check what
+          # actually matters.
+          list="$(grep -oE "Plug '[^']+'" rc.d/vimrc \
+            | sed "s/Plug '//; s/'//; s#.*/##" \
+            | grep -vx 'YouCompleteMe' | sort -u | tr '\n' ' ')"
+          echo "Installing: $list"
+          vim --not-a-term -es -c "PlugInstall --sync $list" -c 'qall!' || true
+
+      - name: Verify vimrc sources without a <Tab> conflict (E227)
+        run: |
+          set -euo pipefail
+          out="$(mktemp)"
+          # Load the real vimrc with all plugins active; E227 fires here if
+          # copilot and snipMate both try to own <Tab>.
+          vim --not-a-term -es -u "$HOME/.vimrc" \
+            -c 'redir! > '"$out" \
+            -c 'silent! echon "errmsg=[" . v:errmsg . "]"' \
+            -c 'redir END' -c 'qall!' 2>/dev/null || true
+          echo "startup $(cat "$out")"
+          if grep -q 'E227' "$out"; then
+            echo "✗ <Tab> mapping conflict (E227) at startup"
+            exit 1
+          fi
+          echo "✓ no <Tab> mapping conflict at startup"
+
+      - name: Verify all declared plugins are installed
+        run: |
+          set -euo pipefail
+          grep -oE "Plug '[^']+'" rc.d/vimrc \
+            | sed "s/Plug '//; s/'//; s#.*/##" \
+            | grep -vx 'YouCompleteMe' | sort -u > /tmp/declared.txt
+          ls "$HOME/.vim/plugged" | sort > /tmp/installed.txt
+          missing="$(comm -23 /tmp/declared.txt /tmp/installed.txt)"
+          if [ -n "$missing" ]; then
+            echo "✗ declared but not installed:"
+            echo "$missing"
+            exit 1
+          fi
+          echo "✓ all $(wc -l < /tmp/declared.txt) declared plugins installed (YouCompleteMe excluded)"

From 06908f835bb728a48d1158953c43e04799440bcb Mon Sep 17 00:00:00 2001
From: Atsushi NAGASE <a@ngs.io>
Date: Mon, 15 Jun 2026 08:37:50 +0900
Subject: [PATCH 3/3] ci(vim): source vimrc with -u during PlugInstall
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The install step ran vim without -u, so the vimrc (and thus plug#begin /
PlugInstall) was never sourced and no plugins installed — which also made
the E227 check pass vacuously. Pass -u "$HOME/.vimrc" so PlugInstall runs,
and fail loudly if plugged/ ends up empty.
---
 .github/workflows/vim.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/vim.yml b/.github/workflows/vim.yml
index f3e333ad..135651b4 100644
--- a/.github/workflows/vim.yml
+++ b/.github/workflows/vim.yml
@@ -51,7 +51,15 @@ jobs:
             | sed "s/Plug '//; s/'//; s#.*/##" \
             | grep -vx 'YouCompleteMe' | sort -u | tr '\n' ' ')"
           echo "Installing: $list"
-          vim --not-a-term -es -c "PlugInstall --sync $list" -c 'qall!' || true
+          # -u is required so the vimrc (which calls plug#begin) is sourced and
+          # PlugInstall is defined; otherwise the command is unknown and nothing
+          # installs.
+          vim --not-a-term -es -u "$HOME/.vimrc" -c "PlugInstall --sync $list" -c 'qall!' || true
+          # Fail loudly if nothing was actually installed (e.g. vimrc didn't load).
+          if [ ! -d "$HOME/.vim/plugged" ] || [ -z "$(ls -A "$HOME/.vim/plugged")" ]; then
+            echo "✗ no plugins were installed — vimrc/plug#begin likely did not run"
+            exit 1
+          fi
 
       - name: Verify vimrc sources without a <Tab> conflict (E227)
         run: |