Switchable completors: RegexpCompletor and TypeCompletion::Completor

Author: tompng

lib/irb.rb

@@ -140,6 +140,10 @@
 #
 #     IRB.conf[:USE_AUTOCOMPLETE] = false
 #
+# To enable enhanced completion using type information, add the following to your +.irbrc+:
+#
+#     IRB.conf[:COMPLETOR] = :type
+#
 # === History
 #
 # By default, irb will store the last 1000 commands you used in

lib/irb/context.rb

@@ -86,14 +86,14 @@ def initialize(irb, workspace = nil, input_method = nil)
         when nil
           if STDIN.tty? && IRB.conf[:PROMPT_MODE] != :INF_RUBY && !use_singleline?
             # Both of multiline mode and singleline mode aren't specified.
-            @io = RelineInputMethod.new
+            @io = RelineInputMethod.new(build_completor)
           else
             @io = nil
           end
         when false
           @io = nil
         when true
-          @io = RelineInputMethod.new
+          @io = RelineInputMethod.new(build_completor)
         end
         unless @io
           case use_singleline?
@@ -149,6 +149,21 @@ def initialize(irb, workspace = nil, input_method = nil)
       @command_aliases = IRB.conf[:COMMAND_ALIASES]
     end
 
+    private def build_completor
+      # Valid values are :regexp and :type
+      if IRB.conf[:COMPLETOR] == :type && RUBY_VERSION >= '3.0.0'
+        begin
+          require 'prism'
+          require 'irb/type_completion/completor'
+          TypeCompletion::Types.preload_in_thread
+          return TypeCompletion::Completor.new
+        rescue LoadError
+        end
+      end
+      # Fallback to RegexpCompletor
+      RegexpCompletor.new
+    end
+
     def save_history=(val)
       IRB.conf[:SAVE_HISTORY] = val
     end

lib/irb/init.rb

@@ -40,6 +40,7 @@ def IRB.init_config(ap_path)
     @CONF[:USE_SINGLELINE] = false unless defined?(ReadlineInputMethod)
     @CONF[:USE_COLORIZE] = (nc = ENV['NO_COLOR']).nil? || nc.empty?
     @CONF[:USE_AUTOCOMPLETE] = ENV.fetch("IRB_USE_AUTOCOMPLETE", "true") != "false"
+    @CONF[:COMPLETOR] = :regexp
     @CONF[:INSPECT_MODE] = true
     @CONF[:USE_TRACER] = false
     @CONF[:USE_LOADER] = false

lib/irb/input-method.rb

@@ -230,13 +230,13 @@ class RelineInputMethod < StdioInputMethod
     HISTORY = Reline::HISTORY
     include HistorySavingAbility
     # Creates a new input method object using Reline
-    def initialize
+    def initialize(completor)
       IRB.__send__(:set_encoding, Reline.encoding_system_needs.name, override: false)
 
-      super
+      super()
 
       @eof = false
-      @completor = RegexpCompletor.new
+      @completor = completor
 
       Reline.basic_word_break_characters = BASIC_WORD_BREAK_CHARACTERS
       Reline.completion_append_character = nil

test/irb/test_input_method.rb

@@ -24,7 +24,7 @@ class RelineInputMethodTest < InputMethodTest
     def test_initialization
       Reline.completion_proc = nil
       Reline.dig_perfect_match_proc = nil
-      IRB::RelineInputMethod.new
+      IRB::RelineInputMethod.new(IRB::RegexpCompletor.new)
 
       assert_nil Reline.completion_append_character
       assert_equal '', Reline.completer_quote_characters
@@ -40,7 +40,7 @@ def test_initialization_without_use_autocomplete
 
       IRB.conf[:USE_AUTOCOMPLETE] = false
 
-      IRB::RelineInputMethod.new
+      IRB::RelineInputMethod.new(IRB::RegexpCompletor.new)
 
       refute Reline.autocompletion
       assert_equal empty_proc, Reline.dialog_proc(:show_doc).dialog_proc
@@ -55,7 +55,7 @@ def test_initialization_with_use_autocomplete
 
       IRB.conf[:USE_AUTOCOMPLETE] = true
 
-      IRB::RelineInputMethod.new
+      IRB::RelineInputMethod.new(IRB::RegexpCompletor.new)
 
       assert Reline.autocompletion
       assert_not_equal empty_proc, Reline.dialog_proc(:show_doc).dialog_proc
@@ -71,7 +71,7 @@ def test_initialization_with_use_autocomplete_but_without_rdoc
       IRB.conf[:USE_AUTOCOMPLETE] = true
 
       without_rdoc do
-        IRB::RelineInputMethod.new
+        IRB::RelineInputMethod.new(IRB::RegexpCompletor.new)
       end
 
       assert Reline.autocompletion
@@ -89,7 +89,7 @@ def setup
     end
 
     def display_document(target, bind)
-      input_method = IRB::RelineInputMethod.new
+      input_method = IRB::RelineInputMethod.new(IRB::RegexpCompletor.new)
       input_method.instance_variable_set(:@completion_params, [target, '', '', bind])
       input_method.display_document(target, driver: @driver)
     end