Skip to content

Change line endings in comments to line_end #219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 22, 2018
Merged

Change line endings in comments to line_end #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion spec/fluent.ebnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ Term ::= "-" Identifier blank_inline? "=" blank_inline? Value Att

/* Adjacent comment lines of the same comment type are joined together during
* the AST construction. */
CommentLine ::= ("###" | "##" | "#") ("\u0020" /.*/)? line_end
CommentLine ::= ("###" | "##" | "#") ("\u0020" comment_char*)? line_end
comment_char ::= any_char - line_end

/* Junk represents unparsed content.
*
Expand Down
8 changes: 7 additions & 1 deletion syntax/grammar.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,18 @@ let CommentLine = defer(() =>
maybe(
sequence(
string(" "),
regex(/.*/).abstract)),
repeat(comment_char)
.map(join).abstract)),
line_end)
.map(flatten(1))
.map(keep_abstract)
.chain(list_into(FTL.Comment)));

let comment_char = defer(() =>
and(
not(line_end),
any_char));

/* -------------------------------------------------------------------------- */
/* Junk represents unparsed content.
*
Expand Down
5 changes: 2 additions & 3 deletions test/fixtures/cr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
"type": "Resource",
"body": [
{
"type": "Junk",
"annotations": [],
"content": "### This entire file uses CR as EOL.\r\rerr01 = Value 01\rerr02 = Value 02\r\rerr03 =\r\r Value 03\r Continued\r\r .title = Title\r\rerr04 = { \"str\r\rerr05 = { $sel -> }\r"
"type": "ResourceComment",
"content": "This entire file uses CR as EOL.\r\rerr01 = Value 01\rerr02 = Value 02\r\rerr03 =\r\r Value 03\r Continued\r\r .title = Title\r\rerr04 = { \"str\r\rerr05 = { $sel -> }\r"
}
]
}