Resolve syntax highlighting group in neovim/treesitter (#160 )

Co-authored-by: Junegunn Choi <junegunn.c@gmail.com>
Allow 'easy-align.txt' to be listed in the LOCAL ADDITIONS section of help.txt
2025-11-17 06:13:41 -05:00 · 2024-04-13 12:21:42 +09:00 · 2019-04-29 13:32:31 +09:00 · 2017-06-03 22:10:13 +09:00 · 2017-06-01 01:15:46 +09:00 · 2017-05-31 21:18:52 +05:30
26 changed files with 4933 additions and 1336 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,4 @@
+.travis.yml    export-ignore
 .gitattributes export-ignore
 .gitignore     export-ignore
 doc/tags       export-ignore
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,15 @@
+language: vim
+
+before_script: |
+  git clone https://github.com/junegunn/vader.vim.git
+  git clone https://github.com/tpope/vim-repeat
+
+script: |
+  vim -Nu <(cat << VIMRC
+  filetype off
+  set rtp+=vader.vim
+  set rtp+=vim-repeat
+  set rtp+=.
+  filetype plugin indent on
+  syntax enable
+  VIMRC) -c 'Vader! test/*' > /dev/null
--- a/EXAMPLES.md
+++ b/EXAMPLES.md
@@ -1,14 +1,23 @@
-vim-easy-align examples
-=======================
+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 the following mappings in your .vimrc.

 ```vim
-vnoremap <silent> <Enter> :EasyAlign<cr>
+" Start interactive EasyAlign in visual mode (e.g. vipga)
+xmap ga <Plug>(EasyAlign)
+
+" Start interactive EasyAlign for a motion/text object (e.g. gaip)
+nmap ga <Plug>(EasyAlign)
 ```

+You can use either of the maps. Place the cursor on the paragraph and press
+
+- `gaip` "(ga) start easy-align on (i)nner (p)aragraph"
+- or `vipga` "(v)isual-select (i)nner (p)aragraph and (ga) start easy-align"
+
 To enable syntax highlighting in the code blocks, define and call the following
 function.

@@ -33,13 +42,16 @@ Alignment around whitespaces

 You can align text around whitespaces with `<space>` delimiter key.

-Try these commands:
+Start the interactive mode as described above (`gaip` or `vipga`) and try
+these commands:
+
+- `<space>`
+- `2<space>`
+- `*<space>`
+- `-<space>`
+- `-2<space>`
 - `<Enter><space>`
- `<Enter>2<space>`
 - `<Enter>*<space>`
- `<Enter>-<space>`
- `<Enter>-2<space>`
- `<Enter><Enter><space>`
 - `<Enter><Enter>*<space>`

 ### Example
@@ -56,11 +68,13 @@ Pete Best 1941
 Formatting table
 ----------------

-Try these commands:
+Again, start the interactive mode and try these commands:
+
+- `*|`
+- `**|`
 - `<Enter>*|`
 - `<Enter>**|`
 - `<Enter><Enter>*|`
- `<Enter><Enter>**|`

 ### Example

@@ -82,14 +96,16 @@ Try these commands:
 Alignment around =
 ------------------

-The default rule for delimiter key `=` aligns around a whole family of operators
-containing `=` character.
+The default rule for delimiter key `=` aligns around a whole family of
+operators containing `=` character.

-Try these commands:
- `<Enter>=`
- `<Enter>*=`
+Try these commands in the interactive mode.
+
+- `=`
+- `*=`
+- `**=`
 - `<Enter>**=`
- `<Enter><Enter>**=`
+- `<Enter><Enter>*=`

 ### Example

@@ -125,8 +141,8 @@ gg <=> ee
 Formatting YAML (or JSON)
 -------------------------

-Try `<Enter>:` here, to align text around only the first occurrences of colons.
-In this case, you don't want to align around all the colons: `<Enter>*:`.
+You can use `:`-rule here to align text around only the first occurrences of
+colons. In this case, you don't want to align around all the colons: `*:`.

 ```yaml
 mysql:
@@ -141,7 +157,7 @@ mysql:
 Formatting multi-line method chaining
 -------------------------------------

-Try `<Enter>.` or `<Enter>*.` on the following lines.
+Try `.` or `*.` on the following lines.

 ```ruby
 my_object
@@ -163,12 +179,12 @@ my_object
 ```


-Using blockwise-visual mode or negative field index
---------------------------------------------------
+Using blockwise-visual mode or negative N-th parameter
+------------------------------------------------------

 You can try either:
- select text around `=>` in blockwise-visual mode (`CTRL-V`) and `<Enter>=`
- or `<Enter>-=`
+- select text around `=>` in blockwise-visual mode (`CTRL-V`) and `ga=`
+- or `gaip-=`

 ```ruby
 options = { :caching => nil,
@@ -179,8 +195,7 @@ options = { :caching => nil,
 Commas
 ------

-There is also a predefined rule for commas, try `<Enter>*,` on the following
-lines.
+There is also a predefined rule for commas, try `*,`.

 ```
 aaa,   bb,c
@@ -194,7 +209,7 @@ Ignoring delimiters in comments or strings
 ------------------------------------------

 Delimiters highlighted as comments or strings are ignored by default, try
-`<Enter>*=` on the following lines.
+`gaip*=` on the following lines.

 ```c

@@ -211,14 +226,17 @@ 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
 ```

-So, how do we align the trailing comments in the above lines?
-Simply try `<Enter>-<space>`. The spaces in the comments are ignored, so the
-trailing comment in each line is considered to be a single chunk.
+So, how do we align the trailing comments in the above lines? Simply try
+`-<space>`. The spaces in the comments are ignored, so the trailing comment in
+each line is considered to be a single chunk.

 But that doesn't work in the following case.

@@ -237,13 +255,13 @@ So, let's define a custom mapping for `#`.
 if !exists('g:easy_align_delimiters')
  let g:easy_align_delimiters = {}
 endif
-let g:easy_align_delimiters['#'] = { 'pattern': '#', 'ignores': ['String'] } }
+let g:easy_align_delimiters['#'] = { 'pattern': '#', 'ignore_groups': ['String'] }
 ```

-Notice that the rule overrides `ignores` attribute in order *not to ignore*
+Notice that the rule overrides `ignore_groups` attribute in order *not to ignore*
 delimiters highlighted as comments.

-Then on `<Enter>#`, we get
+Then on `#`, we get

 ```ruby
 apple = 1         # comment not aligned
@@ -256,13 +274,16 @@ command:

 ```vim
 " Using regular expression /#/
-" - "is" is fuzzy-matched to "*i*gnore*s*"
-:EasyAlign/#/{'is':['String']}
+" - "ig" is a shorthand notation of "ignore_groups"
+:EasyAlign/#/{'ig':['String']}
+
+" Or more concisely with the shorthand notation;
+:EasyAlign/#/ig['String']
 ```

-In this case, the second line is ignored as it doesn't contain a `#`. (The one
-highlighted as String is ignored.) If you don't want the second line to be
-ignored, there are three options:
+In this case, the second line is ignored as it doesn't contain a `#` (The one
+in `'F#AD'` is ignored as it's highlighted as String). If you don't want the
+second line to be ignored, there are three options:

 1. Set global `g:easy_align_ignore_unmatched` flag to 0
 2. Use `:EasyAlign` command with `ignore_unmatched` option
@@ -274,15 +295,17 @@ let g:easy_align_ignore_unmatched = 0

 " 2. Using :EasyAlign command with ignore_unmatched option
 " 2-1. Using predefined rule with delimiter key #
-"      - "iu" is fuzzy-matched to "*i*gnore_*u*nmatched"
+"      - "iu" is expanded to "*i*gnore_*u*nmatched"
 :EasyAlign#{'iu':0}
+" or
+:EasyAlign#iu0

 " 2-2. Using regular expression /#/
-:EasyAlign/#/{'is':['String'],'iu':0}
+:EasyAlign/#/ig['String']iu0

 " 3. Update the alignment rule with ignore_unmatched option
 let g:easy_align_delimiters['#'] = {
-  \ 'pattern': '#', 'ignores': ['String'], 'ignore_unmatched': 0 } }
+  \ 'pattern': '#', 'ignore_groups': ['String'], 'ignore_unmatched': 0 }
 ```

 Then we get,
@@ -305,7 +328,7 @@ static double pi = 3.14;
 ```

 We can align these lines with the predefined `=` rule. Select the lines and
-press `<Enter>=`
+press `ga=`

 ```c
 const char* str  = "Hello";
@@ -315,7 +338,7 @@ static double pi = 3.14;

 Not bad. However, the names of the variables, `str`, `count`, and `pi` are not
 aligned with each other. Can we do better? We can clearly see that simple
-`<Enter><space>` won't properly align those names.
+`<space>`-rule won't properly align those names.
 So let's define an alignment rule than can handle this case.

 ```vim
