Upgrade hosted header in the style module header

roc-lang · Jan 26, 2025 · 631e59c · 631e59c
1 parent 3f09235
commit 631e59c
Show file tree

Hide file tree

Showing 22 changed files with 256 additions and 185 deletions.
diff --git a/crates/cli/tests/benchmarks/platform/Host.roc b/crates/cli/tests/benchmarks/platform/Host.roc
@@ -1,6 +1,4 @@
-hosted Host
-    exposes [put_line!, put_int!, get_int!]
-    imports []
+hosted [put_line!, put_int!, get_int!]
 
 put_line! : Str => {}
 

diff --git a/crates/cli/tests/test-projects/false-interpreter/platform/Host.roc b/crates/cli/tests/test-projects/false-interpreter/platform/Host.roc
@@ -1,6 +1,4 @@
-hosted Host
-    exposes [open_file!, close_file!, get_file_line!, get_file_bytes!, put_line!, put_raw!, get_line!, get_char!]
-    imports []
+hosted [open_file!, close_file!, get_file_line!, get_file_bytes!, put_line!, put_raw!, get_line!, get_char!]
 
 open_file! : Str => U64
 

diff --git a/crates/cli/tests/test-projects/test-platform-effects-zig/Effect.roc b/crates/cli/tests/test-projects/test-platform-effects-zig/Effect.roc
@@ -1,6 +1,4 @@
-hosted Effect
-    exposes [put_line!, get_line!]
-    imports []
+hosted [put_line!, get_line!]
 
 put_line! : Str => {}
 

diff --git a/crates/compiler/fmt/src/header.rs b/crates/compiler/fmt/src/header.rs
@@ -199,15 +199,10 @@ pub fn fmt_module_header<'a>(buf: &mut Buf, header: &'a ModuleHeader<'a>) {
 pub fn fmt_hosted_header<'a>(buf: &mut Buf, header: &'a HostedHeader<'a>) {
     buf.indent(0);
     buf.push_str("hosted");
-    let indent = INDENT;
-    fmt_default_spaces(buf, header.before_name, indent);
 
-    buf.push_str(header.name.value.as_str());
+    let indent = fmt_spaces_with_outdent(buf, header.before_exposes, 0);
 
-    header.exposes.keyword.format(buf, indent);
-    fmt_exposes(buf, header.exposes.item, indent);
-    header.imports.keyword.format(buf, indent);
-    fmt_imports(buf, header.imports.item, indent);
+    fmt_exposes(buf, header.exposes, indent);
 }
 
 pub fn fmt_app_header<'a>(buf: &mut Buf, header: &'a AppHeader<'a>) {

diff --git a/crates/compiler/load_internal/src/file.rs b/crates/compiler/load_internal/src/file.rs
@@ -3952,17 +3952,25 @@ fn parse_header<'a>(
             },
             parse_state,
         )) => {
+            let module_name = match opt_expected_module_name {
+                Some(pq_name) => arena.alloc_str(pq_name.as_inner().as_str()),
+                None => {
+                    // [modules-revamp] [privacy-changes] TODO: Support test/check on nested modules
+                    arena.alloc_str(filename.file_stem().unwrap().to_str().unwrap())
+                }
+            };
+
             let info = HeaderInfo {
                 filename,
                 is_root_module,
                 opt_shorthand,
                 packages: &[],
                 header_type: HeaderType::Hosted {
-                    name: header.name.value,
-                    exposes: unspace(arena, header.exposes.item.items),
+                    name: roc_parse::header::ModuleName::new(module_name),
+                    exposes: unspace(arena, header.exposes.items),
                 },
                 module_comments: comments,
-                header_imports: Some(header.imports),
+                header_imports: header.old_imports,
             };
 
             let (module_id, _, header) =

diff --git a/crates/compiler/parse/src/ast.rs b/crates/compiler/parse/src/ast.rs
@@ -172,7 +172,14 @@ impl<'a> Header<'a> {
                 }),
                 Self::header_imports_to_defs(arena, header.old_imports),
             ),
-            Header::Package(_) | Header::Platform(_) | Header::Hosted(_) => (self, Defs::default()),
+            Header::Hosted(header) => (
+                Header::Hosted(HostedHeader {
+                    old_imports: None,
+                    ..header
+                }),
+                Self::header_imports_to_defs(arena, header.old_imports),
+            ),
+            Header::Package(_) | Header::Platform(_) => (self, Defs::default()),
         };
 
         (header, defs)

diff --git a/crates/compiler/parse/src/header.rs b/crates/compiler/parse/src/header.rs
@@ -103,7 +103,7 @@ pub fn header<'a>() -> impl Parser<'a, SpacesBefore<'a, Header<'a>>, EHeader<'a>
             map(
                 skip_first(
                     keyword("hosted", EHeader::Start),
-                    increment_min_indent(hosted_header())
+                    increment_min_indent(one_of![hosted_header(), old_hosted_header()])
                 ),
                 Header::Hosted
             ),
