Arguments now support parameter names

Author: SSlinky

client/src/syntaxes/vba.tmLanguage.yaml

@@ -622,10 +622,18 @@ repository:
     end: (?=[:)'\n])
     patterns:
       - include: "#lineContinuation"
-      - include: "#functionCall"
       - include: "#separator"
       - include: "#expression"
 
+  argumentName:
+    name: meta.arg-name.vba
+    match: (?i)([a-z][a-z0-9_]*)?(:=)
+    captures:
+      1:
+        name: variable.parameter.name.vba
+      2:
+        name: punctuation.assignment.parameter.vba
+
   comments:
     patterns:
       - include: "#blockComments"
@@ -854,7 +862,7 @@ repository:
     match: (?i)End\s+(Sub|Function|Property)
 
   expressionList:
-    begin: (?=.)
+    begin:
     end: (?=\n|\sThen|\)|'|:)
     patterns:
       - include: "#separator"
@@ -863,10 +871,11 @@ repository:
   expression:
     # Begins and ends without consuming anything.
     name: meta.expression.vba
-    begin: (?!=\n|\sThen|\)|'|,|:)
+    begin: (?!=\n|\sThen|\)|'|,|:|\s)
     end: (?=\n|\sThen|\)|'|,|:)
     patterns:
       - include: "#literals"
+      - include: "#argumentName"
       - include: "#operators"
       - include: "#functionCall"
       - include: "#variable"

test/textmate/unit/arguments.vba

@@ -0,0 +1,73 @@
+'  SYNTAX TEST "source.vba" "arguments"
+
+Sub Foo()
+'    Basic implicit sub call
+    BarSub x, 10, True = False
+'           ^^^^^^^^^^^^^^^^^^^    meta.arguments.vba
+'           ^   ^                  punctuation.separator.vba
+'                  ^^^^^^^^^^^^    meta.expression.vba
+
+'    Basic explicit sub call
+    Call BarSub(x, 10, True = False)
+'               ^^^^^^^^^^^^^^^^^^^     meta.arguments.vba
+'                ^   ^                  punctuation.separator.vba
+'                      ^^^^^^^^^^^^     meta.expression.vba
+
+'    Basic function call    
+    result = BarFunc(x, 10, True = False)
+'                    ^^^^^^^^^^^^^^^^^^^     meta.arguments.vba
+'                     ^   ^                  punctuation.separator.vba
+'                           ^^^^^^^^^^^^     meta.expression.vba
+
+'   Named args sub call
+    BarSub x, 10, NamedArgument:=True = False
+'          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^   meta.arguments.vba
+'           ^   ^                               punctuation.separator.vba
+'                                ^^^^^^^^^^^^   meta.expression.vba
+'                 ^^^^^^^^^^^^^                 meta.arg-name.vba variable.parameter.name.vba
+'                              ^^               meta.arg-name.vba punctuation.assignment.parameter.vba
+
+'   Named function sub call
+    result = BarFunc(x, 10, NamedArgument:=True = False)
+'                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^   meta.arguments.vba
+'                     ^   ^                               punctuation.separator.vba
+'                                          ^^^^^^^^^^^^   meta.expression.vba
+'                           ^^^^^^^^^^^^^                 meta.arg-name.vba variable.parameter.name.vba
+'                                        ^^               meta.arg-name.vba punctuation.assignment.parameter.vba
+
+
+'   Sub call multi-line
+    BarSub  _
+'           ^                               meta.arguments.vba keyword.control.line-continuation.vba
+        validationResult, _
+'       ^^^^^^^^^^^^^^^^^^^                 meta.arguments.vba
+'                       ^                   punctuation.separator.vba
+'                         ^                 keyword.control.line-continuation.vba
+        validationResult + 10, _
+'       ^^^^^^^^^^^^^^^^^^^^^^^^            meta.arguments.vba
+'       ^^^^^^^^^^^^^^^^^^^^^               meta.expression.vba
+'                            ^              punctuation.separator.vba
+'                              ^            keyword.control.line-continuation.vba
+        NamedArgument:=validationResult
+'       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^     meta.arguments.vba
+'       ^^^^^^^^^^^^^                       variable.parameter.name.vba
+'                    ^^                     punctuation.assignment.parameter.vba
+
+'   Function call multi-line
+    result = BarSub( _
+'                    ^                      meta.arguments.vba keyword.control.line-continuation.vba
+        validationResult, _
+'       ^^^^^^^^^^^^^^^^^^^                 meta.arguments.vba
+'                       ^                   punctuation.separator.vba
+'                         ^                 keyword.control.line-continuation.vba
+        validationResult + 10, _
+'       ^^^^^^^^^^^^^^^^^^^^^^^^            meta.arguments.vba
+'       ^^^^^^^^^^^^^^^^^^^^^               meta.expression.vba
+'                            ^              punctuation.separator.vba
+'                              ^            keyword.control.line-continuation.vba
+        NamedArgument:=validationResult)
+'       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^     meta.arguments.vba
+'       ^^^^^^^^^^^^^                       variable.parameter.name.vba
+'                    ^^                     punctuation.assignment.parameter.vba
+'                                      ^    - meta.arguments.vba
+End Sub