rbs-merge 7.1.9 → 7.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 468dd45aa78feb4a4bb4aff5083121a3b78201375b0b7bd327c91e144aefb44c
-  data.tar.gz: 962266643745fd85577d6677276ff1a6cf1b0a8b3a78b0ed17e147d0669b793d
+  metadata.gz: a6bfc96c0fd4c862eac91779e9a4e8e8feb51cbbd5d623835abf76538d371e63
+  data.tar.gz: 06b11fb63f1a1b59d4b991f54a9f5505f244ad0c3f3727813897f790fee405eb
 SHA512:
-  metadata.gz: 5ff69756f489e34947808e697d4d69af53262bc13796763ec11672232c513da32ff6aaa2934212fc10c43fcfd2fa4b97add759698a6eeeadea0de9bd90901504
-  data.tar.gz: fda0f9833655e440a0f819fe52a7e47fd2ae9c4b27ed560d455acf732dfc61534ab7829ab0ab37f5e11f581574c4a7b6f1bd06ef25d29e96d8ad3e311252826f
+  metadata.gz: 2d3be89dc28ee07a3817dca1a7d5b6c919564e897d061b902000874417ba26f5de8aa79453b93481a85ad1846bddf0b2d15d2b59d27cf950825f3b35dc7246ae
+  data.tar.gz: bca368849b94a6d614cca581acf904bdd50596d8eab63d58426c07a98bb51af635e95794e9f904346428e1988d18019cbb9f4c5afed8d91cf28d5bcd3494e585

data/lib/rbs/merge/file_analysis.rb

@@ -318,18 +318,7 @@ module Rbs
       private
 
       def parse_rbs
-        # Use TreeHaver to get the appropriate parser
-        # TreeHaver handles backend selection automatically for the current
-        # sibling-development environment and respects explicit backend overrides.
-        parser = TreeHaver.parser_for(:rbs)
-        result = parser.parse(@source)
-
-        # Determine which backend was used based on the result type
-        if result.is_a?(Backends::RbsBackend::Tree)
-          process_rbs_gem_result(result)
-        else
-          process_tree_sitter_result(result)
-        end
+        process_parse_result(rbs_parser.parse(@source))
       rescue TreeHaver::NotAvailable => e
         @errors << "No RBS parser available: #{e.message}"
         @ast = nil
@@ -341,6 +330,28 @@ module Rbs
         @ast = nil
       end
 
+      def process_parse_result(result)
+        # Determine which backend was used based on the result type
+        if result.is_a?(Backends::RbsBackend::Tree)
+          process_rbs_gem_result(result)
+        else
+          process_tree_sitter_result(result)
+        end
+      end
+
+      def rbs_parser
+        return TreeHaver.parser_for(:rbs) unless native_rbs_required?
+
+        # RBS has a native semantic parser. The Rust TSLP fallback remains
+        # available on runtimes without it, but must not replace this contract
+        # while it lacks parity.
+        TreeHaver.with_backend(:rbs) { TreeHaver.parser_for(:rbs) }
+      end
+
+      def native_rbs_required?
+        TreeHaver.effective_backend == :rust_tslp && Backends::RbsBackend.available?
+      end
+
       # Process result from RBS gem backend
       def process_rbs_gem_result(result)
         @backend = :rbs

data/lib/rbs/merge/version.rb

@@ -5,7 +5,7 @@ module Rbs
     # Version namespace for this gem.
     module Version
       # Current gem version.
-      VERSION = '7.1.9'
+      VERSION = '7.1.10'
     end
     # Current gem version exposed at the traditional constant location.
     VERSION = Version::VERSION # Traditional Constant Location

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbs-merge
 version: !ruby/object:Gem::Version
-  version: 7.1.9
+  version: 7.1.10
 platform: ruby
 authors:
 - Peter H. Boling
@@ -43,14 +43,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.9
+        version: 7.1.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.9
+        version: 7.1.10
 - !ruby/object:Gem::Dependency
   name: rbs
   requirement: !ruby/object:Gem::Requirement
@@ -71,14 +71,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.9
+        version: 7.1.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.9
+        version: 7.1.10
 - !ruby/object:Gem::Dependency
   name: version_gem
   requirement: !ruby/object:Gem::Requirement
@@ -105,20 +105,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.34
+        version: 3.1.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.34
+        version: 3.1.8
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -196,7 +196,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: 3.2.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -206,7 +206,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: 3.2.5
 - !ruby/object:Gem::Dependency
   name: kettle-test
   requirement: !ruby/object:Gem::Requirement
@@ -216,7 +216,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.21
+        version: 2.0.23
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -226,7 +226,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.21
+        version: 2.0.23
 - !ruby/object:Gem::Dependency
   name: turbo_tests2
   requirement: !ruby/object:Gem::Requirement
@@ -236,7 +236,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.7
+        version: 3.2.14
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -246,7 +246,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.7
+        version: 3.2.14
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -270,7 +270,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: 1.0.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -280,7 +280,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: 1.0.9
 - !ruby/object:Gem::Dependency
   name: gitmoji-regex
   requirement: !ruby/object:Gem::Requirement
@@ -290,7 +290,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.12
+        version: 2.0.15
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -300,7 +300,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.12
+        version: 2.0.15
 description: "☯️ RBS declaration, comment, freeze-block, and template merge behavior
   for Structured Merge."
 email:
@@ -335,10 +335,10 @@ licenses:
 - PolyForm-Small-Business-1.0.0
 metadata:
   homepage_uri: https://structuredmerge.org
-  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.9
-  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.9/CHANGELOG.md
+  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.10
+  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.10/CHANGELOG.md
   bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
-  documentation_uri: https://www.rubydoc.info/gems/rbs-merge/7.1.9
+  documentation_uri: https://www.rubydoc.info/gems/rbs-merge/7.1.10
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/structuredmerge/structuredmerge-ruby/wiki
   news_uri: https://www.railsbling.com/tags/rbs-merge
@@ -368,7 +368,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.17
+rubygems_version: 4.0.20
 specification_version: 4
 summary: "☯️ Structured Merge RBS analysis and merge for Ruby"
 test_files: []

metadata.gz.sig

@@ -1,3 +1,4 @@
-m���0Q���!ܟR4���j�?p���L�p<���l͐@y�8���'�wl`�ȸ���,�C�L�T^��R�˟�1�Q�(9&G�fFQ6H�� �R�
��:q�����gBJT�	�}}֟]3|5���v�͚�S��{����;B����?h���j��7����x�rz��u�uظ����H�(z���W���Xm`�T�C��7�֍V�}�(UJ�S�?���|���������~�n��RS9�u�����fb�;���~�~=�J�U��CЖU�\�O�-L��ݢJ�K2�z9�B�XY�bR��)�8bB���,MI�EN��P
-g��R��=-�
-hɗ��#;��c�0��4�
+s�`无i���(>��=��JOf��!��`��K�����Iʡե�y�AN����H������HRzG��JC��u&É�~�)��rI��Y�_t����&�i�x���V
+KO��GT�Mv�)ү� �f�~���1[?�:�f��Dy~!�Dq�֚�����B
�l=�P���
%�99
+��^��8���<r�\�芏,�>�2B>~�_��E�HFb�q|��y�b+�%�W�ozqNqf��)b��
«�!M*��f'-��{��g���Z
+�Is�F����p�1AR���5���j���ǥ�OO�*�7�r��t|��9