From 583d903c2ba5de82bd3eb2eb687b1c107938f9e2 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 13 Mar 2018 01:28:27 +0000 Subject: Speed up func1.func2 completion by using Set for ignored modules And thus avoiding Module#name calls. Those are slow, especially in larger projects, with lots of anonymous modules. [Fix GH-1798] From: Dmitry Gutov git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62732 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/irb/completion.rb | 39 ++++++++++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 11 deletions(-) (limited to 'lib') diff --git a/lib/irb/completion.rb b/lib/irb/completion.rb index e7499a8e2b..1b9d96b8f9 100644 --- a/lib/irb/completion.rb +++ b/lib/irb/completion.rb @@ -169,18 +169,9 @@ module IRB else # func1.func2 candidates = [] + to_ignore = ignored_modules ObjectSpace.each_object(Module){|m| - begin - name = m.name - rescue Exception - name = "" - end - begin - next if name != "IRB::Context" and - /^(IRB|SLex|RubyLex|RubyToken)/ =~ name - rescue Exception - next - end + next if (to_ignore.include?(m) rescue true) candidates.concat m.instance_methods(false).collect{|x| x.to_s} } candidates.sort! @@ -218,6 +209,32 @@ module IRB end end end + + def self.ignored_modules + # We could cache the result, but this is very fast already. + # By using this approach, we avoid Module#name calls, which are + # relatively slow when there are a lot of anonymous modules defined. + require 'set' + s = Set.new + + scanner = lambda do |m| + next if s.include?(m) # IRB::ExtendCommandBundle::EXCB recurses. + s << m + m.constants(false).each do |c| + value = m.const_get(c) + scanner.call(value) if value.is_a?(Module) + end + end + + %i(IRB SLex RubyLex RubyToken).each do |sym| + next unless Object.const_defined?(sym) + scanner.call(Object.const_get(sym)) + end + + s.delete(IRB::Context) if defined?(IRB::Context) + + s + end end end -- cgit v1.2.3