diff --git a/README.md b/README.md index 136f711..8404237 100644 --- a/README.md +++ b/README.md @@ -38,13 +38,16 @@ With the mapping, you can align selected lines with a few keystrokes. 1. `` key to start interactive EasyAlign command 1. Optional Enter keys to toggle right-justification mode 1. Optional field number (default: 1) - - `1` Alignment around 1st delimiters - - `2` Alignment around 2nd delimiters + - `1` Alignment around 1st delimiters + - `2` Alignment around 2nd delimiters + - ... + - `*` Alignment around all delimiters (recursive) + - `-` Alignment around the last delimiters (`-1`) + - `-2` Alignment around the one before the last delimiters - ... - - `*` Alignment around all delimiters (recursive) 1. Delimiter (``, `=`, `:`, `.`, `|`, `,`) -Alignment rules for the following delimiters have been crafted to meet the most needs. +Alignment rules for the following delimiters have been defined to meet the most needs. | Delimiter | Description/Use cases | | --------- | ---------------------------------------------------------- | @@ -53,6 +56,7 @@ Alignment rules for the following delimiters have been crafted to meet the most | `:` | Suitable for formatting JSON or YAML | | `.` | Multi-line method chaining | | `,` | Multi-line method arguments | +| `}` | Closing braces (use it with with a negative field number) | | | | Table markdown | ### Example command sequences @@ -64,9 +68,11 @@ Alignment rules for the following delimiters have been crafted to meet the most | `3=` | Alignment around 3rd equals signs (and the likes) | `:'<,'>EasyAlign3=` | | `*=` | Alignment around all equals signs (and the likes) | `:'<,'>EasyAlign*=` | | `=` | Right-justified alignment around 1st equals signs | `:'<,'>EasyAlignRight=` | -| `` | Alignment around 1st space | `:'<,'>EasyAlign\ ` | -| `2` | Alignment around 2nd space | `:'<,'>EasyAlign2\ ` | +| `` | Alignment around 1st whitespaces | `:'<,'>EasyAlign\ ` | +| `2` | Alignment around 2nd whitespaces | `:'<,'>EasyAlign2\ ` | +| `-` | Alignment around the last whitespaces | `:'<,'>EasyAlign-\ ` | | `:` | Alignment around 1st colon | `:'<,'>EasyAlign:` | +| `-}` | Alignment around the last closing braces | `:'<,'>EasyAlign-}` | | ... | ... | | ### Partial alignment in blockwise-visual mode @@ -100,9 +106,9 @@ Defining custom alignment rules let g:easy_align_delimiters = { \ '>': { 'pattern': '>>\|=>\|>' }, \ '/': { 'pattern': '//*' }, -\ '}': { -\ 'pattern': '}', -\ 'margin_left': ' ', +\ ')': { +\ 'pattern': ')', +\ 'margin_left': '', \ 'margin_right': '', \ 'stick_to_left': 0 \ } diff --git a/autoload/easy_align.vim b/autoload/easy_align.vim index a7b62f4..e36df10 100644 --- a/autoload/easy_align.vim +++ b/autoload/easy_align.vim @@ -10,7 +10,8 @@ let s:easy_align_delimiters_default = { \ ':': { 'pattern': ':', 'margin_left': '', 'margin_right': ' ', 'stick_to_left': 1 }, \ ',': { 'pattern': ',', 'margin_left': '', 'margin_right': ' ', 'stick_to_left': 1 }, \ '|': { 'pattern': '|', 'margin_left': ' ', 'margin_right': ' ', 'stick_to_left': 0 }, -\ '.': { 'pattern': '\.', 'margin_left': '', 'margin_right': '', 'stick_to_left': 0 } +\ '.': { 'pattern': '\.', 'margin_left': '', 'margin_right': '', 'stick_to_left': 0 }, +\ '}': { 'pattern': '}', 'margin_left': ' ', 'margin_right': '', 'stick_to_left': 0 } \ } let s:just = ['', '[R]'] @@ -36,10 +37,22 @@ function! s:do_align(just, fl, ll, fc, lc, pattern, nth, ml, mr, stick_to_left, endif let max_tokens = max([len(tokens), max_tokens]) - if len(tokens) < a:nth - continue + if a:nth > 0 + if len(tokens) < a:nth + continue + endif + let nth = a:nth - 1 " 0-based + else + if match(tokens[len(tokens) - 1], pattern.'$') == -1 + let nth = len(tokens) + a:nth - 1 + else + let nth = len(tokens) + a:nth + endif + + if nth < 0 + continue + endif endif - let nth = a:nth - 1 " 0-based let last = tokens[nth] let prefix = (nth > 0 ? join(tokens[0 : nth - 1], '') : '') @@ -114,6 +127,12 @@ function! easy_align#align(just, ...) range return elseif c == 13 let just = (just + 1) % len(s:just) + elseif c == 45 + if !empty(n) + break + else + let n = '-' + endif elseif c >= 48 && c <= 57 if n == '*' break @@ -148,6 +167,8 @@ function! easy_align#align(just, ...) range if n == '*' let n = 1 let recursive = 1 + elseif n == '-' + let n = -1 elseif empty(n) let n = 1 elseif n != string(str2nr(n)) diff --git a/doc/easy_align.txt b/doc/easy_align.txt index 8cac149..65859cd 100644 --- a/doc/easy_align.txt +++ b/doc/easy_align.txt @@ -26,6 +26,8 @@ With this mapping, you can align selected lines with a few keystrokes. 2 Alignment around 2nd delimiters ... * Alignment around all delimiters (recursive) + - Alignment around the last delimieters + -2 Alignment around the one before the last delimieters 4. Delimiter General alignment around whitespaces = Operators containing equals sign (=, ==, !=, +=, &&=, ...) @@ -46,6 +48,7 @@ Examples: Alignment around 1st whitespace 2 Alignment around 2nd whitespace : Alignment around 1st colon + -} Alignment around the last closing braces EasyAlignRight *EasyAlignRight*