Allow negation operator in ignore_groups option

e.g. ig['!String']

.gitattributes

@@ -1,3 +1,4 @@
+.travis.yml    export-ignore
 .gitattributes export-ignore
 .gitignore     export-ignore
 doc/tags       export-ignore

.travis.yml

@@ -0,0 +1,13 @@
+language: vim
+
+before_script: |
+  git clone https://github.com/junegunn/vader.vim.git
+
+script: |
+  vim -Nu <(cat << VIMRC
+  filetype off
+  set rtp+=vader.vim
+  set rtp+=.
+  set rtp+=after
+  filetype plugin indent on
+  VIMRC) -c 'Vader! test/*' > /dev/null

EXAMPLES.md

@@ -3,10 +3,14 @@ vim-easy-align examples
 
 Open this document in your Vim and try it yourself.
 
-This document assumes that you have defined the following mapping.
+This document assumes that you have defined the following mappings.
 
 ```vim
-vnoremap <silent> <Enter> :EasyAlign<cr>
+" Start interactive EasyAlign in visual mode (e.g. vip<Enter>)
+vmap <Enter> <Plug>(EasyAlign)
+
+" Start interactive EasyAlign for a motion/text object (e.g. <Leader>aip)
+nmap <Leader>a <Plug>(EasyAlign)
 ```
 
 To enable syntax highlighting in the code blocks, define and call the following
@@ -214,6 +218,9 @@ This only works when syntax highlighting is enabled.
 Aligning in-line comments
 -------------------------
 
