greg/just
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow comments after mod statements (#2201)

Browse Source
This commit is contained in:
Casey Rodarmor 2024-06-27 11:47:33 -07:00 committed by GitHub
parent 570d3058cf
commit 23f1c1ca9f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/parser.rs
View File

@ -365,10 +365,11 @@ impl<'run, 'src> Parser<'run, 'src> {
}); });
} }
Some(Keyword::Mod) Some(Keyword::Mod)
if self.next_are(&[Identifier, Identifier, StringToken]) if self.next_are(&[Identifier, Identifier, Comment])
|| self.next_are(&[Identifier, Identifier, Identifier, StringToken])
|| self.next_are(&[Identifier, Identifier, Eof]) || self.next_are(&[Identifier, Identifier, Eof])
|| self.next_are(&[Identifier, Identifier, Eol]) || self.next_are(&[Identifier, Identifier, Eol])
|| self.next_are(&[Identifier, Identifier, Identifier, StringToken])
|| self.next_are(&[Identifier, Identifier, StringToken])
|| self.next_are(&[Identifier, QuestionMark]) => || self.next_are(&[Identifier, QuestionMark]) =>
{ {
self.presume_keyword(Keyword::Mod)?; self.presume_keyword(Keyword::Mod)?;

17
tests/modules.rs
View File

@ -8,8 +8,6 @@ fn modules_are_unstable() {
mod foo mod foo
", ",
) )
.arg("foo")
.arg("foo")
.stderr( .stderr(
"error: Modules are currently unstable. \ "error: Modules are currently unstable. \
Invoke `just` with the `--unstable` flag to enable unstable features.\n", Invoke `just` with the `--unstable` flag to enable unstable features.\n",
@ -781,3 +779,18 @@ fn colon_separated_path_components_are_not_used_as_arguments() {
.status(1) .status(1)
.run(); .run();
} }
#[test]
fn comments_can_follow_modules() {
Test::new()
.write("foo.just", "foo:\n @echo FOO")
.justfile(
"
mod foo # this is foo
",
)
.test_round_trip(false)
.args(["--unstable", "foo", "foo"])
.stdout("FOO\n")
.run();
}