Elixir: fixed capture expressions

* `& 1` -> don't match as a capture argument number
* `& &1.func/1` -> can be a captured remote function
* `&some.thing.good/1` -> several chained members
* `&@module.func/1` -> captured remote function

Author: azizk

syntaxes/Elixir.sublime-syntax

@@ -2432,21 +2432,31 @@ contexts:
   ## Captures
 
   capture:
-    - match: (&)\s*(\d+)(?!\.(?![.\D]))
+    - include: capture_arg_number
+    - include: capture_remote_func
+
+  capture_arg_number:
+    - match: (&)(\d+)(?!\.(?![.\D]))
       captures:
         1: punctuation.definition.capture.elixir constant.other.capture.elixir
         2: constant.other.capture.elixir
+
+  capture_remote_func:
     - match: \&
       scope: keyword.operator.capture.elixir
       push:
         - match: (?=(?>do|fn|true|false|nil){{no_id_key_suffix}})
           pop: 1
         - include: if_closing_token_pop
         - match: (?=\.(?!\.))
-          set:
+          push:
             - include: dot_operator
             - include: capture_name_pop
             - include: member_or_call_pop
+        - match: (?=&\d+\s*\.(?!\.))
+          push:
+            - include: capture_arg_number
+            - include: if_empty_pop
         - include: capture_name_pop
         - include: special_form
         - match: (?={{identifier}}\s*\.(?!\.|\s*\())
@@ -2468,6 +2478,9 @@ contexts:
         )
       comment: exit if module/atom is not followed by `.` or `.(`
       pop: 1
+    - match: '@(?!/)'
+      scope: keyword.operator.attribute.elixir
+      push: module_attribute_pop
     - include: atom_symbol
     - include: atom_keyword
     - include: module_name

tests/syntax_test_misc.ex

@@ -595,12 +595,12 @@ end[]
 #^^^ constant.other.capture
 
  & 1/&1
-#     ^ -punctuation.definition.capture constant.other.capture
-#    ^ punctuation.definition.capture constant.other.capture
+#    ^^ constant.other.capture
+#    ^ punctuation.definition.capture
 #   ^ keyword.operator.arithmetic
-#  ^ -punctuation.definition.capture constant.other.capture
-# ^ -punctuation.definition.capture -constant.other.capture
-#^ punctuation.definition.capture constant.other.capture
+#  ^ constant.numeric.integer
+# ^^^ -punctuation.definition.capture -constant.other.capture
+#^ keyword.operator.capture
 
  & &1..&2; & &1 .. &2
 #                  ^^ constant.other.capture
@@ -622,8 +622,8 @@ end[]
 #  ^^^^^ constant.other.module
  &:"\"Quoted\"\.Module\\".t()
 #                         ^ variable.function
+#                        ^ punctuation.accessor.dot
 #   ^^^^^^^^^^^^^^^^^^^^ constant.other.module
-# FIXME:                 ^ punctuation.accessor.dot
  &:erlang.apply/2
 #              ^ punctuation.accessor.arity
 #         ^^^^^ variable.other.capture
@@ -651,6 +651,39 @@ end[]
 #     ^^^^ variable.other.member
 #    ^ punctuation.accessor.dot
 #  ^^ constant.other.capture
+ & &1.func/2
+#          ^ constant.numeric.arity
+#         ^ punctuation.accessor.arity
+#     ^^^^ variable.other.capture
+#    ^ punctuation.accessor.dot
+#  ^^ constant.other.capture
+#  ^ punctuation.definition.capture
+ & &1.prop.func/1
+#               ^ constant.numeric.arity
+#              ^ punctuation.accessor.arity
+#          ^^^^ variable.other.capture
+#         ^ punctuation.accessor.dot
+#     ^^^^ variable.other.member
+#    ^ punctuation.accessor.dot
+#  ^^ constant.other.capture
+#  ^ punctuation.definition.capture
+
+ &some.thing/1
+#            ^ constant.numeric.arity
+#           ^ punctuation.accessor.arity
+#      ^^^^^ variable.other.capture
+#     ^ punctuation.accessor.dot
+# ^^^^ variable.other
+#^ keyword.operator.capture
+ &some.thing.good/1
+#                 ^ constant.numeric.arity
+#                ^ punctuation.accessor.arity
+#            ^^^^ variable.other.capture
+#           ^ punctuation.accessor.dot
+#      ^^^^^ variable.other.member
+#     ^ punctuation.accessor.dot
+# ^^^^ variable.other
+#^ keyword.operator.capture
 
  &<%= num %>
 #          ^ keyword.operator.comparison
@@ -672,8 +705,8 @@ end[]
 #       ^^^ keyword.operator.logical
 #     ^^ constant.other.capture
 #   ^^ keyword.operator.comparison
-#  ^ constant.other.capture -constant.numeric
-#^ constant.other.capture
+#  ^ constant.numeric.integer
+#^ keyword.operator.capture
 
  &mod.&/1; &Mod.&/1
 #               ^ variable.other.capture
@@ -683,6 +716,15 @@ end[]
 #    ^ punctuation.accessor.dot
 # ^^^ variable.other
 
+ &@module.func/1
+#              ^ constant.numeric.arity
+#             ^ punctuation.accessor.arity
+#         ^^^^ variable.other.capture
+#        ^ punctuation.accessor.dot
+#  ^^^^^^ variable.other.constant
+# ^ keyword.operator.attribute
+#^ keyword.operator.capture.elixir
+
  &x."a func"
 #   ^^^^^^^^ meta.member
 #  ^ punctuation.accessor.dot