Skip to content

Make coverage more similar to the one in Scala 2 #23722

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

Jump to bottom
Merged
merged 2 commits into from
Aug 15, 2025
Merged

Make coverage more similar to the one in Scala 2 #23722

merged 2 commits into from
Aug 15, 2025

Conversation

jchyb
Copy link
Contributor

@jchyb jchyb commented Aug 12, 2025

Closes #21877

  • removes coverage of inlined nodes (as mentioned in the accompanying comment, those are impossible to represent in most cases)
  • adds coverage for Literals (ones directly in Apply are omitted)
  • removes coverage of throw contents
  • if apply node is tagged, we do not tag it's prefix, outside of other prefixing Apply's arguments (eg. when we tag a+b+c we do not redundantly tag a+b)
  • allows instrumenting synthetic method calls (like apply of a case

After all of these changes the statements tagged are much more similar to Scala 2, let's look at the #21877 minimisation:

  • Scala 2:
Zrzut ekranu 2025-08-12 o 17 07 31 Zrzut ekranu 2025-08-12 o 17 07 46
  • Scala 3:
Zrzut ekranu 2025-08-12 o 17 08 48 Zrzut ekranu 2025-08-12 o 17 08 55

There are some differences still remaining, most notably the tagging the DefDefs and its default parameters, but I left them for now, as those seem more useful than harmful.

BEcouse of those changed most of the .covergae files had to be regenerated, however I want through each and every diff to make sure that all of those changes there are expected.

Additionally, this PR also fixes #21695 (issue with certain generated Block nodes not having assigned the correct type, causing later undefined errors).

@jchyb jchyb force-pushed the fix-coverage-s2-s3 branch from fb9a3c7 to da43ab4 Compare August 13, 2025 09:25
@jchyb jchyb requested a review from KacperFKorban August 14, 2025 09:27
KacperFKorban
KacperFKorban reviewed Aug 14, 2025
View reviewed changes
Copy link
Member

@KacperFKorban KacperFKorban left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes look good.

I didn't fully understand one part of the PR, so I left a question about that.

jchyb added 2 commits August 14, 2025 18:20
@jchyb
Make coverage more similar to Scala 2
dd9912e 
* remove coverage of inlined nodes (as mentioned in the accompanying
comment, those are impossible to represent in most cases)
* add coverage for Literals (ones directly in Apply are omitted)
* remove coverage of `throw` contents
* if apply node is tagged, do not tag it's prefix, outside of other
prefixing Apply's arguments (eg. when we tag `a+b+c` we do not
redundantly tag `a+b`)
* allow instrumenting synthetic method calls (like apply of a case
class)

