[ruby/irb] Fix require path completion disturbing string method

completion
(https://github.com/ruby/irb/pull/726)

https://github.com/ruby/irb/commit/e42dc74ce0

2 files changed, 18 insertions, 17 deletions

diff --git a/lib/irb/completion.rb b/lib/irb/completion.rb
index 26215f6fe1..795a35bb2d 100644
--- a/lib/irb/completion.rb
+++ b/lib/irb/completion.rb
@@ -132,24 +132,22 @@ module IRB
           break
         end
       end
-      result = []
-      if tok && tok.event == :on_ident && tok.state == Ripper::EXPR_CMDARG
-        case tok.tok
-        when 'require'
-          result = retrieve_files_to_require_from_load_path.select { |path|
-            path.start_with?(actual_target)
-          }.map { |path|
-            quote + path
-          }
-        when 'require_relative'
-          result = retrieve_files_to_require_relative_from_current_dir.select { |path|
-            path.start_with?(actual_target)
-          }.map { |path|
-            quote + path
-          }
-        end
+      return unless tok&.event == :on_ident && tok.state == Ripper::EXPR_CMDARG
+
+      case tok.tok
+      when 'require'
+        retrieve_files_to_require_from_load_path.select { |path|
+          path.start_with?(actual_target)
+        }.map { |path|
+          quote + path
+        }
+      when 'require_relative'
+        retrieve_files_to_require_relative_from_current_dir.select { |path|
+          path.start_with?(actual_target)
+        }.map { |path|
+          quote + path
+        }
       end
-      result
     end
 
     def completion_candidates(preposing, target, postposing, bind:)
diff --git a/test/irb/test_completion.rb b/test/irb/test_completion.rb
index 8402889400..19a6a4740a 100644
--- a/test/irb/test_completion.rb
+++ b/test/irb/test_completion.rb
@@ -79,6 +79,9 @@ module TestIRB
         %w['irb/init 'irb/ruby-lex].each do |word|
           assert_include candidates, word
         end
+        # Test string completion not disturbed by require completion
+        candidates = IRB::RegexpCompletor.new.completion_candidates("'string ", "'.", "", bind: binding)
+        assert_include candidates, "'.upcase"
       end
 
       def test_complete_require_with_pathname_in_load_path