From 3e60de00a3f158c00b2dbbd0ca2abd34be5604c6 Mon Sep 17 00:00:00 2001
From: Shougo Matsushita <Shougo.Matsu@gmail.com>
Date: Thu, 21 Nov 2013 18:20:36 +0900
Subject: [PATCH] Improve variables methods

---
 autoload/neosnippet.vim           | 33 ++++++++++++++++---------------
 autoload/neosnippet/commands.vim  |  6 +++---
 autoload/neosnippet/init.vim      |  8 ++++----
 autoload/neosnippet/mappings.vim  |  4 ++--
 autoload/neosnippet/variables.vim | 22 ++++++++++++++++-----
 5 files changed, 43 insertions(+), 30 deletions(-)

diff --git a/autoload/neosnippet.vim b/autoload/neosnippet.vim
index fe98335..e852a61 100644
--- a/autoload/neosnippet.vim
+++ b/autoload/neosnippet.vim
@@ -77,7 +77,7 @@ endfunction"}}}
 function! neosnippet#jump(cur_text, col) "{{{
   call s:skip_next_auto_completion()
 
-  let expand_stack = neosnippet#variables#get_expand_stack()
+  let expand_stack = neosnippet#variables#expand_stack()
 
   " Get patterns and count.
   if empty(expand_stack)
@@ -103,7 +103,7 @@ function! neosnippet#jump(cur_text, col) "{{{
   endif
 
   " Not found.
-  let expand_stack = neosnippet#variables#get_expand_stack()
+  let expand_stack = neosnippet#variables#expand_stack()
   let expand_stack = expand_stack[: -2]
 
   return s:search_outof_range(a:col)
@@ -171,7 +171,7 @@ function! neosnippet#expand(cur_text, col, trigger_name) "{{{
     let &l:foldmethod = 'manual'
   endif
 
-  let expand_stack = neosnippet#variables#get_expand_stack()
+  let expand_stack = neosnippet#variables#expand_stack()
 
   try
     call setline('.', snippet_lines[0])
@@ -214,7 +214,7 @@ endfunction"}}}
 function! neosnippet#expand_target() "{{{
   let trigger = input('Please input snippet trigger: ',
         \ '', 'customlist,neosnippet#complete_target_snippets')
