Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix crash during strict typechecking #766

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −3
Open

Fix crash during strict typechecking #766

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
18 changes: 15 additions & 3 deletions lib/solargraph/type_checker.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ def argument_problems_for chain, api_map, block_pin, locals, location
end
if argchain
if par.decl != :arg
errors.concat kwarg_problems_for argchain, api_map, block_pin, locals, location, pin, params, idx
errors.concat kwarg_problems_for sig, argchain, api_map, block_pin, locals, location, pin, params, idx
next
else
ptype = params.key?(par.name) ? params[par.name][:qualified] : ComplexType::UNDEFINED
Expand Down Expand Up @@ -361,10 +361,21 @@ def argument_problems_for chain, api_map, block_pin, locals, location
result
end

def kwarg_problems_for argchain, api_map, block_pin, locals, location, pin, params, idx
# @param sig [Pin::Signature]
# @param argchain [Source::Chain]
# @param api_map [ApiMap]
# @param block_pin [Pin::Block]
# @param locals [Array<Pin::LocalVariable>]
# @param location [Location]
# @param pin [Pin::Method]
# @param params [Hash{String => [nil, Hash]}]
# @param idx [Integer]
#
# @return [Array<Problem>]
def kwarg_problems_for sig, argchain, api_map, block_pin, locals, location, pin, params, idx
result = []
kwargs = convert_hash(argchain.node)
par = pin.signatures.first.parameters[idx]
par = sig.parameters[idx]
argchain = kwargs[par.name.to_sym]
if par.decl == :kwrestarg || (par.decl == :optarg && idx == pin.parameters.length - 1 && par.asgn_code == '{}')
result.concat kwrestarg_problems_for(api_map, block_pin, locals, location, pin, params, kwargs)
Expand Down Expand Up @@ -552,6 +563,7 @@ def required_param_count(parameters)
parameters.sum { |param| %i[arg kwarg].include?(param.decl) ? 1 : 0 }
end

# @param parameters [Enumerable<Pin::Parameter>]
# @param pin [Pin::Method]
def optional_param_count(parameters)
parameters.select { |p| p.decl == :optarg }.length
Expand Down