change to use <script> from <sfile>

sasaplus1 · Dec 26, 2024 · 7d01eb9 · 7d01eb9
1 parent 65bed4e
commit 7d01eb9
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 16 deletions.
diff --git a/vim/plugin-manager.vim b/vim/plugin-manager.vim
@@ -20,7 +20,7 @@ endif
 call dein#begin(s:plugin_dir)
 call dein#add(s:dein_dir)
 
-let plugin_files = split(glob(expand('<sfile>:h') . '/plugins/*.vim'), '\n')
+let plugin_files = split(glob(expand('<script>:h') . '/plugins/*.vim'), '\n')
 
 for plugin_file in plugin_files
   execute 'source' plugin_file

diff --git a/vim/plugins/coc.nvim.vim b/vim/plugins/coc.nvim.vim
@@ -166,7 +166,7 @@ endfunction
 " https://github.com/neoclide/coc.nvim/issues/1826#issuecomment-1149259027
 
 call dein#add('neoclide/coc.nvim', {
-      \ 'hooks_file' : expand('<sfile>:p'),
+      \ 'hooks_file' : expand('<script>:p'),
       \ 'lazy' : 1,
       \ 'merged' : 0,
       \ 'on_cmd' : ['<Plug>(coc-'],

diff --git a/vim/plugins/ctrlp.vim.vim b/vim/plugins/ctrlp.vim.vim
@@ -135,7 +135,7 @@ function! s:hook_source() abort
 endfunction
 
 call dein#add('ctrlpvim/ctrlp.vim', {
-      \ 'hooks_file' : expand('<sfile>:p'),
+      \ 'hooks_file' : expand('<script>:p'),
       \ 'lazy' : 1,
       \ 'on_map' : ['<C-p>', ',ub', ',ug', ',ul', ',um', '<Plug>(CtrlP'],
       \ })

diff --git a/vim/plugins/fzf.vim.vim b/vim/plugins/fzf.vim.vim
@@ -167,7 +167,7 @@ function! s:hook_source() abort
 endfunction
 
 call dein#add('junegunn/fzf.vim', {
-      \ 'hooks_file' : expand('<sfile>:p'),
+      \ 'hooks_file' : expand('<script>:p'),
       \ 'lazy' : 1,
       \ 'on_map' : [',ch', ',gs', ',gm', ',rg', ',rG', '<Plug>(fzf-', '<C-p>', ',ub', ',ug', ',ul', ',um'],
       \ 'on_source' : 'fzf',

diff --git a/vim/plugins/lightline.vim.vim b/vim/plugins/lightline.vim.vim
@@ -15,7 +15,7 @@ endfunction
 
 " NOTE: ColorSchemeイベントは初回起動時に必要
 call dein#add('itchyny/lightline.vim', {
-      \ 'hooks_file' : expand('<sfile>:p'),
+      \ 'hooks_file' : expand('<script>:p'),
       \ 'lazy' : 1,
       \ 'on_event' : ['ColorScheme', 'VimEnter']
       \ })

diff --git a/vim/plugins/nvim-treesitter.vim b/vim/plugins/nvim-treesitter.vim
@@ -4,13 +4,12 @@ if !has('nvim')
   finish
 endif
 
-" このファイルの拡張子をvimからluaに変更したもの
-let s:config = expand('<sfile>:r') . '.lua'
-
 function! s:hook_source() abort
 " hook_source {{{
+  " このスクリプトのパスを取得する
+  let script = dein#get('nvim-treesitter').hooks_file
   " Luaの設定ファイルを読み込む
-  execute 'luafile' s:config
+  execute 'luafile' fnamemodify(script, ':r') . '.lua'
   " nvim-treesitterでの折りたたみを使用する
   setglobal foldmethod=expr
   setglobal foldexpr=nvim_treesitter#foldexpr()
@@ -26,7 +25,7 @@ function! s:hook_done_update() abort
 endfunction
 
 call dein#add('nvim-treesitter/nvim-treesitter', {
-      \ 'hooks_file' : expand('<sfile>:p'),
+      \ 'hooks_file' : expand('<script>:p'),
       \ 'merged' : 0,
       \ })
 

diff --git a/vim/plugins/operator-camelize.vim.vim b/vim/plugins/operator-camelize.vim.vim
@@ -8,7 +8,7 @@ function! s:hook_source() abort
 endfunction
 
 call dein#add('tyru/operator-camelize.vim', {
-      \ 'hooks_file' : expand('<sfile>:p'),
+      \ 'hooks_file' : expand('<script>:p'),
       \ 'lazy' : 1,
       \ 'on_source' : 'vim-operator-user',
       \ 'on_map' : ['c', '_', '<Plug>(operator-'],

diff --git a/vim/plugins/vfiler.vim.vim b/vim/plugins/vfiler.vim.vim
@@ -26,7 +26,7 @@ endfunction
 " 表示が崩れていたのはvim-parenmatchのlazyloadのタイミング設定が悪かった
 " coc.nvimをlazyloadするようにしたらまた崩れるようになった
 call dein#add('obaland/vfiler.vim', {
-      \ 'hooks_file' : expand('<sfile>:p'),
+      \ 'hooks_file' : expand('<script>:p'),
       \ 'lazy' : 1,
       \ 'on_cmd' : ['VFiler'],
       \ 'on_map' : [',vf', ',vF'],

diff --git a/vim/plugins/vim-gf-user.vim b/vim/plugins/vim-gf-user.vim
@@ -26,7 +26,7 @@ function! s:hook_source() abort
 endfunction
 
 call dein#add('kana/vim-gf-user', {
-      \ 'hooks_file' : expand('<sfile>:p'),
+      \ 'hooks_file' : expand('<script>:p'),
       \ 'lazy' : 1,
       \ 'on_ft' : [
       \   'javascript',

diff --git a/vim/plugins/vim-gruvbox8.vim b/vim/plugins/vim-gruvbox8.vim
@@ -31,7 +31,7 @@ function! s:hook_source() abort
 endfunction
 
 call dein#add('lifepillar/vim-gruvbox8', {
-      \ 'hooks_file' : expand('<sfile>:p'),
+      \ 'hooks_file' : expand('<script>:p'),
       \ 'lazy' : 1,
       \ 'merged' : 0,
       \ 'on_event' : ['ColorScheme', 'VimEnter'],

diff --git a/vim/plugins/vim-operator-surround.vim b/vim/plugins/vim-operator-surround.vim
@@ -12,7 +12,7 @@ function! s:hook_source() abort
 endfunction
 
 call dein#add('rhysd/vim-operator-surround', {
-      \ 'hooks_file' : expand('<sfile>:p'),
+      \ 'hooks_file' : expand('<script>:p'),
       \ 'lazy' : 1,
       \ 'on_map' : [
       \   'sa',

diff --git a/vim/plugins/vim-parenmatch.vim b/vim/plugins/vim-parenmatch.vim
@@ -13,7 +13,7 @@ function! s:hook_source() abort
 endfunction
 
 call dein#add('itchyny/vim-parenmatch', {
-      \ 'hooks_file' : expand('<sfile>:p'),
+      \ 'hooks_file' : expand('<script>:p'),
       \ 'lazy' : 1,
       \ 'on_event' : ['VimEnter'],
       \ })