Clean up code

Author: erw7

autoload/textobj/underscore.vim

@@ -0,0 +1,43 @@
+function! s:search_underscore(object_type)
+  let current_pos = getpos('.')
+  let start_pos = copy(current_pos)
+  let start_pos[1:2] = searchpos('_', 'bcn', current_pos[1])
+  if start_pos[1:2] == [0, 0]
+    return 0
+  else
+    let end_pos = copy(current_pos)
+    let end_pos[1:2] = searchpos('_', 'n', current_pos[1])
+    if end_pos[1:2] == [0, 0]
+      if current_pos == start_pos
+        let end_pos = copy(start_pos)
+        let start_pos[1:2] = searchpos('_', 'bn', current_pos[1])
+        if start_pos == [0, 0]
+          return 0
+        endif
+      else
+        return 0
+      endif
+    endif
+  endif
+
+  if a:object_type ==# 'A'
+    let start_pos[2] = start_pos[2] + 1
+  elseif a:object_type ==# 'i'
+    let start_pos[2] = start_pos[2] + 1
+    let end_pos[2] = end_pos[2] - 1
+  endif
+
+  return [ 'v', start_pos, end_pos ]
+endfunction
+
+function! textobj#underscore#select_a()
+  return s:search_underscore('a')
+endfunction
+
+function! textobj#underscore#select_A()
+  return s:search_underscore('A')
+endfunction
+
+function! textobj#underscore#select_i()
+  return s:search_underscore('i')
+endfunction

plugin/textobj/underscore.vim

@@ -3,82 +3,9 @@ if exists('g:loaded_textobj_underscore')
 endif
 
 call textobj#user#plugin('underscore', {
-      \      'a': { 'sfile': expand('<sfile>'), 'select': 'a_', 'select-function': 's:select_a' },
-      \      'A': { 'sfile': expand('<sfile>'), 'select': 'a-', 'select-function': 's:select_A' },
-      \      'i': { 'sfile': expand('<sfile>'), 'select': 'i_', 'select-function': 's:select_i' },
+      \      'a': { 'select': 'a_', 'select-function': 'textobj#underscore#select_a' },
+      \      'A': { 'select': 'a-', 'select-function': 'textobj#underscore#select_A' },
+      \      'i': { 'select': 'i_', 'select-function': 'textobj#underscore#select_i' },
       \    })
 
-function! s:search_underscore()
-  let current_pos = getpos('.')
-  let start_pos = searchpos('_', 'bcn', current_pos[1])
-  if start_pos == [0, 0]
-    throw 'not_found'
-  else
-    let end_pos = searchpos('_', 'n', current_pos[1])
-    if end_pos == [0, 0]
-      if current_pos[1:2] == start_pos
-        let end_pos = start_pos
-        let start_pos = searchpos('_', 'bn', current_pos[1])
-        if start_pos == [0, 0]
-          throw 'not_found'
-        endif
-      else
-        throw 'not_found'
-      endif
-    endif
-  endif
-
-  return [ start_pos[1], end_pos[1] ]
-endfunction
-
-function! s:select_a()
-  try
-    let [ start_col, end_col ] = s:search_underscore()
-  catch
-    return 0
-  endtry
-
-  let start_pos = getpos('.')
-  let start_pos[2] = start_col
-
-  let end_pos = getpos('.')
-  let end_pos[2] = end_col
-
-  return [ 'v', start_pos, end_pos ]
-endfunction
-
-function! s:select_A()
-  try
-    let [ start_col, end_col ] = s:search_underscore()
-  catch
-    return 0
-  endtry
-
-  let start_pos = getpos('.')
-  let start_pos[2] = start_col + 1
-
-  let end_pos = getpos('.')
-  let end_pos[2] = end_col
-
-  return [ 'v', start_pos, end_pos ]
-endfunction
-
-" ciao_come_stai
-
-function! s:select_i()
-  try
-    let [ start_col, end_col ] = s:search_underscore()
-  catch
-    return 0
-  endtry
-
-  let start_pos = getpos('.')
-  let start_pos[2] = start_col + 1
-
-  let end_pos = getpos('.')
-  let end_pos[2] = end_col - 1
-
-  return ['v', start_pos, end_pos]
-endfunction
-
 let g:loaded_textobj_underscore = 1