Skip to content

Commit 2e4ab6f

Browse files
authored
Merge pull request #1732 from Shopify/vs/handle_new_identity_comparison_hashes
Account for new identity comparison hashes in Sorbet internals
2 parents 5673e5f + 4dddb17 commit 2e4ab6f

File tree

3 files changed

+14
-9
lines changed

3 files changed

+14
-9
lines changed

Gemfile.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -346,14 +346,14 @@ GEM
346346
rack (>= 2.2.4)
347347
redis-client (>= 0.14.0)
348348
smart_properties (1.17.0)
349-
sorbet (0.5.11150)
350-
sorbet-static (= 0.5.11150)
351-
sorbet-runtime (0.5.11150)
352-
sorbet-static (0.5.11150-universal-darwin)
353-
sorbet-static (0.5.11150-x86_64-linux)
354-
sorbet-static-and-runtime (0.5.11150)
355-
sorbet (= 0.5.11150)
356-
sorbet-runtime (= 0.5.11150)
349+
sorbet (0.5.11155)
350+
sorbet-static (= 0.5.11155)
351+
sorbet-runtime (0.5.11155)
352+
sorbet-static (0.5.11155-universal-darwin)
353+
sorbet-static (0.5.11155-x86_64-linux)
354+
sorbet-static-and-runtime (0.5.11155)
355+
sorbet (= 0.5.11155)
356+
sorbet-runtime (= 0.5.11155)
357357
spoom (1.2.4)
358358
erubi (>= 1.10.0)
359359
sorbet-static-and-runtime (>= 0.5.10187)

lib/tapioca/gem/listeners/sorbet_signatures.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,11 @@ def compile_signature(signature, parameters)
6767
sig { params(signature: T.untyped).returns(T::Boolean) }
6868
def signature_final?(signature)
6969
modules_with_final = T::Private::Methods.instance_variable_get(:@modules_with_final)
70-
final_methods = modules_with_final[signature.owner.object_id]
70+
final_methods = if sorbet_supports?(:identity_comparison)
71+
modules_with_final[signature.owner]
72+
else
73+
modules_with_final[signature.owner.object_id]
74+
end
7175

7276
return false unless final_methods
7377

lib/tapioca/helpers/sorbet_helper.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ module SorbetHelper
2626
# feature_name: ::Gem::Requirement.new(">= ___"), # https://github.com/sorbet/sorbet/pull/___
2727
non_generic_weak_map: ::Gem::Requirement.new(">= 0.5.10587"), # https://github.com/sorbet/sorbet/pull/6610
2828
generic_class: ::Gem::Requirement.new(">= 0.5.10820"), # https://github.com/sorbet/sorbet/pull/6781
29+
identity_comparison: ::Gem::Requirement.new(">= 0.5.11155"), # https://github.com/sorbet/sorbet/pull/7531
2930
}.freeze,
3031
T::Hash[Symbol, ::Gem::Requirement],
3132
)

0 commit comments

Comments
 (0)