Skip to content

Resolve scopes of referenced types when merging trees #513

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.

Sign up for GitHub

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

Open
bcdanieldickison wants to merge 10 commits into
base: main
Choose a base branch
from
+262 −204
Open

Resolve scopes of referenced types when merging trees #513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5ccb7c0
Add currently-failing test
bcdanieldickison Sep 16, 2025
c9921f9
Implement merging type references by looking up scopes
bcdanieldickison Sep 17, 2025
1319920
Refactor merge logic
bcdanieldickison Sep 18, 2025
ea324ca
Fix typing issues
bcdanieldickison Sep 22, 2025
3f5fc21
Fix bug with Proc merging
bcdanieldickison Sep 23, 2025
f64296c
Work around type checking issue with kwarg splatting
bcdanieldickison Sep 29, 2025
3d2efed
Change return type of merge_nodes so it's not a ? method
bcdanieldickison Oct 1, 2025
9ac7bde
Add custom error class for invalid type lookup
bcdanieldickison Oct 1, 2025
738f73c
Allow TypeMember for type references
bcdanieldickison Oct 1, 2025
ca1b391
It’s not actually possibe to raise Merge::Error
bcdanieldickison Oct 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions lib/rbi/index.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ def visit(node)
end
end

#: -> String
def to_s
"#<RBI::Index #{@index.filter { |_, v| v.any? }.keys.sort}>"
end

private

#: ((Indexable & Node) node) -> void
Expand Down
2 changes: 1 addition & 1 deletion lib/rbi/model.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ class Attr < NodeWithComments
attr_accessor :visibility

#: Array[Sig]
attr_reader :sigs
attr_accessor :sigs

#: (Symbol name, Array[Symbol] names, ?visibility: Visibility, ?sigs: Array[Sig], ?loc: Loc?, ?comments: Array[Comment]) -> void
def initialize(name, names, visibility: Public.new, sigs: [], loc: nil, comments: [])
Expand Down
Loading
Loading