Move completion candidate listup logic from dialog proc to LineEditor

ruby · Mar 30, 2024 · 0666479 · 0666479
1 parent 453699c
commit 0666479
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 39 deletions.
diff --git a/lib/reline.rb b/lib/reline.rb
@@ -222,21 +222,13 @@ def get_screen_size
       return unless config.autocompletion
 
       journey_data = completion_journey_data
-      if just_cursor_moving and journey_data.nil?
-        # Auto complete starts only when edited
-        return
-      end
-      if journey_data
-        result = journey_data.list.drop(1)
-        pointer = journey_data.pointer - 1
-        target = journey_data.list[journey_data.pointer]
-      else
-        pre, target, post = retrieve_completion_block(true)
-        return if target.nil? || target.empty?
+      return unless journey_data
+
+      target = journey_data.list[journey_data.pointer]
+      result = journey_data.list.drop(1)
+      pointer = journey_data.pointer - 1
+      return if target.empty? || (result == [target] && pointer < 0)
 
-        result = call_completion_proc_with_checking_args(pre, target, post)
-        return if result and result.size == 1 and result[0] == target
-      end
       target_width = Reline::Unicode.calculate_width(target)
       x = cursor_pos.x - target_width
       if x < 0

diff --git a/lib/reline/line_editor.rb b/lib/reline/line_editor.rb
@@ -888,33 +888,32 @@ def dialog_proc_scope_completion_journey_data
   end
 
   private def move_completed_list(direction)
-    if @completion_journey_state
-      if (delta = { up: -1, down: +1 }[direction])
-        @completion_journey_state.pointer = (@completion_journey_state.pointer + delta) % @completion_journey_state.list.size
-      end
-    else
-      preposing, target, postposing = retrieve_completion_block
-      return false unless target
-
-      list = call_completion_proc
-      return false unless list.is_a?(Array)
+    @completion_journey_state ||= retrieve_completion_journey_state
+    return false unless @completion_journey_state
 
-      candidates = list.select{ |item| item.start_with?(target) }
-      return false if candidates.empty?
-
-      pre = preposing.split("\n", -1).last || ''
-      post = postposing.split("\n", -1).first || ''
-      pointer = direction == :up ? candidates.size : 1
-      @completion_journey_state = CompletionJourneyState.new(
-        @line_index, pre, target, post, [target] + candidates, pointer
-      )
+    if (delta = { up: -1, down: +1 }[direction])
+      @completion_journey_state.pointer = (@completion_journey_state.pointer + delta) % @completion_journey_state.list.size
     end
-
     completed = @completion_journey_state.list[@completion_journey_state.pointer]
     set_current_line(@completion_journey_state.pre + completed + @completion_journey_state.post, @completion_journey_state.pre.bytesize + completed.bytesize)
     true
   end
 
+  private def retrieve_completion_journey_state
+    preposing, target, postposing = retrieve_completion_block
+    list = call_completion_proc
+    return unless list.is_a?(Array)
+
+    candidates = list.select{ |item| item.start_with?(target) }
+    return if candidates.empty?
+
+    pre = preposing.split("\n", -1).last || ''
+    post = postposing.split("\n", -1).first || ''
+    CompletionJourneyState.new(
+      @line_index, pre, target, post, [target] + candidates, 0
+    )
+  end
+
   private def run_for_operators(key, method_symbol, &block)
     if @waiting_operator_proc
       if VI_MOTIONS.include?(method_symbol)
@@ -1133,15 +1132,21 @@ def input_key(key)
     else
       normal_char(key)
     end
+    if @in_pasting
+      clear_dialogs
+      return
+    end
+
+    modified = old_lines != @buffer_of_lines
     unless completion_occurs
       @completion_state = CompletionState::NORMAL
       @completion_journey_state = nil
+      if modified && !@config.disable_completion && @config.autocompletion
+        # Auto complete starts only when edited
+        @completion_journey_state = retrieve_completion_journey_state
+      end
     end
-    if @in_pasting
-      clear_dialogs
-    else
-      return old_lines != @buffer_of_lines
-    end
+    modified
   end
 
   def scroll_into_view