Skip to content
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.

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

[fact] Convert Spoon3dmMerge to kotlin #164

Merged
merged 3 commits into from
Feb 23, 2021

Conversation

slarse
Copy link
Collaborator

@slarse slarse commented Feb 23, 2021

@codecov-io
Copy link

Codecov Report

Merging #164 (e912cad) into master (76690fd) will decrease coverage by 0.01%.
The diff coverage is 98.02%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master     #164      +/-   ##
============================================
- Coverage     81.75%   81.74%   -0.02%     
+ Complexity      434      428       -6     
============================================
  Files            43       43              
  Lines          1776     1764      -12     
  Branches        275      275              
============================================
- Hits           1452     1442      -10     
+ Misses          201      195       -6     
- Partials        123      127       +4     
Impacted Files Coverage Δ Complexity Δ
...rc/main/kotlin/se/kth/spork/spoon/Spoon3dmMerge.kt 98.01% <98.01%> (ø) 19.00 <19.00> (?)
src/main/java/se/kth/spork/cli/Cli.java 59.82% <100.00%> (ø) 6.00 <0.00> (ø)
.../spoon/conflict/OptimisticInsertInsertHandler.java 50.00% <0.00%> (-25.00%) 3.00% <0.00%> (-2.00%)
.../spoon/conflict/MethodOrderingConflictHandler.java 37.50% <0.00%> (-6.25%) 5.00% <0.00%> (-1.00%)
...h/spork/spoon/pcsinterpreter/SporkTreeBuilder.java 84.24% <0.00%> (-0.69%) 32.00% <0.00%> (-1.00%)
...in/java/se/kth/spork/exception/MergeException.java
...java/se/kth/spork/exception/ConflictException.java
...in/java/se/kth/spork/exception/SporkException.java
...kotlin/se/kth/spork/exception/ConflictException.kt 100.00% <0.00%> (ø) 1.00% <0.00%> (?%)
...in/kotlin/se/kth/spork/exception/MergeException.kt 100.00% <0.00%> (ø) 1.00% <0.00%> (?%)
... and 2 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 76690fd...e912cad. Read the comment docs.

@slarse slarse merged commit a7393e4 into master Feb 23, 2021
@slarse slarse deleted the issue/155-convert-Spoon3dmMerge-to-kotlin branch February 23, 2021 16:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants