prism-merge 7.1.1 → 7.1.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (21) hide show
  1. checksums.yaml +4 -4
  2. checksums.yaml.gz.sig +0 -0
  3. data/README.md +2 -10
  4. data/lib/prism/merge/provider.rb +717 -0
  5. data/lib/prism/merge/version.rb +1 -1
  6. data/lib/prism/merge.rb +101 -8
  7. data/lib/ruby/merge/block_binding_support.rb +22 -0
  8. data/lib/ruby/merge/block_directive_detector.rb +208 -0
  9. data/lib/ruby/merge/doc_comment_support.rb +97 -0
  10. data/lib/ruby/merge/gemspec_support.rb +32 -0
  11. data/lib/ruby/merge/magic_comment_support.rb +128 -0
  12. data/lib/ruby/merge/method_similarity.rb +75 -0
  13. data/lib/ruby/merge/nocov_node_base.rb +75 -0
  14. data/lib/ruby/merge/nocov_wrapper_base.rb +46 -0
  15. data/lib/ruby/merge/rescue_semantics.rb +209 -0
  16. data/lib/ruby/merge/scaffold_chunk_support.rb +74 -0
  17. data/lib/ruby/merge/signature_support.rb +97 -0
  18. data/sig/prism/merge.rbs +13 -0
  19. data.tar.gz.sig +0 -0
  20. metadata +41 -15
  21. metadata.gz.sig +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: e746e33165b81c8213b46fb68de60386a0bb0bd88ad29e4abeb4bc0e9d9a7050
4
- data.tar.gz: fec3c1ad285a6cea78b69c68d499fdca8856113abb3c2c79e22a72c565773042
3
+ metadata.gz: 05162706e7a7aad556baf0781fb12f4b357235ecd8cfb7c97d4e78f3f09d5a15
4
+ data.tar.gz: e4599c75cf98de86668c0029d87e5556bbeaf42ee099bd466effc8a1949f261d
5
5
  SHA512:
6
- metadata.gz: 94060d0dd8879f84e4516e118b606454f14df7203cacad358392d1f8e666b0282757ee9044bdc047ad8f2c612437d8066d16be7d0a0803ce5d4eb31415c242f2
7
- data.tar.gz: 34d11e92d49b0fa616604f8c6396100d21d7ca3d7d69549978835bec42145c211e9aa085b2fae58a2322990ac910dff0c68591b97096cda7854db98409d9814a
6
+ metadata.gz: 302024d190da6a5d406bdd7107c7fd7b0ba566852d1043a58738cba02eb09b2a0501ceaa4c9a993ed076601919f49939f2bc93b103e66bfb98fde42bfb62e35a
7
+ data.tar.gz: 8f58d15fcd6dafb0392b5279fbd8fde3de0dc91f2a83ffd67cc827e4370c72d0cb402436bfd9e260c294f3b28e3e28470737ac1eba38eaae7e2a80241b57efc3
checksums.yaml.gz.sig CHANGED
Binary file
data/README.md CHANGED
@@ -83,7 +83,7 @@ File.write("merged.rb", result)
83
83
 
84
84
  ### Compatibility
85
85
 
86
- Compatible with MRI Ruby 4.0.0+, and concordant releases of JRuby, and TruffleRuby.
86
+ Compatible with MRI Ruby 4.0.0+, JRuby, and TruffleRuby.
87
87
  CI workflows and Appraisals are generated for MRI Ruby 4.0.0+.
88
88
  This test floor is configured by `ruby.test_minimum` in `.kettle-jem.yml` and
89
89
  may be higher than the gem's runtime compatibility floor when legacy Rubies are
@@ -1099,20 +1099,12 @@ See [SECURITY.md][🔐security].
1099
1099
  ## 🤝 Contributing
1100
1100
 
1101
1101
  If you need some ideas of where to help, you could work on adding more code coverage,
1102
- or if it is already 💯 (see [below](#code-coverage)) check [issues][🤝gh-issues] or [PRs][🤝gh-pulls],
1103
- or use the gem and think about how it could be better.
1102
+ check [issues][🤝gh-issues] or [PRs][🤝gh-pulls], or use the gem and think about how it could be better.
1104
1103
 
1105
1104
  We [![Keep A Changelog][📗keep-changelog-img]][📗keep-changelog] so if you make changes, remember to update it.
1106
1105
 
1107
1106
  See [CONTRIBUTING.md][🤝contributing] for more detailed instructions.
1108
1107
 
1109
- ### Code Coverage
1110
-
1111
- <details markdown="1">
1112
- <summary>Coverage service badges</summary>
1113
-
1114
- </details>
1115
-
1116
1108
  ## 📌 Versioning
1117
1109
 
1118
1110
  This library follows [![Semantic Versioning 2.0.0][📌semver-img]][📌semver] for its public API where practical.