- Improved initialization.

Shougo · Feb 24, 2013 · 0a8a358 · 0a8a358
1 parent c9eebc7
commit 0a8a358
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 53 deletions.
diff --git a/autoload/neocomplcache/sources/buffer_complete.vim b/autoload/neocomplcache/sources/buffer_complete.vim
@@ -1,7 +1,7 @@
 "=============================================================================
 " FILE: buffer_complete.vim
 " AUTHOR:  Shougo Matsushita <Shougo.Matsu@gmail.com>
-" Last Modified: 16 Feb 2013.
+" Last Modified: 24 Feb 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
@@ -38,6 +38,8 @@ let s:source = {
       \}
 
 function! s:source.initialize() "{{{
+  let s:buffer_sources = {}
+
   augroup neocomplcache "{{{
     " Caching events
     autocmd CursorHold *

diff --git a/autoload/neocomplcache/sources/include_complete.vim b/autoload/neocomplcache/sources/include_complete.vim
@@ -1,7 +1,7 @@
 "=============================================================================
 " FILE: include_complete.vim
 " AUTHOR:  Shougo Matsushita <Shougo.Matsu@gmail.com>
-" Last Modified: 17 Nov 2012.
+" Last Modified: 24 Feb 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,63 +27,14 @@
 let s:save_cpo = &cpo
 set cpo&vim
 
-if !exists('s:include_info')
-  let s:include_info = {}
-  let s:include_cache = {}
-  let s:cache_accessed_time = {}
-  let s:async_include_cache = {}
-  let s:cached_pattern = {}
-
-  " Initialize include pattern. "{{{
-  let g:neocomplcache_include_patterns =
-        \ get(g:, 'neocomplcache_include_patterns', {})
-  call neocomplcache#util#set_default_dictionary(
-        \ 'g:neocomplcache_include_patterns',
-        \ 'java,haskell', '^\s*\<import')
-  call neocomplcache#util#set_default_dictionary(
-        \ 'g:neocomplcache_include_patterns',
-        \ 'cs', '^\s*\<using')
-  call neocomplcache#util#set_default_dictionary(
-        \ 'g:neocomplcache_include_patterns',
-        \ 'ruby', '^\s*\<\%(load\|require\|require_relative\)\>')
-  "}}}
-  " Initialize expr pattern. "{{{
-  call neocomplcache#util#set_default(
-        \ 'g:neocomplcache_include_exprs', {})
-  call neocomplcache#util#set_default_dictionary(
-        \ 'g:neocomplcache_include_exprs',
-        \ 'haskell,cs',
-        \ "substitute(v:fname, '\\.', '/', 'g')")
-  "}}}
-  " Initialize path pattern. "{{{
-  call neocomplcache#util#set_default(
-        \ 'g:neocomplcache_include_paths', {})
-  "}}}
-  " Initialize include suffixes. "{{{
-  call neocomplcache#util#set_default(
-        \ 'g:neocomplcache_include_suffixes', {})
-  call neocomplcache#util#set_default_dictionary(
-        \ 'g:neocomplcache_include_suffixes',
-        \ 'haskell', '.hs')
-  "}}}
-  " Initialize include functions. "{{{
-  call neocomplcache#util#set_default(
-        \ 'g:neocomplcache_include_functions', {})
-  " call neocomplcache#util#set_default_dictionary(
-  "       \ 'g:neocomplcache_include_functions', 'vim',
-  "       \ 'neocomplcache#sources#include_complete#analyze_vim_include_files')
-  call neocomplcache#util#set_default_dictionary(
-        \ 'g:neocomplcache_include_functions', 'ruby',
-        \ 'neocomplcache#sources#include_complete#analyze_ruby_include_files')
-  "}}}
-endif
-
 let s:source = {
       \ 'name' : 'include_complete',
       \ 'kind' : 'plugin',
       \}
 
 function! s:source.initialize() "{{{
+  call s:initialize_variables()
+
   " Set rank.
   call neocomplcache#util#set_default_dictionary(
         \ 'g:neocomplcache_source_rank', 'include_complete', 8)
@@ -480,6 +431,61 @@ function! neocomplcache#sources#include_complete#analyze_ruby_include_files(line
   return include_files
 endfunction"}}}
 
+function! s:initialize_variables() "{{{
+  let s:include_info = {}
+  let s:include_cache = {}
+  let s:cache_accessed_time = {}
+  let s:async_include_cache = {}
+  let s:cached_pattern = {}
+
+  " Initialize include pattern. "{{{
+  let g:neocomplcache_include_patterns =
+        \ get(g:, 'neocomplcache_include_patterns', {})
+  call neocomplcache#util#set_default_dictionary(
+        \ 'g:neocomplcache_include_patterns',
+        \ 'java,haskell', '^\s*\<import')
+  call neocomplcache#util#set_default_dictionary(
+        \ 'g:neocomplcache_include_patterns',
+        \ 'cs', '^\s*\<using')
+  call neocomplcache#util#set_default_dictionary(
+        \ 'g:neocomplcache_include_patterns',
+        \ 'ruby', '^\s*\<\%(load\|require\|require_relative\)\>')
+  "}}}
+  " Initialize expr pattern. "{{{
+  call neocomplcache#util#set_default(
+        \ 'g:neocomplcache_include_exprs', {})
+  call neocomplcache#util#set_default_dictionary(
+        \ 'g:neocomplcache_include_exprs',
+        \ 'haskell,cs',
+        \ "substitute(v:fname, '\\.', '/', 'g')")
+  "}}}
+  " Initialize path pattern. "{{{
+  call neocomplcache#util#set_default(
+        \ 'g:neocomplcache_include_paths', {})
+  "}}}
+  " Initialize include suffixes. "{{{
+  call neocomplcache#util#set_default(
+        \ 'g:neocomplcache_include_suffixes', {})
+  call neocomplcache#util#set_default_dictionary(
+        \ 'g:neocomplcache_include_suffixes',
+        \ 'haskell', '.hs')
+  "}}}
+  " Initialize include functions. "{{{
+  call neocomplcache#util#set_default(
+        \ 'g:neocomplcache_include_functions', {})
+  " call neocomplcache#util#set_default_dictionary(
+  "       \ 'g:neocomplcache_include_functions', 'vim',
+  "       \ 'neocomplcache#sources#include_complete#analyze_vim_include_files')
+  call neocomplcache#util#set_default_dictionary(
+        \ 'g:neocomplcache_include_functions', 'ruby',
+        \ 'neocomplcache#sources#include_complete#analyze_ruby_include_files')
+  "}}}
+endfunction"}}}
+
+if !exists('s:include_info')
+  call s:initialize_variables()
+endif
+
 let &cpo = s:save_cpo
 unlet s:save_cpo
 

diff --git a/doc/neocomplcache.txt b/doc/neocomplcache.txt
@@ -1506,6 +1506,9 @@ Improve cache behavior in current buffer.
 ==============================================================================
 CHANGELOG					*neocomplcache-changelog*
 
+2013-02-24
+- Improved initialization.
+
 2013-02-22
 - Improved filename pattern.