1
0
Fork 0
mirror of https://github.com/pry/pry.git synced 2022-11-09 12:35:05 -05:00

Replace map.flatten(1) with flat_map

This commit is contained in:
Erik Michaels-Ober 2014-10-14 17:31:27 +01:00
parent 6d5eb0831b
commit b07fe4ba73
4 changed files with 10 additions and 10 deletions

View file

@ -603,9 +603,9 @@ class Pry
# @param [String] search The line typed so far
# @return [Array<String>] the words to complete
def complete(search)
slop.map do |opt|
slop.flat_map do |opt|
[opt.long && "--#{opt.long} " || opt.short && "-#{opt.short}"]
end.flatten(1).compact + super
end.compact + super
end
# A method called just before `options(opt)` as part of `call`.

View file

@ -19,7 +19,7 @@ module Pry::Command::Ls::JRubyHacks
m.name.sub(/\A(is|get|set)(?=[A-Z_])/, '').gsub(/[_?=]/, '').downcase
end
grouped.map do |key, values|
grouped.flat_map do |key, values|
values = values.sort_by do |m|
rubbishness(m.name)
end
@ -28,7 +28,7 @@ module Pry::Command::Ls::JRubyHacks
values.select do |x|
(!found.any? { |y| x == y }) && found << x
end
end.flatten(1)
end
end
# When removing jruby aliases, we want to keep the alias that is

View file

@ -140,11 +140,11 @@ class Pry
# @param [Boolean] include_super Whether to include methods from ancestors.
# @return [Array[Pry::Method]]
def all_from_class(klass, include_super=true)
%w(public protected private).map do |visibility|
%w(public protected private).flat_map do |visibility|
safe_send(klass, :"#{visibility}_instance_methods", include_super).map do |method_name|
new(safe_send(klass, :instance_method, method_name), :visibility => visibility.to_sym)
end
end.flatten(1)
end
end
#
@ -212,9 +212,9 @@ class Pry
# the lowest copy will be returned.
def singleton_class_resolution_order(klass)
ancestors = Pry::Method.safe_send(klass, :ancestors)
resolution_order = ancestors.grep(Class).map do |anc|
resolution_order = ancestors.grep(Class).flat_map do |anc|
[singleton_class_of(anc), *singleton_class_of(anc).included_modules]
end.flatten(1)
end
resolution_order.reverse.uniq.reverse - Class.included_modules
end

View file

@ -330,13 +330,13 @@ class Pry
return methods unless methods.empty?
safe_send(mod, :constants).map do |const_name|
safe_send(mod, :constants).flat_map do |const_name|
if const = nested_module?(mod, const_name)
all_relevant_methods_for(const)
else
[]
end
end.flatten
end
end
# Return all methods (instance methods and class methods) for a