Skip to content

In Kotlin elvis operator that follows safe call operator should be filtered #1814

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
Godin merged 4 commits into from
May 13, 2025
Merged

In Kotlin elvis operator that follows safe call operator should be filtered #1814

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
470e707
(WIP) add validation tests
Godin Apr 11, 2025
4fcbf27
(WIP) add unit tests
Godin Apr 16, 2025
c7826a0
(WIP) fix
Godin Apr 11, 2025
2c44071
(WIP) update changelog
Godin Apr 29, 2025
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
Prev Previous commit
Next Next commit
(WIP) fix
  • Loading branch information
@Godin
Godin committed Apr 16, 2025
commit c7826a08105c58a064422295793703d83683b14a
15 changes: 11 additions & 4 deletions ...acoco.core/src/org/jacoco/core/internal/analysis/filter/KotlinSafeCallOperatorFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,26 @@ final class KotlinSafeCallOperatorFilter implements IFilter {
public void filter(final MethodNode methodNode,
final IFilterContext context, final IFilterOutput output) {
for (final ArrayList<JumpInsnNode> chain : findChains(methodNode)) {
if (chain.size() == 1) {
final AbstractInsnNode ifNonNullInstruction = chain.get(0).label
.getPrevious();
if (chain.size() == 1
&& ifNonNullInstruction.getOpcode() != Opcodes.IFNONNULL) {
continue;
}
final JumpInsnNode lastIfNullInstruction = chain
.get(chain.size() - 1);
final AbstractInsnNode nullTarget = AbstractMatcher
.skipNonOpcodes(lastIfNullInstruction.label);
.skipNonOpcodes(chain.get(0).label);
for (final AbstractInsnNode ifNullInstruction : chain) {
final Replacements replacements = new Replacements();
replacements.add(ifNullInstruction, ifNullInstruction, 0);
replacements.add(nullTarget, nullTarget, 0);
output.replaceBranches(ifNullInstruction, replacements);
}
if (ifNonNullInstruction.getOpcode() == Opcodes.IFNONNULL) {
final Replacements replacements = new Replacements();
replacements.add(nullTarget, nullTarget, 0);
replacements.add(ifNonNullInstruction, ifNonNullInstruction, 1);
output.replaceBranches(ifNonNullInstruction, replacements);
}
}
}

Expand Down