Merge pull request #16724 from Homebrew/dependabot/bundler/Library/Homebrew/sorbet-static-and-runtime-and-sorbet-runtime-0.5.11264

This commit is contained in:
Patrick Linnane 2024-02-22 08:49:45 -08:00 committed by GitHub
commit 3d3f0696b1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
90 changed files with 41 additions and 19 deletions

View File

@ -128,14 +128,14 @@ GEM
simplecov_json_formatter (0.1.4)
simpleidn (0.2.1)
unf (~> 0.1.4)
sorbet (0.5.11262)
sorbet-static (= 0.5.11262)
sorbet-runtime (0.5.11262)
sorbet-static (0.5.11262-universal-darwin)
sorbet-static (0.5.11262-x86_64-linux)
sorbet-static-and-runtime (0.5.11262)
sorbet (= 0.5.11262)
sorbet-runtime (= 0.5.11262)
sorbet (0.5.11264)
sorbet-static (= 0.5.11264)
sorbet-runtime (0.5.11264)
sorbet-static (0.5.11264-universal-darwin)
sorbet-static (0.5.11264-x86_64-linux)
sorbet-static-and-runtime (0.5.11264)
sorbet (= 0.5.11264)
sorbet-runtime (= 0.5.11264)
spoom (1.2.4)
erubi (>= 1.10.0)
sorbet-static-and-runtime (>= 0.5.10187)

View File

@ -66,7 +66,7 @@ $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/racc-1.7.3/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/parser-3.3.0.5/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/rainbow-3.1.1/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-runtime-0.5.11262/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-runtime-0.5.11264/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/parlour-8.1.0/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/patchelf-1.5.0/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/plist-3.7.1/lib")
@ -106,9 +106,9 @@ $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/simplecov_json_formatter-0.1.4/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/simplecov-0.22.0/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/simplecov-cobertura-2.1.0/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-static-0.5.11262-universal-darwin/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-0.5.11262/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-static-and-runtime-0.5.11262/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-static-0.5.11264-universal-darwin/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-0.5.11264/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-static-and-runtime-0.5.11264/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/syntax_tree-6.2.0/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/thor-1.3.0/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/spoom-1.2.4/lib")

View File

@ -19,6 +19,7 @@ module T::Private::Types; end
require_relative 'types/configuration'
require_relative 'types/_types'
require_relative 'types/private/decl_state'
require_relative 'types/private/caller_utils'
require_relative 'types/private/class_utils'
require_relative 'types/private/runtime_levels'
require_relative 'types/private/methods/_methods'

View File

@ -0,0 +1,21 @@
# frozen_string_literal: true
# typed: false
module T::Private::CallerUtils
if Thread.respond_to?(:each_caller_location) # RUBY_VERSION >= "3.2"
def self.find_caller
Thread.each_caller_location do |loc|
next if loc.path&.start_with?("<internal:")
return loc if yield(loc)
end
nil
end
else
def self.find_caller
caller_locations(2).find do |loc|
!loc.path&.start_with?("<internal:") && yield(loc)
end
end
end
end

View File

@ -168,7 +168,7 @@ module T::Private::Methods
definition_file, definition_line = T::Private::Methods.signature_for_method(ancestor.instance_method(method_name)).method.source_location
is_redefined = target == ancestor
caller_loc = caller_locations.find {|l| !l.to_s.start_with?(SORBET_RUNTIME_LIB_PATH)}
caller_loc = T::Private::CallerUtils.find_caller {|loc| !loc.path.to_s.start_with?(SORBET_RUNTIME_LIB_PATH)}
extra_info = "\n"
if caller_loc
extra_info = (is_redefined ? "Redefined" : "Overridden") + " here: #{caller_loc.path}:#{caller_loc.lineno}\n"

View File

@ -5,8 +5,8 @@ module T::Private::Sealed
module NoInherit
def inherited(child)
super
this_line = Kernel.caller.find {|line| !line.match(/in `inherited'$/)}
T::Private::Sealed.validate_inheritance(this_line, self, child, 'inherited')
caller_loc = T::Private::CallerUtils.find_caller {|loc| !loc.to_s.match(/in `inherited'$/)}
T::Private::Sealed.validate_inheritance(caller_loc&.to_s, self, child, 'inherited')
@sorbet_sealed_module_all_subclasses << child
end
@ -22,15 +22,15 @@ module T::Private::Sealed
module NoIncludeExtend
def included(child)
super
this_line = Kernel.caller.find {|line| !line.match(/in `included'$/)}
T::Private::Sealed.validate_inheritance(this_line, self, child, 'included')
caller_loc = T::Private::CallerUtils.find_caller {|loc| !loc.to_s.match(/in `included'$/)}
T::Private::Sealed.validate_inheritance(caller_loc&.to_s, self, child, 'included')
@sorbet_sealed_module_all_subclasses << child
end
def extended(child)
super
this_line = Kernel.caller.find {|line| !line.match(/in `extended'$/)}
T::Private::Sealed.validate_inheritance(this_line, self, child, 'extended')
caller_loc = T::Private::CallerUtils.find_caller {|loc| !loc.to_s.match(/in `extended'$/)}
T::Private::Sealed.validate_inheritance(caller_loc&.to_s, self, child, 'extended')
@sorbet_sealed_module_all_subclasses << child
end