auto close & custom_complete routine

Author: JimZhouZZY

TeXmacs/progs/dynamic/program-edit.scm

@@ -654,6 +654,12 @@
   (clipboard-cut "nowhere")
   (clipboard-clear "nowhere"))
 
+(tm-define (kbd-remove t forwards?)
+  (:mode complete-mode?)
+  (remove-text forwards?)
+  (exec-delayed (lambda ()
+    (kbd-variant (focus-tree) #t))))
+
 (tm-define (kbd-variant t forwards?)
   (:require (and (prog-field-context? t) (program-supports-completions?)))
   (let* ((lan (get-env "prog-language"))

TeXmacs/progs/generic/generic-edit.scm

@@ -142,6 +142,12 @@
   (clipboard-cut "nowhere")
   (clipboard-clear "nowhere"))
 
+(tm-define (kbd-remove t forwards?)
+  (:mode complete-mode?)
+  (remove-text forwards?)
+  (exec-delayed (lambda ()
+    (kbd-variant (focus-tree) #t))))
+
 (tm-define (kbd-variant t forwards?)
   (:require (tree-is-buffer? t))
   (if (and (not (complete-try?)) forwards?)

src/Edit/Interface/edit_complete.cpp

@@ -87,15 +87,22 @@ edit_interface_rep::complete_try () {
   }
   else {
     if ((end == 0) || (!is_iso_alpha (s[end - 1])) ||
-        ((end != N (s)) && is_iso_alpha (s[end])))
+        ((end != N (s)) && is_iso_alpha (s[end]))) {
+      set_input_normal ();
+      SERVER (set_completion_listbox_visible (false));
       return false;
+    }
     int start= end - 1;
     while ((start > 0) && is_iso_alpha (s[start - 1]))
       start--;
     ss= s (start, end);
     a = find_completions (drd, et, ss);
   }
-  if (N (a) == 0) return false;
+  if (N (a) <= 1) {
+    set_input_normal ();
+    SERVER (set_completion_listbox_visible (false));
+    return false;
+  }
   complete_start (ss, a);
   return true;
 }
@@ -123,25 +130,18 @@ edit_interface_rep::complete_start (string prefix, array<string> compls) {
   if ((end < N (prefix)) || (s (end - N (prefix), end) != prefix)) return;
 
   // perform first completion and switch to completion mode if necessary
-  if (N (compls) == 1) {
-    string s= compls[0];
-    if (ends (s, "()")) // temporary fix for Pari
-      insert_tree (s, path (N (s) - 1));
-    else insert_tree (s);
-    completions= array<string> ();
-  }
-  else {
+  {
     completion_prefix= prefix;
     completions      = close_completions (compls);
     completion_pos   = 0;
     {
       // TODO: ?refactor this part to edit_interface_rep::show_completion_listbox
       cout << "complete_start: "
-           << "completions=" << completions
-           << ", prefix=" << completion_prefix
-           << ", tp=" << tp
-           << ", et=" << et
-           << ", eb=" << eb
+      //     << "completions=" << completions
+          << ", prefix=" << completion_prefix
+      //     << ", tp=" << tp
+      //     << ", et=" << et
+      //     << ", eb=" << eb
            << LF;
       array<string> full_completions;
       for (int i= 0; i < N (completions); ++i) {
@@ -166,7 +166,7 @@ edit_interface_rep::complete_start (string prefix, array<string> compls) {
     }
     insert_tree (completions[0]);
     complete_message ();
-    beep ();
+    // beep ();
     set_input_mode (INPUT_COMPLETE);
   }
 }
@@ -182,11 +182,16 @@ edit_interface_rep::complete_keypress (string key) {
     SERVER (set_completion_listbox_visible (false));
     return true;
   }
-  if ((key != "tab") && (key != "S-tab") && (key != "up") && (key != "down")) {
+  else if (key == "escape" || key == " ") {
     set_input_normal ();
     SERVER (set_completion_listbox_visible (false));
     return false;
   }
+  else if ((key != "tab") && (key != "S-tab") && (key != "up") && (key != "down")) {
+    //set_input_normal ();
+    //SERVER (set_completion_listbox_visible (false));
+    return false;
+  }
   tree st= subtree (et, path_up (tp));
   if (is_compound (st)) {
     set_input_normal ();
@@ -272,7 +277,7 @@ edit_interface_rep::custom_complete (tree r) {
   if (!is_tuple (r)) return;
   int           i, n= N (r);
   string        prefix;
-  array<string> compls;
+  hashset<string> compls;
   compls << string ("");
   for (i= 0; i < n; i++)
     if (is_atomic (r[i])) {
@@ -283,8 +288,12 @@ edit_interface_rep::custom_complete (tree r) {
     }
   // cout << prefix << ", " << compls << LF;
 
-  if ((prefix == "") || (N (compls) == 0)) return;
-  complete_start (prefix, compls);
+  if ((prefix == "") || (N (compls) <= 1)) {
+    set_input_normal ();
+    SERVER (set_completion_listbox_visible (false));
+    return;
+  }
+  complete_start (prefix, as_completions (compls));
 }
 
 /******************************************************************************

src/Edit/Interface/edit_keyboard.cpp

@@ -152,7 +152,11 @@ edit_interface_rep::try_shortcut (string comb) {
             verbatim (rhs), shorth == "" ? 1 : 3000);
     }
     if ((status & 1) == 1) cmd ();
-    else if (N (shorth) > 0 && comb != "S-F5") call ("kbd-insert", shorth);
+    else if (N (shorth) > 0 && comb != "S-F5") {
+      call ("kbd-insert", shorth);
+      if (get_input_mode() == INPUT_COMPLETE)
+        exec_delayed (scheme_cmd("(kbd-variant (focus-tree) #t)"));
+    }
     // cout << "Mark= " << sh_mark << "\n";
     return true;
   }
@@ -223,6 +227,7 @@ is_combo_shortcuts (string key) {
 
 void
 edit_interface_rep::key_press (string gkey) {
+  cout << "Key press: " << gkey << "\n";
   string zero= "a";
   zero[0]    = '\0';
   string key = replace (gkey, "<#0>", zero);
@@ -303,12 +308,19 @@ edit_interface_rep::key_press (string gkey) {
       if (!inside_active_graphics ()) {
         archive_state ();
         call ("kbd-insert", rew);
+        cout << "Inserted single character1: " << rew << "\n";
+        if (get_input_mode() == INPUT_COMPLETE){
+          cout << "Exec delayed complete-try\n";
+          //exec_delayed (scheme_cmd("(if (complete-try?) (noop))"));
+          exec_delayed (scheme_cmd("(kbd-variant (focus-tree) #t)"));
+      }
       }
     interrupt_shortcut ();
   }
   else if (contains_unicode_char (rew)) {
     archive_state ();
     call ("kbd-insert", key);
+        cout << "Inserted single character2: " << rew << "\n";
     interrupt_shortcut ();
   }
 #ifdef Q_OS_MAC
@@ -323,11 +335,13 @@ edit_interface_rep::key_press (string gkey) {
            !inside_active_graphics ()) {
     archive_state ();
     call ("kbd-insert", "<" * key * ">");
+        cout << "Inserted single character3: " << rew << "\n";
     interrupt_shortcut ();
   }
   else if (N (key) > 1 && !is_combo_shortcuts (key) && key != "escape") {
     archive_state ();
     call ("insert", key);
+        cout << "Inserted single character4: " << rew << "\n";
     interrupt_shortcut ();
   }
   else {