Skip to content

Parse non-fixme /* comments not preceded by newlines #9276

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

Open
muglug wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Parse non-fixme /* comments not preceded by newlines #9276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6d42503
Parse non-fixme /* comments not preceded by newlines
muglug Oct 27, 2022
c069eda
Multiline comment now belongs to following node
muglug Oct 28, 2022
0ad6129
Fix vec size
muglug Oct 28, 2022
3cb257f
Fix test expectations
muglug Feb 27, 2023
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 hphp/hack/src/parser/core/lexer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1979,7 +1979,7 @@ where
acc.push(t);
return acc;
}
TriviaKind::FixMe | TriviaKind::IgnoreError => {
TriviaKind::FixMe | TriviaKind::IgnoreError | TriviaKind::DelimitedComment => {
return acc;
}
_ => {
Expand Down
18 changes: 9 additions & 9 deletions hphp/hack/test/full_fidelity/cases/modes/test_multi_line_comment.php.json.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"elements":[
{
"kind":"markup_section",
"markup_hashbang":{"kind":"missing"},
"markup_suffix":{
"kind":"markup_suffix",
"markup_suffix_less_than_question":{
Expand All @@ -29,13 +30,9 @@
"offset":2,
"leading_width":0,
"width":2,
"trailing_width":20,
"trailing_width":1,
"leading":[],
"trailing":[
{"kind":"whitespace","text":" ","offset":4,"width":1},
{"kind":"delimited_comment","text":"/* stric strict */","offset":5,"width":18},
{"kind":"end_of_line","text":"\n","offset":23,"width":1}
],
"trailing":[{"kind":"whitespace","text":" ","offset":4,"width":1}],
"line_number":1
}
}
Expand All @@ -48,11 +45,14 @@
"token":{
"kind":"end_of_file",
"text":"",
"offset":24,
"leading_width":0,
"offset":5,
"leading_width":19,
"width":0,
"trailing_width":0,
"leading":[],
"leading":[
{"kind":"delimited_comment","text":"/* stric strict */","offset":5,"width":18},
{"kind":"end_of_line","text":"\n","offset":23,"width":1}
],
"trailing":[],
"line_number":2
}
Expand Down
22 changes: 16 additions & 6 deletions hphp/hack/test/hackfmt/tests/collection_literal_trailing_comma.php.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,14 @@ $vec = Vector {
$baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaar,
};

$vec = Vector {$foo /* foo */};
$vec = Vector {$foo /* foo */};
$vec = Vector {
$foo,
/* foo */
};
$vec = Vector {
$foo,
/* foo */
};

$vec = Vector {
$foo, // foo
Expand All @@ -43,10 +49,14 @@ $vec = Vector {
,
};

$vec =
Vector {/* leading comment */ $fooooooooooooooooo /* trailing comment */};
$vec =
Vector {/* leading comment */ $fooooooooooooooooo /* trailing comment */};
$vec = Vector {
/* leading comment */ $fooooooooooooooooo,
/* trailing comment */
};
$vec = Vector {
/* leading comment */ $fooooooooooooooooo,
/* trailing comment */
};

$vec = Vector {
/* leading comment */
Expand Down
8 changes: 4 additions & 4 deletions hphp/test/slow/parser/extension/shape_type_alias.php.expectf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ dict(6) {
string(20) "// Float description"
}
["some_string"]=>
vec(4) {
vec(3) {
string(11) "// Multiple"
string(2) "//"
string(13) "// paragraphs"
}
["some_bool"]=>
vec(12) {
string(26) "/*

Another paragraph.*/"
}
["some_bool"]=>
vec(11) {
string(7) "// Long"
string(17) "/* long */"
string(13) "//description"
Expand Down