-
Notifications
You must be signed in to change notification settings - Fork 136
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
More effectively determine method ownership for RBI generation #896
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -66,7 +66,7 @@ def compile_directly_owned_methods(tree, module_name, mod, for_visibility = [:pu | |
end | ||
def compile_method(tree, symbol_name, constant, method, visibility = RBI::Public.new) | ||
return unless method | ||
return unless method.owner == constant | ||
return unless method_owned_by_constant?(method, constant) | ||
return if @pipeline.symbol_in_payload?(symbol_name) && [email protected]_in_gem?(method) | ||
|
||
signature = signature_of(method) | ||
|
@@ -142,6 +142,29 @@ def compile_method(tree, symbol_name, constant, method, visibility = RBI::Public | |
tree << rbi_method | ||
end | ||
|
||
# Check whether the method is defined by the constant. | ||
# | ||
# In most cases, it works to check that the constant is the method owner. However, | ||
# in the case that a method is also defined in a module prepended to the constant, it | ||
# will be owned by the prepended module, not the constant. | ||
# | ||
# This method implements a better way of checking whether a constant defines a method. | ||
# It walks up the ancestor tree via the `super_method` method; if any of the super | ||
# methods are owned by the constant, it means that the constant declares the method. | ||
sig { params(method: UnboundMethod, constant: Module).returns(T::Boolean) } | ||
def method_owned_by_constant?(method, constant) | ||
# Widen the type of `method` to be nilable | ||
method = T.let(method, T.nilable(UnboundMethod)) | ||
|
||
while method | ||
return true if method.owner == constant | ||
|
||
method = method.super_method | ||
end | ||
|
||
false | ||
end | ||
|
||
sig { params(mod: Module).returns(T::Hash[Symbol, T::Array[Symbol]]) } | ||
def method_names_by_visibility(mod) | ||
{ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we add an example that does not call
super
? 🙏