@@ -184,15 +184,38 @@ fn imports_none_if_empty(value: ImportsKeywordItem<'_>) -> Option<ImportsKeyword
 
 #[inline(always)]
 fn hosted_header<'a>() -> impl Parser<'a, HostedHeader<'a>, EHeader<'a>> {
-    record!(HostedHeader {
-        before_name: space0_e(EHeader::IndentStart),
-        name: loc(module_name_help(EHeader::ModuleName)),
-        exposes: specialize_err(EHeader::Exposes, exposes_values_kw()),
-        imports: specialize_err(EHeader::Imports, imports()),
-    })
+    map(
+        and(
+            backtrackable(space0_e(EHeader::IndentStart)),
+            specialize_err(EHeader::Exposes, exposes_list()),
+        ),
+        |(before_exposes, exposes)| HostedHeader {
+            before_exposes,
+            exposes,
+            old_imports: None,
+        },
+    )
     .trace("hosted_header")
 }
 
+#[inline(always)]
+fn old_hosted_header<'a>() -> impl Parser<'a, HostedHeader<'a>, EHeader<'a>> {
+    map(
+        record!(OldHostedHeader {
+            before_name: space0_e(EHeader::IndentStart),
+            name: loc(module_name_help(EHeader::ModuleName)),
+            exposes: specialize_err(EHeader::Exposes, exposes_values_kw()),
+            imports: specialize_err(EHeader::Imports, imports()),
+        }),
+        |old_hosted| HostedHeader {
+            before_exposes: old_hosted.before_name,
+            exposes: old_hosted.exposes.item,
+            old_imports: Some(old_hosted.imports),
+        },
+    )
+    .trace("old_hosted_header")
+}
+
 fn chomp_module_name(buffer: &[u8]) -> Result<&str, Progress> {
     use encode_unicode::CharExt;
 
@@ -1196,6 +1219,15 @@ pub type ImportsCollection<'a> = Collection<'a, Loc<Spaced<'a, ImportsEntry<'a>>
 
 #[derive(Clone, Debug, PartialEq)]
 pub struct HostedHeader<'a> {
+    pub before_exposes: &'a [CommentOrNewline<'a>],
+    pub exposes: Collection<'a, Loc<Spaced<'a, ExposedName<'a>>>>,
+
+    // Keeping this so we can format old interface header into module headers
+    pub old_imports: Option<KeywordItem<'a, ImportsKeyword, ImportsCollection<'a>>>,
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub struct OldHostedHeader<'a> {
     pub before_name: &'a [CommentOrNewline<'a>],
     pub name: Loc<ModuleName<'a>>,
     pub exposes: KeywordItem<'a, ExposesKeyword, Collection<'a, Loc<Spaced<'a, ExposedName<'a>>>>>,

diff --git a/crates/compiler/parse/src/normalize.rs b/crates/compiler/parse/src/normalize.rs
@@ -172,10 +172,9 @@ impl<'a> Normalize<'a> for Header<'a> {
                 provides: header.provides.normalize(arena),
             }),
             Header::Hosted(header) => Header::Hosted(HostedHeader {
-                before_name: &[],
-                name: header.name.normalize(arena),
+                before_exposes: &[],
                 exposes: header.exposes.normalize(arena),
-                imports: header.imports.normalize(arena),
+                old_imports: None,
             }),
         }
     }

diff --git a/crates/compiler/test_syntax/tests/snapshots/pass/empty_hosted_header.header.result-ast b/crates/compiler/test_syntax/tests/snapshots/pass/empty_hosted_header.header.result-ast
@@ -2,26 +2,9 @@ SpacesBefore {
     before: [],
     item: Hosted(
         HostedHeader {
-            before_name: [],
-            name: @7-10 ModuleName(
-                "Foo",
-            ),
-            exposes: KeywordItem {
-                keyword: Spaces {
-                    before: [],
-                    item: ExposesKeyword,
-                    after: [],
-                },
-                item: [],
-            },
-            imports: KeywordItem {
-                keyword: Spaces {
-                    before: [],
-                    item: ImportsKeyword,
-                    after: [],
-                },
-                item: [],
-            },
+            before_exposes: [],
+            exposes: [],
+            old_imports: None,
         },
     ),
 }
