Skip to content

Fix equality for types whose name cannot be rooted #133

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
apiology wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix equality for types whose name cannot be rooted #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions lib/solargraph/complex_type/unique_type.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ def eql? other
# @sg-ignore flow sensitive typing should support .class == .class
@subtypes == other.subtypes &&
# @sg-ignore flow sensitive typing should support .class == .class
@rooted == other.rooted? &&
rooted? == other.rooted? &&
# @sg-ignore flow sensitive typing should support .class == .class
@all_params == other.all_params &&
# @sg-ignore flow sensitive typing should support .class == .class
Expand Down Expand Up @@ -273,7 +273,7 @@ def conforms_to? api_map, expected, situation, rules = [],
end

def hash
[self.class, @name, @key_types, @sub_types, @rooted, @all_params, @parameters_type].hash
[self.class, @name, @key_types, @sub_types, rooted?, @all_params, @parameters_type].hash
end

# @return [self]
Expand Down
22 changes: 22 additions & 0 deletions spec/complex_type_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,4 +765,26 @@ def make_bar
expect(atype.conforms_to?(api_map, ptype, :method_call)).to be(true)
end
end

context 'with Ruby equality of types' do
it 'considers two parses of a name that cannot be rooted equal' do
a = Solargraph::ComplexType.parse('undefined').items.first
b = Solargraph::ComplexType.parse('undefined').items.first
expect(a).to eql(b)
expect(a.hash).to eq(b.hash)
end

it 'treats the rooted flag as meaningless on a name that cannot be rooted' do
unrooted = Solargraph::ComplexType::UniqueType.new('undefined', rooted: false)
rooted = Solargraph::ComplexType::UniqueType.new('undefined', rooted: true)
expect(unrooted).to eql(rooted)
expect(unrooted.hash).to eq(rooted.hash)
end

it 'still distinguishes a name that can be rooted by its rooted flag' do
rooted = Solargraph::ComplexType::UniqueType.new('String', rooted: true)
unrooted = Solargraph::ComplexType::UniqueType.new('String', rooted: false)
expect(rooted).not_to eql(unrooted)
end
end
end
Loading