Support comma separated import declarations

Author: mads-hartmann

corpus/definitions.txt

@@ -37,9 +37,8 @@ Imports
 ================================
 
 import PartialFunction.condOpt
+import a.b, c.e
 import reflect.io.{Directory, File, Path}
-import tools.nsc.classpath._
-import lang.System.{lineSeparator => EOL}
 
 ---
 
@@ -48,10 +47,33 @@ import lang.System.{lineSeparator => EOL}
     (stable_identifier (identifier) (identifier)))
   (import_declaration
     (stable_identifier (identifier) (identifier))
-    (import_selectors (identifier) (identifier) (identifier)))
+    (stable_identifier (identifier) (identifier)))
+  (import_declaration
+    (stable_identifier (identifier) (identifier))
+    (import_selectors (identifier) (identifier) (identifier))))
+
+================================
+Imports: Wildcard
+================================
+
+import tools.nsc.classpath._
+
+---
+
+(compilation_unit
   (import_declaration
     (stable_identifier (stable_identifier (identifier) (identifier)) (identifier))
-    (wildcard))
+    (wildcard)))
+
+================================
+Imports: Rename
+================================
+
+import lang.System.{lineSeparator => EOL}
+
+---
+
+(compilation_unit
   (import_declaration
     (stable_identifier (identifier) (identifier))
     (import_selectors (renamed_identifier (identifier) (identifier)))))

grammar.js

@@ -75,6 +75,10 @@ module.exports = grammar({
 
     import_declaration: $ => seq(
       'import',
+      sep1(',', $._import_expression)
+    ),
+
+    _import_expression: $ => seq(
       choice($.stable_identifier, $.identifier),
       optional(seq(
         '.',