Allow trailing comments in exposes decl

compiler/parse/src/header.rs

@@ -177,7 +177,7 @@ pub struct Effects<'a> {
     pub entries: &'a [Loc<TypedIdent<'a>>],
 }
 
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Copy, Clone, Debug, PartialEq)]
 pub enum ExposesEntry<'a, T> {
     /// e.g. `Task`
     Exposed(T),
@@ -199,13 +199,16 @@ impl<'a, T> Spaceable<'a> for ExposesEntry<'a, T> {
 #[derive(Clone, Debug, PartialEq)]
 pub enum ImportsEntry<'a> {
     /// e.g. `Task` or `Task.{ Task, after }`
-    Module(ModuleName<'a>, Vec<'a, Loc<ExposesEntry<'a, &'a str>>>),
+    Module(
+        ModuleName<'a>,
+        Collection<'a, Loc<ExposesEntry<'a, &'a str>>>,
+    ),
 
     /// e.g. `base.Task` or `base.Task.{ after }` or `base.{ Task.{ Task, after } }`
     Package(
         &'a str,
         ModuleName<'a>,
-        Vec<'a, Loc<ExposesEntry<'a, &'a str>>>,
+        Collection<'a, Loc<ExposesEntry<'a, &'a str>>>,
     ),
 
     // Spaces

compiler/parse/src/module.rs

@@ -768,7 +768,7 @@ fn imports_entry<'a>() -> impl Parser<'a, ImportsEntry<'a>, EImports> {
 
     type Temp<'a> = (
         (Option<&'a str>, ModuleName<'a>),
-        Option<Vec<'a, Located<ExposesEntry<'a, &'a str>>>>,
+        Option<Collection<'a, Located<ExposesEntry<'a, &'a str>>>>,
     );
 
     map_with_arena!(
@@ -785,19 +785,21 @@ fn imports_entry<'a>() -> impl Parser<'a, ImportsEntry<'a>, EImports> {
             // e.g. `.{ Task, after}`
             maybe!(skip_first!(
                 word1(b'.', EImports::ExposingDot),
-                collection_e!(
+                collection_trailing_sep_e!(
                     word1(b'{', EImports::SetStart),
                     exposes_entry(EImports::Identifier),
                     word1(b',', EImports::SetEnd),
                     word1(b'}', EImports::SetEnd),
                     min_indent,
+                    EImports::Open,
                     EImports::Space,
-                    EImports::IndentSetEnd
+                    EImports::IndentSetEnd,
+                    ExposesEntry::SpaceBefore
                 )
             ))
         ),
-        |arena, ((opt_shortname, module_name), opt_values): Temp<'a>| {
-            let exposed_values = opt_values.unwrap_or_else(|| Vec::new_in(arena));
+        |_arena, ((opt_shortname, module_name), opt_values): Temp<'a>| {
+            let exposed_values = opt_values.unwrap_or_else(|| Collection::empty());
 
             match opt_shortname {
                 Some(shortname) => ImportsEntry::Package(shortname, module_name, exposed_values),

compiler/parse/src/parser.rs

@@ -315,6 +315,7 @@ pub enum EEffects<'a> {
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum EImports {
+    Open(Row, Col),
     Imports(Row, Col),
     IndentImports(Row, Col),
     IndentListStart(Row, Col),