refactor(autoload): generate syntax files in after/syntax

Author: sainnhe

.gitignore

@@ -1,2 +1,2 @@
 doc/tags
-after/ftplugin
+after/syntax

CHANGELOG.md

@@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file.
 
 - Add `g:sonokai_spell_foreground`.
 - Optimize `junegunn/limelight.vim`.
+- Generate `/after/syntax`.
 
 ### Changed
 

autoload/sonokai.vim

@@ -202,62 +202,62 @@ function! sonokai#highlight(group, fg, bg, ...) "{{{
           \ a:2[0] :
           \ 'NONE')
 endfunction "}}}
-function! sonokai#ft_gen(path, last_modified, msg) "{{{
-  " Generate the `after/ftplugin` directory.
+function! sonokai#syn_gen(path, last_modified, msg) "{{{
+  " Generate the `after/syntax` directory.
   let full_content = join(readfile(a:path), "\n") " Get the content of `colors/sonokai.vim`
-  let ft_content = []
-  let rootpath = sonokai#ft_rootpath(a:path) " Get the path to place the `after/ftplugin` directory.
-  call substitute(full_content, '" ft_begin.\{-}ft_end', '\=add(ft_content, submatch(0))', 'g') " Search for 'ft_begin.\{-}ft_end' (non-greedy) and put all the search results into a list.
-  for content in ft_content
-    let ft_list = []
-    call substitute(matchstr(matchstr(content, 'ft_begin:.\{-}{{{'), ':.\{-}{{{'), '\(\w\|-\)\+', '\=add(ft_list, submatch(0))', 'g') " Get the file types. }}}}}}
-    for ft in ft_list
-      call sonokai#ft_write(rootpath, ft, content) " Write the content.
+  let syn_conent = []
+  let rootpath = sonokai#syn_rootpath(a:path) " Get the path to place the `after/syntax` directory.
+  call substitute(full_content, '" syn_begin.\{-}syn_end', '\=add(syn_conent, submatch(0))', 'g') " Search for 'syn_begin.\{-}syn_end' (non-greedy) and put all the search results into a list.
+  for content in syn_conent
+    let syn_list = []
+    call substitute(matchstr(matchstr(content, 'syn_begin:.\{-}{{{'), ':.\{-}{{{'), '\(\w\|-\)\+', '\=add(syn_list, submatch(0))', 'g') " Get the file types. }}}}}}
+    for syn in syn_list
+      call sonokai#syn_write(rootpath, syn, content) " Write the content.
     endfor
   endfor
-  call sonokai#ft_write(rootpath, 'text', "let g:sonokai_last_modified = '" . a:last_modified . "'") " Write the last modified time to `after/ftplugin/text/sonokai.vim`
-  let ftplugin_relative_path = has('win32') ? '\after\ftplugin' : '/after/ftplugin'
+  call sonokai#syn_write(rootpath, 'text', "let g:sonokai_last_modified = '" . a:last_modified . "'") " Write the last modified time to `after/syntax/text/sonokai.vim`
+  let syntax_relative_path = has('win32') ? '\after\syntax' : '/after/syntax'
   if a:msg ==# 'update'
-    echohl WarningMsg | echom '[sonokai] Updated ' . rootpath . ftplugin_relative_path | echohl None
+    echohl WarningMsg | echom '[sonokai] Updated ' . rootpath . syntax_relative_path | echohl None
   else
-    echohl WarningMsg | echom '[sonokai] Generated ' . rootpath . ftplugin_relative_path | echohl None
+    echohl WarningMsg | echom '[sonokai] Generated ' . rootpath . syntax_relative_path | echohl None
   endif
 endfunction "}}}
-function! sonokai#ft_write(rootpath, ft, content) "{{{
+function! sonokai#syn_write(rootpath, syn, content) "{{{
   " Write the content.
-  let ft_path = a:rootpath . '/after/ftplugin/' . a:ft . '/sonokai.vim' " The path of a ftplugin file.
+  let syn_path = a:rootpath . '/after/syntax/' . a:syn . '/sonokai.vim' " The path of a syntax file.
   " create a new file if it doesn't exist
-  if !filereadable(ft_path)
-    call mkdir(a:rootpath . '/after/ftplugin/' . a:ft, 'p')
+  if !filereadable(syn_path)
+    call mkdir(a:rootpath . '/after/syntax/' . a:syn, 'p')
     call writefile([
           \ "if !exists('g:colors_name') || g:colors_name !=# 'sonokai'",
           \ '    finish',
           \ 'endif'
-          \ ], ft_path, 'a') " Abort if the current color scheme is not sonokai.
+          \ ], syn_path, 'a') " Abort if the current color scheme is not sonokai.
     call writefile([
-          \ "if index(g:sonokai_loaded_file_types, '" . a:ft . "') ==# -1",
-          \ "    call add(g:sonokai_loaded_file_types, '" . a:ft . "')",
+          \ "if index(g:sonokai_loaded_file_types, '" . a:syn . "') ==# -1",
+          \ "    call add(g:sonokai_loaded_file_types, '" . a:syn . "')",
           \ 'else',
           \ '    finish',
           \ 'endif'
-          \ ], ft_path, 'a') " Abort if this file type has already been loaded.
+          \ ], syn_path, 'a') " Abort if this file type has already been loaded.
   endif
   " If there is something like `call sonokai#highlight()`, then add
   " code to initialize the palette and configuration.
   if matchstr(a:content, 'sonokai#highlight') !=# ''
     call writefile([
           \ 'let s:configuration = sonokai#get_configuration()',
           \ 'let s:palette = sonokai#get_palette(s:configuration.style)'
-          \ ], ft_path, 'a')
+          \ ], syn_path, 'a')
   endif
   " Append the content.
