Revise a rule to leave from multiline/spaced []

kana · Apr 1, 2012 · 43931fb · 43931fb
1 parent 2b0ea75
commit 43931fb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/autoload/smartinput.vim b/autoload/smartinput.vim
@@ -81,7 +81,7 @@ function! smartinput#define_default_rules()  "{{{2
   \ ])
   call urules.add('[]', [
   \   {'at': '\%#', 'char': '[', 'input': '[]<Left>'},
-  \   {'at': '\%#\]', 'char': ']', 'input': '<Right>'},
+  \   {'at': '\%#\_s*\]', 'char': ']', 'input': '<C-o>:call search('']'', ''cW'')<Enter><Right>'},
   \   {'at': '\[\%#\]', 'char': '<BS>', 'input': '<BS><Del>'},
   \   {'at': '\[\]\%#', 'char': '<BS>', 'input': '<BS><BS>'},
   \   {'at': '\\\%#', 'char': '[', 'input': '['},

diff --git a/t/api.vim b/t/api.vim
@@ -735,6 +735,16 @@ describe 'The default configuration'
     \     ["x", ['[x]'], 1, 3 - 1],
     \     ["]", ['[x]'], 1, 4 - 1],
     \   ],
+    \   '[] leave #3': [
+    \     ["[", ['[]'], 1, 2 - 1],
+    \     ["  x  \<Left>\<Left>", ['[  x  ]'], 1, 5 - 1],
+    \     ["]", ['[  x  ]'], 1, 8 - 1],
+    \   ],
+    \   '[] leave #4': [
+    \     ["[", ['[]'], 1, 2 - 1],
+    \     ["\<Enter>x\<Enter>\<Up>\<Right>", ['[', 'x', ']'], 2, 2 - 1],
+    \     ["]", ['[', 'x', ']'], 3, 2 - 1],
+    \   ],
     \   '[] undo #1': [
     \     ["[", ['[]'], 1, 2 - 1],
     \     ["x", ['[x]'], 1, 3 - 1],
@@ -893,6 +903,8 @@ describe 'The default configuration'
     \   '[] escape',
     \   '[] leave #1',
     \   '[] leave #2',
+    \   '[] leave #3',
+    \   '[] leave #4',
     \   '[] undo #1',
     \   '[] undo #2',
     \   '{} complete',