From 53c99ed0851f12e8b5fbee0cb3f09bab26d872d1 Mon Sep 17 00:00:00 2001 From: Lionel Zoubritzky Date: Tue, 3 Oct 2023 09:59:09 +0200 Subject: [PATCH] Handle infix operators in REPL completion --- stdlib/REPL/src/REPLCompletions.jl | 11 +++++++++++ stdlib/REPL/test/replcompletions.jl | 12 ++++++++++++ 2 files changed, 23 insertions(+) diff --git a/stdlib/REPL/src/REPLCompletions.jl b/stdlib/REPL/src/REPLCompletions.jl index fad8af86b125d..c390deae1376d 100644 --- a/stdlib/REPL/src/REPLCompletions.jl +++ b/stdlib/REPL/src/REPLCompletions.jl @@ -1014,6 +1014,17 @@ function complete_identifiers!(suggestions::Vector{Completion}, @nospecialize(ff ex = Meta.parse(lookup_name, raise=false, depwarn=false) end isexpr(ex, :incomplete) && (ex = nothing) + elseif isexpr(ex, :call) && length(ex.args) > 1 + isinfix = s[end] != ')' + # A complete call expression that does not finish with ')' is an infix call. + if !isinfix + # Handle infix call argument completion of the form bar + foo(qux). + frange, end_of_identifier = find_start_brace(@view s[1:end-1]) + isinfix = Meta.parse(@view(s[frange[1]:end]), raise=false, depwarn=false) == ex.args[end] + end + if isinfix + ex = ex.args[end] + end end end append!(suggestions, complete_symbol(ex, name, ffunc, context_module)) diff --git a/stdlib/REPL/test/replcompletions.jl b/stdlib/REPL/test/replcompletions.jl index a113d85a66977..c5e01d6615437 100644 --- a/stdlib/REPL/test/replcompletions.jl +++ b/stdlib/REPL/test/replcompletions.jl @@ -25,6 +25,7 @@ let ex = quote (::Test_y)() = "", "" unicode_αβγ = Test_y(1) + Base.:(+)(x::Test_x, y::Test_y) = Test_x(Test_y(x.xx.yy + y.yy)) module CompletionFoo2 end @@ -2051,3 +2052,14 @@ end # If this last test starts failing, that's okay, just pick a new example symbol: @test !Base.isexported(Base, :ispublic) end + +# issue #51194 +for (s, compl) in (("2*CompletionFoo.nam", "named"), + (":a isa CompletionFoo.test!1", "test!12"), + ("-CompletionFoo.Test_y(3).", "yy"), + ("99 ⨷⁻ᵨ⁷ CompletionFoo.type_test.", "xx"), + ("CompletionFoo.type_test + CompletionFoo.Test_y(2).", "yy"), + ("foo'CompletionFoo.test!1", "test!12")) + c, r = test_complete(s) + @test only(c) == compl +end