Also fixes issue with certain generated Block nodes not having assigned
the correct type
@jchyb
Apply review comments
2c479e1
@jchyb jchyb force-pushed the fix-coverage-s2-s3 branch from da43ab4 to 2c479e1 Compare August 14, 2025 16:20
@KacperFKorban KacperFKorban merged commit c535dbc into scala:main Aug 15, 2025
45 checks passed
@KacperFKorban KacperFKorban deleted the fix-coverage-s2-s3 branch August 15, 2025 08:58
tgodzik pushed a commit to scala/scala3-lts that referenced this pull request Sep 1, 2025
@jchyb @tgodzik
Make coverage more similar to the one in Scala 2 (scala#23722)
c855931 
Closes scala#21877
* removes coverage of inlined nodes (as mentioned in the accompanying
comment, those are impossible to represent in most cases)
* adds coverage for Literals (ones directly in Apply are omitted)
* removes coverage of `throw` contents
* if apply node is tagged, we do not tag it's prefix, outside of other
prefixing Apply's arguments (eg. when we tag `a+b+c` we do not
redundantly tag `a+b`)
* allows instrumenting synthetic method calls (like apply of a case

After all of these changes the statements tagged are much more similar
to Scala 2, let's look at the scala#21877 minimisation:
* Scala 2:
<img width="704" height="364" alt="Zrzut ekranu 2025-08-12 o 17 07 31"
src="https://github.com/user-attachments/assets/f647dfa5-973e-424f-9818-483b7d01d550"
/>
<img width="740" height="379" alt="Zrzut ekranu 2025-08-12 o 17 07 46"
src="https://github.com/user-attachments/assets/09eca1c0-a202-4e5e-b3e4-0947d9e8662d"
/>

* Scala 3:
<img width="623" height="360" alt="Zrzut ekranu 2025-08-12 o 17 08 48"
src="https://github.com/user-attachments/assets/efd5baaa-9f52-4ad6-9ba6-2f5bde42a470"
/>
<img width="638" height="428" alt="Zrzut ekranu 2025-08-12 o 17 08 55"
src="https://github.com/user-attachments/assets/01ff6cc6-c348-47db-8ae5-d758ca0bf302"
/>

There are some differences still remaining, most notably the tagging the
DefDefs and its default parameters, but I left them for now, as those
seem more useful than harmful.

BEcouse of those changed most of the .covergae files had to be
regenerated, however I want through each and every diff to make sure
that all of those changes there are expected.

Additionally, this PR also fixes scala#21695 (issue with certain generated
Block nodes not having assigned the correct type, causing later
undefined errors).
tgodzik added a commit to scala/scala3-lts that referenced this pull request Sep 1, 2025
@tgodzik
Make coverage more similar to the one in Scala 2 (scala#23722)
ef8d678 
Closes scala#21877
* removes coverage of inlined nodes (as mentioned in the accompanying
comment, those are impossible to represent in most cases)
* adds coverage for Literals (ones directly in Apply are omitted)
* removes coverage of `throw` contents
* if apply node is tagged, we do not tag it's prefix, outside of other
prefixing Apply's arguments (eg. when we tag `a+b+c` we do not
redundantly tag `a+b`)
* allows instrumenting synthetic method calls (like apply of a case 

After all of these changes the statements tagged are much more similar
to Scala 2, let's look at the scala#21877 minimisation:
* Scala 2:
<img width="704" height="364" alt="Zrzut ekranu 2025-08-12 o 17 07 31"
src="https://github.com/user-attachments/assets/f647dfa5-973e-424f-9818-483b7d01d550"
/>
<img width="740" height="379" alt="Zrzut ekranu 2025-08-12 o 17 07 46"
src="https://github.com/user-attachments/assets/09eca1c0-a202-4e5e-b3e4-0947d9e8662d"
/>

* Scala 3:
<img width="623" height="360" alt="Zrzut ekranu 2025-08-12 o 17 08 48"
src="https://github.com/user-attachments/assets/efd5baaa-9f52-4ad6-9ba6-2f5bde42a470"
/>
<img width="638" height="428" alt="Zrzut ekranu 2025-08-12 o 17 08 55"
src="https://github.com/user-attachments/assets/01ff6cc6-c348-47db-8ae5-d758ca0bf302"
/>


There are some differences still remaining, most notably the tagging the
DefDefs and its default parameters, but I left them for now, as those
seem more useful than harmful.

BEcouse of those changed most of the .covergae files had to be
regenerated, however I want through each and every diff to make sure
that all of those changes there are expected.

Additionally, this PR also fixes scala#21695 (issue with certain generated
Block nodes not having assigned the correct type, causing later
undefined errors).
[Cherry-picked c535dbc][modified]
@tgodzik tgodzik mentioned this pull request Sep 1, 2025
Merged
WojciechMazur pushed a commit to scala/scala3-lts that referenced this pull request Sep 9, 2025
@jchyb @WojciechMazur
Make coverage more similar to the one in Scala 2 (scala#23722)
6997885 
Closes scala#21877
* removes coverage of inlined nodes (as mentioned in the accompanying
comment, those are impossible to represent in most cases)
* adds coverage for Literals (ones directly in Apply are omitted)
* removes coverage of `throw` contents
* if apply node is tagged, we do not tag it's prefix, outside of other
prefixing Apply's arguments (eg. when we tag `a+b+c` we do not
redundantly tag `a+b`)
* allows instrumenting synthetic method calls (like apply of a case

After all of these changes the statements tagged are much more similar
to Scala 2, let's look at the scala#21877 minimisation:
* Scala 2:
<img width="704" height="364" alt="Zrzut ekranu 2025-08-12 o 17 07 31"
src="https://github.com/user-attachments/assets/f647dfa5-973e-424f-9818-483b7d01d550"
/>
<img width="740" height="379" alt="Zrzut ekranu 2025-08-12 o 17 07 46"
src="https://github.com/user-attachments/assets/09eca1c0-a202-4e5e-b3e4-0947d9e8662d"
/>

* Scala 3:
<img width="623" height="360" alt="Zrzut ekranu 2025-08-12 o 17 08 48"
src="https://github.com/user-attachments/assets/efd5baaa-9f52-4ad6-9ba6-2f5bde42a470"
/>
<img width="638" height="428" alt="Zrzut ekranu 2025-08-12 o 17 08 55"
src="https://github.com/user-attachments/assets/01ff6cc6-c348-47db-8ae5-d758ca0bf302"
/>

There are some differences still remaining, most notably the tagging the
DefDefs and its default parameters, but I left them for now, as those
seem more useful than harmful.

BEcouse of those changed most of the .covergae files had to be
regenerated, however I want through each and every diff to make sure
that all of those changes there are expected.

Additionally, this PR also fixes scala#21695 (issue with certain generated
Block nodes not having assigned the correct type, causing later
undefined errors).
WojciechMazur pushed a commit to scala/scala3-lts that referenced this pull request Sep 9, 2025
@tgodzik @WojciechMazur
Make coverage more similar to the one in Scala 2 (scala#23722)
f5bc882 
Closes scala#21877
* removes coverage of inlined nodes (as mentioned in the accompanying
comment, those are impossible to represent in most cases)
* adds coverage for Literals (ones directly in Apply are omitted)
* removes coverage of `throw` contents
* if apply node is tagged, we do not tag it's prefix, outside of other
prefixing Apply's arguments (eg. when we tag `a+b+c` we do not
redundantly tag `a+b`)
* allows instrumenting synthetic method calls (like apply of a case 

After all of these changes the statements tagged are much more similar
to Scala 2, let's look at the scala#21877 minimisation:
* Scala 2:
<img width="704" height="364" alt="Zrzut ekranu 2025-08-12 o 17 07 31"
src="https://github.com/user-attachments/assets/f647dfa5-973e-424f-9818-483b7d01d550"
/>
<img width="740" height="379" alt="Zrzut ekranu 2025-08-12 o 17 07 46"
src="https://github.com/user-attachments/assets/09eca1c0-a202-4e5e-b3e4-0947d9e8662d"
/>

* Scala 3:
<img width="623" height="360" alt="Zrzut ekranu 2025-08-12 o 17 08 48"
src="https://github.com/user-attachments/assets/efd5baaa-9f52-4ad6-9ba6-2f5bde42a470"
/>
<img width="638" height="428" alt="Zrzut ekranu 2025-08-12 o 17 08 55"
src="https://github.com/user-attachments/assets/01ff6cc6-c348-47db-8ae5-d758ca0bf302"
/>


There are some differences still remaining, most notably the tagging the
DefDefs and its default parameters, but I left them for now, as those
seem more useful than harmful.

BEcouse of those changed most of the .covergae files had to be
regenerated, however I want through each and every diff to make sure
that all of those changes there are expected.

Additionally, this PR also fixes scala#21695 (issue with certain generated
Block nodes not having assigned the correct type, causing later
undefined errors).
[Cherry-picked c535dbc][modified]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@KacperFKorban KacperFKorban KacperFKorban approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Different coverage results for scala 2 and scala 3 undefined error if enable coverage
2 participants
@jchyb @KacperFKorban