Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add the rest of the block opener keywords #29

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion plugin/textobj/rubyblock.vim
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ call textobj#user#plugin('rubyblock', {

" Misc. "{{{1
let s:comment_escape = '\v^[^#]*'
let s:block_openers = '\zs(<def>|<if>|<do>|<module>|<class>)'
let s:block_openers = '\zs(<def>|<if>|<unless>|<do>|<module>|<class>|<case>'
let s:block_openers .= '|<for>|<while>|<until>|<begin>)'
let s:start_pattern = s:comment_escape . s:block_openers
let s:end_pattern = s:comment_escape . '\zs<end>'
let s:skip_pattern = 'getline(".") =~ "\\v\\S\\s<(if|unless)>\\s\\S"'
Expand Down
16 changes: 16 additions & 0 deletions t/examples.rb
Original file line number Diff line number Diff line change
Expand Up @@ -65,3 +65,19 @@ def hello
bar
end

def method_with_while
var1 = 1
i = 0
while i < 10
i += 1
end
var2 = 2
end

def method_with_unless
var1 = 1
unless condition
puts 'foo'
end
var2 = 2
end
17 changes: 17 additions & 0 deletions t/rubyblock_test.vim
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,23 @@ describe '<Plug>(textobj-rubyblock-a)'

end

describe 'nested while and unless blocks'

before
silent tabnew t/examples.rb
end

after
silent tabclose
end

it 'ignores nested while and unless blocks'
Expect SelectAroundFrom(69, '^') ==# [69, 68, 75]
Expect SelectAroundFrom(78, '^') ==# [78, 77, 83]
end

end

describe '<Plug>(textobj-rubyblock-i)'

before
Expand Down