+*Note: Since the current version provides '#'-rule as one of the default rules,
+you can ignore this section.*
+
 ```ruby
 apple = 1 # comment not aligned
 banana = 'Gros Michel' # comment 2

README.md

@@ -37,14 +37,9 @@ and extract in ~/.vim or
 [plugin](https://github.com/Shougo/neobundle.vim)
 [manager](https://github.com/MarcWeber/vim-addon-manager).
 
-- [Pathogen](https://github.com/tpope/vim-pathogen)
-  - `git clone https://github.com/junegunn/vim-easy-align.git ~/.vim/bundle/vim-easy-align`
 - [Vundle](https://github.com/gmarik/vundle)
-  1. Add `Bundle 'junegunn/vim-easy-align'` to .vimrc
-  2. Run `:BundleInstall`
-- [NeoBundle](https://github.com/Shougo/neobundle.vim)
-  1. Add `NeoBundle 'junegunn/vim-easy-align'` to .vimrc
-  2. Run `:NeoBundleInstall`
+  1. Add `Plugin 'junegunn/vim-easy-align'` to .vimrc
+  2. Run `:PluginInstall`
 - [vim-plug](https://github.com/junegunn/vim-plug)
   1. Add `Plug 'junegunn/vim-easy-align'` to .vimrc
   2. Run `:PlugInstall`
@@ -55,19 +50,19 @@ TL;DR - One-minute guide
 Add the following mappings to your .vimrc.
 
 ```vim
-" Start interactive EasyAlign in visual mode
+" Start interactive EasyAlign in visual mode (e.g. vip<Enter>)
 vmap <Enter> <Plug>(EasyAlign)
 
-" Start interactive EasyAlign with a Vim movement
+" Start interactive EasyAlign for a motion/text object (e.g. <Leader>aip)
 nmap <Leader>a <Plug>(EasyAlign)
 ```
 
 And with the following lines of text,
 
 ```
-apple = red
-grass=green
-sky=blue
+apple   =red
+grass+=green
+sky-=   blue
 ```
 
 try these commands:
@@ -83,67 +78,67 @@ try these commands:
 Notice that the commands are repeatable with `.` key if you have installed
 [repeat.vim](https://github.com/tpope/vim-repeat). Install
 [visualrepeat](https://github.com/vim-scripts/visualrepeat) as well if you want
-to repeat in visual mode. Or you can add the following mapping to your .vimrc.
-
-```vim
-" Repeat alignment in visual mode with . key
-vmap . <Plug>(EasyAlignRepeat)
-```
+to repeat in visual mode.
 
 Usage
 -----
 
-_vim-easy-align_ defines `:EasyAlign` command (and the right-align
-variant `:EasyAlign!`).
-
-| Mode                      | Command                                          |
-| ------------------------- | ------------------------------------------------ |
-| Interactive mode          | `:EasyAlign[!] [OPTIONS]`                        |
-| Using predefined rules    | `:EasyAlign[!] [N-th] DELIMITER_KEY [OPTIONS]`   |
-| Using regular expressions | `:EasyAlign[!] [N-th] /REGEXP/ [OPTIONS]`        |
-| Live interactive mode     | `:LiveEasyAlign[!] [...]`                        |
-
 ### Concept of _alignment rule_
 
+Though easy-align can align lines of text around any delimiter, it provides
+shortcuts for the most common use cases with the concept of "_alignment rule_".
+
 An *alignment rule* is a predefined set of options for common alignment tasks,
 which is identified by a single character, *DELIMITER KEY*, such as `<Space>`,
-`=`, `:`, `.`, `|`, `&`, and `,`.
+`=`, `:`, `.`, `|`, `&`, `#`, and `,`.
 
 Think of it as a shortcut. Instead of writing regular expression and setting
 several options, you can just type in a single character.
 
+### Execution models
+
+There are two ways to use easy-align.
+
+#### 1. Using `<Plug>` mappings
+
+The recommended method is to use `<Plug>` mappings as described earlier.
+
+| Mapping                 | Mode   | Description                                          |
+| ----------------------- | ------ | ---------------------------------------------------- |
+| `<Plug>(EasyAlign)`     | normal | Start interactive mode for a motion/text object      |
+| `<Plug>(EasyAlign)`     | visual | Start interactive mode for the selection             |
+| `<Plug>(LiveEasyAlign)` | normal | Start live-interactive mode for a motion/text object |
+| `<Plug>(LiveEasyAlign)` | visual | Start live-interactive mode for the selection        |
+
+#### 2. Using `:EasyAlign` command
+
+If you prefer command-line or do not want to start interactive mode, you can use
+`:EasyAlign` command instead.
+
+| Mode                                       | Command                                          |
+| ------------------------------------------ | ------------------------------------------------ |
+| Interactive mode                           | `:EasyAlign[!] [OPTIONS]`                        |
+| Live interactive mode                      | `:LiveEasyAlign[!] [...]`                        |
+| Non-interactive mode (predefined rules)    | `:EasyAlign[!] [N-th] DELIMITER_KEY [OPTIONS]`   |
+| Non-interactive mode (regular expressions) | `:EasyAlign[!] [N-th] /REGEXP/ [OPTIONS]`        |
+
 ### Interactive mode
 
-The command will go into the interactive mode when no argument is given.
+The following sections will assume that you have `<Plug>(EasyAlign)` mappings in
+your .vimrc as below:
 
 ```vim
-:EasyAlign
-```
+" Start interactive EasyAlign in visual mode (e.g. vip<Enter>)
+vmap <Enter> <Plug>(EasyAlign)
 
-However, it is strongly advised that you define mappings for triggering it in
-your `.vimrc` as follows. (Of course you can use any key combination as the
-trigger.)
-
-```vim
-" For visual mode (e.g. vip<Enter>)
-vmap <Enter>   <Plug>(EasyAlign)
-
-" For normal mode, with Vim movement (e.g. <Leader>aip)
+" Start interactive EasyAlign for a motion/text object (e.g. <Leader>aip)
 nmap <Leader>a <Plug>(EasyAlign)
 ```
 
-The advantages of using the above mappings are two-fold:
+With these mappings, you can align text with only a few keystrokes.
 
-- They require less keystrokes
-- They make alignments repeatable with
-  [repeat.vim](https://github.com/tpope/vim-repeat) and
-  [visualrepeat](https://github.com/vim-scripts/visualrepeat)
-
-
-With the mapping, you can align selected lines of text with only a few keystrokes.
-
-1. `<Enter>` key in visual mode, or `<Leader>a` followed by a Vim movement to
-   start interactive EasyAlign command
+1. `<Enter>` key in visual mode, or `<Leader>a` followed by a motion or a text
+   object to start interactive mode
 1. Optional: Enter keys to select alignment mode (left, right, or center)
 1. Optional: N-th delimiter (default: 1)
     - `1`         Around the 1st occurrences of delimiters
@@ -154,9 +149,9 @@ With the mapping, you can align selected lines of text with only a few keystroke
     - `-`         Around the last occurrences of delimiters (`-1`)
     - `-2`        Around the second to last occurrences of delimiters
     - ...
-1. Delimiter key (a single keystroke; `<Space>`, `=`, `:`, `.`, `|`, `&`, `,`)
+1. Delimiter key (a single keystroke; `<Space>`, `=`, `:`, `.`, `|`, `&`, `#`, `,`)
 
-Alignment rules for the following delimiters have been defined to meet the most needs.
+#### Predefined alignment rules
 
 | Delimiter key | Description/Use cases                                                |
 | ------------- | -------------------------------------------------------------------- |
@@ -166,13 +161,14 @@ Alignment rules for the following delimiters have been defined to meet the most
 | `.`           | Multi-line method chaining                                           |
 | `,`           | Multi-line method arguments                                          |
 | `&`           | LaTeX tables (matches `&` and `\\`)                                  |
+| `#`           | Ruby/Python comments                                                 |
 | `<Bar>`       | Table markdown                                                       |
 
 You can override these default rules or define your own rules with
 `g:easy_align_delimiters`, which will be described in
 [the later section](https://github.com/junegunn/vim-easy-align#extending-alignment-rules).
 
-#### Example command sequences
+#### Examples
 
 | With visual map     | Description                        | Equivalent command     |
 | ------------------- | ---------------------------------- | ---------------------- |
@@ -183,7 +179,6 @@ You can override these default rules or define your own rules with
 | `<Enter>:`          | Around 1st colon (`key:  value`)   | `:'<,'>EasyAlign:`     |
 | `<Enter><Right>:`   | Around 1st colon (`key : value`)   | `:'<,'>EasyAlign:s0l1` |
 | `<Enter>=`          | Around 1st operators with =        | `:'<,'>EasyAlign=`     |
-| `<Enter>2=`         | Around 2nd operators with =        | `:'<,'>EasyAlign2=`    |
 | `<Enter>3=`         | Around 3rd operators with =        | `:'<,'>EasyAlign3=`    |
 | `<Enter>*=`         | Around all operators with =        | `:'<,'>EasyAlign*=`    |
 | `<Enter>**=`        | Left-right alternating around =    | `:'<,'>EasyAlign**=`   |
@@ -198,7 +193,7 @@ For example, if you want to align text around all occurrences of numbers:
 
 - `<Enter>`
 - `*`
-- `<CTRL-/>` (or `<CTRL-X>` on GVim)
+- `<CTRL-X>`
   - `[0-9]\+`
 
 #### Alignment options in interactive mode
@@ -221,80 +216,50 @@ keys listed below. The meaning of each option will be described in
 | `<Right>` | `stick_to_left`    | `{ 'stick_to_left': 0, 'left_margin': 1 }`         |
 | `<Down>`  | `*_margin`         | `{ 'left_margin': 0, 'right_margin': 0 }`          |
 
-After a successful alignment, you can repeat the same operation using the
-repeatable, non-interactive command recorded in `g:easy_align_last_command`.
-
-```vim
-:<C-R>=g:easy_align_last_command<Enter><Enter>
-```
-
-### EasyAlign as Vim operator
-
-With normal-mode map to `<Plug>(EasyAlign)`, EasyAlign command becomes a Vim
-operator that can be used with any Vim movement.
-
-```vim
-nmap <Leader>a <Plug>(EasyAlign)
-```
-
-Now without going into visual mode, you can align the lines in the paragraph
-with `<Leader>aip=`, `<Leader>aip*|`, or `<Leader>aip:`. And if you have
-installed [repeat.vim](https://github.com/tpope/vim-repeat) by Tim Pope, the
-exact alignment can be repeated with `.` key.
-
 ### Live interactive mode
 
 If you're performing a complex alignment where multiple options should be
 carefully adjusted, try "live interactive mode" where you can preview the result
 of the alignment on-the-fly as you type in.
 
-Live interactive mode can be started with `:LiveEasyAlign` command which takes
-the same parameters as `:EasyAlign`. I suggest you define mappings such as
-follows in addition to the ones for `:EasyAlign` command.
-
-```vim
-vmap <Leader><Enter> <Plug>(LiveEasyAlign)
-nmap <Leader>A       <Plug>(LiveEasyAlign)
-```
+Live interactive mode can be started with either `<Plug>(LiveEasyAlign)` or
+`:LiveEasyAlign` command.
 
 In live interactive mode, you have to type in the same delimiter (or `CTRL-X` on
 regular expression) again to finalize the alignment. This allows you to preview
 the result of the alignment and freely change the delimiter using backspace key
 without leaving the interactive mode.
 
-### Using `EasyAlign` in command line
+### Non-interactive mode
 
-Instead of going into the interactive mode, you can just type in arguments to
+Instead of starting interactive mode, you can use declarative, non-interactive
 `:EasyAlign` command.
 
 ```vim
 " Using predefined alignment rules
-:EasyAlign[!] [N-th] DELIMITER_KEY [OPTIONS]
+"   :EasyAlign[!] [N-th] DELIMITER_KEY [OPTIONS]
+:EasyAlign :
+:EasyAlign =
+:EasyAlign *=
+:EasyAlign 3\
 
 " Using arbitrary regular expressions
-:EasyAlign[!] [N-th] /REGEXP/ [OPTIONS]
+"   :EasyAlign[!] [N-th] /REGEXP/ [OPTIONS]
+:EasyAlign /[:;]\+/
+:EasyAlign 2/[:;]\+/
+:EasyAlign */[:;]\+/
+:EasyAlign **/[:;]\+/
 ```
 
-For example, when aligning the following lines around colons and semi-colons,
-
-    apple;:banana::cake
-    data;;exchange:;format
-
-try these commands:
-
-- `:EasyAlign /[:;]\+/`
-- `:EasyAlign 2/[:;]\+/`
-- `:EasyAlign */[:;]\+/`
-- `:EasyAlign **/[:;]\+/`
-
-You can also provide a number of alignment options, [which will be discussed in
+A command can end with alignment options, [each of which will be discussed in
 detail later](https://github.com/junegunn/vim-easy-align#alignment-options),
-to EasyAlign command in Vim dictionary format.
+in Vim dictionary format.
 
 - `:EasyAlign * /[:;]\+/ { 'stick_to_left': 1, 'left_margin': 0 }`
 
-Which means that the matched delimiter should be positioned right next to the
-preceding token, without margin on the left. So we get:
+`stick_to_left` of 1 means that the matched delimiter should be positioned right
+next to the preceding token, and `left_margin` of 0 removes the margin on the
+left. So we get:
 
     apple;: banana::   cake
     data;;  exchange:; format
@@ -326,13 +291,13 @@ The following table summarizes the shorthand notation.
 | `mode_sequence`    | `m[lrc*]*` |
 | `indentation`      | `i[ksdn]`  |
 
-For your information, the same thing can be done in the interactive mode as well
-with the following key combination.
+For your information, the same operation can be done in interactive mode as
+follows:
 
 - `<Enter>`
 - `*`
 - `<Left>`
-- `<CTRL-/>` (or `<CTRL-X>` on GVim)
+- `<CTRL-X>`
   - `[:;]\+`
 
 ### Partial alignment in blockwise-visual mode
@@ -406,7 +371,7 @@ There are 4 ways to set alignment options (from lowest precedence to highest):
 With `filter` option, you can align lines that only match or do not match a
 given pattern. There are several ways to set the pattern.
 
-1. Press `CTRL-F` in interactive mode and input `g/pat/` or `v/pat/`
+1. Press `CTRL-F` in interactive mode and type in `g/pat/` or `v/pat/`
 2. In command-line, it can be written in dictionary format: `{'filter': 'g/pat/'}`
 3. Or in shorthand notation: `g/pat/` or `v/pat/`
 
@@ -487,7 +452,9 @@ For example if you set `ignore_groups` option to be an empty list, you get
 }
 ```
 
-Satisfied? :satisfied:
+If a pattern in `ignore_groups` is prepended by a `!`, it will have the opposite
+meaning. For instance, if `ignore_groups` is given as `['!Comment']`, delimiters
+that are *not* highlighted as Comment will be ignored during the alignment.
 
 ### Ignoring unmatched lines
 
@@ -630,8 +597,6 @@ daisy    = 4
 eggplant = 5
 ```
 
-Notice that `idt` is fuzzy-matched to `indentation`.
-
 In interactive mode, you can change the option value with `CTRL-I` key.
 
 ### Alignments over multiple occurrences of delimiters
@@ -708,8 +673,10 @@ You may refer to the definitions of the default alignment rules
 ```vim
 let g:easy_align_delimiters = {
 \ '>': { 'pattern': '>>\|=>\|>' },
-\ '/': { 'pattern': '//\+\|/\*\|\*/', 'ignore_groups': ['String'] },
-\ '#': { 'pattern': '#\+', 'ignore_groups': ['String'], 'delimiter_align': 'l' },
+\ '/': {
+\     'pattern':         '//\+\|/\*\|\*/',
+\     'delimiter_align': 'l',
+\     'ignore_groups':   ['!Comment'] },
 \ ']': {
 \     'pattern':       '[[\]]',
 \     'left_margin':   0,
@@ -723,8 +690,8 @@ let g:easy_align_delimiters = {
 \     'stick_to_left': 0
 \   },
 \ 'd': {
-\     'pattern': ' \(\S\+\s*[;=]\)\@=',
-\     'left_margin': 0,
+\     'pattern':      ' \(\S\+\s*[;=]\)\@=',
+\     'left_margin':  0,
 \     'right_margin': 0
 \   }
 \ }
@@ -776,7 +743,7 @@ for more examples.
 Related work
 ------------
 
-There are two well-known plugins with the same goal as that of vim-easy-align.
+There are two well-known plugins with the same goal as that of easy-align.
 
 - [DrChip's Alignment Tool for Vim](http://www.drchip.org/astronaut/vim/align.html) (herein will be referred to as "Align")
 - [Tabular](https://github.com/godlygeek/tabular)
@@ -784,15 +751,15 @@ There are two well-known plugins with the same goal as that of vim-easy-align.
 Both are great plugins with very large user bases. I actually had been a Tabular
 user for a couple of years before I finally made up my mind to roll out my own.
 
-So why would someone choose vim-easy-align over those two?
+So why would someone choose easy-align over those two?
 
 Feature-by-feature comparison I believe is not quite useful, since a typical
 user will end up using only a small subset of the features.
-So I will mention just a few core benefits of vim-easy-align.
+So I will mention just a few core benefits of easy-align.
 
 ### Ease of use
 
-As the name implies, vim-easy-align is *easier* to use. Its interactive mode
+As the name implies, easy-align is *easier* to use. Its interactive mode
 allows you to achieve what you want with just a few keystrokes.
 The key sequence is mnemonic, so it's easy to remember and execute.
 It even feels like a native Vim command!
@@ -810,17 +777,17 @@ without affecting the ones before it?"_
 
 ### Clean
 
-vim-easy-align doesn't clutter your workspace with mappings and global
+easy-align doesn't clutter your workspace with mappings and global
 variables. All you would need is a single mapping to the interactive EasyAlign
 command, and even that is totally up to you.
 
 ### Optimized for code editing
 
-vim-easy-align by default performs syntax-aware alignment, which is invaluable
+easy-align by default performs syntax-aware alignment, which is invaluable
 when editing codes.
 
 Try to come up with a regular expression to correctly format the following code
-snippet. With vim-easy-align under default configuration and a mapping, it can
+snippet. With easy-align under default configuration and a mapping, it can
 be done with just two keystrokes: `<Enter>:`
 
 ```javascript
@@ -840,13 +807,13 @@ looks up the syntax group of a character on a certain position)
 
 ### Thoroughly tested
 
-Virtually every aspect of vim-easy-align is being tested with a comprehensive
+Virtually every aspect of easy-align is being tested with a comprehensive
 set of test cases using [Vader.vim](https://github.com/junegunn/vader.vim).
 
 ### "Okay. So should I switch?"
 
-Maybe, but I can't really say. I have no ambition to make vim-easy-align
-an absolute superior to the others. For some cases, vim-easy-align works better
+Maybe, but I can't really say. I have no ambition to make easy-align
+an absolute superior to the others. For some cases, easy-align works better
 than the others, but for some other cases, Tabular or Align.vim might be a
 better choice.
 

autoload/easy_align.vim

@@ -26,6 +26,9 @@ if exists("g:loaded_easy_align")
 endif
 let g:loaded_easy_align = 1
 
+let s:cpo_save = &cpo
+set cpo&vim
+
 let s:easy_align_delimiters_default = {
 \  ' ': { 'pattern': ' ',  'left_margin': 0, 'right_margin': 0, 'stick_to_left': 0 },
 \  '=': { 'pattern': '===\|<=>\|\(&&\|||\|<<\|>>\)=\|=\~[#?]\?\|=>\|[:+/*!%^=><&|.-]\?=[#?]\?',
@@ -34,6 +37,7 @@ let s:easy_align_delimiters_default = {
 \  ',': { 'pattern': ',',  'left_margin': 0, 'right_margin': 1, 'stick_to_left': 1 },
 \  '|': { 'pattern': '|',  'left_margin': 1, 'right_margin': 1, 'stick_to_left': 0 },
 \  '.': { 'pattern': '\.', 'left_margin': 0, 'right_margin': 0, 'stick_to_left': 0 },
+\  '#': { 'pattern': '#\+', 'delimiter_align': 'l', 'ignore_groups': ['!Comment']  },
 \  '&': { 'pattern': '\\\@<!&\|\\\\',
 \                          'left_margin': 1, 'right_margin': 1, 'stick_to_left': 0 },
 \  '{': { 'pattern': '(\@<!{',
@@ -64,9 +68,9 @@ let s:shorthand = {
 \ 'mode_sequence': 'm',  'ignores':          'ig', 'filter':          'f'
 \ }
 
-if exists("*strwidth")
+if exists("*strdisplaywidth")
   function! s:strwidth(str)
-    return strwidth(a:str) + len(matchstr(a:str, '^\t*')) * (&tabstop - 1)
+    return strdisplaywidth(a:str)
   endfunction
 else
   function! s:strwidth(str)
@@ -74,11 +78,23 @@ else
   endfunction
 endif
 
+function! s:ceil2(v)
+  return a:v % 2 == 0 ? a:v : a:v + 1
+endfunction
+
+function! s:floor2(v)
+  return a:v % 2 == 0 ? a:v : a:v - 1
+endfunction
+
 function! s:highlighted_as(line, col, groups)
   if empty(a:groups) | return 0 | endif
   let hl = synIDattr(synID(a:line, a:col, 0), 'name')
   for grp in a:groups
-    if hl =~# grp
+    if grp[0] == '!'
+      if hl !~# grp[1:-1]
+        return 1
+      endif
+    elseif hl =~# grp
       return 1
     endif
   endfor
@@ -332,7 +348,7 @@ function! s:do_align(todo, modes, all_tokens, all_delims, fl, ll, fc, lc, nth, r
   let mode       = a:modes[0]
   let lines      = {}
   let min_indent = -1
-  let max = { 'pivot_len': 0.0, 'token_len': 0, 'just_len': 0, 'delim_len': 0,
+  let max = { 'pivot_len2': 0, 'token_len': 0, 'just_len': 0, 'delim_len': 0,
         \ 'indent': 0, 'tokens': 0, 'strip_len': 0 }
   let d = a:dict
   let [f, fx] = s:parse_filter(d.filter)
@@ -410,8 +426,9 @@ function! s:do_align(todo, modes, all_tokens, all_delims, fl, ll, fc, lc, nth, r
     let max.delim_len = max([max.delim_len, s:strwidth(delim)])
 
     if mode ==? 'c'
-      if max.pivot_len < pw + tw / 2.0
-        let max.pivot_len = pw + tw / 2.0
+      let pivot_len2 = pw * 2 + tw
+      if max.pivot_len2 < pivot_len2
+        let max.pivot_len2 = pivot_len2
       endif
       let max.strip_len = max([max.strip_len, s:strwidth(s:trim(token))])
     endif
@@ -432,9 +449,9 @@ function! s:do_align(todo, modes, all_tokens, all_delims, fl, ll, fc, lc, nth, r
     end
 
     if idt !=? 'k'
-      let max.just_len  = 0
-      let max.token_len = 0
-      let max.pivot_len = 0
+      let max.just_len   = 0
+      let max.token_len  = 0
+      let max.pivot_len2 = 0
 
       for [line, elems] in items(lines)
         let [nth, prefix, token, delim] = elems
@@ -460,8 +477,9 @@ function! s:do_align(todo, modes, all_tokens, all_delims, fl, ll, fc, lc, nth, r
         let max.token_len = max([max.token_len, tw])
         let max.just_len  = max([max.just_len,  pw + tw])
         if mode ==? 'c'
-          if max.pivot_len < pw + tw / 2.0
-            let max.pivot_len = pw + tw / 2.0
+          let pivot_len2 = pw * 2 + tw
+          if max.pivot_len2 < pivot_len2
+            let max.pivot_len2 = pivot_len2
           endif
         endif
 
@@ -496,15 +514,15 @@ function! s:do_align(todo, modes, all_tokens, all_delims, fl, ll, fc, lc, nth, r
       let indent = matchstr(token, '^\s*')
       let token = indent . pad . s:ltrim(token)
     elseif mode ==? 'c'
-      let p1  = max.pivot_len - (pw + tw / 2.0)
-      let p2  = (max.token_len - tw) / 2.0
-      let pf1 = floor(p1)
-      if pf1 < p1 | let p2 = ceil(p2)
-      else        | let p2 = floor(p2)
+      let p1  = max.pivot_len2 - (pw * 2 + tw)
+      let p2  = max.token_len - tw
+      let pf1 = s:floor2(p1)
+      if pf1 < p1 | let p2 = s:ceil2(p2)
+      else        | let p2 = s:floor2(p2)
       endif
-      let strip = float2nr(ceil((max.token_len - max.strip_len) / 2.0))
+      let strip = s:ceil2(max.token_len - max.strip_len) / 2
       let indent = matchstr(token, '^\s*')
-      let token = indent. repeat(' ', float2nr(pf1)) .s:ltrim(token). repeat(' ', float2nr(p2))
+      let token = indent. repeat(' ', pf1 / 2) .s:ltrim(token). repeat(' ', p2 / 2)
       let token = substitute(token, repeat(' ', strip) . '$', '', '')
 
       if d.stick_to_left
@@ -1093,3 +1111,6 @@ function! easy_align#align(bang, live, visualmode, expr) range
   endtry
 endfunction
 
+let &cpo = s:cpo_save
+unlet s:cpo_save
+

doc/easy_align.txt

@@ -1,4 +1,4 @@
-easy-align.txt	vim-easy-align	Last change: December 8 2013
+easy-align.txt	vim-easy-align	Last change: May 31 2014
 
 VIM-EASY-ALIGN - TABLE OF CONTENTS         *easyalign* *easy-align* *easy-align-toc*
 ==============================================================================
@@ -10,13 +10,16 @@ VIM-EASY-ALIGN - TABLE OF CONTENTS         *easyalign* *easy-align* *easy-align-
     TLDR - One-minute guide                                   |easy-align-4|
     Usage                                                     |easy-align-5|
         Concept of alignment rule                             |easy-align-5-1|
-        Interactive mode                                      |easy-align-5-2|
-            Example command sequences                         |easy-align-5-2-1|
-            Using regular expressions                         |easy-align-5-2-2|
-            Alignment options in interactive mode             |easy-align-5-2-3|
-        EasyAlign as Vim operator                             |easy-align-5-3|
+        Execution models                                      |easy-align-5-2|
+            1. Using <Plug>   mappings                        |easy-align-5-2-1|
+            2. Using :EasyAlign command                       |easy-align-5-2-2|
+        Interactive mode                                      |easy-align-5-3|
+            Predefined alignment rules                        |easy-align-5-3-1|
+            Examples                                          |easy-align-5-3-2|
+            Using regular expressions                         |easy-align-5-3-3|
+            Alignment options in interactive mode             |easy-align-5-3-4|
         Live interactive mode                                 |easy-align-5-4|
-        Using EasyAlign in command line                       |easy-align-5-5|
+        Non-interactive mode                                  |easy-align-5-5|
         Partial alignment in blockwise-visual mode            |easy-align-5-6|
     Alignment options                                         |easy-align-6|
         List of options                                       |easy-align-6-1|
@@ -97,14 +100,9 @@ Either {download zip file}{2} and extract in ~/.vim or {use}{3} {your}{4}
                       {6} https://github.com/Shougo/neobundle.vim
                       {7} https://github.com/MarcWeber/vim-addon-manager
 
- - {Pathogen}{3}
-     - `git clone https://github.com/junegunn/vim-easy-align.git ~/.vim/bundle/vim-easy-align`
  - {Vundle}{4}
-     - Add `Bundle 'junegunn/vim-easy-align'` to .vimrc
-     - Run `:BundleInstall`
- - {NeoBundle}{6}
-     - Add `NeoBundle 'junegunn/vim-easy-align'` to .vimrc
-     - Run `:NeoBundleInstall`
+     - Add `Plugin 'junegunn/vim-easy-align'` to .vimrc
+     - Run `:PluginInstall`
  - {vim-plug}{5}
      - Add `Plug 'junegunn/vim-easy-align'` to .vimrc
      - Run `:PlugInstall`
@@ -116,17 +114,17 @@ TLDR - ONE-MINUTE GUIDE                       *easy-align-tldr-one-minute-guide*
 
 Add the following mappings to your .vimrc.
 >
-    " Start interactive EasyAlign in visual mode
+    " Start interactive EasyAlign in visual mode (e.g. vip<Enter>)
     vmap <Enter> <Plug>(EasyAlign)
 
-    " Start interactive EasyAlign with a Vim movement
+    " Start interactive EasyAlign for a motion/text object (e.g. <Leader>aip)
     nmap <Leader>a <Plug>(EasyAlign)
 <
 And with the following lines of text,
 >
-    apple = red
-    grass=green
-    sky=blue
+    apple   =red
+    grass+=green
+    sky-=   blue
 <
 try these commands:
 
@@ -140,36 +138,24 @@ try these commands:
 
 Notice that the commands are repeatable with `.` key if you have installed
 {repeat.vim}{8}. Install {visualrepeat}{9} as well if you want to repeat in
-visual mode. Or you can add the following mapping to your .vimrc.
+visual mode.
 
                                {8} https://github.com/tpope/vim-repeat
                                {9} https://github.com/vim-scripts/visualrepeat
->
-    " Repeat alignment in visual mode with . key
-    vmap . <Plug>(EasyAlignRepeat)
-<
+
 
                                                                   *easy-align-5*
 USAGE                                                         *easy-align-usage*
 ==============================================================================
 
-                                                        *:EasyAlign* *:EasyAlign!*
-
-vim-easy-align defines `:EasyAlign` command (and the right-align variant
-`:EasyAlign!`).
-
- Mode                      | Command~
- ------------------------- | ------------------------------------------------
- Interactive mode          | `:EasyAlign[!] [OPTIONS]`
- Using predefined rules    | `:EasyAlign[!] [N-th] DELIMITER_KEY [OPTIONS]`
- Using regular expressions | `:EasyAlign[!] [N-th] /REGEXP/ [OPTIONS]`
- Live interactive mode     | `:LiveEasyAlign[!] [...]`
-
 
 < Concept of alignment rule >_________________________________________________~
                                           *easy-align-concept-of-alignment-rule*
                                                                 *easy-align-5-1*
 
+Though easy-align can align lines of text around any delimiter, it provides
+shortcuts for the most common use cases with the concept of "alignment rule".
+
 An alignment rule is a predefined set of options for common alignment tasks,
 which is identified by a single character, DELIMITER KEY, such as <Space> ,
 `=`, `:`, `.`, `|`, `&`, and `,`.
@@ -178,34 +164,63 @@ Think of it as a shortcut. Instead of writing regular expression and setting
 several options, you can just type in a single character.
 
 
-< Interactive mode >__________________________________________________________~
-                                                   *easy-align-interactive-mode*
+< Execution models >__________________________________________________________~
+                                                   *easy-align-execution-models*
                                                                 *easy-align-5-2*
 
-The command will go into the interactive mode when no argument is given.
->
-    :EasyAlign
-<
-However, it is strongly advised that you define mappings for triggering it in
-your `.vimrc` as follows. (Of course you can use any key combination as the
-trigger.)
->
-    " For visual mode (e.g. vip<Enter>)
-    vmap <Enter>   <Plug>(EasyAlign)
+There are two ways to use easy-align.
 
-    " For normal mode, with Vim movement (e.g. <Leader>aip)
+
+1. Using <Plug>   mappings~
+                                              *easy-align-1-using-plug-mappings*
+                                                              *easy-align-5-2-1*
+
+The recommended method is to use <Plug> mappings as described earlier.
+
+                                       *<Plug>(EasyAlign)* *<Plug>(LiveEasyAlign)*
+
+ Mapping                 | Mode   | Description~
+ ----------------------- | ------ | ----------------------------------------------------
+ <Plug>(EasyAlign)       | normal | Start interactive mode for a motion/text object
+ <Plug>(EasyAlign)       | visual | Start interactive mode for the selection
+ <Plug>(LiveEasyAlign)   | normal | Start live-interactive mode for a motion/text object
+ <Plug>(LiveEasyAlign)   | visual | Start live-interactive mode for the selection
+
+
+2. Using :EasyAlign command~
+                                          *easy-align-2-using-easyalign-command*
+                                                              *easy-align-5-2-2*
+
+                                                                    *:EasyAlign*
+
+If you prefer command-line or do not want to start interactive mode, you can
+use `:EasyAlign` command instead.
+
+ Mode                                       | Command~
+ ------------------------------------------ | ------------------------------------------------
+ Interactive mode                           | `:EasyAlign[!] [OPTIONS]`
+ Live interactive mode                      | `:LiveEasyAlign[!] [...]`
+ Non-interactive mode (predefined rules)    | `:EasyAlign[!] [N-th] DELIMITER_KEY [OPTIONS]`
+ Non-interactive mode (regular expressions) | `:EasyAlign[!] [N-th] /REGEXP/ [OPTIONS]`
+
+
+< Interactive mode >__________________________________________________________~
+                                                   *easy-align-interactive-mode*
+                                                                *easy-align-5-3*
+
+The following sections will assume that you have <Plug>(EasyAlign) mappings in
+your .vimrc as below:
+>
+    " Start interactive EasyAlign in visual mode (e.g. vip<Enter>)
+    vmap <Enter> <Plug>(EasyAlign)
+
+    " Start interactive EasyAlign for a motion/text object (e.g. <Leader>aip)
     nmap <Leader>a <Plug>(EasyAlign)
 <
-The advantages of using the above mappings are two-fold:
+With these mappings, you can align text with only a few keystrokes.
 
- - They require less keystrokes
- - They make alignments repeatable with {repeat.vim}{8} and {visualrepeat}{9}
-
-With the mapping, you can align selected lines of text with only a few
-keystrokes.
-
- 1. <Enter> key in visual mode, or <Leader>a followed by a Vim movement to start
-    interactive EasyAlign command
+ 1. <Enter> key in visual mode, or <Leader>a followed by a motion or a text object
+    to start interactive mode
  2. Optional: Enter keys to select alignment mode (left, right, or center)
  3. Optional: N-th delimiter (default: 1)
      - `1` Around the 1st occurrences of delimiters
@@ -218,8 +233,10 @@ keystrokes.
      - ...
  4. Delimiter key (a single keystroke; <Space> , `=`, `:`, `.`, `|`, `&`, `,`)
 
-Alignment rules for the following delimiters have been defined to meet the most
-needs.
+
+Predefined alignment rules~
+                                         *easy-align-predefined-alignment-rules*
+                                                              *easy-align-5-3-1*
 
  Delimiter key | Description/Use cases~
  ------------- | --------------------------------------------------------------------
@@ -238,9 +255,9 @@ You can override these default rules or define your own rules with
 (|easy-align-extending-alignment-rules|).
 
 
-< Example command sequences >_________________________________________________~
-                                          *easy-align-example-command-sequences*
-                                                              *easy-align-5-2-1*
+Examples~
+                                                           *easy-align-examples*
+                                                              *easy-align-5-3-2*
 
  With visual map     | Description                        | Equivalent command~
  ------------------- | ---------------------------------- | ----------------------
@@ -251,7 +268,6 @@ You can override these default rules or define your own rules with
  <Enter>:            | Around 1st colon (`key:  value`)   | :'<,'>EasyAlign:
  <Enter><Right>:     | Around 1st colon (`key : value`)   | :'<,'>EasyAlign:s0l1
  <Enter>=            | Around 1st operators with =        | :'<,'>EasyAlign=
- <Enter>2=           | Around 2nd operators with =        | :'<,'>EasyAlign2=
  <Enter>3=           | Around 3rd operators with =        | :'<,'>EasyAlign3=
  <Enter>*=           | Around all operators with =        | :'<,'>EasyAlign*=
  <Enter>**=          | Left-right alternating around =    | :'<,'>EasyAlign**=
@@ -259,9 +275,9 @@ You can override these default rules or define your own rules with
  <Enter><Enter>**=   | Right-left alternating around =    | :'<,'>EasyAlign!**=
 
 
-< Using regular expressions >_________________________________________________~
+Using regular expressions~
                                           *easy-align-using-regular-expressions*
-                                                              *easy-align-5-2-2*
+                                                              *easy-align-5-3-3*
 
 Instead of finishing the command with a predefined delimiter key, you can type
 in a regular expression after CTRL-/ or CTRL-X key. For example, if you want to
@@ -269,13 +285,13 @@ align text around all occurrences of numbers:
 
  - <Enter>
  - `*`
- - CTRL-/ (or CTRL-X on GVim)
+ - CTRL-X
      - `[0-9]\+`
 
 
-< Alignment options in interactive mode >_____________________________________~
+Alignment options in interactive mode~
                               *easy-align-alignment-options-in-interactive-mode*
-                                                              *easy-align-5-2-3*
+                                                              *easy-align-5-3-4*
 
 While in interactive mode, you can set alignment options using special shortcut
 keys listed below. The meaning of each option will be described in the
@@ -295,31 +311,6 @@ following sections (|easy-align-alignment-options|).
  <Right>   | `stick_to_left`      | `{ 'stick_to_left': 0, 'left_margin': 1 }`
  <Down>    | `*_margin`           | `{ 'left_margin': 0, 'right_margin': 0 }`
 
-                                                     *g:easy_align_last_command*
-
-After a successful alignment, you can repeat the same operation using the
-repeatable, non-interactive command recorded in `g:easy_align_last_command`.
->
-    :<C-R>=g:easy_align_last_command<Enter><Enter>
-<
-
-< EasyAlign as Vim operator >_________________________________________________~
-                                          *easy-align-easyalign-as-vim-operator*
-                                                                *easy-align-5-3*
-
-                                                             *<Plug>(EasyAlign)*
-
-With normal-mode map to <Plug>(EasyAlign) , EasyAlign command becomes a Vim
-operator that can be used with any Vim movement.
->
-    nmap <Leader>a <Plug>(EasyAlign)
-<
-Now without going into visual mode, you can align the lines in the paragraph
-with <Leader>aip= , <Leader>aip*| , or <Leader>aip: . And if you have installed
-{repeat.vim}{8} by Tim Pope, the exact alignment can be repeated with `.` key.
-
-                                       {8} https://github.com/tpope/vim-repeat
-
 
 < Live interactive mode >_____________________________________________________~
                                               *easy-align-live-interactive-mode*
@@ -331,52 +322,44 @@ result of the alignment on-the-fly as you type in.
 
                                                                 *:LiveEasyAlign*
 
-Live interactive mode can be started with `:LiveEasyAlign` command which takes
-the same parameters as `:EasyAlign`. I suggest you define mappings such as
-follows in addition to the ones for `:EasyAlign` command.
->
-    vmap <Leader><Enter> <Plug>(LiveEasyAlign)
-    nmap <Leader>A       <Plug>(LiveEasyAlign)
-<
+Live interactive mode can be started with either <Plug>(LiveEasyAlign) or
+`:LiveEasyAlign` command.
+
 In live interactive mode, you have to type in the same delimiter (or CTRL-X on
 regular expression) again to finalize the alignment. This allows you to preview
 the result of the alignment and freely change the delimiter using backspace key
 without leaving the interactive mode.
 
 
-< Using EasyAlign in command line >___________________________________________~
-                                    *easy-align-using-easyalign-in-command-line*
+< Non-interactive mode >______________________________________________________~
+                                               *easy-align-non-interactive-mode*
                                                                 *easy-align-5-5*
 
-Instead of going into the interactive mode, you can just type in arguments to
+Instead of starting interactive mode, you can use declarative, non-interactive
 `:EasyAlign` command.
 >
     " Using predefined alignment rules
-    :EasyAlign[!] [N-th] DELIMITER_KEY [OPTIONS]
+    "   :EasyAlign[!] [N-th] DELIMITER_KEY [OPTIONS]
+    :EasyAlign :
+    :EasyAlign =
+    :EasyAlign *=
+    :EasyAlign 3\
 
     " Using arbitrary regular expressions
-    :EasyAlign[!] [N-th] /REGEXP/ [OPTIONS]
+    "   :EasyAlign[!] [N-th] /REGEXP/ [OPTIONS]
+    :EasyAlign /[:;]\+/
+    :EasyAlign 2/[:;]\+/
+    :EasyAlign */[:;]\+/
+    :EasyAlign **/[:;]\+/
 <
-For example, when aligning the following lines around colons and semi-colons,
->
-    apple;:banana::cake
-    data;;exchange:;format
-<
-try these commands:
-
- - `:EasyAlign /[:;]\+/`
- - `:EasyAlign 2/[:;]\+/`
- - `:EasyAlign */[:;]\+/`
- - `:EasyAlign **/[:;]\+/`
-
-You can also provide a number of alignment options, which will be discussed in
-detail later (|easy-align-alignment-options|), to EasyAlign command in Vim
-dictionary format.
+A command can end with alignment options, each of which will be discussed in
+detail later (|easy-align-alignment-options|), in Vim dictionary format.
 
  - `:EasyAlign * /[:;]\+/ { 'stick_to_left': 1, 'left_margin': 0 }`
 
-Which means that the matched delimiter should be positioned right next to the
-preceding token, without margin on the left. So we get:
+`stick_to_left` of 1 means that the matched delimiter should be positioned
+right next to the preceding token, and `left_margin` of 0 removes the margin on
+the left. So we get:
 >
     apple;: banana::   cake
     data;;  exchange:; format
@@ -408,13 +391,13 @@ The following table summarizes the shorthand notation.
  `mode_sequence`      | `m[lrc*]*`
  `indentation`        | `i[ksdn]`
 
-For your information, the same thing can be done in the interactive mode as
-well with the following key combination.
+For your information, the same operation can be done in interactive mode as
+follows:
 
  - <Enter>
  - `*`
  - <Left>
- - CTRL-/ (or CTRL-X on GVim)
+ - CTRL-X
      - `[:;]\+`
 
 
@@ -497,15 +480,15 @@ There are 4 ways to set alignment options (from lowest precedence to highest):
 With `filter` option, you can align lines that only match or do not match a
 given pattern. There are several ways to set the pattern.
 
- 1. Press CTRL-F in interactive mode and input `g/pat/` or `v/pat/`
+ 1. Press CTRL-F in interactive mode and type in `g/pat/` or `v/pat/`
  2. In command-line, it can be written in dictionary format: `{'filter': 'g/pat/'}`
  3. Or in shorthand notation: `g/pat/` or `v/pat/`
 
 (You don't need to escape '/'s in the regular expression)
 
 
-< Examples >__________________________________________________________________~
-                                                           *easy-align-examples*
+Examples~
+                                                         *easy-align-examples-2*
                                                               *easy-align-6-2-1*
 >
     " Start interactive mode with filter option set to g/hello/
@@ -710,8 +693,6 @@ then again we have `indentation` option. See the following example.
     daisy    = 4
     eggplant = 5
 <
-Notice that `idt` is fuzzy-matched to `indentation`.
-
 In interactive mode, you can change the option value with CTRL-I key.
 
 
@@ -787,8 +768,8 @@ You may refer to the definitions of the default alignment rules {here}{10}.
 {10} https://github.com/junegunn/vim-easy-align/blob/2.9.0/autoload/easy_align.vim#L29
 
 
-< Examples >__________________________________________________________________~
-                                                         *easy-align-examples-2*
+Examples~
+                                                         *easy-align-examples-3*
                                                               *easy-align-6-8-1*
 >
     let g:easy_align_delimiters = {
@@ -853,6 +834,9 @@ version first starts in right-alignment mode.
 
 If you do not prefer this default mode transition, you can define your own
 settings as follows.
+
+                                                *g:easy_align_interactive_modes*
+                                           *g:easy_align_bang_interactive_modes*
 >
     let g:easy_align_interactive_modes = ['l', 'r']
     let g:easy_align_bang_interactive_modes = ['c', 'r']
@@ -871,7 +855,7 @@ See {EXAMPLES.md}{12} for more examples.
 RELATED WORK                                           *easy-align-related-work*
 ==============================================================================
 
-There are two well-known plugins with the same goal as that of vim-easy-align.
+There are two well-known plugins with the same goal as that of easy-align.
 
  - {DrChip's Alignment Tool for Vim}{13} (herein will be referred to as "Align")
  - {Tabular}{14}
@@ -880,21 +864,21 @@ Both are great plugins with very large user bases. I actually had been a
 Tabular user for a couple of years before I finally made up my mind to roll out
 my own.
 
-So why would someone choose vim-easy-align over those two?
+So why would someone choose easy-align over those two?
 
 Feature-by-feature comparison I believe is not quite useful, since a typical
 user will end up using only a small subset of the features. So I will mention
-just a few core benefits of vim-easy-align.
+just a few core benefits of easy-align.
 
 
 < Ease of use >_______________________________________________________________~
                                                         *easy-align-ease-of-use*
                                                                 *easy-align-9-1*
 
-As the name implies, vim-easy-align is easier to use. Its interactive mode
-allows you to achieve what you want with just a few keystrokes. The key
-sequence is mnemonic, so it's easy to remember and execute. It even feels like
-a native Vim command!
+As the name implies, easy-align is easier to use. Its interactive mode allows
+you to achieve what you want with just a few keystrokes. The key sequence is
+mnemonic, so it's easy to remember and execute. It even feels like a native Vim
+command!
 
  - Right-align: <Enter><Enter>
  - around the second occurrences: `2`
@@ -912,21 +896,21 @@ without affecting the ones before it?"
                                                               *easy-align-clean*
                                                                 *easy-align-9-2*
 
-vim-easy-align doesn't clutter your workspace with mappings and global
-variables. All you would need is a single mapping to the interactive EasyAlign
-command, and even that is totally up to you.
+easy-align doesn't clutter your workspace with mappings and global variables.
+All you would need is a single mapping to the interactive EasyAlign command,
+and even that is totally up to you.
 
 
 < Optimized for code editing >________________________________________________~
                                          *easy-align-optimized-for-code-editing*
                                                                 *easy-align-9-3*
 
-vim-easy-align by default performs syntax-aware alignment, which is invaluable
-when editing codes.
+easy-align by default performs syntax-aware alignment, which is invaluable when
+editing codes.
 
 Try to come up with a regular expression to correctly format the following code
-snippet. With vim-easy-align under default configuration and a mapping, it can
-be done with just two keystrokes: <Enter>:
+snippet. With easy-align under default configuration and a mapping, it can be
+done with just two keystrokes: <Enter>:
 >
     var jdbc = {
       // JDBC driver for MySQL database:
@@ -937,8 +921,6 @@ be done with just two keystrokes: <Enter>:
       "user:pass":"r00t:pa55"
     };
 <
-                                                                   *g:AlignSkip*
-
 (To be fair, Align also can be configured to consider syntax highlighting with
 `g:AlignSkip` function reference which should point to a custom function that
 looks up the syntax group of a character on a certain position)
@@ -948,8 +930,8 @@ looks up the syntax group of a character on a certain position)
                                                   *easy-align-thoroughly-tested*
                                                                 *easy-align-9-4*
 
-Virtually every aspect of vim-easy-align is being tested with a comprehensive
-set of test cases using {Vader.vim}{15}.
+Virtually every aspect of easy-align is being tested with a comprehensive set
+of test cases using {Vader.vim}{15}.
 
                                     {15} https://github.com/junegunn/vader.vim
 
@@ -958,10 +940,10 @@ set of test cases using {Vader.vim}{15}.
                                             *easy-align-okay-so-should-i-switch*
                                                                 *easy-align-9-5*
 
-Maybe, but I can't really say. I have no ambition to make vim-easy-align an
-absolute superior to the others. For some cases, vim-easy-align works better
-than the others, but for some other cases, Tabular or Align.vim might be a
-better choice.
+Maybe, but I can't really say. I have no ambition to make easy-align an
+absolute superior to the others. For some cases, easy-align works better than
+the others, but for some other cases, Tabular or Align.vim might be a better
+choice.
 
 So try it yourself and see if it works for you!
 

plugin/easy_align.vim

@@ -31,8 +31,12 @@ command! -nargs=* -range -bang LiveEasyAlign <line1>,<line2>call easy_align#alig
 
 let s:last_command = 'EasyAlign'
 
+function! s:abs(v)
+  return a:v >= 0 ? a:v : - a:v
+endfunction
+
 function! s:remember_visual(mode)
-  let s:last_visual = [a:mode, abs(line("'>") - line("'<")), abs(col("'>") - col("'<"))]
+  let s:last_visual = [a:mode, s:abs(line("'>") - line("'<")), s:abs(col("'>") - col("'<"))]
 endfunction
 
 function! s:repeat_visual()

test/README.md

@@ -7,7 +7,7 @@ Test cases for vim-easy-align
 
 ### Run
 
-```vim
-:Vader*
+```
+./run
 ```
 

test/commandline.vader

@@ -1,14 +1,4 @@
-Execute (Clean up test environment):
-  Save g:easy_align_ignore_groups,     g:easy_align_ignore_unmatched
-  Save g:easy_align_indentation,       g:easy_align_delimiter_align
-  Save g:easy_align_interactive_modes, g:easy_align_bang_interactive_modes
-  Save g:easy_align_delimiters
-
-  let g:easy_align_delimiters = {}
-  silent! unlet g:easy_align_ignore_groups
-  silent! unlet g:easy_align_ignore_unmatched
-  silent! unlet g:easy_align_indentation
-  silent! unlet g:easy_align_delimiter_align
+Include: include/setup.vader
 
 Given (fruits):
   apple;:;;banana::cake
@@ -161,5 +151,4 @@ Expect javascript:
     "user:    pass": "r00t: pa55"
   };
 
-Execute:
-  Restore
+Include: include/teardown.vader

test/fixed.vader

@@ -1,5 +1,4 @@
-Execute:
-  Save &tabstop
+Include: include/setup.vader
 
 Given (Table):
   |a|b|c|d|
@@ -118,5 +117,26 @@ Expect:
   		n2gv = {}
   		n2vt = {}
 
+Given (Tab-indented code (#20)):
+  class MyUnitTest(unittest.TestCase):
+  	def test_base(self):
+  	# 	n2f= {}
+  	## 	n2v= {}
+  	# 	f2v = {}
+  	## 	n2gv  = {}
+  	# 	n2vt   = {}
+
 Execute:
-  Restore
+  set tabstop=12
+  %EasyAlign=
+
+Expect:
+  class MyUnitTest(unittest.TestCase):
+  	def test_base(self):
+  	# 	n2f  = {}
+  	## 	n2v  = {}
+  	# 	f2v  = {}
+  	## 	n2gv = {}
+  	# 	n2vt = {}
+
+Include: include/teardown.vader

test/fixme.vader

@@ -1,3 +1,5 @@
+Include: include/setup.vader
+
 # It is currently possible that EasyAlign command incorrectly judges
 # that it was executed in block-wise visual mode
 Given:
@@ -18,3 +20,5 @@ Do (TODO Workaround: reset visualmode() on error):
 Expect:
   a | b | c
 
+Include: include/teardown.vader
+

test/include/setup.vader

@@ -0,0 +1,32 @@
+Execute (Clean up test environment):
+  Save g:easy_align_ignore_groups,     g:easy_align_ignore_unmatched
+  Save g:easy_align_indentation,       g:easy_align_delimiter_align
+  Save g:easy_align_interactive_modes, g:easy_align_bang_interactive_modes
+  Save g:easy_align_delimiters,        g:easy_align_bypass_fold
+  Save &tabstop, mapleader
+
+  unlet! g:easy_align_ignore_groups
+  unlet! g:easy_align_ignore_unmatched
+  unlet! g:easy_align_indentation
+  unlet! g:easy_align_delimiter_align
+  unlet! g:easy_align_interactive_modes
+  unlet! g:easy_align_bang_interactive_modes
+  unlet! g:easy_align_bypass_fold
+
+  let g:easy_align_delimiters = {}
+  let mapleader = ' '
+  vnoremap <silent> r<Enter>         :EasyAlign!<Enter>
+  vnoremap <silent> <Leader>r<Enter> :LiveEasyAlign!<Enter>
+
+  " " Legacy
+  " vnoremap <silent> <Enter>          :EasyAlign<Enter>
+  " vnoremap <silent> <Leader><Enter>  :LiveEasyAlign<Enter>
+  " nmap <leader>A <Plug>(EasyAlignOperator)
+
+  set ts=2
+
+  vmap <Enter>         <Plug>(EasyAlign)
+  vmap <leader><Enter> <Plug>(LiveEasyAlign)
+  nmap <leader>A       <Plug>(EasyAlign)
+  vmap <leader>.       <Plug>(EasyAlignRepeat)
+

test/include/teardown.vader

@@ -0,0 +1,3 @@
+Execute:
+  Restore
+

test/interactive.vader

@@ -1,32 +1,4 @@
-Execute (Clean up test environment):
-  Save g:easy_align_ignore_groups,     g:easy_align_ignore_unmatched
-  Save g:easy_align_indentation,       g:easy_align_delimiter_align
-  Save g:easy_align_interactive_modes, g:easy_align_bang_interactive_modes
-  Save g:easy_align_delimiters,        &tabstop
-  Save mapleader
-
-  " TODO: revert after test
-  silent! unlet g:easy_align_ignore_groups
-  silent! unlet g:easy_align_ignore_unmatched
-  silent! unlet g:easy_align_indentation
-  silent! unlet g:easy_align_delimiter_align
-  silent! unlet g:easy_align_interactive_modes
-  silent! unlet g:easy_align_bang_interactive_modes
-
-  let g:easy_align_delimiters = {}
-  let mapleader = ' '
-  vnoremap <silent> r<Enter>         :EasyAlign!<Enter>
-  vnoremap <silent> <Leader>r<Enter> :LiveEasyAlign!<Enter>
-
-  " " Legacy
-  " vnoremap <silent> <Enter>          :EasyAlign<Enter>
-  " vnoremap <silent> <Leader><Enter>  :LiveEasyAlign<Enter>
-  " nmap <leader>A <Plug>(EasyAlignOperator)
-
-  vmap <Enter>         <Plug>(EasyAlign)
-  vmap <leader><Enter> <Plug>(LiveEasyAlign)
-  nmap <leader>A       <Plug>(EasyAlign)
-  vmap <leader>.       <Plug>(EasyAlignRepeat)
+Include: include/setup.vader
 
 ###########################################################
 
@@ -921,10 +893,6 @@ Expect ruby:
   apricot = 'DAD' +      'F#AD'
   banana = 'Gros Michel' ## comment 2
 
-Execute (define # rule):
-  let g:easy_align_delimiters =
-  \ { '#': { 'pattern': '#\+', 'ignores': ['String'], 'delimiter_align': 'l' } }
-
 Do (using # rule):
   vip\<Enter>\<C-U>#
 
@@ -1619,6 +1587,5 @@ Expect:
   :: :: f : 6
 
 ###########################################################
-Execute:
-  Restore
 
+Include: include/teardown.vader

test/run

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+cd $(dirname $BASH_SOURCE)
+
+vim -Nu <(cat << EOF
+syntax on
+for dep in ['vader.vim', 'vim-repeat']
+  execute 'set rtp+=' . finddir(dep, expand('~/.vim').'/**')
+endfor
+set rtp+=..
+EOF) +Vader*

test/tex.vader

@@ -1,8 +1,6 @@
 # http://en.wikibooks.org/wiki/LaTeX/Tables
-Execute:
-  Save g:easy_align_delimiters, g:easy_align_bypass_fold
-  let g:easy_align_delimiters = {}
-  silent! unlet g:easy_align_bypass_fold
+
+Include: include/setup.vader
 
 Given tex (table with escaped &):
   \begin{tabular}{ l c r }
@@ -157,5 +155,4 @@ Expect tex:
     8192 & 9.45\e2 & 0.0 & 4.51\e2 & 0.0 &  &  &         &     &         &     \\
   \end{tabular}
 
-Execute:
-  Restore
+Include: include/teardown.vader