Allow shorthand option notation when using delimiter key

e.g. :EasyAlign=l2r2dlmlr**

autoload/easy_align.vim

@@ -701,14 +701,16 @@ function! s:test_regexp(regexp)
   return a:regexp
 endfunction
 
-function! s:parse_shortcut_opts(expr)
+let s:shorthand_regex =
+  \ '\s*\('
+  \   .'\(lm\?[0-9]\+\)\|\(rm\?[0-9]\+\)\|\(iu[01]\)\|\(s\%(tl\)\?[01]\)\|'
+  \   .'\(da\?[clr]\)\|\(ms\?[lrc*]\+\)\|\(i\%(dt\)\?[kdsn]\)\|\(ig\[.*\]\)'
+  \ .'\)\+\s*$'
+
+function! s:parse_shorthand_opts(expr)
   let opts = {}
   let expr = substitute(a:expr, '\s', '', 'g')
-  let regex =
+  let regex = '^'. s:shorthand_regex
-    \ '^\('
-    \   .'\(l[0-9]\+\)\|\(r[0-9]\+\)\|\(iu[01]\)\|\(s[01]\)\|'
-    \   .'\(d[clr]\)\|\(m[lrc*]\+\)\|\(i[kdsn]\)\|\(ig\[.*\]\)'
-    \ .'\)\+$'
 
   if empty(expr)
     return opts
@@ -718,29 +720,30 @@ function! s:parse_shortcut_opts(expr)
     let match = matchlist(expr, regex)
     if empty(match) | break | endif
     for m in filter(match[ 2 : -1 ], '!empty(v:val)')
-      let k  = tolower(m[0])
+      for key in ['lm', 'rm', 'l', 'r', 'stl', 's', 'iu', 'da', 'd', 'ms', 'm', 'ig', 'i']
-      let kk = tolower(m[0 : 1])
+        if stridx(tolower(m), key) == 0
-      let rest = m[1 : -1]
+          let rest = strpart(m, len(key))
-      if index(['l', 'r', 's'], k) >= 0
+          if key == 'i' | let key = 'idt' | endif
-        let opts[k] = str2nr(rest)
+
-      elseif kk == 'iu'
+          if key == 'idt' || index(['d', 'm'], key[0]) >= 0
-        let opts['iu'] = str2nr(m[2 : -1])
+            let opts[key] = rest
-      elseif kk == 'ig'
+          elseif key == 'ig'
             try
-          let arr = eval(m[2 : -1])
+              let arr = eval(rest)
               if type(arr) == 3
-            let opts['ig'] = arr
+                let opts[key] = arr
               else
                 throw 'Not an array'
               endif
             catch
               call s:exit("Invalid ignore_groups: ". a:expr)
             endtry
-      elseif k == 'i'
-        let opts['idt'] = rest
           else
-        let opts[k] = rest
+            let opts[key] = str2nr(rest)
           endif
+          break
+        endif
+      endfor
     endfor
   endif
   return s:normalize_options(opts)
@@ -785,14 +788,18 @@ function! s:parse_args(args)
     let opts = s:normalize_options(opts)
   endif
 
+  " Shorthand option notation
+  let sopts = matchstr(args, s:shorthand_regex)
+  if !empty(sopts)
+    let args = strpart(args, 0, len(args) - len(sopts))
+    let opts = extend(s:parse_shorthand_opts(sopts), opts)
+  endif
+
   " Has /Regexp/?
-  let matches = matchlist(args, '^\(.\{-}\)\s*/\(.*\)/\(.\{-}\)$')
+  let matches = matchlist(args, '^\(.\{-}\)\s*/\(.*\)/\s*$')
 
   " Found regexp
   if !empty(matches)
-    if !empty(matches[3])
-      let opts = extend(s:parse_shortcut_opts(matches[3]), opts)
-    endif
     return [matches[1], s:test_regexp(matches[2]), opts, 1]
   else
     let tokens = matchlist(args, '^\([1-9][0-9]*\|-[0-9]*\|\*\*\?\)\?\s*\(.\{-}\)\?$')

test/regexp.expected

@@ -106,3 +106,23 @@ data ;;exchange:;format
 apple   ;:   banana   ::     cake
 data   ;;    exchange   :;   format
 
+a+=         1
+bb==#       2
+ccc=        3
+dddd=>      4
+
+apple;:     banana::    cake
+ data;;   exchange:;   format
+
+```ruby
+apple = 1       # comment not aligned
+apricot = 'DAD' + 'F#AD'
+banana = 'Gros  Michel'   # comment 2
+```
+
+```ruby
+apple = 1              # comment not aligned
+apricot = 'DAD'        + 'F#AD'
+banana = 'Gros Michel' # comment 2
+```
+

test/regexp.script

@@ -1 +1 @@
-4Gvipjyvip:EasyAlign:
+4Gvipjyvip:EasyAlign: