Update .vimrc (use Ctrl-S to save)

.ideavimrc

@@ -55,6 +55,10 @@ sethandler <A-N> a:vim
 sethandler <A-O> a:vim
 sethandler <A-P> a:vim
 sethandler <A-S-B> a:vim
+sethandler <A-S-H> a:vim
+sethandler <A-S-J> a:vim
+sethandler <A-S-K> a:vim
+sethandler <A-S-L> a:vim
 sethandler <A-S-O> a:vim
 sethandler <A-V> a:vim
 sethandler <A-X> a:vim
@@ -98,8 +102,8 @@ map í 9
 map é 0
 
 " Move some commands closer on Czech keyboard layout
+map ů %
 nnoremap ú @@
-noremap ů %
 noremap , +
 
 noremap § `
@@ -109,6 +113,9 @@ nnoremap m§ m
 sunmap ů
 sunmap §
 
+" Enter visual block mode
+map <A-v> <C-v>
+
 " Navigate camel humps
 noremap L [w
 noremap H [b
@@ -136,20 +143,23 @@ nnoremap go o<Esc>$
 nnoremap gO O<Esc>$
 nnoremap g<CR> i<CR><Esc>l
 
-" Delete lines
+" Edit current line
 nnoremap C cc
 xnoremap C cc
 nnoremap D dd
 xnoremap D dd
-
-" Enter visual block mode
-map <A-v> <C-v>
+nnoremap < <<
+nnoremap > >>
 
 " Indent keeping selection
 xnoremap < <gv
 xnoremap > >gv
 xnoremap = =gv
 
+" Extend selection
+xmap x <Action>(EditorSelectWord)
+xmap X <Action>(EditorUnSelectWord)
+
 " Turn capital letters into opposite actions
 " nnoremap U :redo<CR> " Handled by custom version of IdeaVIM
 
@@ -188,6 +198,13 @@ map ] <Action>(MethodDown)
 map { <Plug>(ParagraphPrevMotion)$
 map } <Plug>(ParagraphNextMotion)$
 
+" Move statement/element
+map <A-S-h> <Action>(MoveElementLeft)
+map <A-S-l> <Action>(MoveElementRight)
+
+map <A-S-j> <Action>(MoveStatementDown)
+map <A-S-k> <Action>(MoveStatementUp)
+
 " Multiple carets
 map <expr> <A-j> pumvisible() ? '<Action>(EditorDown)' : '<Action>(EditorCloneCaretBelow)'
 map <expr> <A-k> pumvisible() ? '<Action>(EditorUp)' : '<Action>(EditorCloneCaretAbove)'

.vimrc

@@ -10,7 +10,8 @@ set incsearch
 set infercase
 set laststatus=2
 set linebreak
-set listchars=space:·,tab:>·,trail:~,extends:>,precedes:<
+set list
+set listchars=lead:·,trail:·,tab:→\ ,extends:>,precedes:<
 set modeline
 set modelines=2
 set mouse=a
@@ -55,9 +56,12 @@ else
   highlight Visual    ctermfg=240 ctermbg=250
 endif
 
+highlight SpecialKey ctermfg=8 guifg=#584f46
+
 " Windows GUI
 if has("win32") && has("gui_running")
   au GUIEnter * simalt ~x " Maximize window
+  set listchars+=tab:▶\ 
   set renderoptions=type:directx " Fix unicode rendering
   set showbreak=→\ 
 endif
@@ -86,8 +90,8 @@ map í 9
 map é 0
 
 " Move some commands closer on Czech keyboard layout
+map ů %
 nnoremap ú @@
-noremap ů %
 noremap , +
 
 noremap § `
@@ -97,6 +101,9 @@ nnoremap m§ m
 sunmap ů
 sunmap §
 
+" Enter visual block mode
+noremap <M-v> <C-v>
+
 " Navigate camel humps (https://github.com/vim-scripts/camelcasemotion)
 map L <Plug>CamelCaseMotion_w
 map H <Plug>CamelCaseMotion_b
@@ -140,25 +147,13 @@ nnoremap go o<Esc>$
 nnoremap gO O<Esc>$
 nnoremap g<CR> i<CR><Esc>l
 
-" Delete lines
+" Edit current line
 nnoremap C cc
 xnoremap C cc
 nnoremap D dd
 xnoremap D dd
-
-" Enter visual block mode
-noremap <M-v> <C-v>
-
-" Use Ctrl for selection and clipboard
-nnoremap <C-a> ggVG
-xnoremap <C-a> ggoG
-
-xnoremap <C-c> "+y
-xnoremap <C-x> "+x
-
-noremap <C-v> "+gP
-inoremap <C-v> <Esc>:set paste<CR>i<C-r>+<Esc>:set nopaste<CR>i
-cnoremap <C-v> <C-r>+
+nnoremap < <<
+nnoremap > >>
 
 " Indent keeping selection
 xnoremap < <gv
@@ -178,6 +173,21 @@ xnoremap P p
 " Clear search highlights
 nnoremap <Esc> :nohlsearch<Return><Esc>
 
+" Use Ctrl for selection and clipboard
+nnoremap <C-a> ggVG
+xnoremap <C-a> ggoG
+
+xnoremap <C-c> "+y
+xnoremap <C-x> "+x
+
+noremap <C-v> "+gP
+inoremap <C-v> <C-o>:set paste<CR><C-r>+<C-o>:set nopaste<CR>
+cnoremap <C-v> <C-r>+
+
+nnoremap <C-s> :w<CR>
+xnoremap <C-s> :<C-U>w<CR>gv
+inoremap <C-s> <C-o>:w<CR>
+
 " Update search register when using f/t
 function FindChar(action, reverse, search_affix)
   let t:reverse_search = a:reverse