support negative modifier (backward scan)

README.md

@@ -38,13 +38,16 @@ With the mapping, you can align selected lines with 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`        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 (`<space>`, `=`, `:`, `.`, `|`, `,`)
 
-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)  |
 | &#124;    | Table markdown                                             |
 
 ### Example command sequences
@@ -64,9 +68,11 @@ Alignment rules for the following delimiters have been crafted to meet the most
 | `<Enter>3=`       | Alignment around 3rd equals signs (and the likes) | `:'<,'>EasyAlign3=`     |
 | `<Enter>*=`       | Alignment around all equals signs (and the likes) | `:'<,'>EasyAlign*=`     |
 | `<Enter><Enter>=` | Right-justified alignment around 1st equals signs | `:'<,'>EasyAlignRight=` |
-| `<Enter><space>`  | Alignment around 1st space                        | `:'<,'>EasyAlign\ `     |
-| `<Enter>2<space>` | Alignment around 2nd space                        | `:'<,'>EasyAlign2\ `    |
+| `<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 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
 \   }

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))

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
     <space>  General alignment around whitespaces
     =        Operators containing equals sign (=, ==, !=, +=, &&=, ...)
@@ -46,6 +48,7 @@ Examples:
   <Enter><space>   Alignment around 1st whitespace
   <Enter>2<space>  Alignment around 2nd whitespace
   <Enter>:         Alignment around 1st colon
+  <Enter>-}        Alignment around the last closing braces
 
 
 EasyAlignRight                                           *EasyAlignRight*