diff --git a/crates/compiler/test_syntax/tests/snapshots/pass/empty_hosted_header.header.roc b/crates/compiler/test_syntax/tests/snapshots/pass/empty_hosted_header.header.roc
@@ -1 +1 @@
-hosted Foo exposes [] imports []
+hosted []
diff --git a/...es/compiler/test_syntax/tests/snapshots/pass/empty_old_hosted_header.header.formatted.roc b/...es/compiler/test_syntax/tests/snapshots/pass/empty_old_hosted_header.header.formatted.roc
@@ -0,0 +1 @@
+hosted []
diff --git a/crates/compiler/test_syntax/tests/snapshots/pass/empty_old_hosted_header.header.result-ast b/crates/compiler/test_syntax/tests/snapshots/pass/empty_old_hosted_header.header.result-ast
@@ -0,0 +1,19 @@
+SpacesBefore {
+    before: [],
+    item: Hosted(
+        HostedHeader {
+            before_exposes: [],
+            exposes: [],
+            old_imports: Some(
+                KeywordItem {
+                    keyword: Spaces {
+                        before: [],
+                        item: ImportsKeyword,
+                        after: [],
+                    },
+                    item: [],
+                },
+            ),
+        },
+    ),
+}
diff --git a/crates/compiler/test_syntax/tests/snapshots/pass/empty_old_hosted_header.header.roc b/crates/compiler/test_syntax/tests/snapshots/pass/empty_old_hosted_header.header.roc
@@ -0,0 +1 @@
+hosted Foo exposes [] imports []
diff --git a/crates/compiler/test_syntax/tests/snapshots/pass/nonempty_hosted_header.header.formatted.roc b/crates/compiler/test_syntax/tests/snapshots/pass/nonempty_hosted_header.header.formatted.roc
@@ -1,12 +1,5 @@
-hosted Foo
-    exposes
-    [
-        Stuff,
-        Things,
-        somethingElse,
-    ]
-    imports
-    [
-        Blah,
-        Baz.{ stuff, things },
-    ]
+hosted [
+    Stuff,
+    Things,
+    somethingElse,
+]
diff --git a/crates/compiler/test_syntax/tests/snapshots/pass/nonempty_hosted_header.header.result-ast b/crates/compiler/test_syntax/tests/snapshots/pass/nonempty_hosted_header.header.result-ast
@@ -2,99 +2,29 @@ SpacesBefore {
     before: [],
     item: Hosted(
         HostedHeader {
-            before_name: [],
-            name: @7-10 ModuleName(
-                "Foo",
-            ),
-            exposes: KeywordItem {
-                keyword: Spaces {
-                    before: [
-                        Newline,
-                    ],
-                    item: ExposesKeyword,
-                    after: [
-                        Newline,
-                    ],
-                },
-                item: Collection {
-                    items: [
-                        @45-50 SpaceBefore(
-                            ExposedName(
-                                "Stuff",
-                            ),
-                            [
-                                Newline,
-                            ],
+            before_exposes: [],
+            exposes: Collection {
+                items: [
+                    @8-13 ExposedName(
+                        "Stuff",
+                    ),
+                    @15-21 ExposedName(
+                        "Things",
+                    ),
+                    @27-40 SpaceBefore(
+                        ExposedName(
+                            "somethingElse",
                         ),
-                        @64-70 SpaceBefore(
-                            ExposedName(
-                                "Things",
-                            ),
-                            [
-                                Newline,
-                            ],
-                        ),
-                        @84-97 SpaceBefore(
-                            ExposedName(
-                                "somethingElse",
-                            ),
-                            [
-                                Newline,
-                            ],
-                        ),
-                    ],
-                    final_comments: [
-                        Newline,
-                    ],
-                },
-            },
-            imports: KeywordItem {
-                keyword: Spaces {
-                    before: [
-                        Newline,
-                    ],
-                    item: ImportsKeyword,
-                    after: [
-                        Newline,
-                    ],
-                },
-                item: Collection {
-                    items: [
-                        @143-147 SpaceBefore(
-                            Module(
-                                ModuleName(
-                                    "Blah",
-                                ),
-                                [],
-                            ),
-                            [
-                                Newline,
-                            ],
-                        ),
-                        @161-182 SpaceBefore(
-                            Module(
-                                ModuleName(
-                                    "Baz",
-                                ),
-                                [
-                                    @167-172 ExposedName(
-                                        "stuff",
-                                    ),
-                                    @174-180 ExposedName(
-                                        "things",
-                                    ),
-                                ],
-                            ),
-                            [
-                                Newline,
-                            ],
-                        ),
-                    ],
-                    final_comments: [
-                        Newline,
-                    ],
-                },
+                        [
+                            Newline,
+                        ],
+                    ),
+                ],
+                final_comments: [
+                    Newline,
+                ],
             },
+            old_imports: None,
         },
     ),
 }
diff --git a/crates/compiler/test_syntax/tests/snapshots/pass/nonempty_hosted_header.header.roc b/crates/compiler/test_syntax/tests/snapshots/pass/nonempty_hosted_header.header.roc
@@ -1,12 +1,3 @@
-hosted Foo
-    exposes
-        [
-            Stuff,
-            Things,
-            somethingElse,
-        ]
-    imports
-        [
-            Blah,
-            Baz.{ stuff, things },
-        ]
+hosted [Stuff, Things,
+    somethingElse,
+]
diff --git a/...compiler/test_syntax/tests/snapshots/pass/nonempty_old_hosted_header.header.formatted.roc b/...compiler/test_syntax/tests/snapshots/pass/nonempty_old_hosted_header.header.formatted.roc
@@ -0,0 +1,5 @@
+hosted [
+    Stuff,
+    Things,
+    somethingElse,
+]