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.

Sign up for GitHub

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

Visual downwards move with big count goes to end of line and new configuration options #27

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Visual downwards move with big count goes to end of line and new configuration options #27

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59e641a
Bug corrections and minor functionality changes
saulaxel Aug 21, 2018
592751c
Configuration dissection using dictionaries
saulaxel Aug 22, 2018
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
24 changes: 23 additions & 1 deletion doc/move.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,31 @@ wrapping the :move command.
===============================================================================
2. Mappings *move-mappings*

To enable custom key maps you must disable the automatic key maps with >
To enable/disable automatic key maps you can define the variable
g:move_map_keys in to 1 or 0 respectively. IE, if you want to define your own
key mappings you would put in your vimrc: >

let g:move_map_keys = 0

The default value of g:move_map_keys is 1 so all mappings are usually defined.

The automatic key maps also can be enabled/disabled by parts defining
g:move_map_keys as a dictionary instad of an integer. This can be
done through the entries 'vertical' and 'horizontal' each of which should be
also a dictionary with the integer (boolean) entries 'normal' and 'visual'.
With that in mind, if you want to have the vertical mappings only enabled in
visual mode but the horizontal mappings to be enabled in both modes you can
define g:move_map_keys as: >

let g:move_map_keys = {}
let g:move_map_keys.vertical = {'normal': 0, 'visual': 1}
let g:move_map_keys.horizontal = {'normal': 1, 'visual': 1}

Or, as the default values of all entries are also 1, it can be simply
written as: >

let g:move_map_keys = {'vertical': {'normal': 0}}

The plugin provide finger-friendly mappings to move text around by using <jk>
keys. You can specify the key modifier that is used in key bindings with >

Expand Down Expand Up @@ -145,6 +166,7 @@ v1.4.1
* Bug corrections from 1.4
* If vertical movement receives a count past end of file, it moves to the
end instead of staying in place.
* The standard mappings can be enabled by parts through a dictionary.

v1.4
* Released on 08/19/18
Expand Down
52 changes: 42 additions & 10 deletions plugin/move.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ if exists('g:loaded_move') || &compatible
endif
let g:loaded_move = 1

" =====[ Configuration Variables ]=====
" =====[ Configuration Variables ]================
function! s:SetDefaultValue(var, val)
if !exists(a:var)
execute 'let' a:var '=' string(a:val)
Expand All @@ -23,13 +23,22 @@ call s:SetDefaultValue('g:move_auto_indent', 1)
call s:SetDefaultValue('g:move_map_keys', 1)
call s:SetDefaultValue('g:move_past_end_of_line', 1)

" =====[ Script local variables ]=====
if type(g:move_map_keys) == type({})
call s:SetDefaultValue('g:move_map_keys.vertical', {})
call s:SetDefaultValue('g:move_map_keys.vertical.normal', 1)
call s:SetDefaultValue('g:move_map_keys.vertical.visual', 1)
call s:SetDefaultValue('g:move_map_keys.horizontal', {})
call s:SetDefaultValue('g:move_map_keys.horizontal.normal', 1)
call s:SetDefaultValue('g:move_map_keys.horizontal.visual', 1)
endif

" =====[ Script local variables ]=================
let s:command_blockwise_selection = "\<C-v>"
" After deleting and pasting "gv" would select the old position but the
" following command selects the position of the pasted text
let s:command_select_after_P = '`[' . s:command_blockwise_selection . '`]'

" =====[ Utility functions ]=====
" =====[ Utility functions ]======================
function! s:ResetCursor()
normal! gv=gv^
endfunction
Expand All @@ -48,7 +57,7 @@ function! s:MoveKey(key)
return '<' . g:move_key_modifier . '-' . a:key . '>'
endfunction

" =====[ Functionality ]=====
" =====[ Functionality ]==========================
function! s:MoveBlockDown(start, end, num)
let l:next_line = a:end + a:num + max([0, v:count - 1])
let l:next_line = min([line('$'), l:next_line])
Expand Down Expand Up @@ -79,6 +88,8 @@ function! s:MoveBlockLeft() range
let l:distance = v:count ? v:count : 1
let l:min_col = min([col("'<"), col("'>")])

" Having 'virtualenv' set to 'onemore' fixes problem of one more movement
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Someone seems to write a lot of Python code as well ;-)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I still don't find a way to avoid inserting trailing spaces after a left/right move. But found that just removing the spaces after those operations is a possible solution. It is not exactly the same as not inserting them, because removing after an operation can also delete existing (possible wanted) spaces but this solution still will do right most times and could be configurable for those who don't want it.

" that needed when moving block from end of line to the left
let [l:old_virtualedit, &virtualedit] = [&virtualedit, 'onemore']

let l:move_command = 'silent normal! gvd'
Expand Down Expand Up @@ -190,7 +201,7 @@ function! s:MoveBlockNumUp(num) range
call s:MoveBlockUp(a:firstline, a:lastline, a:num)
endfunction

" =====[ API ]=====
" =====[ API ]===================================
vnoremap <silent> <Plug>MoveBlockDown :call <SID>MoveBlockNumDown(1)<CR>
vnoremap <silent> <Plug>MoveBlockUp :call <SID>MoveBlockNumUp(1)<CR>
vnoremap <silent> <Plug>MoveBlockHalfPageDown :call <SID>MoveBlockNumDown(s:HalfWin())<CR>
Expand All @@ -205,14 +216,35 @@ nnoremap <silent> <Plug>MoveLineHalfPageUp :<C-u>call <SID>MoveLineUp(s:Hal
nnoremap <silent> <Plug>MoveCharLeft :<C-u>call <SID>MoveCharLeft()<CR>
nnoremap <silent> <Plug>MoveCharRight :<C-u>call <SID>MoveCharRight()<CR>

if g:move_map_keys
execute 'vmap' s:MoveKey('j') '<Plug>MoveBlockDown'
execute 'vmap' s:MoveKey('k') '<Plug>MoveBlockUp'
execute 'vmap' s:MoveKey('h') '<Plug>MoveBlockLeft'
execute 'vmap' s:MoveKey('l') '<Plug>MoveBlockRight'
function! s:UserWantMap(movement, mode)
" In vim 8, v:t_number can be used instead of type(0) and v:t_dict instead
" of type({}), but at the cost of losing compatibility with previous
" versions
if type(g:move_map_keys) == type(0)
return g:move_map_keys != 0
endif

if type(g:move_map_keys) == type({})
return g:move_map_keys[a:movement][a:mode] != 0
endif
endfunction

if s:UserWantMap('vertical', 'visual')
execute 'xmap' s:MoveKey('j') '<Plug>MoveBlockDown'
execute 'xmap' s:MoveKey('k') '<Plug>MoveBlockUp'
endif

if s:UserWantMap('horizontal', 'visual')
execute 'xmap' s:MoveKey('h') '<Plug>MoveBlockLeft'
execute 'xmap' s:MoveKey('l') '<Plug>MoveBlockRight'
endif

if s:UserWantMap('vertical', 'normal')
execute 'nmap' s:MoveKey('j') '<Plug>MoveLineDown'
execute 'nmap' s:MoveKey('k') '<Plug>MoveLineUp'
endif

if s:UserWantMap('horizontal', 'normal')
execute 'nmap' s:MoveKey('h') '<Plug>MoveCharLeft'
execute 'nmap' s:MoveKey('l') '<Plug>MoveCharRight'
endif