Fix tests, BS in expansions and close #105.

Raimondi · Jun 18, 2013 · 8a8aad1 · 8a8aad1
1 parent cfc6654
commit 8a8aad1
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/autoload/delimitMate.vim b/autoload/delimitMate.vim
@@ -143,7 +143,7 @@ function! delimitMate#WriteAfter(str) "{{{
 	let len = 1 "len(a:str)
 	let line = split(getline('.'), '\zs')
 	let col = delimitMate#CursorIdx() - 1
-	if (col + 1) < 0
+	if (col + 1) < 0 || col('.') == 1
 		let line = insert(line, a:str)
 	elseif col('.') == col('$')
 		let line = add(line, a:str)

diff --git a/plugin/delimitMate.vim b/plugin/delimitMate.vim
@@ -338,7 +338,7 @@ endfunction "}}}
 
 function! s:ExtraMappings() "{{{
 	" If pair is empty, delete both delimiters:
-	inoremap <silent><expr> <Plug>delimitMateBS delimitMate#WithinEmptyPair() ? "\<C-R>=delimitMate#BS()\<CR>" : "\<BS>"
+	inoremap <silent> <Plug>delimitMateBS <C-R>=delimitMate#BS()<CR>
 	if !hasmapto('<Plug>delimitMateBS','i') && maparg('<BS>'. 'i') == ''
 		silent! imap <unique> <buffer> <BS> <Plug>delimitMateBS
 	endif

diff --git a/test/autoclose_quotes.txt b/test/autoclose_quotes.txt
@@ -36,3 +36,5 @@ set cpo=ces$
 " 'x" " 'x'"
 # Make sure we jump over a quote on the right. #89.
 "('test'x" "('test'x)"
+# Duplicate whole line when inserting quote at bol #105
+"}\<Home>'" "''}"
diff --git a/test/expand_cr.txt b/test/expand_cr.txt
@@ -12,6 +12,8 @@ $(document).ready(function() {
 --------------------------------------------------------------------------------
 # Issue #95
 new
+let b:delimitMate_jump_expansion = 1
+DelimitMateReload
 exec "normal i(\<CR>test)x"
 ================================================================================
 (
@@ -43,10 +45,10 @@ sub foo {
 }
 --------------------------------------------------------------------------------
 %d
-call setline(1, "\"{bracketed}")
+call setline(1, '"{bracketed}')
 normal A"x
 ================================================================================
-"{bracketed""x
+"{bracketed}"x"
 --------------------------------------------------------------------------------
 # Syntax folding enabled by autocmd breaks expansion. But ti can't be tested
 # with :normal

diff --git a/test/expand_space.txt b/test/expand_space.txt
@@ -1,5 +1,7 @@
 # Issue #95
 new
+let b:delimitMate_jump_expansion = 1
+DelimitMateReload
 exec "normal i( test)x"
 ================================================================================
 ( test )x