Ticket #4160: CompleteAllFiles_v2-1.patch

src/editor/edit.c

@@ -90 +90 @@
 int option_line_state_width = 0;
 gboolean option_cursor_after_inserted_block = FALSE;
 gboolean option_state_full_filename = FALSE;
+gboolean option_completion_collect_other_files = TRUE;
 
 gboolean enable_show_tabs_tws = TRUE;
 gboolean option_check_nl_at_eof = FALSE;

src/editor/edit.h

@@ -47 +47 @@
 extern gboolean option_save_position;
 extern gboolean option_syntax_highlighting;
 extern gboolean option_group_undo;
+extern gboolean option_completion_collect_other_files;
 extern char *option_backup_ext;
 extern char *option_filesize_threshold;
 extern char *option_stop_format_chars;

src/editor/editcmd.c

@@ -96 +96 @@
 
 #define TEMP_BUF_LEN 1024
 
-#define MAX_WORD_COMPLETIONS 100        /* in listbox */
+#define MAX_WORD_COMPLETIONS 150        /* in listbox */
 
 /*** file scope type declarations ****************************************************************/
 
@@ -1212 +1212 @@
 
 static gsize
 edit_collect_completions (WEdit * edit, off_t word_start, gsize word_len,
-                          char *match_expr, GString ** compl, gsize * num)
+                          char *match_expr, GString ** compl, gsize * num, gsize current_limit)
 {
     gsize len = 0;
     gsize max_len = 0;
@@ -1235 +1235 @@
 
     entire_file =
         mc_config_get_bool (mc_global.main_config, CONFIG_APP_SECTION,
-                            "editor_wordcompletion_collect_entire_file", 0);
+                            "editor_wordcompletion_collect_entire_file", 1);
 
     last_byte = entire_file ? edit->buffer.size : word_start;
 
@@ -1302 +1302 @@
         if (skip != 0)
             continue;
 
-        if (*num == MAX_WORD_COMPLETIONS)
+        if (*num >= current_limit)
         {
             g_string_free (compl[0], TRUE);
             for (i = 1; i < *num; i++)
@@ -3339 +3339 @@
     GString *match_expr;
     GString *compl[MAX_WORD_COMPLETIONS];       /* completions */
 
+    WEdit *edit_wid;
+    const WGroup *gr;
+    GList *w;
+
     /* search start of word to be completed */
     if (!edit_find_word_start (&edit->buffer, &word_start, &word_len))
         return;
@@ -3355 +3359 @@
     /* start search from begin to end of file */
     max_len =
         edit_collect_completions (edit, word_start, word_len, match_expr->str, (GString **) & compl,
-                                  &num_compl);
+                                  &num_compl, MAX_WORD_COMPLETIONS);
+
+    /*
+     * Should search also other open files ? This «if» collects them up to MAX_WORD_COMPLETIONS
+     * limit.
+     */
+    if (option_completion_collect_other_files && num_compl < MAX_WORD_COMPLETIONS)
+    {
+        /*
+         * Process all the remaining files by listing the editor widgets
+         * grouped in the main editor dialog.
+         */
+        gr = CONST_GROUP (CONST_WIDGET (edit)->owner);
+        for (w = gr->widgets; w != NULL; w = g_list_next (w))
+        {
+            if (w->data != edit && edit_widget_is_editor (CONST_WIDGET (w->data)))
+            {
+                gsize max_len_candidate, num_compl_sub = 0;
+                edit_wid = (WEdit *) w->data;
+                max_len_candidate =
+                    edit_collect_completions (edit_wid, word_start, word_len, match_expr->str,
+                                              ((GString **) & compl) + num_compl, &num_compl_sub,
+                                              MAX_WORD_COMPLETIONS - num_compl);
+
+                if (max_len_candidate > max_len)
+                    max_len = max_len_candidate;
+
+                num_compl += num_compl_sub;
+                if (num_compl >= MAX_WORD_COMPLETIONS)
+                    break;
+            }
+        }
+    }
 
     if (num_compl > 0)
     {

src/editor/editcmd_dialogs.c

@@ -385 +385 @@
 
     /* create the listbox */
     compl_list = listbox_new (1, 1, compl_dlg_h - 2, compl_dlg_w - 2, FALSE, NULL);
+    compl_list->allow_duplicates = FALSE;
 
     /* add the dialog */
     group_add_widget (GROUP (compl_dlg), compl_list);
@@ -394 +395 @@
         listbox_add_item (compl_list, LISTBOX_APPEND_AT_END, 0, (char *) compl[i]->str, NULL,
                           FALSE);
 
+    /* Set widgets size after possible duplicates removal. */
+    num_compl = listbox_get_length (compl_list);
+    if (num_compl < compl_dlg_h - 2)
+    {
+        WIDGET (compl_list)->lines = num_compl;
+        WIDGET (compl_dlg)->lines = num_compl + 2;
+    }
+
     /* pop up the dialog and apply the chosen completion */
     if (dlg_run (compl_dlg) == B_ENTER)
     {

src/setup.c

@@ -357 +357 @@
     { "editor_show_right_margin", &show_right_margin },
     { "editor_group_undo", &option_group_undo },
     { "editor_state_full_filename", &option_state_full_filename },
+    { "editor_wordcompletion_collect_other_files", &option_completion_collect_other_files },
 #endif /* USE_INTERNAL_EDIT */
     { "editor_ask_filename_before_edit", &editor_ask_filename_before_edit },
     { "nice_rotating_dash", &nice_rotating_dash },