@@ -326,7 +349,7 @@ let g:easy_align_delimiters['d'] = {
 ```

 This new rule aligns text around spaces that are *not* preceded by
-`const` or `static`. Let's try it with `<Enter>d`.
+`const` or `static`. Let's select the lines and try `gad`.

 ```c
 const char*   str = "Hello";
@@ -335,7 +358,7 @@ static double pi = 3.14;
 ```

 Okay, the names are now aligned. We select the lines again with `gv`, and then
-press `<Enter>=` to finish our alignment.
+press `ga=` to finish our alignment.

 ```c
 const char*   str   = "Hello";
@@ -366,14 +389,14 @@ So what do we do? Let's try to improve our alignment rule.

 ```vim
 let g:easy_align_delimiters['d'] = {
-\ 'pattern': ' \(\S\+\s*[;=]\)\@=',
+\ 'pattern': ' \ze\S\+\s*[;=]',
 \ 'left_margin': 0, 'right_margin': 0
 \ }
 ```

 Now the new rule has changed to align text around spaces that are followed
 by some non-whitespace characters and then an equals sign or a semi-colon.
-Try `<Enter>d`
+Try `vipgad`

 ```c
 const char*                          str = "Hello";
@@ -382,7 +405,7 @@ static double                        pi = 3.14;
 static std::map<std::string, float>* scores = pointer;
 ```

-We're right on track, now press `gv<Enter>=` and voila!
+We're right on track, now press `gvga=` and voila!

 ```c
 const char*                          str    = "Hello";
--- a/README.md
+++ b/README.md
@@ -1,69 +1,148 @@
-vim-easy-align
+vim-easy-align ![travis-ci](https://travis-ci.org/junegunn/vim-easy-align.svg?branch=master)
 ==============

-A simple, easy-to-use Vim alignment plugin without too much ambition.
+A simple, easy-to-use Vim alignment plugin.

-Demo
----
-
-![Screencast](https://raw.github.com/junegunn/vim-easy-align/gif/vim-easy-align.gif)
-
-Features
--------
-
- Makes the common case easy
-  - Comes with a predefined set of alignment rules
-  - Provides a fast and intuitive interface
- Extensible
-  - You can define your own rules
-  - Supports arbitrary regular expressions
- Optimized for code editing
-  - Takes advantage of syntax highlighting feature to avoid unwanted alignments
+![](https://raw.githubusercontent.com/junegunn/i/master/easy-align/equals.gif)

 Installation
 ------------

-Either [download zip file](http://www.vim.org/scripts/script.php?script_id=4520)
-and extract in ~/.vim or use [Vundle](https://github.com/gmarik/vundle) (recommended)
-or [Pathogen](https://github.com/tpope/vim-pathogen).
+Use your favorite plugin manager.

-### With Vundle
-
-Add the following line to your .vimrc,
+Using [vim-plug](https://github.com/junegunn/vim-plug):

 ```vim
-Bundle 'junegunn/vim-easy-align'
+Plug 'junegunn/vim-easy-align'
 ```

-then execute `:BundleInstall` command.
+Quick start guide
+-----------------
+
+Add the following mappings to your .vimrc.
+
+```vim
+" Start interactive EasyAlign in visual mode (e.g. vipga)
+xmap ga <Plug>(EasyAlign)
+
+" Start interactive EasyAlign for a motion/text object (e.g. gaip)
+nmap ga <Plug>(EasyAlign)
+```
+
+Then with the following lines of text,
+
+```
+apple   =red
+grass+=green
+sky-=   blue
+```
+
+try these commands:
+
+- `vipga=`
+    - `v`isual-select `i`nner `p`aragraph
+    - Start EasyAlign command (`ga`)
+    - Align around `=`
+- `gaip=`
+    - Start EasyAlign command (`ga`) for `i`nner `p`aragraph
+    - Align around `=`
+
+Demo
+----
+
+*Click on each image to see from the beginning.*
+
+### Using predefined alignment rules
+
+An *alignment rule* is a predefined set of options for common alignment tasks,
+which is identified by a single character, such as `<Space>`, `=`, `:`, `.`,
+`|`, `&`, `#`, and `,`.
+
+#### `=`
+
+![](https://raw.githubusercontent.com/junegunn/i/master/easy-align/equals.gif)
+
+- `=` Around the 1st occurrences
+- `2=` Around the 2nd occurrences
+- `*=` Around all occurrences
+- `**=` Left/Right alternating alignment around all occurrences
+- `<Enter>` Switching between left/right/center alignment modes
+
+#### `<Space>`
+
+![](https://raw.githubusercontent.com/junegunn/i/master/easy-align/spaces.gif)
+
+- `<Space>` Around the 1st occurrences of whitespaces
+- `2<Space>` Around the 2nd occurrences
+- `-<Space>` Around the last occurrences
+- `<Enter><Enter>2<Space>` Center-alignment around the 2nd occurrences
+
+#### `,`
+
+![](https://raw.githubusercontent.com/junegunn/i/master/easy-align/commas.gif)
+
+- The predefined comma-rule places a comma right next to the preceding token
+  without margin (`{'stick_to_left': 1, 'left_margin': 0}`)
+- You can change it with `<Right>` arrow
+
+### Using regular expression
+
+![](https://raw.githubusercontent.com/junegunn/i/master/easy-align/regex.gif)
+
+You can use an arbitrary regular expression by
+- pressing `<Ctrl-X>` in interactive mode
+- or using `:EasyAlign /REGEX/` command in visual mode or in normal mode with
+  a range (e.g. `:%`)
+
+### Different ways to start
+
+![](https://raw.githubusercontent.com/junegunn/i/master/easy-align/modes.gif)
+
+This demo shows how you can start interactive mode with visual selection or use
+non-interactive `:EasyAlign` command.
+
+### Aligning table cells
+
+![](https://raw.githubusercontent.com/junegunn/i/master/easy-align/tables.gif)
+
+Check out various alignment options and "live interactive mode".
+
+### Syntax-aware alignment
+
+![](https://raw.githubusercontent.com/junegunn/i/master/easy-align/yaml.gif)
+
+Delimiters in strings and comments are ignored by default.
+
+### Using blockwise-visual mode
+
+![](https://raw.githubusercontent.com/junegunn/i/master/easy-align/blockwise-visual.gif)
+
+You can limit the scope with blockwise-visual mode.

 Usage
 -----

-_vim-easy-align_ defines `:EasyAlign` command (and the right-justification
-variant `:EasyAlign!`) in the visual mode.
+### Flow of execution

-| Mode                      | Command                                       |
-| ------------------------- | --------------------------------------------- |
-| Interactive mode          | `:EasyAlign`                                  |
-| Using predefined rules    | `:EasyAlign [FIELD#] DELIMITER_KEY [OPTIONS]` |
-| Using regular expressions | `:EasyAlign [FIELD#] /REGEXP/ [OPTIONS]`      |
+<img src="https://raw.githubusercontent.com/junegunn/i/master/easy-align/usage.png" width="469">

-### Interactive mode
+There are two ways to use easy-align.

-The command will go into the interactive mode when no argument is given.
-For convenience, it is advised that you define a mapping for triggering it in
-your `.vimrc`.
+#### 1. `<Plug>` mappings (interactive mode)
+
+The recommended method is to use `<Plug>(EasyAlign)` mapping in normal and
+visual mode. They are usually mapped to `ga`, but you can choose any key
+sequences.

 ```vim
-vnoremap <silent> <Enter> :EasyAlign<cr>
+nmap ga <Plug>(EasyAlign)
+xmap ga <Plug>(EasyAlign)
 ```

-With the mapping, you can align selected lines of text with only a few keystrokes.
-
-1. `<Enter>` key to start interactive EasyAlign command
-1. Optional Enter keys to toggle right-justification mode
-1. Optional field number (default: 1)
+1. `ga` key in visual mode, or `ga` followed by a motion or a text
+   object to start interactive mode
+1. (Optional) Enter keys to cycle between alignment mode (left, right, or center)
+1. (Optional) N-th delimiter (default: 1)
    - `1`         Around the 1st occurrences of delimiters
    - `2`         Around the 2nd occurrences of delimiters
    - ...
@@ -72,82 +151,161 @@ 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>`, `=`, `:`, `.`, `|`, `&`, `#`, `,`) or an arbitrary regular expression followed by `<CTRL-X>`

-Alignment rules for the following delimiters have been defined to meet the most needs.
+#### 2. Using `:EasyAlign` command

-| Delimiter key | Description/Use cases                                                |
-| ------------- | -------------------------------------------------------------------- |
-| `<space>`     | General alignment around whitespaces                                 |
-| `=`           | Operators containing equals sign (`=`, `==,` `!=`, `+=`, `&&=`, ...) |
-| `:`           | Suitable for formatting JSON or YAML                                 |
-| `.`           | Multi-line method chaining                                           |
-| `,`           | Multi-line method arguments                                          |
-| &#124;        | Table markdown                                                       |
+If you prefer command-line, use `:EasyAlign` command instead.

-#### Example command sequences
+```vim
+" Using predefined rules
+:EasyAlign[!] [N-th] DELIMITER_KEY [OPTIONS]

-| With visual map     | Description                                              | Equivalent command    |
-| ------------------- | -------------------------------------------------------- | --------------------- |
-| `<Enter><space>`    | Alignment around 1st whitespaces                         | `:'<,'>EasyAlign\ `   |
-| `<Enter>2<space>`   | Alignment around 2nd whitespaces                         | `:'<,'>EasyAlign2\ `  |
-| `<Enter>-<space>`   | Alignment around the last whitespaces                    | `:'<,'>EasyAlign-\ `  |
-| `<Enter>:`          | Alignment around 1st colon                               | `:'<,'>EasyAlign:`    |
-| `<Enter>=`          | Alignment around 1st equals signs (and the likes)        | `:'<,'>EasyAlign=`    |
-| `<Enter>2=`         | Alignment around 2nd equals signs (and the likes)        | `:'<,'>EasyAlign2=`   |
-| `<Enter>3=`         | Alignment around 3rd equals signs (and the likes)        | `:'<,'>EasyAlign3=`   |
-| `<Enter>*=`         | Alignment around all equals signs (and the likes)        | `:'<,'>EasyAlign*=`   |
-| `<Enter>**=`        | Left-right alternating alignment around all equals signs | `:'<,'>EasyAlign**=`  |
-| `<Enter><Enter>=`   | Right-justified alignment around 1st equals signs        | `:'<,'>EasyAlign!=`   |
-| `<Enter><Enter>**=` | Right-left alternating alignment around all equals signs | `:'<,'>EasyAlign!**=` |
-| ...                 | ...                                                      |                       |
+" Using regular expression
+:EasyAlign[!] [N-th] /REGEXP/ [OPTIONS]
+```

-### Non-interactive mode
+### Regular expression vs. predefined rules

-Instead of going into the interactive mode, you can type in arguments to
-`:EasyAlign` command. In non-interactive mode, you can even use arbitrary
-regular expressions.
+You can use regular expressions but it's usually much easier to use predefined
+alignment rules that you can trigger with a single keystroke.
+
+| Key       | Description/Use cases                                                |
+| --------- | -------------------------------------------------------------------- |
+| `<Space>` | General alignment around whitespaces                                 |
+| `=`       | Operators containing equals sign (`=`, `==,` `!=`, `+=`, `&&=`, ...) |
+| `:`       | Suitable for formatting JSON or YAML                                 |
+| `.`       | Multi-line method chaining                                           |
+| `,`       | Multi-line method arguments                                          |
+| `&`       | LaTeX tables (matches `&` and `\\`)                                  |
+| `#`       | Ruby/Python comments                                                 |
+| `"`       | Vim comments                                                         |
+| `<Bar>`   | Table markdown                                                       |
+
+You can also define your own rules with `g:easy_align_delimiters` which will
+be described in [the later section](#extending-alignment-rules).
+
+----
+
+### Interactive mode
+
+Interactive mode is started either with `<Plug>(EasyAlign)` mapping or with
+`:EasyAlign` command with no argument.
+
+#### Examples using predefined rules
+
+| Keystrokes   | Description                        | Equivalent command    |
+| ------------ | ---------------------------------- | --------------------- |
+| `<Space>`    | Around 1st whitespaces             | `:'<,'>EasyAlign\ `   |
+| `2<Space>`   | Around 2nd whitespaces             | `:'<,'>EasyAlign2\ `  |
+| `-<Space>`   | Around the last whitespaces        | `:'<,'>EasyAlign-\ `  |
+| `-2<Space>`  | Around the 2nd to last whitespaces | `:'<,'>EasyAlign-2\ ` |
+| `:`          | Around 1st colon (`key:  value`)   | `:'<,'>EasyAlign:`    |
+| `<Right>:`   | Around 1st colon (`key : value`)   | `:'<,'>EasyAlign:>l1` |
+| `=`          | Around 1st operators with =        | `:'<,'>EasyAlign=`    |
+| `3=`         | Around 3rd operators with =        | `:'<,'>EasyAlign3=`   |
+| `*=`         | Around all operators with =        | `:'<,'>EasyAlign*=`   |
+| `**=`        | Left-right alternating around =    | `:'<,'>EasyAlign**=`  |
+| `<Enter>=`   | Right alignment around 1st =       | `:'<,'>EasyAlign!=`   |
+| `<Enter>**=` | Right-left alternating around =    | `:'<,'>EasyAlign!**=` |
+
+Instead of finishing the alignment with a delimiter key, you can type in
+a regular expression if you press `<CTRL-/>` or `<CTRL-X>`.
+
+#### Alignment options in interactive mode
+
+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 following sections](#alignment-options).
+
+| Key       | Option             | Values                                             |
+| --------- | ------------------ | -------------------------------------------------- |
+| `CTRL-F`  | `filter`           | Input string (`[gv]/.*/?`)                         |
+| `CTRL-I`  | `indentation`      | shallow, deep, none, keep                          |
+| `CTRL-L`  | `left_margin`      | Input number or string                             |
+| `CTRL-R`  | `right_margin`     | Input number or string                             |
+| `CTRL-D`  | `delimiter_align`  | left, center, right                                |
+| `CTRL-U`  | `ignore_unmatched` | 0, 1                                               |
+| `CTRL-G`  | `ignore_groups`    | `[]`, `['String']`, `['Comment']`, `['String', 'Comment']` |
+| `CTRL-A`  | `align`            | Input string (`/[lrc]+\*{0,2}/`)                   |
+| `<Left>`  | `stick_to_left`    | `{ 'stick_to_left': 1, 'left_margin': 0 }`         |
+| `<Right>` | `stick_to_left`    | `{ 'stick_to_left': 0, 'left_margin': 1 }`         |
+| `<Down>`  | `*_margin`         | `{ 'left_margin': 0, 'right_margin': 0 }`          |
+
+#### 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 either `<Plug>(LiveEasyAlign)` map
+or `:LiveEasyAlign` command. Or you can switch to live interactive mode while
+in ordinary interactive mode by pressing `<CTRL-P>`. (P for Preview)
+
+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.
+
+### :EasyAlign command
+
+Instead of starting interactive mode, you can use non-interactive `:EasyAlign`
+command.

 ```vim
 " Using predefined alignment rules
-:EasyAlign[!] [FIELD#] DELIMITER_KEY [OPTIONS]
+"   :EasyAlign[!] [N-th] DELIMITER_KEY [OPTIONS]
+:EasyAlign :
+:EasyAlign =
+:EasyAlign *=
+:EasyAlign 3\

 " Using arbitrary regular expressions
-:EasyAlign[!] [FIELD#] /REGEXP/ [OPTIONS]
+"   :EasyAlign[!] [N-th] /REGEXP/ [OPTIONS]
+:EasyAlign /[:;]\+/
+:EasyAlign 2/[:;]\+/
+:EasyAlign */[:;]\+/
+:EasyAlign **/[:;]\+/
 ```

-For example, when aligning the following lines around colons and semi-colons,
+A command can end with alignment options, [each of which will be discussed in
+detail later](#alignment-options), in Vim dictionary format.

-    apple;:banana::cake
-    data;;exchange:;format
+- `:EasyAlign * /[:;]\+/ { 'stick_to_left': 1, 'left_margin': 0 }`

-try these commands:
-
- `:EasyAlign /[:;]\+/`
- `:EasyAlign 2/[:;]\+/`
- `:EasyAlign */[:;]\+/`
- `:EasyAlign **/[:;]\+/`
-
-Notice that you can't append `\zs` to your regular expression to put delimiters
-on the left. It can be done by providing additional options in Vim dictionary
-format.
-
- `:EasyAlign * /[:;]\+/ { 'stick_to_left': 1, 'left_margin': '' }`
-
-Then 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

-Options keys are fuzzy-matched, so you can write as follows:
+You don't have to write complete names as long as they're distinguishable.

 - `:EasyAlign * /[:;]\+/ { 'stl': 1, 'l': 0 }`

-You can even omit spaces between the arguments, so concisely (or cryptically):
+You can even omit spaces between the arguments.

 - `:EasyAlign*/[:;]\+/{'s':1,'l':0}`

-Available options will be shown later in the document.
+Nice. But let's make it even shorter. Option values can be written in shorthand
+notation.
+
+- `:EasyAlign*/[:;]\+/<l0`
+
+The following table summarizes the shorthand notation.
+
+| Option             | Expression     |
+| ------------------ | -------------- |
+| `filter`           | `[gv]/.*/`     |
+| `left_margin`      | `l[0-9]+`      |
+| `right_margin`     | `r[0-9]+`      |
+| `stick_to_left`    | `<` or `>`     |
+| `ignore_unmatched` | `iu[01]`       |
+| `ignore_groups`    | `ig\[.*\]`     |
+| `align`            | `a[lrc*]*`     |
+| `delimiter_align`  | `d[lrc]`       |
+| `indentation`      | `i[ksdn]`      |

 ### Partial alignment in blockwise-visual mode

@@ -174,37 +332,70 @@ my_hash = { :a   => 1,
 ```

 However, in this case, we don't really need blockwise visual mode
-since the same can be easily done using the negative field number: `<Enter>-=`
+since the same can be easily done using the negative N-th parameter: `<Enter>-=`
+

 Alignment options
 -----------------

-Options values can be 1) specified as global variables, 2) set on each alignment
-rule in `g:easy_align_delimiters`, 3) or given to every `:EasyAlign` command.
-
-Command-line options have the highest precedence, and global variables have the
-lowest precedence.
-
 ### List of options

-| Option             | Type              | Default                 | Description                                             |
-| ------------------ | ----------------- | ----------------------- | ------------------------------------------------------- |
-| `left_margin`      | number            | 0                       | Number of spaces to attach before delimiter             |
-| `left_margin`      | string            | `''`                    | String to attach before delimiter                       |
-| `right_margin`     | number            | 0                       | Number of spaces to attach after delimiter              |
-| `right_margin`     | string            | `''`                    | String to attach after delimiter                        |
-| `stick_to_left`    | boolean           | 0                       | Whether to position delimiter on the left-side          |
-| `ignore_unmatched` | boolean           | 1                       | Whether to ignore lines without matching delimiter      |
-| `ignores`          | array             | `['String', 'Comment']` | Delimiters in these syntax highlight groups are ignored |
-| `delimiter_align`  | string            | `r`                     | Determines how to align delimiters of different lengths |
+| Option             | Type    | Default               | Description                                             |
+| ------------------ | ------- | --------------------- | ------------------------------------------------------- |
+| `filter`           | string  |                       | Line filtering expression: `g/../` or `v/../`           |
+| `left_margin`      | number  | 1                     | Number of spaces to attach before delimiter             |
+| `left_margin`      | string  | `' '`                 | String to attach before delimiter                       |
+| `right_margin`     | number  | 1                     | Number of spaces to attach after delimiter              |
+| `right_margin`     | string  | `' '`                 | String to attach after delimiter                        |
+| `stick_to_left`    | boolean | 0                     | Whether to position delimiter on the left-side          |
+| `ignore_groups`    | list    | ['String', 'Comment'] | Delimiters in these syntax highlight groups are ignored |
+| `ignore_unmatched` | boolean | 1                     | Whether to ignore lines without matching delimiter      |
+| `indentation`      | string  | `k`                   | Indentation method (*k*eep, *d*eep, *s*hallow, *n*one)  |
+| `delimiter_align`  | string  | `r`                   | Determines how to align delimiters of different lengths |
+| `align`            | string  | `l`                   | Alignment modes for multiple occurrences of delimiters  |

-Some of the options can be specified using corresponding global variables.
+There are 4 ways to set alignment options (from lowest precedence to highest):

-| Option             | Global variable                 |
-| ------------------ | ------------------------------- |
-| `ignore_unmatched` | `g:easy_align_ignore_unmatched` |
-| `ignores`          | `g:easy_align_ignores`          |
-| `delimiter_align`  | `g:easy_align_delimiter_align`  |
+1. Some option values can be set with corresponding global variables
+2. Option values can be specified in the definition of each alignment rule
+3. Option values can be given as arguments to `:EasyAlign` command
+4. Option values can be set in interactive mode using special shortcut keys
+
+| Option name        | Shortcut key        | Abbreviated    | Global variable                 |
+| ------------------ | ------------------- | -------------- | ------------------------------- |
+| `filter`           | `CTRL-F`            | `[gv]/.*/`     |                                 |
+| `left_margin`      | `CTRL-L`            | `l[0-9]+`      |                                 |
+| `right_margin`     | `CTRL-R`            | `r[0-9]+`      |                                 |
+| `stick_to_left`    | `<Left>`, `<Right>` | `<` or `>`     |                                 |
+| `ignore_groups`    | `CTRL-G`            | `ig\[.*\]`     | `g:easy_align_ignore_groups`    |
+| `ignore_unmatched` | `CTRL-U`            | `iu[01]`       | `g:easy_align_ignore_unmatched` |
+| `indentation`      | `CTRL-I`            | `i[ksdn]`      | `g:easy_align_indentation`      |
+| `delimiter_align`  | `CTRL-D`            | `d[lrc]`       | `g:easy_align_delimiter_align`  |
+| `align`            | `CTRL-A`            | `a[lrc*]*`     |                                 |
+
+### Filtering lines
+
+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 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
+
+```vim
+" Start interactive mode with filter option set to g/hello/
+EasyAlign g/hello/
+
+" Start live interactive mode with filter option set to v/goodbye/
+LiveEasyAlign v/goodbye/
+
+" Align the lines with 'hi' around the first colons
+EasyAlign:g/hi/
+```

 ### Ignoring delimiters in comments or strings

@@ -215,8 +406,8 @@ highlighted as code comments or strings are ignored.
 ```vim
 " Default:
 "   If a delimiter is in a highlight group whose name matches
-"   any of the followings, it will be ignored.
-let g:easy_align_ignores = ['Comment', 'String']
+"   any of the following regular expressions, it will be ignored.
+let g:easy_align_ignore_groups = ['Comment', 'String']
 ```

 For example, the following paragraph
@@ -247,13 +438,15 @@ becomes as follows on `<Enter>:` (or `:EasyAlign:`)

 Naturally, this feature only works when syntax highlighting is enabled.

-You can change the default rule by using one of these 3 methods.
+You can change the default rule by using one of these 4 methods.

-1. Define global `g:easy_align_ignores` list
-2. Define a custom alignment rule in `g:easy_align_delimiters` with `ignores` option
-3. Provide `ignores` option to `:EasyAlign` command. e.g. `:EasyAlign:{'is':[]}`
+1. Press `CTRL-G` in interactive mode to switch groups
+2. Define global `g:easy_align_ignore_groups` list
+3. Define a custom rule in `g:easy_align_delimiters` with `ignore_groups` option
+4. Provide `ignore_groups` option to `:EasyAlign` command.
+   e.g. `:EasyAlign:ig[]`

-For example if you set `ignores` option to be an empty list, you get
+For example if you set `ignore_groups` option to be an empty list, you get

 ```ruby
 {
@@ -266,14 +459,37 @@ For example if you set `ignores` 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.
+
+To make `ignore_groups` work, and to debug the related issues, it is useful to
+know which highlight group a certain location in a file belongs to. A special
+function exists for this purpose, returning exactly the name of the highlight
+group that is used by the easy align plugin.
+
+```vim
+" Highlight group name of the cursor position
+echo easy_align#get_highlight_group_name()
+
+" Highlight group name of the line 10, column 20
+echo easy_align#get_highlight_group_name(10, 20)
+```

 ### Ignoring unmatched lines

-Lines without any matching delimiter are ignored as well (except in
-right-justification mode).
+`ignore_unmatched` option determines how EasyAlign command processes lines that
+do not have N-th delimiter.

-For example, when aligning the following code block around the colons,
+1. In left-alignment mode, they are ignored
+2. In right or center-alignment mode, they are *not* ignored, and the last
+   tokens from those lines are aligned as well as if there is an invisible
+   trailing delimiter at the end of each line
+3. If `ignore_unmatched` is 1, they are ignored regardless of the alignment mode
+4. If `ignore_unmatched` is 0, they are *not* ignored regardless of the mode
+
+Let's take an example.
+When we align the following code block around the (1st) colons,

 ```ruby
 {
@@ -297,12 +513,13 @@ this is usually what we want.
 }
 ```

-However, this default behavior is also configurable by using one of these 3
-methods.
+However, we can override this default behavior by setting `ignore_unmatched`
+option to zero using one of the following methods.

-1. Set the global `g:easy_align_ignore_unmatched` variable to 0
-2. Define a custom alignment rule with `ignore_unmatched` option set to 0
-3. Provide `ignore_unmatched` option to `:EasyAlign` command. e.g. `:EasyAlign:{'iu':0}`
+1. Press `CTRL-U` in interactive mode to toggle `ignore_unmatched` option
+2. Set the global `g:easy_align_ignore_unmatched` variable to 0
+3. Define a custom alignment rule with `ignore_unmatched` option set to 0
+4. Provide `ignore_unmatched` option to `:EasyAlign` command. e.g. `:EasyAlign:iu0`

 Then we get,

@@ -336,7 +553,7 @@ banana  += apple
 cake   ||= banana
 ```

-However, with `:EasyAlign={'da':l}`, delimiters are left-aligned.
+However, with `:EasyAlign=dl`, delimiters are left-aligned.

 ```ruby
 apple  =   1
@@ -344,7 +561,7 @@ banana +=  apple
 cake   ||= banana
 ```

-And on `:EasyAlign={'da':c}`, center-aligned.
+And on `:EasyAlign=dc`, center-aligned.

 ```ruby
 apple   =  1
@@ -352,20 +569,136 @@ banana +=  apple
 cake   ||= banana
 ```

+In interactive mode, you can change the option value with `CTRL-D` key.
+
+### Adjusting indentation
+
+By default :EasyAlign command keeps the original indentation of the lines. But
+then again we have `indentation` option. See the following example.
+
+```ruby
+# Lines with different indentation
+  apple = 1
+    banana = 2
+      cake = 3
+        daisy = 4
+     eggplant = 5
+
+# Default: _k_eep the original indentation
+#   :EasyAlign=
+  apple       = 1
+    banana    = 2
+      cake    = 3
+        daisy = 4
+     eggplant = 5
+
+# Use the _s_hallowest indentation among the lines
+#   :EasyAlign=is
+  apple    = 1
+  banana   = 2
+  cake     = 3
+  daisy    = 4
+  eggplant = 5
+
+# Use the _d_eepest indentation among the lines
+#   :EasyAlign=id
+        apple    = 1
+        banana   = 2
+        cake     = 3
+        daisy    = 4
+        eggplant = 5
+
+# Indentation: _n_one
+#   :EasyAlign=in
+apple    = 1
+banana   = 2
+cake     = 3
+daisy    = 4
+eggplant = 5
+```
+
+In interactive mode, you can change the option value with `CTRL-I` key.
+
+### Alignments over multiple occurrences of delimiters
+
+As stated above, "N-th" parameter is used to target specific occurrences of
+the delimiter when it appears multiple times in each line.
+
+To recap:
+
+```vim
+" Left-alignment around the FIRST occurrences of delimiters
+:EasyAlign =
+
+" Left-alignment around the SECOND occurrences of delimiters
+:EasyAlign 2=
+
+" Left-alignment around the LAST occurrences of delimiters
+:EasyAlign -=
+
+" Left-alignment around ALL occurrences of delimiters
+:EasyAlign *=
+
+" Left-right ALTERNATING alignment around all occurrences of delimiters
+:EasyAlign **=
+
+" Right-left ALTERNATING alignment around all occurrences of delimiters
+:EasyAlign! **=
+```
+
+In addition to these, you can fine-tune alignments over multiple occurrences
+of the delimiters with 'align' option. (The option can also be set in
+interactive mode with the special key `CTRL-A`)
+
+```vim
+" Left alignment over the first two occurrences of delimiters
+:EasyAlign = { 'align': 'll' }
+
+" Right, left, center alignment over the 1st to 3rd occurrences of delimiters
+:EasyAlign = { 'a': 'rlc' }
+
+" Using shorthand notation
+:EasyAlign = arlc
+
+" Right, left, center alignment over the 2nd to 4th occurrences of delimiters
+:EasyAlign 2=arlc
+
+" (*) Repeating alignments (default: l, r, or c)
+"   Right, left, center, center, center, center, ...
+:EasyAlign *=arlc
+
+" (**) Alternating alignments (default: lr or rl)
+"   Right, left, center, right, left, center, ...
+:EasyAlign **=arlc
+
+" Right, left, center, center, center, ... repeating alignment
+" over the 3rd to the last occurrences of delimiters
+:EasyAlign 3=arlc*
+
+" Right, left, center, right, left, center, ... alternating alignment
+" over the 3rd to the last occurrences of delimiters
+:EasyAlign 3=arlc**
+```
+
 ### Extending alignment rules

 Although the default rules should cover the most of the use cases,
 you can extend the rules by setting a dictionary named `g:easy_align_delimiters`.

-#### Example
+You may refer to the definitions of the default alignment rules
+[here](https://github.com/junegunn/vim-easy-align/blob/2.9.6/autoload/easy_align.vim#L32-L46).
+
+#### Examples

 ```vim
 let g:easy_align_delimiters = {
 \ '>': { 'pattern': '>>\|=>\|>' },
-\ '/': { 'pattern': '//\+\|/\*\|\*/', 'ignores': ['String'] },
-\ '#': { 'pattern': '#\+', 'ignores': ['String'], 'delimiter_align': 'l' },
+\ '/': {
+\     'pattern':         '//\+\|/\*\|\*/',
+\     'delimiter_align': 'l',
+\     'ignore_groups':   ['!Comment'] },
 \ ']': {
-\     'pattern':       '[\[\]]',
+\     'pattern':       '[[\]]',
 \     'left_margin':   0,
 \     'right_margin':  0,
 \     'stick_to_left': 0
@@ -377,19 +710,61 @@ 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
 \   }
 \ }
 ```

+Other options
+-------------
+
+### Disabling &foldmethod during alignment
+
+[It is reported](https://github.com/junegunn/vim-easy-align/issues/14) that
+`&foldmethod` value of `expr` or `syntax` can significantly slow down the
+alignment when editing a large, complex file with many folds. To alleviate this
+issue, EasyAlign provides an option to temporarily set `&foldmethod` to `manual`
+during the alignment task. In order to enable this feature, set
+`g:easy_align_bypass_fold` switch to 1.
+
+```vim
+let g:easy_align_bypass_fold = 1
+```
+
+### Left/right/center mode switch in interactive mode
+
+In interactive mode, you can choose the alignment mode you want by pressing
+enter keys. The non-bang command, `:EasyAlign` starts in left-alignment mode
+and changes to right and center mode as you press enter keys, while the bang
+version first starts in right-alignment mode.
+
+- `:EasyAlign`
+  - Left, Right, Center
+- `:EasyAlign!`
+  - Right, Left, Center
+
+If you do not prefer this default mode transition, you can define your own
+settings as follows.
+
+```vim
+let g:easy_align_interactive_modes = ['l', 'r']
+let g:easy_align_bang_interactive_modes = ['c', 'r']
+```
+
 Advanced examples and use cases
 -------------------------------

 See [EXAMPLES.md](https://github.com/junegunn/vim-easy-align/blob/master/EXAMPLES.md)
 for more examples.

+Related work
+------------
+
+- [DrChip's Alignment Tool for Vim](http://www.drchip.org/astronaut/vim/align.html)
+- [Tabular](https://github.com/godlygeek/tabular)
+
 Author
 ------

--- a/autoload/easy_align.vim
+++ b/autoload/easy_align.vim
--- a/doc/easy_align.txt
+++ b/doc/easy_align.txt
--- a/plugin/easy_align.vim
+++ b/plugin/easy_align.vim
@@ -1,4 +1,4 @@
-" Copyright (c) 2013 Junegunn Choi
+" Copyright (c) 2014 Junegunn Choi
 "
 " MIT License
 "
@@ -26,4 +26,118 @@ if exists("g:loaded_easy_align_plugin")
 endif
 let g:loaded_easy_align_plugin = 1

-command! -nargs=* -range -bang EasyAlign <line1>,<line2>call easy_align#align('<bang>' == '!', <q-args>)
+command! -nargs=* -range -bang EasyAlign <line1>,<line2>call easy_align#align(<bang>0, 0, 'command', <q-args>)
+command! -nargs=* -range -bang LiveEasyAlign <line1>,<line2>call easy_align#align(<bang>0, 1, 'command', <q-args>)
+
+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, s:abs(line("'>") - line("'<")), s:abs(col("'>") - col("'<"))]
+endfunction
+
+function! s:repeat_visual()
+  let [mode, ldiff, cdiff] = s:last_visual
+  let cmd = 'normal! '.mode
+  if ldiff > 0
+    let cmd .= ldiff . 'j'
+  endif
+
+  let ve_save = &virtualedit
+  try
+    if mode == "\<C-V>"
+      if cdiff > 0
+        let cmd .= cdiff . 'l'
+      endif
+      set virtualedit+=block
+    endif
+    execute cmd.":\<C-r>=g:easy_align_last_command\<Enter>\<Enter>"
+    call s:set_repeat()
+  finally
+    if ve_save != &virtualedit
+      let &virtualedit = ve_save
+    endif
+  endtry
+endfunction
+
+function! s:repeat_in_visual()
+  if exists('g:easy_align_last_command')
+    call s:remember_visual(visualmode())
+    call s:repeat_visual()
+  endif
+endfunction
+
+function! s:set_repeat()
+  silent! call repeat#set("\<Plug>(EasyAlignRepeat)")
+endfunction
+
+function! s:generic_easy_align_op(type, vmode, live)
+  if !&modifiable
+    if a:vmode
+      normal! gv
+    endif
+    return
+  endif
+  let sel_save = &selection
+  let &selection = "inclusive"
+
+  if a:vmode
+    let vmode = a:type
+    let [l1, l2] = ["'<", "'>"]
+    call s:remember_visual(vmode)
+  else
+    let vmode = ''
+    let [l1, l2] = [line("'["), line("']")]
+    unlet! s:last_visual
+  endif
+
+  try
+    let range = l1.','.l2
+    if get(g:, 'easy_align_need_repeat', 0)
+      execute range . g:easy_align_last_command
+    else
+      execute range . "call easy_align#align(0, a:live, vmode, '')"
+    end
+    call s:set_repeat()
+  finally
+    let &selection = sel_save
+  endtry
+endfunction
+
+function! s:easy_align_op(type, ...)
+  call s:generic_easy_align_op(a:type, a:0, 0)
+endfunction
+
+function! s:live_easy_align_op(type, ...)
+  call s:generic_easy_align_op(a:type, a:0, 1)
+endfunction
+
+function! s:easy_align_repeat()
+  if exists('s:last_visual')
+    call s:repeat_visual()
+  else
+    try
+      let g:easy_align_need_repeat = 1
+      normal! .
+    finally
+      unlet! g:easy_align_need_repeat
+    endtry
+  endif
+endfunction
+
+nnoremap <silent> <Plug>(EasyAlign) :set opfunc=<SID>easy_align_op<Enter>g@
+vnoremap <silent> <Plug>(EasyAlign) :<C-U>call <SID>easy_align_op(visualmode(), 1)<Enter>
+nnoremap <silent> <Plug>(LiveEasyAlign) :set opfunc=<SID>live_easy_align_op<Enter>g@
+vnoremap <silent> <Plug>(LiveEasyAlign) :<C-U>call <SID>live_easy_align_op(visualmode(), 1)<Enter>
+
+" vim-repeat support
+nnoremap <silent> <Plug>(EasyAlignRepeat) :call <SID>easy_align_repeat()<Enter>
+vnoremap <silent> <Plug>(EasyAlignRepeat) :<C-U>call <SID>repeat_in_visual()<Enter>
+
+" Backward-compatibility (deprecated)
+nnoremap <silent> <Plug>(EasyAlignOperator) :set opfunc=<SID>easy_align_op<Enter>g@
+
+" vim: set et sw=2 :
--- a/test/README.md
+++ b/test/README.md
@@ -0,0 +1,13 @@
+Test cases for vim-easy-align
+=============================
+
+### Prerequisite
+
+- [Vader.vim](https://github.com/junegunn/vader.vim)
+
+### Run
+
+```
+./run
+```
+
--- a/test/basic.expected
+++ b/test/basic.expected
@@ -1,506 +0,0 @@
-" :source run.vim
-" @a
-
-Pa  ul  Mc  Ca  rt  ne  y{  {1  }}  94 2
-Ge  or  ge  Ha  rr  is  on  {{  1}  }9  43
-Ri  ng  o   St  ar  r   {{  1}  }9  40
-Pe  te  Be  st  {{  1}  }9  41
-
-  Paul McCartney{{1}}942
-George Harrison {{1}}943
- Ringo Starr    {{1}}940
-  Pete Best     {{1}}941
-
-  Paul McCartney 1942
-George Harrison  1943
- Ringo Starr     1940
-  Pete Best      1941
-
-Paul  McCartney 1942
-George Harrison 1943
-Ringo     Starr 1940
-Pete       Best 1941
-
-Paul   McCartney 1942
-George Harrison 1943
-Ringo  Starr 1940
-Pete   Best 1941
-
-Paul McCartney  1942
-George Harrison 1943
-Ringo Starr     1940
-Pete Best       1941
-
-Paul   McCartney 1942
-George  Harrison 1943
-Ringo      Starr 1940
-Pete        Best 1941
-
-  Paul McCartney 1942
-George  Harrison 1943
- Ringo     Starr 1940
-  Pete      Best 1941
-
-Paul  McCartney 1942
-George Harrison 1943
-Ringo     Starr 1940
-Pete       Best 1941
-
-  Paul McCartney 1942
-George Harrison 1943
- Ringo Starr 1940
-  Pete Best 1941
-
-Paul   McCartney 1942
-George Harrison  1943
-Ringo  Starr     1940
-Pete   Best      1941
-
-Paul McCartney  1942
-George Harrison 1943
-Ringo Starr     1940
-Pete Best       1941
-
-Paul   McCartney 1942
-George Harrison 1943
-Ringo  Starr 1940
-Pete   Best 1941
-
-|     Option | Type    | Default | Description                                    |
-|         -- | --      |      -- | --                                             |
-|    threads | Fixnum  |       1 | number of threads in the thread pool           |
-|     queues | Fixnum  |       1 | number of concurrent queues                    |
-| queue_size | Fixnum  |    1000 | size of each queue                             |
-|   interval | Numeric |       0 | dispatcher interval for batch processing       |
-|      batch | Boolean |   false | enables batch processing mode                  |
-| batch_size | Fixnum  |     nil | number of maximum items to be assigned at once |
-|     logger | Logger  |     nil | logger instance for debug logs                 |
-
-|     Option |    Type | Default |                                    Description |
-|         -- |      -- |      -- |                                             -- |
-|    threads |  Fixnum |       1 |           number of threads in the thread pool |
-|     queues |  Fixnum |       1 |                    number of concurrent queues |
-| queue_size |  Fixnum |    1000 |                             size of each queue |
-|   interval | Numeric |       0 |       dispatcher interval for batch processing |
-|      batch | Boolean |   false |                  enables batch processing mode |
-| batch_size |  Fixnum |     nil | number of maximum items to be assigned at once |
-|     logger |  Logger |     nil |                 logger instance for debug logs |
-
-| Option     | Type    | Default | Description                                    |
-| --         | --      | --      | --                                             |
-| threads    | Fixnum  | 1       | number of threads in the thread pool           |
-| queues     | Fixnum  | 1       | number of concurrent queues                    |
-| queue_size | Fixnum  | 1000    | size of each queue                             |
-| interval   | Numeric | 0       | dispatcher interval for batch processing       |
-| batch      | Boolean | false   | enables batch processing mode                  |
-| batch_size | Fixnum  | nil     | number of maximum items to be assigned at once |
-| logger     | Logger  | nil     | logger instance for debug logs                 |
-
-aaa,   bb,         c
-d,     eeeeeee
-fffff, gggggggggg,
-h,     ,           ii
-j,     ,           k
-
-```ruby
-
-              a   =
-              a   =        1
-           bbbb   =        2
-        ccccccc   =        3
-ccccccccccccccc
-            ddd   =        4
-           eeee ===      eee  = eee = eee=f
-            fff   =      ggg += gg &&= gg
-              g  != hhhhhhhh == 888
-              i  :=        5
-              i  %=        5
-              i  *=        5
-              j  =~        5
-              j  >=        5
-             aa  =>      123
-             aa <<=      123
-             aa >>=      123
-            bbb  =>      123
-              c  =>  1233123
-              d  =>      123
-         dddddd &&=      123
-         dddddd ||=      123
-         dddddd  /=      123
-             gg <=>       ee
-
-a         =
-a         =        1
-bbbb      =        2
-ccccccc   =        3
-ccccccccccccccc
-ddd       =        4
-eeee    ===      eee  = eee   = eee = f
-fff       =      ggg += gg  &&=  gg
-g        != hhhhhhhh == 888
-i        :=        5
-i        %=        5
-i        *=        5
-j        =~        5
-j        >=        5
-aa       =>      123
-aa      <<=      123
-aa      >>=      123
-bbb      =>      123
-c        =>  1233123
-d        =>      123
-dddddd  &&=      123
-dddddd  ||=      123
-dddddd   /=      123
-gg      <=>       ee
-
-a         =
-a         = 1
-bbbb      = 2
-ccccccc   = 3
-ccccccccccccccc
-ddd       = 4
-eeee    === eee       = eee   = eee = f
-fff       = ggg      += gg  &&= gg
-g        != hhhhhhhh == 888
-i        := 5
-i        %= 5
-i        *= 5
-j        =~ 5
-j        >= 5
-aa       => 123
-aa      <<= 123
-aa      >>= 123
-bbb      => 123
-c        => 1233123
-d        => 123
-dddddd  &&= 123
-dddddd  ||= 123
-dddddd   /= 123
-gg      <=> ee
-
-a         =
-a         = 1
-bbbb      = 2
-ccccccc   = 3
-ccccccccccccccc
-ddd       = 4
-eeee    === eee = eee = eee=f
-fff       = ggg += gg &&= gg
-g        != hhhhhhhh == 888
-i        := 5
-i        %= 5
-i        *= 5
-j        =~ 5
-j        >= 5
-aa       => 123
-aa      <<= 123
-aa      >>= 123
-bbb      => 123
-c        => 1233123
-d        => 123
-dddddd  &&= 123
-dddddd  ||= 123
-dddddd   /= 123
-gg      <=> ee
-
-options = {       :caching => nil,
-                 :versions => 3,
-            "cache=blocks" => false }.merge(options)
-
-options = { :caching       => nil,
-            :versions      => 3,
-            "cache=blocks" => false }.merge(options)
-
-options                     = { :caching => nil,
-            :versions      => 3,
-            "cache=blocks" => false }.merge(options)
-
-apple = 1              # comment not aligned
-banana = 'Gros Michel' # comment 2
-
-# let g:easy_align_delimiters = { '#': { 'pattern': '#\+', 'ignores': ['String'] } }
-
-apple = 1              # comment not aligned
-apricot = 'DAD' + 'F#AD'
-banana = 'Gros Michel' # comment 2
-
-apple = 1 # comment not aligned
-apricot = 'DAD' + 'F#AD'
-banana = 'Gros Michel' # comment 2
-
-```
-
-```yaml
-
-        mysql:
-  # JDBC driver for MySQL database:
-       driver: com.mysql.jdbc.Driver
-  # JDBC URL for the connection (jdbc:mysql://HOSTNAME/DATABASE)
-          url: jdbc:mysql://localhost/test
-     database: test
-  "user:pass": r00t:pa55
-
-mysql:
-  # JDBC driver for MySQL database:
-  driver:      com.mysql.jdbc.Driver
-  # JDBC URL for the connection (jdbc:mysql://HOSTNAME/DATABASE)
-  url:         jdbc:mysql://localhost/test
-  database:    test
-  "user:pass": r00t:pa55
-
-```
-```c
-
-/* a */ b          = c
-aa                >= bb
-// aaa             = bbb        = cccc
-/* aaaa            = */ bbbb  === cccc   " = dddd   = " = eeee
-aaaaa /* bbbbb */ == ccccc /*  != eeeee    = */   === fffff
-
-/* a */ b           = c
-aa                 >= bb
-// aaa = bbb = cccc
-/* aaaa = */ bbbb === cccc   " = dddd = "      = eeee
-aaaaa /* bbbbb */  == ccccc /* != eeeee = */ === fffff
-
-```
-
-my_object
-      .method1    .chain
-    .second_method.call
-      .third      .call
-     .method_4    .execute
-
-my_object
-         .method1      .  chain
-         .second_method.   call
-         .third        .   call
-         .method_4     .execute
-
-my_object
-    .      method1.chain
-    .second_method.call
-    .        third.call
-    .     method_4.execute
-
-my_object
-         .      method1.chain
-         .second_method.call
-         .        third.call
-         .     method_4.execute
-
-my_object
-         .      method1.  chain
-         .second_method.   call
-         .        third.   call
-         .     method_4.execute
-
-my_object
-    .method1      .chain
-    .second_method.call
-    .third        .call
-    .method_4     .execute
-
-my_object
-    .method1.chain
-    .second_method.call
-    .third.call
-    .method_4.execute
-
-my_object        .
-      method1    .chain.
-    second_method.call.
-      third      .call.
-     method_4    .execute
-
-  | Option     |    Type | Default |                                    Description |
-  | --         |      -- | --      |                                             -- |
-  | threads    |  Fixnum | 1       |           number of threads in the thread pool |
-  | queues     |  Fixnum | 1       |                    number of concurrent queues |
-  | queue_size |  Fixnum | 1000    |                             size of each queue |
-  | interval   | Numeric | 0       |       dispatcher interval for batch processing |
-  | batch      | Boolean | false   |                  enables batch processing mode |
-  | batch_size |  Fixnum | nil     | number of maximum items to be assigned at once |
-  | logger     |  Logger | nil     |                 logger instance for debug logs |
-
-  |     Option |    Type | Default |                                    Description |
-  |         -- |      -- |      -- |                                             -- |
-  |    threads |  Fixnum |       1 |           number of threads in the thread pool |
-  |     queues |  Fixnum |       1 |                    number of concurrent queues |
-  | queue_size |  Fixnum |    1000 |                             size of each queue |
-  |   interval | Numeric |       0 |       dispatcher interval for batch processing |
-  |      batch | Boolean |   false |                  enables batch processing mode |
-  | batch_size |  Fixnum |     nil | number of maximum items to be assigned at once |
-  |     logger |  Logger |     nil |                 logger instance for debug logs |
-
-  | Option     | Type    | Default | Description                                    |
-  | --         | --      | --      | --                                             |
-  | threads    | Fixnum  | 1       | number of threads in the thread pool           |
-  | queues     | Fixnum  | 1       | number of concurrent queues                    |
-  | queue_size | Fixnum  | 1000    | size of each queue                             |
-  | interval   | Numeric | 0       | dispatcher interval for batch processing       |
-  | batch      | Boolean | false   | enables batch processing mode                  |
-  | batch_size | Fixnum  | nil     | number of maximum items to be assigned at once |
-  | logger     | Logger  | nil     | logger instance for debug logs                 |
-
-
-  |Option         |Type        |Default     |Description                                        |
-  |--             |--          |--          |--                                                 |
-  |threads        |Fixnum      |1           |number of threads in the thread pool               |
-  |queues         |Fixnum      |1           |number of concurrent queues                        |
-  |queue_size     |Fixnum      |1000        |size of each queue                                 |
-  |interval       |Numeric     |0           |dispatcher interval for batch processing           |
-  |batch          |Boolean     |false       |enables batch processing mode                      |
-  |batch_size     |Fixnum      |nil         |number of maximum items to be assigned at once     |
-  |logger         |Logger      |nil         |logger instance for debug logs                     |
-
-  |    Option    <|    Type   <|    Default<|    Description                                   <|
-  |    --        <|    --     <|    --     <|    --                                            <|
-  |    threads   <|    Fixnum <|    1      <|    number of threads in the thread pool          <|
-  |    queues    <|    Fixnum <|    1      <|    number of concurrent queues                   <|
-  |    queue_size<|    Fixnum <|    1000   <|    size of each queue                            <|
-  |    interval  <|    Numeric<|    0      <|    dispatcher interval for batch processing      <|
-  |    batch     <|    Boolean<|    false  <|    enables batch processing mode                 <|
-  |    batch_size<|    Fixnum <|    nil    <|    number of maximum items to be assigned at once<|
-  |    logger    <|    Logger <|    nil    <|    logger instance for debug logs                <|
-
-```c
-
-const char*                          str    = "Hello";
-int64_t                              count  = 1 + 2;
-static double                        pi     = 3.14;
-static std::map<std::string, float>* scores = pointer;
-
-```
-
-  Paul<<< McCartney{{{ 1942
-George<<< Harrison {{{ 1943
- Ringo<<< Starr    {{{ 1940
-  Pete<<< Best     {{{ 1941
-
-  Paul McCartney 1942
-George  Harrison 1943
- Ringo     Starr 1940
-  Pete      Best 1941
-
-...    - .     -----
-..    -- ..     ----
-.    --- ...     ---
-    ---- ....     --
-.    --- .....     -
-..    -- ......
-...    - .....     -
-
-...  -   .     -----
-..   --  ..    ----
-.   ---  ...    ---
-    ---- ....   --
-.   ---  .....   -
-..   --  ......
-...  -   .....   -
-
-... -    .     -----
-..  --   ..    ----
-.   ---  ...   ---
-    ---- ....  --
-.   ---  ..... -
-..  --   ......
-... -    ..... -
-
-...  -   .     -----
-..   --  ..    ----
-.   ---  ...    ---
-    ---- ....   --
-.   ---  .....   -
-..   --  ......
-...  -   .....   -
-
-...  -   .-----
-..   --  ..----
-.   ---  ...---
-    ---- ....--
-.   ---  .....-
-..   --  ......
-...  -   .....-
-
-... -    .     -----
-..  --   ..    ----
-.   ---  ...   ---
-    ---- ....  --
-.   ---  ..... -
-..  --   ......
-... -    ..... -
-
-... -    .-----
-..  --   ..----
-.   ---  ...---
-    ---- ....--
-.   ---  .....-
-..  --   ......
-... -    .....-
-
-...    - .-----
-..    -- ..----
-.    --- ...---
-    ---- ....--
-.    --- .....-
-..    -- ......
-...    - .....-
-
-...-.-----
-..--..----
-.---...---
----....--
-.---.....-
-..--......
-...-.....-
-
-...  -   .     -----
-..   --  ..    ----
-.   ---  ...    ---
-    ---- ....   --
-.   ---  .....   -
-..   --  ......
-...  -   .....   -
-
-...  -   .-----
-..   --  ..----
-.   ---  ...---
-    ---- ....--
-.   ---  .....-
-..   --  ......
-...  -   .....-
-
-... -    .     -----
-..  --   ..    ----
-.   ---  ...   ---
-    ---- ....  --
-.   ---  ..... -
-..  --   ......
-... -    ..... -
-
-...    - .     -----
-..    -- ..     ----
-.    --- ...     ---
-    ---- ....     --
-.    --- .....     -
-..    -- ......
-...    - .....     -
-
-...-.     -----
-..--..     ----
-.---...     ---
----....     --
-.---.....     -
-..--......
-...-.....     -
-
-...    - .-----
-..    -- ..----
-.    --- ...---
-    ---- ....--
-.    --- .....-
-..    -- ......
-...    - .....-
-
--- a/test/basic.md
+++ b/test/basic.md
@@ -1,132 +0,0 @@
-" :source run.vim
-" @a
-
-Paul McCartney 1942
-George Harrison 1943
-Ringo Starr 1940
-Pete Best 1941
-
-| Option| Type | Default | Description |
-|--|--|--|--|
-| threads | Fixnum | 1 | number of threads in the thread pool |
-|queues |Fixnum | 1 | number of concurrent queues |
-|queue_size | Fixnum | 1000 | size of each queue |
-|   interval | Numeric | 0 | dispatcher interval for batch processing |
-|batch | Boolean | false | enables batch processing mode |
- |batch_size | Fixnum | nil | number of maximum items to be assigned at once |
- |logger | Logger | nil | logger instance for debug logs |
-
-aaa,   bb,c
-d,eeeeeee
-fffff, gggggggggg,
-h, ,           ii
-j,,k
-
-```ruby
-
-a =
-a = 1
-bbbb = 2
-ccccccc = 3
-ccccccccccccccc
-ddd = 4
-eeee === eee = eee = eee=f
-fff = ggg += gg &&= gg
-g != hhhhhhhh == 888
-i   := 5
-i     %= 5
-i       *= 5
-j     =~ 5
-j   >= 5
-aa      =>         123
-aa <<= 123
-aa        >>= 123
-bbb               => 123
-c     => 1233123
-d   =>      123
-dddddd &&= 123
-dddddd ||= 123
-dddddd /= 123
-gg <=> ee
-
-options = { :caching => nil,
-            :versions => 3,
-            "cache=blocks" => false }.merge(options)
-
-apple = 1 # comment not aligned
-banana = 'Gros Michel' # comment 2
-
-# let g:easy_align_delimiters = { '#': { 'pattern': '#\+', 'ignores': ['String'] } }
-
-apple = 1 # comment not aligned
-apricot = 'DAD' + 'F#AD'
-banana = 'Gros Michel' # comment 2
-
-```
-
-```yaml
-
-mysql:
-  # JDBC driver for MySQL database:
-  driver: com.mysql.jdbc.Driver
-  # JDBC URL for the connection (jdbc:mysql://HOSTNAME/DATABASE)
-  url: jdbc:mysql://localhost/test
-  database: test
-  "user:pass":r00t:pa55
-
-```
-```c
-
-/* a */ b = c
-aa >= bb
-// aaa = bbb = cccc
-/* aaaa = */ bbbb   === cccc   " = dddd = " = eeee
-aaaaa /* bbbbb */      == ccccc /* != eeeee = */ === fffff
-
-```
-
-my_object
-      .method1.chain
-    .second_method.call
-      .third.call
-     .method_4.execute
-
-my_object.
-      method1.chain.
-    second_method.call.
-      third.call.
-     method_4.execute
-
-   | Option| Type | Default | Description |
-    |--|--|--|--|
-       | threads | Fixnum | 1 | number of threads in the thread pool |
-  |queues |Fixnum | 1 | number of concurrent queues |
-   |queue_size | Fixnum | 1000 | size of each queue |
-    |   interval | Numeric | 0 | dispatcher interval for batch processing |
-       |batch | Boolean | false | enables batch processing mode |
-   |batch_size | Fixnum | nil | number of maximum items to be assigned at once |
-   |logger | Logger | nil | logger instance for debug logs |
-
-
-```c
-
-const char* str = "Hello";
-int64_t count = 1 + 2;
-static double pi = 3.14;
-static std::map<std::string, float>* scores =    pointer;
-
-```
-
-Paul McCartney 1942
-George Harrison 1943
-Ringo Starr 1940
-Pete Best 1941
-
-...-.-----
-..--..----
-.---...---
----....--
-.---.....-
-..--......
-...-.....-
-
--- a/test/basic.script
+++ b/test/basic.script
@@ -1 +0,0 @@
-4Gvipjyvip
--- a/test/blockwise.vader
+++ b/test/blockwise.vader
@@ -0,0 +1,22 @@
+Include: include/setup.vader
+
+Given clojure:
+  (def world [[1      1 1 1       1]
+              [999 999 999 999 1]
+              [1 1 1 1 1]
+              [1 999 999 999 999]
+              [1 1 1 1 1]])
+
+Do (Recursive alignment in blockwise-visual mode):
+  f[;
+  \<C-V>G
+  \<Enter>*\<Space>
+
+Expect clojure:
+  (def world [[1   1   1   1   1]
+              [999 999 999 999 1]
+              [1   1   1   1   1]
+              [1   999 999 999 999]
+              [1   1   1   1   1]])
+
+Include: include/teardown.vader
--- a/test/commandline.vader
+++ b/test/commandline.vader
@@ -0,0 +1,191 @@
+Include: include/setup.vader
+
+Given (fruits):
+  apple;:;;banana::cake
+  data;;exchange:;::format
+
+Execute (regular expression):
+  %EasyAlign/[:;]\+/
+  AssertEqual ':EasyAlign /[:;]\+/', g:easy_align_last_command
+
+Expect:
+  apple ;:;; banana::cake
+  data    ;; exchange:;::format
+
+Execute (options dictionary):
+  %EasyAlign/[:;]\+/{ 'left_margin': '<', 'right_margin': 3 }
+
+Expect:
+  apple<;:;;   banana::cake
+  data <  ;;   exchange:;::format
+
+Execute (fuzzy matching):
+  %EasyAlign/[:;]\+/{ 'l':'<', 'r': '>'}
+
+Expect:
+  apple<;:;;>banana::cake
+  data <  ;;>exchange:;::format
+
+Execute (shorthand notation of margin):
+  %EasyAlign/[:;]\+/l0r0
+
+Expect:
+  apple;:;;banana::cake
+  data   ;;exchange:;::format
+
+Execute (delimiter align):
+  %EasyAlign*/[:;]\+/l0r0dc
+
+Expect:
+  apple;:;;banana   :: cake
+  data  ;; exchange:;::format
+
+Execute (DEPRECATED: shorthand notation of mode_sequence and margin):
+  %EasyAlign/[:;]\+/mrc*l2r2
+
+Expect:
+  apple  ;:;;   banana     ::   cake
+   data    ;;  exchange  :;::  format
+
+Execute (shorthand notation of align and margin):
+  %EasyAlign/[:;]\+/arc*l2r2
+
+Expect:
+  apple  ;:;;   banana     ::   cake
+   data    ;;  exchange  :;::  format
+
+Execute (DEPRECATED: deep indentation):
+  %EasyAlign/[:;]\+/mrc*l2r2
+  %EasyAlign*/[:;]\+/idmrl*
+
+Expect:
+   apple ;:;; banana     :: cake
+    data   ;; exchange :;:: format
+
+Execute (deep indentation):
+  %EasyAlign/[:;]\+/arc*l2r2
+  %EasyAlign*/[:;]\+/idarl*
+
+Expect:
+   apple ;:;; banana     :: cake
+    data   ;; exchange :;:: format
+
+Execute (stick_to_left):
+  %EasyAlign*/[:;]\+/stl1l0dlrm3
+
+Expect:
+  apple;:;;   banana::       cake
+  data;;      exchange:;::   format
+
+Execute (<):
+  %EasyAlign*/[:;]\+/<l0dlrm3
+
+Expect:
+  apple;:;;   banana::       cake
+  data;;      exchange:;::   format
+
+Execute (>):
+  %EasyAlign*/[:;]\+/l0dl<>rm3
+
+Expect:
+  apple;:;;   banana  ::     cake
+  data ;;     exchange:;::   format
+
+Execute (different regular expression):
+  %EasyAlign*/../{'lm':'<','rm':'>'}
+
+Expect:
+  ap><pl><e;><:;><;b><an><an><a:><:c><ak>e
+  da><ta><;;><ex><ch><an><ge><:;><::><fo><rm><at
+
+Execute (merge different option notations):
+  %EasyAlign*/../iu0 { 'l': '<', 'r': '>' }
+
+Expect:
+  ap><pl><e;><:;><;b><an><an><a:><:c><ak>e
+  da><ta><;;><ex><ch><an><ge><:;><::><fo> <rm><at
+
+Execute (Use current search pattern as delimiter if empty regular expression is given):
+  /an
+  %EasyAlign*//
+
+Expect:
+  apple;:;;b an  an a::cake
+  data;;exch an ge:;::format
+
+Given javascript (json):
+  var jdbc = {
+    // JDBC driver for MySQL database:
+    driver: "com.mysql.jdbc.Driver",
+    /* JDBC URL for the connection (jdbc:mysql://HOSTNAME/DATABASE) */
+    url: 'jdbc:mysql://localhost/test',
+    database: "test",
+    "user:pass":"r00t:pa55"
+  };
+
+Execute (default syntax-aware alignment):
+  %EasyAlign*:
+
+Expect javascript:
+  var jdbc = {
+    // JDBC driver for MySQL database:
+    driver:      "com.mysql.jdbc.Driver",
+    /* JDBC URL for the connection (jdbc:mysql://HOSTNAME/DATABASE) */
+    url:         'jdbc:mysql://localhost/test',
+    database:    "test",
+    "user:pass": "r00t:pa55"
+  };
+
+Execute (do not ignore unmatched):
+  %EasyAlign*:iu0
+
+Expect javascript:
+  var jdbc = {
+    // JDBC driver for MySQL database:
+    driver:                                                             "com.mysql.jdbc.Driver",
+    /* JDBC URL for the connection (jdbc:mysql://HOSTNAME/DATABASE) */
+    url:                                                                'jdbc:mysql://localhost/test',
+    database:                                                           "test",
+    "user:pass":                                                        "r00t:pa55"
+  };
+
+Execute (do not ignore any group):
+  %EasyAlign*:ig[]iu0
+
+Expect javascript:
+  var jdbc = {
+    // JDBC driver for MySQL database:
+    driver:                               "com.mysql.jdbc.Driver",
+    /* JDBC URL for the connection (jdbc: mysql:                    //HOSTNAME/DATABASE) */
+    url:                                  'jdbc:                    mysql:                   //localhost/test',
+    database:                             "test",
+    "user:                                pass":                    "r00t:                   pa55"
+  };
+
+Execute (ignore only strings):
+  %EasyAlign*:ig['String']
+
+Expect javascript:
+  var jdbc = {
+    // JDBC driver for MySQL database:
+    driver:                               "com.mysql.jdbc.Driver",
+    /* JDBC URL for the connection (jdbc: mysql: //HOSTNAME/DATABASE) */
+    url:                                  'jdbc:mysql://localhost/test',
+    database:                             "test",
+    "user:pass":                          "r00t:pa55"
+  };
+
+Execute (ignore only comments):
+  %EasyAlign*:ig['Comment']
+
+Expect javascript:
+  var jdbc = {
+    // JDBC driver for MySQL database:
+    driver:   "com.mysql.jdbc.Driver",
+    /* JDBC URL for the connection (jdbc:mysql://HOSTNAME/DATABASE) */
+    url:      'jdbc: mysql: //localhost/test',
+    database: "test",
+    "user:    pass": "r00t: pa55"
+  };
+
+Include: include/teardown.vader
--- a/test/extra.vader
+++ b/test/extra.vader
@@ -0,0 +1,13 @@
+Include: include/setup.vader
+
+Before:
+  set nomodifiable
+After:
+  set modifiable
+  AssertEqual "hello\nworld\n", @"
+Given:
+  hello
+  world
+Do (#43 Do nothing when nomodifiable):
+  vip\<enter>\<enter>\<enter>y
+
--- a/test/fixed.vader
+++ b/test/fixed.vader
@@ -0,0 +1,263 @@
+Include: include/setup.vader
+
+Given (Table):
+  |a|b|c|d|
+  | -|-|>-|-|
+  |aaa|bbb|ccc|ddd|
+
+Do (Partial alignment around 1st |):
+  \<C-V>ljj\<Enter>|
+
+Expect (Right margin should be correctly attached):
+  | a|b|c|d|
+  | -|-|>-|-|
+  | aaa|bbb|ccc|ddd|
+
+Given (empty buffer):
+
+Execute (Aligning lines with many delimiters should not fail):
+  call visualmode(1)
+  call setline(1, repeat('|', &maxfuncdepth + 1))
+  %EasyAlign*|
+  AssertEqual (&maxfuncdepth + 1) * 3 - 2, len(getline(1))
+
+Given:
+  a  | b | c
+  aa | bb | cc
+
+Execute:
+  %EasyAlign*|iu0{'l':'<', 'r': '>'}
+
+Expect:
+  a <|>b <|>c
+  aa<|>bb<|>cc
+
+Given (Trailing delimiter):
+  a  | b | c |
+  aa | bb | cc |
+
+Execute:
+  %EasyAlign*|iu0{'l':'<', 'r': '>'}
+
+Expect:
+  a <|>b <|>c <|
+  aa<|>bb<|>cc<|
+
+Given (Tab-indented code (#20)):
+  class MyUnitTest(unittest.TestCase):
+  	def test_base(self):
+  		n2f = {}
+  		n2v = {}
+  		f2v = {}
+  		n2gv = {}
+  		n2vt = {}
+
+Execute:
+  set tabstop=1
+  %EasyAlign=
+
+Expect:
+  class MyUnitTest(unittest.TestCase):
+  	def test_base(self):
+  		n2f  = {}
+  		n2v  = {}
+  		f2v  = {}
+  		n2gv = {}
+  		n2vt = {}
+
+Execute:
+  set tabstop=2
+  %EasyAlign=
+
+Expect:
+  class MyUnitTest(unittest.TestCase):
+  	def test_base(self):
+  		n2f  = {}
+  		n2v  = {}
+  		f2v  = {}
+  		n2gv = {}
+  		n2vt = {}
+
+Execute:
+  set tabstop=4
+  %EasyAlign=
+
+Expect:
+  class MyUnitTest(unittest.TestCase):
+  	def test_base(self):
+  		n2f  = {}
+  		n2v  = {}
+  		f2v  = {}
+  		n2gv = {}
+  		n2vt = {}
+
+Execute:
+  set tabstop=8
+  %EasyAlign=
+
+Expect:
+  class MyUnitTest(unittest.TestCase):
+  	def test_base(self):
+  		n2f  = {}
+  		n2v  = {}
+  		f2v  = {}
+  		n2gv = {}
+  		n2vt = {}
+
+Execute:
+  set tabstop=12
+  %EasyAlign=
+
+Expect:
+  class MyUnitTest(unittest.TestCase):
+  	def test_base(self):
+  		n2f  = {}
+  		n2v  = {}
+  		f2v  = {}
+  		n2gv = {}
+  		n2vt = {}
+
+Given (Tab-indented code (#20)):
+  class MyUnitTest(unittest.TestCase):
+  	def test_base(self):
+  	# 	n2f= {}
+  	## 	n2v= {}
+  	# 	f2v = {}
+  	## 	n2gv  = {}
+  	# 	n2vt   = {}
+
+Execute:
+  set tabstop=12
+  %EasyAlign=
+
+Expect:
+  class MyUnitTest(unittest.TestCase):
+  	def test_base(self):
+  	# 	n2f  = {}
+  	## 	n2v  = {}
+  	# 	f2v  = {}
+  	## 	n2gv = {}
+  	# 	n2vt = {}
+
+Given (Some text):
+  a,b,c
+
+  d,e,f
+
+Do (Select 1st line, align 3rd line):
+- First line
+  V\<esc>
+- Last line
+  G
+- Align
+  \<space>Aip*,
+- Previous selection
+  gv
+- Upcase
+  U
+
+Expect:
+  A,B,C
+
+  d, e, f
+
+Given c (#40 Ignored delimiters in LiveEasyAlign causes spurious undo):
+  printf("foo = %f\n", foo);
+  printf("foobar = %f\n", foobar);
+
+Do:
+  gUiw
+  :%LiveEasyAlign\<enter>
+  =\<bs>==
+
+Expect c:
+  PRINTF("foo = %f\n", foo);
+  printf("foobar = %f\n", foobar);
+
+* #50 Error when using delimiter alignment option
+Given:
+  a|bbb|c
+  aa|bb|cc
+
+Do (#50 EasyAlign command with 'a' option):
+  :%EasyAlign {'a': 'l'}\<cr>
+  \<cr>
+  *|
+
+Expect (Some text):
+   a | bbb |  c
+  aa |  bb | cc
+
+* #51 Repeat of visual <Plug>(LiveEasyAlign) broken
+Do (#51/#52 <Plug>(EasyAlignRepeat) in visual mode):
+  V\<space>\<enter>\<enter>*||
+  G
+  V\<space>.
+
+Expect:
+  a | bbb | c
+  aa | bb | cc
+
+* #65 ?=
+Given:
+  a?=b
+  aa-=bb
+  aaa?=bbb
+
+Do (#65 Alignment around ?=):
+  \<space>Aip=
+
+Expect:
+  a   ?= b
+  aa  -= bb
+  aaa ?= bbb
+
+* #67 \v
+Given c:
+  bzero(&servaddr, sizeof(servaddr));
+  servaddr.sin_family = AF_INET;
+  servaddr.sin_addr.s_addr = htonl(INADDR_ANY);
+  servaddr.sin_port = htons(SERV_PORT);
+
+Execute (#67 \v breaks surrounding regex):
+  %EasyAlign/\v(\=\s)@<=</
+
+Expect:
+  bzero(&servaddr, sizeof(servaddr));
+  servaddr.sin_family =       AF_INET;
+  servaddr.sin_addr.s_addr =  htonl(INADDR_ANY);
+  servaddr.sin_port =         htons(SERV_PORT);
+
+Execute (#67 \V followed by \v shouldn't matter):
+  %EasyAlign/\v(\=\s)@<=<\V/
+
+Expect:
+  bzero(&servaddr, sizeof(servaddr));
+  servaddr.sin_family =       AF_INET;
+  servaddr.sin_addr.s_addr =  htonl(INADDR_ANY);
+  servaddr.sin_port =         htons(SERV_PORT);
+
+Execute (#67 \zs is now allowed):
+  %EasyAlign/=\zs/
+
+Expect:
+  bzero(&servaddr, sizeof(servaddr));
+  servaddr.sin_family =       AF_INET;
+  servaddr.sin_addr.s_addr =  htonl(INADDR_ANY);
+  servaddr.sin_port =         htons(SERV_PORT);
+
+Include: include/teardown.vader
+
+Given:
+  hello = world bye all
+  hello world = bye all
+  hello world = foo all
+
+Do (#105: Incorrectly detection of blockwise visual mode):
+  \<c-v>jj\<esc>
+  \<Space>Aip=
+
+Expect:
+  hello       = world bye all
+  hello world = bye all
+  hello world = foo all
--- a/test/fixme.vader
+++ b/test/fixme.vader
@@ -0,0 +1,24 @@
+Include: include/setup.vader
+
+# It is currently possible that EasyAlign command incorrectly judges
+# that it was executed in block-wise visual mode
+Given:
+  a|b|c
+
+Do (FIXME invalid judgement - block-wise visual mode):
+  \<C-V>\<Esc>
+  :%EasyAlign|\<CR>
+
+Expect:
+  a | b | c
+
+Do (TODO Workaround: reset visualmode() on error):
+  \<C-V>\<Esc>
+  :%EasyAlign|\<CR>
+  :%EasyAlign|\<CR>
+
+Expect:
+  a | b | c
+
+Include: include/teardown.vader
+
--- a/test/include.vim
+++ b/test/include.vim
@@ -1,44 +0,0 @@
-function! GFM()
-  let syntaxes = {
-  \ 'ruby':   'syntax/ruby.vim',
-  \ 'yaml':   'syntax/yaml.vim',
-  \ 'vim':    'syntax/vim.vim',
-  \ 'sh':     'syntax/sh.vim',
-  \ 'python': 'syntax/python.vim',
-  \ 'java':   'syntax/java.vim',
-  \ 'c':      'syntax/c.vim'
-  \ }
-
-  for [lang, syn] in items(syntaxes)
-    unlet b:current_syntax
-    silent! exec printf("syntax include @%s %s", lang, syn)
-    exec printf("syntax region %sSnip matchgroup=Snip start='```%s' end='```' contains=@%s",
-                \ lang, lang, lang)
-  endfor
-  let b:current_syntax='mkd'
-
-  syntax sync fromstart
-endfunction
-
-silent! unlet g:easy_align_delimiters
-silent! unlet g:easy_align_ignore_unmatched
-silent! unlet g:easy_align_ignores
-
-vnoremap <silent> <Enter> :EasyAlign<cr>
-
-noremap  <silent> <C-k> <nop>
-noremap  <silent> <C-j> <nop>
-noremap  <silent> <C-h> <nop>
-noremap  <silent> <C-l> <nop>
-vnoremap <silent> <C-k> <nop>
-vnoremap <silent> <C-j> <nop>
-vnoremap <silent> <C-h> <nop>
-vnoremap <silent> <C-l> <nop>
-
-set nolazyredraw
-set buftype=nofile
-
-silent! ScrollPositionHide
-
-call GFM()
-
--- a/test/include/setup.vader
+++ b/test/include/setup.vader
@@ -0,0 +1,38 @@
+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)
+
+  silent! call plug#load('vim-easy-align')
+
+Before:
+After:
+Given:
+
--- a/test/include/teardown.vader
+++ b/test/include/teardown.vader
@@ -0,0 +1,4 @@
+Given:
+Execute (Restoring test environment):
+  Restore
+
--- a/test/interactive.vader
+++ b/test/interactive.vader
--- a/test/regexp.expected
+++ b/test/regexp.expected
@@ -1,96 +0,0 @@
-" :source run.vim
-" @a
-
-apple;:banana  :: cake
-data;;exchange :; format
-
-apple ;: banana   ::   cake
- data ;; exchange :; format
-
-apple ;:   banana :: cake
-data  ;; exchange :; format
-
-apple ;:____banana::cake
-data  ;;____exchange:;format
-
-apple ;  : banana   :  : cake
-data  ;  ; exchange :  ; format
-
-ap  pl  e;  :b  an  an  a:  :c  ak e
-da  ta  ;;  ex  ch  an  ge  :;  fo  rm  at
-
-ap ple;:banana::cake
-da ta;;exchange:;format
-
-apple???;:~~~banana???::~~~  cake
-data???;;~~~ exchange???:;~~~format
-
-apple;: banana::cake
-data;;  exchange:;format
-
-apple<<<;:>>>banana::cake
-data <<<;;>>>exchange:;format
-
-apple ;: banana::cake
-data  ;; exchange:;format
-
-apple;:banana  :: cake
-data;;exchange :; format
-
-apple ;: banana   :: cake
-data  ;; exchange :; format
-
-apple ;: banana   :: cake
-data  ;; exchange :; format
-
-apple ;: banana   :: cake
-data  ;; exchange :; format
-
-apple ;: banana   :: cake
-data  ;; exchange :; format
-
-apple ;: banana::cake
-data  ;; exchange:;format
-
-apple ; :banana::cake
-data  ;  ; exchange: ; format
-
-apple ; :banana::cake
-data  ; ;exchange:;format
-
-apple ; :banana::cake
-data  ; ;exchange:;format
-
-apple;:banana::cake
-data;;exchange:;format
-
-apple;:         banana: : cake
-data;;exchange: ;format
-
-apple;:banana: :cake
-data;;exchange:;format
-
-apple;:banana: :cake
-data;;exchange:;format
-
-apple;:         banana: : cake
-data;;exchange: ;format
-
-apple;:banana:: cake
-data;;exchange: ;format
-
-apple;:         banana: : cake
-data;;exchange: ;format
-
-apple;:         banana::cake
-data;;exchange: ;format
-
-```ruby
-apple = 1                # comment not aligned
-apricot = 'DAD' + 'F#AD'
-banana = 'Gros Michel'   # comment 2
-```
-
-a()p()p()l()e();():()b()a()n()a()n()a():():()c()a()k()e
-d()a()t()a();();()e()x()c()h()a()n()g()e():();()f()o()r()m()a()t
-
--- a/test/regexp.md
+++ b/test/regexp.md
@@ -1,12 +0,0 @@
-" :source run.vim
-" @a
-
-apple;:banana::cake
-data;;exchange:;format
-
-```ruby
-apple = 1 # comment not aligned
-apricot = 'DAD' + 'F#AD'
-banana = 'Gros Michel' # comment 2
-```
-
--- a/test/regexp.script
+++ b/test/regexp.script
@@ -1 +0,0 @@
-4Gvipjyvip:EasyAlign:
--- a/test/run
+++ b/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*
--- a/test/run.vim
+++ b/test/run.vim
@@ -1,7 +0,0 @@
-e!
-execute 'source '. expand('%:p:h') . '/include.vim'
-
-normal gg
-let @b=system('cat '. expand('%:p:r') . '.script')
-let @a='@b:vert diffsplit ' . expand('%:p:r') . '.expected
-'
--- a/test/tex.vader
+++ b/test/tex.vader
@@ -0,0 +1,158 @@
+# http://en.wikibooks.org/wiki/LaTeX/Tables
+
+Include: include/setup.vader
+
+Given tex (table with escaped &):
+  \begin{tabular}{ l c r }
+    1&2&3\\
+    44&55&66\\
+    777&8\&8&999\\
+  \end{tabular}
+
+# FIXME vip doesn't work if folded
+Do (Align around all &s and \\s):
+  VG\<Enter>*&
+
+Expect tex:
+  \begin{tabular}{ l c r }
+    1   & 2    & 3   \\
+    44  & 55   & 66  \\
+    777 & 8\&8 & 999 \\
+  \end{tabular}
+
+Do (right-align with explicit ignore_unmatched):
+  VG\<Enter>\<Enter>\<C-U>\<C-U>*&
+
+Expect tex:
+  \begin{tabular}{ l c r }
+      1 &    2 &   3 \\
+     44 &   55 &  66 \\
+    777 & 8\&8 & 999 \\
+  \end{tabular}
+
+Do (center-align with explicit ignore_unmatched):
+  VG\<Enter>\<Enter>\<Enter>\<C-U>\<C-U>*&
+
+Expect tex:
+  \begin{tabular}{ l c r }
+     1  &  2   &  3  \\
+    44  &  55  & 66  \\
+    777 & 8\&8 & 999 \\
+  \end{tabular}
+
+Given tex (simple table with \hline):
+  \begin{tabular}{ l c r }
+    1&2&3\\ \hline
+    44&55&66\\ \hline
+    777&8\&&999\\ \hline
+  \end{tabular}
+
+Do:
+  VG\<Enter>*&
+
+Expect tex:
+  \begin{tabular}{ l c r }
+    1   & 2   & 3   \\ \hline
+    44  & 55  & 66  \\ \hline
+    777 & 8\& & 999 \\ \hline
+  \end{tabular}
+
+Given tex (table with lines w/o &s):
+  \begin{tabular}{|r|l|}
+    \hline
+    7C0 & hexadecimal \\
+    3700&octal \\ \cline{2-2}
+    1111100000 & binary \\
+    \hline \hline
+    1984 & decimal \\
+    \hline
+  \end{tabular}
+
+Do (left-align*):
+  VG\<Enter>*&
+
+Expect tex:
+  \begin{tabular}{|r|l|}
+    \hline
+    7C0        & hexadecimal \\
+    3700       & octal       \\ \cline{2-2}
+    1111100000 & binary      \\
+    \hline \hline
+    1984       & decimal     \\
+    \hline
+  \end{tabular}
+
+Do(left-align* and right-align around 2nd):
+  VG\<Enter>*&
+  gv\<Enter>\<Enter>2&
+
+Expect tex:
+  \begin{tabular}{|r|l|}
+    \hline
+    7C0        & hexadecimal \\
+    3700       &       octal \\ \cline{2-2}
+    1111100000 &      binary \\
+    \hline \hline
+    1984       &     decimal \\
+    \hline
+  \end{tabular}
+
+Given tex:
+  \begin{tabular}{}
+    32&1.14\e1&&5.65\e2&&&&1.16\e1&&1.28\e1&\\
+    64&1.03\e1&0.1&4.98\e2&0.2&&&9.21\e2&0.3&1.02\e1&0.3\\
+    128&9.86\e2&0.1&4.69\e2&0.1&&&8.46\e2&0.1&9.45\e2&0.1\\
+    256&9.65\e2&0.0&4.59\e2&0.0&&&8.15\e2&0.1&9.11\e2&0.1\\
+  % 512&9.55\e2&0.0&4.56\e2&0.0&&&8.01\e2&0.0&8.96\e2&0.0\\
+    1024&9.49\e2&0.0&4.53\e2&0.0&&&7.94\e2&0.0&8.89\e2&0.0\\
+    2048&9.47\e2&0.0&4.52\e2&0.0&&&7.91\e2&0.0&8.85\e2&0.0\\
+    4096&9.46\e2&0.0&4.51\e2&0.0%&&&7.90\e2&0.0&8.83\e2&0.0\\
+    8192&9.45\e2&0.0&4.51\e2&0.0&&&&&&\\
+  \end{tabular}
+
+Execute (Alignment around &s, foldmethod should not change):
+  setlocal foldmethod=syntax
+  %EasyAlign*&
+  AssertEqual 'syntax', &l:foldmethod
+
+  setlocal foldmethod=manual
+  %EasyAlign*&
+  AssertEqual 'manual', &l:foldmethod
+
+Expect tex:
+  \begin{tabular}{}
+    32   & 1.14\e1 &     & 5.65\e2 &     &  &  & 1.16\e1 &     & 1.28\e1 &     \\
+    64   & 1.03\e1 & 0.1 & 4.98\e2 & 0.2 &  &  & 9.21\e2 & 0.3 & 1.02\e1 & 0.3 \\
+    128  & 9.86\e2 & 0.1 & 4.69\e2 & 0.1 &  &  & 8.46\e2 & 0.1 & 9.45\e2 & 0.1 \\
+    256  & 9.65\e2 & 0.0 & 4.59\e2 & 0.0 &  &  & 8.15\e2 & 0.1 & 9.11\e2 & 0.1 \\
+  % 512&9.55\e2&0.0&4.56\e2&0.0&&&8.01\e2&0.0&8.96\e2&0.0\\
+    1024 & 9.49\e2 & 0.0 & 4.53\e2 & 0.0 &  &  & 7.94\e2 & 0.0 & 8.89\e2 & 0.0 \\
+    2048 & 9.47\e2 & 0.0 & 4.52\e2 & 0.0 &  &  & 7.91\e2 & 0.0 & 8.85\e2 & 0.0 \\
+    4096 & 9.46\e2 & 0.0 & 4.51\e2 & 0.0%&&&7.90\e2&0.0&8.83\e2&0.0\\
+    8192 & 9.45\e2 & 0.0 & 4.51\e2 & 0.0 &  &  &         &     &         &     \\
+  \end{tabular}
+
+Execute (g:easy_align_bypass_fold set, foldmethod should not change):
+  let g:easy_align_bypass_fold = 1
+  setlocal foldmethod=syntax
+  %EasyAlign*&
+  AssertEqual 'syntax', &l:foldmethod
+
+  setlocal foldmethod=manual
+  %EasyAlign*&
+  AssertEqual 'manual', &l:foldmethod
+
+Expect tex:
+  \begin{tabular}{}
+    32   & 1.14\e1 &     & 5.65\e2 &     &  &  & 1.16\e1 &     & 1.28\e1 &     \\
+    64   & 1.03\e1 & 0.1 & 4.98\e2 & 0.2 &  &  & 9.21\e2 & 0.3 & 1.02\e1 & 0.3 \\
+    128  & 9.86\e2 & 0.1 & 4.69\e2 & 0.1 &  &  & 8.46\e2 & 0.1 & 9.45\e2 & 0.1 \\
+    256  & 9.65\e2 & 0.0 & 4.59\e2 & 0.0 &  &  & 8.15\e2 & 0.1 & 9.11\e2 & 0.1 \\
+  % 512&9.55\e2&0.0&4.56\e2&0.0&&&8.01\e2&0.0&8.96\e2&0.0\\
+    1024 & 9.49\e2 & 0.0 & 4.53\e2 & 0.0 &  &  & 7.94\e2 & 0.0 & 8.89\e2 & 0.0 \\
+    2048 & 9.47\e2 & 0.0 & 4.52\e2 & 0.0 &  &  & 7.91\e2 & 0.0 & 8.85\e2 & 0.0 \\
+    4096 & 9.46\e2 & 0.0 & 4.51\e2 & 0.0%&&&7.90\e2&0.0&8.83\e2&0.0\\
+    8192 & 9.45\e2 & 0.0 & 4.51\e2 & 0.0 &  &  &         &     &         &     \\
+  \end{tabular}
+
+Include: include/teardown.vader