-  let neosnippet = neosnippet#get_current_neosnippet()
+  let neosnippet = neosnippet#variables#current_neosnippet()
   if !has_key(neosnippet#get_snippets(), trigger) ||
         \ neosnippet#get_snippets()[trigger].snip !~#
         \   neosnippet#get_placeholder_target_marker_pattern()
@@ -229,7 +229,7 @@ function! neosnippet#expand_target() "{{{
   call neosnippet#expand_target_trigger(trigger)
 endfunction"}}}
 function! neosnippet#expand_target_trigger(trigger) "{{{
-  let neosnippet = neosnippet#get_current_neosnippet()
+  let neosnippet = neosnippet#variables#current_neosnippet()
   let neosnippet.target = substitute(
         \ neosnippet#get_selected_text(visualmode(), 1), '\n$', '', '')
 
@@ -249,7 +249,7 @@ function! s:indent_snippet(begin, end) "{{{
 
   let pos = getpos('.')
 
-  let neosnippet = neosnippet#get_current_neosnippet()
+  let neosnippet = neosnippet#variables#current_neosnippet()
 
   let equalprg = &l:equalprg
   try
@@ -366,7 +366,7 @@ function! s:expand_placeholder(start, end, holder_cnt, line, ...) "{{{
         \ '\\d\\+', a:holder_cnt, '')
   let current_line = getline(a:line)
   let match = match(current_line, pattern)
-  let neosnippet = neosnippet#get_current_neosnippet()
+  let neosnippet = neosnippet#variables#current_neosnippet()
 
   let default_pattern = substitute(
         \ neosnippet#get_placeholder_marker_default_pattern(),
@@ -438,7 +438,7 @@ function! s:expand_placeholder(start, end, holder_cnt, line, ...) "{{{
 endfunction"}}}
 function! s:expand_target_placeholder(line, col) "{{{
   " Expand target
-  let neosnippet = neosnippet#get_current_neosnippet()
+  let neosnippet = neosnippet#variables#current_neosnippet()
   let next_line = getline(a:line)[a:col-1 :]
   let target_lines = split(neosnippet.target, '\n', 1)
 
@@ -557,7 +557,7 @@ function! s:eval_snippet(snippet_text) "{{{
 
   return snip_word
 endfunction"}}}
-function! neosnippet#get_current_neosnippet() "{{{
+function! neosnippet#variables#current_neosnippet() "{{{
   if !exists('b:neosnippet')
     let b:neosnippet = {
           \ 'snippets' : {},
@@ -572,12 +572,12 @@ endfunction"}}}
 function! neosnippet#get_snippets() "{{{
   call neosnippet#init#check()
 
-  let neosnippet = neosnippet#get_current_neosnippet()
+  let neosnippet = neosnippet#variables#current_neosnippet()
   let snippets = copy(neosnippet.snippets)
   for filetype in s:get_sources_filetypes(neosnippet#get_filetype())
     call neosnippet#commands#_make_cache(filetype)
     call extend(snippets,
-          \ neosnippet#variables#get_snippets()[filetype], 'keep')
+          \ neosnippet#variables#snippets()[filetype], 'keep')
   endfor
 
   let cur_text = neosnippet#util#get_cur_text()
@@ -594,20 +594,20 @@ function! neosnippet#get_snippets() "{{{
   return snippets
 endfunction"}}}
 function! neosnippet#get_snippets_directory() "{{{
-  let snippets_dir = copy(neosnippet#variables#get_snippets_dir())
+  let snippets_dir = copy(neosnippet#variables#snippets_dir())
   if !get(g:neosnippet#disable_runtime_snippets,
         \ neosnippet#get_filetype(),
         \ get(g:neosnippet#disable_runtime_snippets, '_', 0))
-    let snippets_dir += neosnippet#variables#get_runtime_dir()
+    let snippets_dir += neosnippet#variables#runtime_dir()
   endif
 
   return snippets_dir
 endfunction"}}}
 function! neosnippet#get_user_snippets_directory() "{{{
-  return copy(neosnippet#variables#get_snippets_dir())
+  return copy(neosnippet#variables#snippets_dir())
 endfunction"}}}
 function! neosnippet#get_runtime_snippets_directory() "{{{
-  return copy(neosnippet#variables#get_runtime_dir())
+  return copy(neosnippet#variables#runtime_dir())
 endfunction"}}}
 function! neosnippet#get_filetype() "{{{
   if !exists('s:exists_context_filetype')
@@ -661,6 +661,7 @@ function! neosnippet#complete_target_snippets(arglead, cmdline, cursorpos) "{{{
         \ && v:val.snip =~# neosnippet#get_placeholder_target_marker_pattern()"), 'v:val.word')
 endfunction"}}}
 
+" Get marker patterns.
 function! neosnippet#get_placeholder_target_marker_pattern() "{{{
   return '\${\d\+:TARGET\%(:.\{-}\)\?\\\@<!}'
 endfunction"}}}
@@ -767,7 +768,7 @@ function! s:skip_next_auto_completion() "{{{
     call neocomplete#skip_next_complete()
   endif
 
-  let neosnippet = neosnippet#get_current_neosnippet()
+  let neosnippet = neosnippet#variables#current_neosnippet()
   let neosnippet.trigger = 0
 endfunction"}}}
 
diff --git a/autoload/neosnippet/commands.vim b/autoload/neosnippet/commands.vim
index 3b8c76f..d7758d3 100644
--- a/autoload/neosnippet/commands.vim
+++ b/autoload/neosnippet/commands.vim
@@ -94,7 +94,7 @@ function! neosnippet#commands#_make_cache(filetype) "{{{
     let filetype = 'nothing'
   endif
 
-  let snippets = neosnippet#variables#get_snippets()
+  let snippets = neosnippet#variables#snippets()
   if has_key(snippets, filetype)
     return
   endif
@@ -112,14 +112,14 @@ function! neosnippet#commands#_make_cache(filetype) "{{{
     call neosnippet#parser#_parse(snippet, snippets_file)
   endfor
 
-  let snippets = neosnippet#variables#get_snippets()
+  let snippets = neosnippet#variables#snippets()
   let snippets[filetype] = snippet
 endfunction"}}}
 
 function! neosnippet#commands#_source(filename) "{{{
   call neosnippet#init#check()
 
-  let neosnippet = neosnippet#get_current_neosnippet()
+  let neosnippet = neosnippet#variables#current_neosnippet()
   call neosnippet#parser#_parse(neosnippet.snippets, a:filename)
 endfunction"}}}
 
diff --git a/autoload/neosnippet/init.vim b/autoload/neosnippet/init.vim
index a0051b4..bdde10c 100644
--- a/autoload/neosnippet/init.vim
+++ b/autoload/neosnippet/init.vim
@@ -43,7 +43,7 @@ endfunction"}}}
 
 function! s:initialize_script_variables() "{{{
   " Set runtime dir.
-  let runtime_dir = neosnippet#variables#get_runtime_dir()
+  let runtime_dir = neosnippet#variables#runtime_dir()
   let runtime_dir += split(globpath(&runtimepath,
         \ 'autoload/neosnippet/snippets'), '\n')
   if g:neosnippet#enable_snipmate_compatibility
@@ -57,7 +57,7 @@ function! s:initialize_script_variables() "{{{
   call map(runtime_dir, 'substitute(v:val, "[\\\\/]$", "", "")')
 
   " Set snippets_dir.
-  let snippets_dir = neosnippet#variables#get_snippets_dir()
+  let snippets_dir = neosnippet#variables#snippets_dir()
   for dir in neosnippet#util#option2list(g:neosnippet#snippets_directory)
     let dir = neosnippet#util#expand(dir)
     if !isdirectory(dir) && !neosnippet#util#is_sudo()
@@ -130,11 +130,11 @@ function! s:initialize_others() "{{{
 endfunction"}}}
 
 function! s:on_insert_leave() "{{{
-  let expand_stack = neosnippet#variables#get_expand_stack()
+  let expand_stack = neosnippet#variables#expand_stack()
 
   " Get patterns and count.
   if empty(expand_stack)
-        \ || neosnippet#get_current_neosnippet().trigger
+        \ || neosnippet#variables#current_neosnippet().trigger
     return
   endif
 
diff --git a/autoload/neosnippet/mappings.vim b/autoload/neosnippet/mappings.vim
index 653de7f..670d0d3 100644
--- a/autoload/neosnippet/mappings.vim
+++ b/autoload/neosnippet/mappings.vim
@@ -101,7 +101,7 @@ function! neosnippet#mappings#_register_oneshot_snippet() "{{{
   let selected_text = substitute(selected_text,
         \'^' . base_indent, '', 'g')
 
-  let neosnippet = neosnippet#get_current_neosnippet()
+  let neosnippet = neosnippet#variables#current_neosnippet()
   let options = neosnippet#parser#_initialize_snippet_options()
   let options.word = 1
 
@@ -164,7 +164,7 @@ function! s:trigger(function) "{{{
   endif
 
   " Get selected text.
-  let neosnippet = neosnippet#get_current_neosnippet()
+  let neosnippet = neosnippet#variables#current_neosnippet()
   let neosnippet.trigger = 1
   if mode() ==# 's' && neosnippet.selected_text =~ '^#:'
     let expr .= "\<C-o>\"_d"
diff --git a/autoload/neosnippet/variables.vim b/autoload/neosnippet/variables.vim
index a1442c9..6545330 100644
--- a/autoload/neosnippet/variables.vim
+++ b/autoload/neosnippet/variables.vim
@@ -1,7 +1,7 @@
 "=============================================================================
 " FILE: variables.vim
 " AUTHOR:  Shougo Matsushita <Shougo.Matsu@gmail.com>
-" Last Modified: 19 Nov 2013.
+" Last Modified: 21 Nov 2013.
 " License: MIT license  {{{
 "     Permission is hereby granted, free of charge, to any person obtaining
 "     a copy of this software and associated documentation files (the
@@ -27,14 +27,26 @@
 let s:save_cpo = &cpo
 set cpo&vim
 
-function! neosnippet#variables#get_expand_stack() "{{{
+function! neosnippet#variables#current_neosnippet() "{{{
+  if !exists('b:neosnippet')
+    let b:neosnippet = {
+          \ 'snippets' : {},
+          \ 'selected_text' : '',
+          \ 'target' : '',
+          \ 'trigger' : 0,
+          \}
+  endif
+
+  return b:neosnippet
+endfunction"}}}
+function! neosnippet#variables#expand_stack() "{{{
   if !exists('s:expand_stack')
     let s:expand_stack = []
   endif
 
   return s:expand_stack
 endfunction"}}}
-function! neosnippet#variables#get_snippets() "{{{
+function! neosnippet#variables#snippets() "{{{
   if !exists('s:snippets')
     let s:snippets= {}
   endif
@@ -48,14 +60,14 @@ function! neosnippet#variables#set_snippets(list) "{{{
 
   let s:snippets = a:list
 endfunction"}}}
-function! neosnippet#variables#get_snippets_dir() "{{{
+function! neosnippet#variables#snippets_dir() "{{{
   if !exists('s:snippets_dir')
     let s:snippets_dir = []
   endif
 
   return s:snippets_dir
 endfunction"}}}
-function! neosnippet#variables#get_runtime_dir() "{{{
+function! neosnippet#variables#runtime_dir() "{{{
   if !exists('s:runtime_dir')
     let s:runtime_dir = []
   endif