Skip to content

Fix lexing of multiline comments to include the trailing '/' #2359

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 3 commits into from
Jul 22, 2022
Merged

Fix lexing of multiline comments to include the trailing '/' #2359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c27f9d4
Fix lexing of multiline comments to include the trailing '/'
mitchmindtree Jul 22, 2022
35da25e
Add missing slash to sway-fmt-v2 comment test
mitchmindtree Jul 22, 2022
f1c165b
Merge branch 'master' into mitchmindtree/fix-multiline-comment-lex
mitchmindtree Jul 22, 2022
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
2 changes: 1 addition & 1 deletion sway-fmt-v2/src/utils/comments.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ mod tests {
.unwrap();
assert_eq!(
found_comment.1.span.as_str(),
"/* multi-\n * line-\n * comment *"
"/* multi-\n * line-\n * comment */"
);
}
}
6 changes: 3 additions & 3 deletions sway-parse/src/token.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,9 +418,9 @@ pub fn lex_commented(
None => return Err(unclosed_multiline_comment(unclosed_indices)),
Some((_, '*')) => match char_indices.next() {
None => return Err(unclosed_multiline_comment(unclosed_indices)),
Some((end, '/')) => {
let _ = char_indices.next();
Some((slash_ix, '/')) => {
let start = unclosed_indices.pop().unwrap();
let end = slash_ix + '/'.len_utf8();
let span =
Span::new(src.clone(), start, end, path.clone()).unwrap();
let comment = Comment { span };
Expand Down Expand Up @@ -1135,7 +1135,7 @@ mod tests {
let mut tts = group.token_stream.token_trees().iter();
assert_eq!(
tts.next().unwrap().span().as_str(),
"/* multi-\n * line-\n * comment *",
"/* multi-\n * line-\n * comment */",
);
assert_eq!(tts.next().unwrap().span().as_str(), "bar");
assert_eq!(tts.next().unwrap().span().as_str(), ":");
Expand Down