Add multi-line variable declaration support

Author: SSlinky

client/src/syntaxes/vba.tmLanguage.yaml

@@ -411,10 +411,10 @@ repository:
           - include: "#AsTypeObject"
         repository:
           AsTypePrimative:
-            name: support.type.primitive.vba
+            name: support.type.primitive.$1.vba
             match: (?i)(boolean|byte|currency|date|decimal|double|integer|long(long|ptr)?|single|string|variant)\b
           AsTypeObject:
-            name: support.type.object.vba
+            name: support.type.object.$1.vba
             match: (?i)([A-Z][A-Z0-9_]*)
 
   argumentsSignature:
@@ -760,18 +760,33 @@ repository:
         patterns:
           - include: "#lineContinuation"
           - include: "#separator"
-          - match: (?i)([a-z][a-z0-9_]*)([&%#!@$^])?(?:\s+(as)\s+([a-z][a-z0-9_.]*))?
+          - include: "#types"
+          - include: "#variable"
+
+      constDeclaration:
+        name: meta.const.declaration.vba
+        begin: (?i)(?:(global|public|private)\s+)?(const)
+        end: (?=[':\n])
+        beginCaptures:
+          1:
+            name: storage.modifier.vba
+          2:
+            name: storage.type.vba
+        patterns:
+          - include: "#lineContinuation"
+          - include: "#separator"
+          - include: "#types"
+          - include: "#variable"
+          - match: (=)\s+([^,'_\n]*)
             captures:
               1:
-                name: variable.other.read-write.vba
+                name: keyword.operator.assignment.vba
               2:
-                name: storage.type.$2.vba
-              3:
-                name: keyword.control.as.vba
-              4:
-                name: support.type.$4.vba
+                patterns:
+                  - include: "#literals"
 
-      constDeclaration:
+
+      constDeclaration2:
         name: storage.const-declaration.vba
         match: (?i)^\s*((?:(?:Public|Private)\s+)?Const)\s+([a-z][a-z0-9_]*)([&%#!@$^])?(\s+As\s+[a-z][a-z0-9_]*)?(.*)
         captures:
@@ -865,7 +880,6 @@ repository:
     beginCaptures:
       1:
         patterns:
-          - include: "#kw-storageMe"
           - include: "#variable"
       2:
         patterns:

test/textmate/unit/declarations.vba

@@ -68,3 +68,39 @@ Global  Const X As Long = 0, Y As Long = 0, Z = 0 ' Comment
 '                  ^^^^           ^^^^                      support.type.primitive.Long.vba
 '                          ^              ^                 punctuation.separator.vba
 '                                                 ^^^^^^^^^ comment.line.apostrophe.vba - meta.variable.declaration.vba
+Dim x As Long, _
+'<---               meta.variable.declaration.vba storage.modifier.declare-variable.vba
+'   ^               meta.variable.declaration.vba variable.other.readwrite.vba
+'     ^^            meta.variable.declaration.vba keyword.control.as.vba
+'        ^^^^       meta.variable.declaration.vba support.type.primitive.Long.vba
+'            ^      meta.variable.declaration.vba punctuation.separator.vba
+'              ^    meta.variable.declaration.vba keyword.control.line-continuation.vba
+    y As Long, _
+'   ^               meta.variable.declaration.vba variable.other.readwrite.vba
+'     ^^            meta.variable.declaration.vba keyword.control.as.vba
+'        ^^^^       meta.variable.declaration.vba support.type.primitive.Long.vba
+'            ^      meta.variable.declaration.vba punctuation.separator.vba
+'              ^    meta.variable.declaration.vba keyword.control.line-continuation.vba
+    z ' Comment
+'   ^               meta.variable.declaration.vba variable.other.readwrite.vba
+'     ^^^^^^^^^     comment.line.apostrophe.vba - meta.variable.declaration.vba
+Const X As Long = 0, _
+'<-----                 meta.const.declaration.vba storage.type.vba
+'     ^                 meta.const.declaration.vba variable.other.constant
+'       ^^              meta.const.declaration.vba keyword.control.as.vba
+'          ^^^^         meta.const.declaration.vba support.type.primitive.Long.vba
+'               ^       meta.const.declaration.vba keyword.operator.assignment.vba
+'                 ^     meta.const.declaration.vba constant.numeric.vba
+'                    ^  meta.const.declaration.vba keyword.control.line-continuation.vba
+    Y As Long = 0, _
+'   ^                   meta.const.declaration.vba variable.other.constant
+'     ^^                meta.const.declaration.vba keyword.control.as.vba
+'        ^^^^           meta.const.declaration.vba support.type.primitive.Long.vba
+'             ^         meta.const.declaration.vba keyword.operator.assignment.vba
+'               ^       meta.const.declaration.vba constant.numeric.vba
+'                  ^    meta.const.declaration.vba keyword.control.line-continuation.vba    
+    Z = 0 ' Comment
+'   ^                   meta.const.declaration.vba variable.other.constant
+'     ^                 meta.const.declaration.vba keyword.operator.assignment.vba
+'       ^               meta.const.declaration.vba constant.numeric.vba
+'         ^^^^^^^^^     comment.line.apostrophe.vba - meta.variable.declaration.vba