-  call writefile(split(a:content, "\n"), ft_path, 'a')
+  call writefile(split(a:content, "\n"), syn_path, 'a')
   " Add modeline.
-  call writefile(['" vim: set sw=2 ts=2 sts=2 et tw=80 ft=vim fdm=marker fmr={{{,}}}:'], ft_path, 'a')
+  call writefile(['" vim: set sw=2 ts=2 sts=2 et tw=80 ft=vim fdm=marker fmr={{{,}}}:'], syn_path, 'a')
 endfunction "}}}
-function! sonokai#ft_rootpath(path) "{{{
-  " Get the directory where `after/ftplugin` is generated.
-  if (matchstr(a:path, '^/usr/share') ==# '') " Return the plugin directory. The `after/ftplugin` directory should never be generated in `/usr/share`, even if you are a root user.
+function! sonokai#syn_rootpath(path) "{{{
+  " Get the directory where `after/syntax` is generated.
+  if (matchstr(a:path, '^/usr/share') ==# '') " Return the plugin directory. The `after/syntax` directory should never be generated in `/usr/share`, even if you are a root user.
     return fnamemodify(a:path, ':p:h:h')
   else " Use vim home directory.
     if has('nvim')
@@ -267,40 +267,40 @@ function! sonokai#ft_rootpath(path) "{{{
     endif
   endif
 endfunction "}}}
-function! sonokai#ft_newest(path, last_modified) "{{{
-  " Determine whether the current ftplugin files are up to date by comparing the last modified time in `colors/sonokai.vim` and `after/ftplugin/text/sonokai.vim`.
-  let rootpath = sonokai#ft_rootpath(a:path)
-  execute 'source ' . rootpath . '/after/ftplugin/text/sonokai.vim'
+function! sonokai#syn_newest(path, last_modified) "{{{
+  " Determine whether the current syntax files are up to date by comparing the last modified time in `colors/sonokai.vim` and `after/syntax/text/sonokai.vim`.
+  let rootpath = sonokai#syn_rootpath(a:path)
+  execute 'source ' . rootpath . '/after/syntax/text/sonokai.vim'
   return a:last_modified ==# g:sonokai_last_modified ? 1 : 0
 endfunction "}}}
-function! sonokai#ft_clean(path, msg) "{{{
-  " Clean the `after/ftplugin` directory.
-  let rootpath = sonokai#ft_rootpath(a:path)
-  " Remove `after/ftplugin/**/sonokai.vim`.
-  let file_list = split(globpath(rootpath, 'after/ftplugin/**/sonokai.vim'), "\n")
+function! sonokai#syn_clean(path, msg) "{{{
+  " Clean the `after/syntax` directory.
+  let rootpath = sonokai#syn_rootpath(a:path)
+  " Remove `after/syntax/**/sonokai.vim`.
+  let file_list = split(globpath(rootpath, 'after/syntax/**/sonokai.vim'), "\n")
   for file in file_list
     call delete(file)
   endfor
   " Remove empty directories.
-  let dir_list = split(globpath(rootpath, 'after/ftplugin/*'), "\n")
+  let dir_list = split(globpath(rootpath, 'after/syntax/*'), "\n")
   for dir in dir_list
     if globpath(dir, '*') ==# ''
       call delete(dir, 'd')
     endif
   endfor
-  if globpath(rootpath . '/after/ftplugin', '*') ==# ''
-    call delete(rootpath . '/after/ftplugin', 'd')
+  if globpath(rootpath . '/after/syntax', '*') ==# ''
+    call delete(rootpath . '/after/syntax', 'd')
   endif
   if globpath(rootpath . '/after', '*') ==# ''
     call delete(rootpath . '/after', 'd')
   endif
   if a:msg
-    let ftplugin_relative_path = has('win32') ? '\after\ftplugin' : '/after/ftplugin'
-    echohl WarningMsg | echom '[sonokai] Cleaned ' . rootpath . ftplugin_relative_path | echohl None
+    let syntax_relative_path = has('win32') ? '\after\syntax' : '/after/syntax'
+    echohl WarningMsg | echom '[sonokai] Cleaned ' . rootpath . syntax_relative_path | echohl None
   endif
 endfunction "}}}
-function! sonokai#ft_exists(path) "{{{
-  return filereadable(sonokai#ft_rootpath(a:path) . '/after/ftplugin/text/sonokai.vim')
+function! sonokai#syn_exists(path) "{{{
+  return filereadable(sonokai#syn_rootpath(a:path) . '/after/syntax/text/sonokai.vim')
 endfunction "}}}
 
 " vim: set sw=2 ts=2 sts=2 et tw=80 ft=vim fdm=marker fmr={{{,}}}: