Merge pull request #14 from returntocorp/mj-copy-multiple-files

Allow copying multiple files with ADD/COPY

corpus/add.txt

@@ -25,3 +25,16 @@ ADD --chown=a:b /src ./dst
 		(path)
 		(path)))
 
+==================
+Multiple files
+==================
+
+ADD src1 src2 dst
+
+---
+
+(source_file
+  (add_instruction
+    (path)
+    (path)
+    (path)))

corpus/copy.txt

@@ -25,3 +25,16 @@ COPY --chown=a:b /src ./dst
 		(path)
 		(path)))
 
+==================
+Multiple files
+==================
+
+COPY src1 src2 dst
+
+---
+
+(source_file
+  (copy_instruction
+    (path)
+    (path)
+    (path)))

grammar.js

@@ -68,8 +68,9 @@ module.exports = grammar({
       seq(
         alias(/[aA][dD][dD]/, "ADD"),
         optional($.param),
-        $.path,
+        repeat1(
-        $._non_newline_whitespace,
+          seq($.path, $._non_newline_whitespace)
+        ),
         $.path
       ),
 
@@ -77,8 +78,9 @@ module.exports = grammar({
       seq(
         alias(/[cC][oO][pP][yY]/, "COPY"),
         optional($.param),
-        $.path,
+        repeat1(
-        $._non_newline_whitespace,
+          seq($.path, $._non_newline_whitespace)
+        ),
         $.path
       ),
 

src/grammar.json

@@ -332,12 +332,20 @@
           ]
         },
         {
-          "type": "SYMBOL",
+          "type": "REPEAT1",
-          "name": "path"
+          "content": {
-        },
+            "type": "SEQ",
-        {
+            "members": [
-          "type": "SYMBOL",
+              {
-          "name": "_non_newline_whitespace"
+                "type": "SYMBOL",
+                "name": "path"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "_non_newline_whitespace"
+              }
+            ]
+          }
         },
         {
           "type": "SYMBOL",
@@ -370,12 +378,20 @@
           ]
         },
         {
-          "type": "SYMBOL",
+          "type": "REPEAT1",
-          "name": "path"
+          "content": {
-        },
+            "type": "SEQ",
-        {
+            "members": [
-          "type": "SYMBOL",
+              {
-          "name": "_non_newline_whitespace"
+                "type": "SYMBOL",
+                "name": "path"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "_non_newline_whitespace"
+              }
+            ]
+          }
         },
         {
           "type": "SYMBOL",