Refactored
This commit is contained in:
@@ -1,26 +1,7 @@
|
||||
"=============================================================================
|
||||
" FILE: snippets.vim
|
||||
" AUTHOR: Shougo Matsushita <Shougo.Matsu@gmail.com>
|
||||
" License: MIT license {{{
|
||||
" Permission is hereby granted, free of charge, to any person obtaining
|
||||
" a copy of this software and associated documentation files (the
|
||||
" "Software"), to deal in the Software without restriction, including
|
||||
" without limitation the rights to use, copy, modify, merge, publish,
|
||||
" distribute, sublicense, and/or sell copies of the Software, and to
|
||||
" permit persons to whom the Software is furnished to do so, subject to
|
||||
" the following conditions:
|
||||
"
|
||||
" The above copyright notice and this permission notice shall be included
|
||||
" in all copies or substantial portions of the Software.
|
||||
"
|
||||
" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||
" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
" IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
||||
" CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
||||
" TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
||||
" SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
" }}}
|
||||
" AUTHOR: Shougo Matsushita <Shougo.Matsu at gmail.com>
|
||||
" License: MIT license
|
||||
"=============================================================================
|
||||
|
||||
" Only load this indent file when no other was loaded.
|
||||
@@ -29,13 +10,10 @@ if exists('b:did_indent')
|
||||
endif
|
||||
let b:did_indent = 1
|
||||
|
||||
let s:save_cpo = &cpo
|
||||
set cpo&vim
|
||||
|
||||
if !exists('b:undo_indent')
|
||||
let b:undo_indent = ''
|
||||
let b:undo_indent = ''
|
||||
else
|
||||
let b:undo_indent .= '|'
|
||||
let b:undo_indent .= '|'
|
||||
endif
|
||||
|
||||
setlocal autoindent
|
||||
@@ -49,34 +27,31 @@ let b:undo_indent .= 'setlocal
|
||||
\'
|
||||
|
||||
function! SnippetsIndent() abort "{{{
|
||||
let line = getline('.')
|
||||
let prev_line = (line('.') == 1)? '' : getline(line('.')-1)
|
||||
let syntax = '\%(include\|snippet\|abbr\|prev_word\|delete\|alias\|options\|regexp\)\s'
|
||||
let defining = '\%(snippet\|abbr\|prev_word\|alias\|options\|regexp\)\s'
|
||||
let line = getline('.')
|
||||
let prev_line = (line('.') == 1)? '' : getline(line('.')-1)
|
||||
let syntax = '\%(include\|snippet\|abbr\|prev_word\|delete\|alias\|options\|regexp\)\s'
|
||||
let defining = '\%(snippet\|abbr\|prev_word\|alias\|options\|regexp\)\s'
|
||||
|
||||
"for indentkeys o,O
|
||||
if s:is_empty(line)
|
||||
if prev_line =~ '^' . defining
|
||||
return shiftwidth()
|
||||
else
|
||||
return -1
|
||||
endif
|
||||
"for indentkeys o,O
|
||||
if s:is_empty(line)
|
||||
if prev_line =~ '^' . defining
|
||||
return shiftwidth()
|
||||
else
|
||||
return -1
|
||||
endif
|
||||
|
||||
"for indentkeys =words
|
||||
else
|
||||
if line =~ '^\s*' . syntax
|
||||
\ && (s:is_empty(prev_line)
|
||||
\ || prev_line =~ '^' . defining)
|
||||
return 0
|
||||
else
|
||||
if line =~ '^\s*' . syntax
|
||||
\ && (s:is_empty(prev_line)
|
||||
\ || prev_line =~ '^' . defining)
|
||||
return 0
|
||||
else
|
||||
return -1
|
||||
endif
|
||||
return -1
|
||||
endif
|
||||
endif
|
||||
endfunction"}}}
|
||||
|
||||
function! s:is_empty(line)
|
||||
return a:line =~ '^\s*$'
|
||||
return a:line =~ '^\s*$'
|
||||
endfunction
|
||||
|
||||
let &cpo = s:save_cpo
|
||||
unlet s:save_cpo
|
||||
|
||||
Reference in New Issue
Block a user