Expression now multi-line

Author: SSlinky

client/src/syntaxes/vba.tmLanguage.yaml

@@ -711,28 +711,16 @@ repository:
     match: (?i)^\s*End\s+(Sub|Function|Property)
 
   expression:
-    # (?:[*&\/\+-]|\bMod\b)|
-    # (?:[<>=]|\b(is|like)\b)|
-    # (?:[&+])|
-    # (?:\b(and|eqv|imp|not|or|xor)\b)|
-    # (?:\b(addressof|typeof)\b)
-
-    # This match just made up of the operators matchs. Don't look at it too hard.
+    # Begins and ends without consuming anything.
     name: meta.expression.vba
-    match: (?i)(?:(.*?)\s+)?((?:[*&\/\+-]|\bMod\b)|(?:[<>=]|\b(?:is|like)\b)|(?:[&+])|(?:\b(?:and|eqv|imp|not|or|xor)\b)|(?:\b(?:addressof|typeof)\b))\s+(.*)
-    captures:
-      1:  # Left side of expression?
-        patterns:
-          - include: "#functionCall"
-          - include: "#literal"
-      2:  # Operator
-        patterns:
-          - include: "#operators"
-      3:  # Right side of expression
-        patterns:
-          - include: "#literals"
-          - include: "#functionCall"
-          - include: "#expression"
+    begin: (?=.)
+    end: (?=\n|\sThen|\)|'|,)
+    patterns:
+      - include: "#literals"
+      - include: "#operators"
+      - include: "#functionCall"
+      - include: "#variable"
+      - include: "#lineContinuation"
 
   block:
     patterns:

test/textmate/unit/expressions.vba

@@ -0,0 +1,50 @@
+'  SYNTAX TEST "source.vba" "expressions"
+
+' Expressions as part of other statements.
+
+Sub Test()
+    foo = bar ' Comment
+'         ^^^                           meta.expression.vba
+'             ^^^^^^^^^                 comment.line.apostrophe.vba - meta.expression.vba
+    foo.bar = "' Not comment"   
+'             ^^^^^^^^^^^^^^^           meta.expression.vba
+    foo.bar = bar.foo   
+'             ^^^^^^^                   meta.expression.vba
+    foo = bar And Not True  
+'         ^^^^^^^^^^^^^^^^              meta.expression.vba
+    foo = bar Or Not foo = 12   
+'         ^^^^^^^^^^^^^^^^^^^           meta.expression.vba
+    foo = Not bar   
+'         ^^^^^^^                       meta.expression.vba
+    foo = _ 
+'         ^                             meta.expression.vba
+        foo.bar.baz() _ 
+'       ^^^^^^^^^^^^^^^                 meta.expression.vba
+        + bar.foo.biz _ 
+'       ^^^^^^^^^^^^^^^                 meta.expression.vba
+'       ^                               keyword.operator.arithmetic.vba
+        * 3 
+'       ^^^                             meta.expression.vba
+'       ^                               keyword.operator.arithmetic.vba
+
+    foo = Not Me.Bar( _
+'         ^^^^^^^^^^^^^                 meta.expression.vba
+'         ^^^                           keyword.operator.logical.vba
+'             ^^                        meta.function.call.vba variable.language.me.vba
+'                ^^^                    meta.function.call.vba entity.name.function.call.vba
+        foo, x = 3, False) ' Comment
+'       ^^^^^^^^^^^^^^^^^               meta.expression.vba
+'       ^^^  ^^^^^  ^^^^^               meta.expression.vba meta.expression.vba
+'       ^^^                             variable.other.object.vba
+'            ^                          variable.other.object.vba
+'              ^                        keyword.operator.comparison.vba
+'                ^                      constant.numeric.vba
+'                   ^^^^^               constant.language.boolean.vba
+'                          ^^^^^^^^^    comment.line.apostrophe.vba - meta.expression.vba
+
+    If condA And Not Foo(condB) Then
+'      ^^^^^^^^^^^^^^^^^^^^^^^^         meta.expression.vba
+'            ^^^ ^^^                    keyword.operator.logical.vba
+'                        ^^^^^          meta.expression.vba meta.expression.vba variable.other.object.vba
+    End If
+End Sub