Merge branch 'fix-11'

* fix-11:
  Update binstubs.
  Fix the new tests.
  Failing test.
  Fix "Single-character CamelCase segments seem not to work" (#11)

Author: Julian

autoload/textobj/variable_segment.vim

@@ -1,8 +1,85 @@
+" Given three positions, return the position closest to the first one.
+function! s:closest_position(main, a, b)
+    let a_distance = mapnew(a:main, {k,v->abs(v-a:a[k])})
+    let b_distance = mapnew(a:main, {k,v->abs(v-a:b[k])})
+    if a_distance[1] < b_distance[1]
+        return a:a
+    endif
+    if a_distance[1] > b_distance[1]
+        return a:b
+    endif
+    if a_distance[2] < b_distance[2]
+        return a:a
+    endif
+    if a_distance[2] > b_distance[2]
+        return a:b
+    endif
+    " Distances are the same, return either one
+    return a:a
+endfunction!
+
 function! s:select(object_type, right_boundary)
     let left_boundaries = ['_\+\k', '\<', '\l\u', '\u\u\ze\l', '\a\d', '\d\a']
-    call search(join(left_boundaries, '\|'), 'bce')
-    let start_position = getpos('.')
 
+    " Gather all possible matches
+    let cursor_position = getpos('.')
+    let all_positions = []
+    for boundary in left_boundaries
+        " search() moves the cursor, so we need to reset the cursor's position
+        " before each search
+        call setpos('.', cursor_position)
+        if search(boundary, 'bce') > 0
+            call add(all_positions, getpos('.'))
+        endif
+    endfor
+
+    " Try to find a good match on the same line and on the left of the cursor
+    let start_position = v:null
+    let potential_matches = filter(copy(all_positions),
+        \ {v -> v[1] == cursor_position[1] && v[2] <= cursor_position[2]})
+    if len(potential_matches) > 0
+        let start_position = reduce(potential_matches,
+            \ {a, b -> s:closest_position(cursor_position, a, b)})
+    endif
+
+    if type(start_position) == type(v:null)
+        " No match found yet, try on the same line but on the right of the
+        " cursor
+        let potential_matches = filter(copy(all_positions),
+            \ {v -> v[1] == cursor_position[1] && v[2] > cursor_position[2]})
+        if len(potential_matches) > 0
+            let start_position = reduce(potential_matches,
+                \ {a, b -> s:closest_position(cursor_position, a, b)})
+        endif
+    endif
+
+    if type(start_position) == type(v:null)
+        " No match found yet, try to find one on lines above the cursor
+        let potential_matches = filter(copy(all_positions),
+            \ {v -> v[1] < cursor_position[1]})
+        if len(potential_matches) > 0
+            let start_position = reduce(potential_matches,
+                \ {a, b -> s:closest_position(cursor_position, a, b)})
+        endif
+    endif
+
+    if type(start_position) == type(v:null)
+        " No match found yet, try to find one on below after the cursor
+        let potential_matches = filter(copy(all_positions),
+            \ {v -> v[1] > cursor_position[1]})
+        if len(potential_matches) > 0
+            let start_position = reduce(potential_matches,
+                \ {a, b -> s:closest_position(cursor_position, a, b)})
+        endif
+    endif
+
+    if type(start_position) == type(v:null)
+        " The buffer must not contain any words - fall back to the cursor's
+        " position
+        let start_position = cursor_position
+    endif
+
+    call setpos('.', start_position)
     call search('\>', 'c')
     let word_end = getpos('.')
     call setpos('.', start_position)

bin/bundle

@@ -27,7 +27,7 @@ m = Module.new do
     bundler_version = nil
     update_index = nil
     ARGV.each_with_index do |a, i|
-      if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN
+      if update_index && update_index.succ == i && a.match?(Gem::Version::ANCHORED_VERSION_PATTERN)
         bundler_version = a
       end
       next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/
@@ -41,13 +41,13 @@ m = Module.new do
     gemfile = ENV["BUNDLE_GEMFILE"]
     return gemfile if gemfile && !gemfile.empty?
 
-    File.expand_path("../../Gemfile", __FILE__)
+    File.expand_path("../Gemfile", __dir__)
   end
 
   def lockfile
     lockfile =
       case File.basename(gemfile)
-      when "gems.rb" then gemfile.sub(/\.rb$/, gemfile)
+      when "gems.rb" then gemfile.sub(/\.rb$/, ".locked")
       else "#{gemfile}.lock"
       end
     File.expand_path(lockfile)
@@ -60,24 +60,19 @@ m = Module.new do
     Regexp.last_match(1)
   end
 
-  def bundler_version
-    @bundler_version ||=
-      env_var_version || cli_arg_version ||
-        lockfile_version
-  end
-
   def bundler_requirement
-    return "#{Gem::Requirement.default}.a" unless bundler_version
-
-    bundler_gem_version = Gem::Version.new(bundler_version)
-
-    requirement = bundler_gem_version.approximate_recommendation
+    @bundler_requirement ||=
+      env_var_version ||
+      cli_arg_version ||
+      bundler_requirement_for(lockfile_version)
+  end
 
-    return requirement unless Gem::Version.new(Gem::VERSION) < Gem::Version.new("2.7.0")
+  def bundler_requirement_for(version)
+    return "#{Gem::Requirement.default}.a" unless version
 
-    requirement += ".a" if bundler_gem_version.prerelease?
+    bundler_gem_version = Gem::Version.new(version)
 
-    requirement
+    bundler_gem_version.approximate_recommendation
   end
 
   def load_bundler!

bin/rake

@@ -8,14 +8,12 @@
 # this file is here to facilitate running it.
 #
 
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 
-bundle_binstub = File.expand_path("../bundle", __FILE__)
+bundle_binstub = File.expand_path("bundle", __dir__)
 
 if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
     load(bundle_binstub)
   else
     abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.

bin/thor

@@ -8,14 +8,12 @@
 # this file is here to facilitate running it.
 #
 
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 
-bundle_binstub = File.expand_path("../bundle", __FILE__)
+bundle_binstub = File.expand_path("bundle", __dir__)
 
 if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
     load(bundle_binstub)
   else
     abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.

bin/vim-flavor

@@ -8,14 +8,12 @@
 # this file is here to facilitate running it.
 #
 
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 
-bundle_binstub = File.expand_path("../bundle", __FILE__)
+bundle_binstub = File.expand_path("bundle", __dir__)
 
 if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
     load(bundle_binstub)
   else
     abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.

t/variable-segment.vim

@@ -164,6 +164,20 @@ describe 'iv'
         Expect getline(1) == 'theThingILike'
     end
 
+    it 'selects segments after single letter snake case sections'
+        put! = 'a_thing_I_like'
+        normal! 3|
+        normal civtest
+        Expect getline(1) == 'a_test_I_like'
+    end
+
+    it 'selects segments after single letter camel sections'
+        put! = 'aThingILike'
+        normal! 2|
+        normal civTest
+        Expect getline(1) == 'aTestILike'
+    end
+
     it 'does not cross left snake boundaries'
         put! = 'foo_bar baz_quux'
         normal! 10|