]> git.djapps.eu Git - pkg/ggml/sources/llama.cpp/commitdiff
main : consistent prefix/suffix coloring (#3425)
authorh-h-h-h <redacted>
Tue, 3 Oct 2023 18:16:15 +0000 (20:16 +0200)
committerGitHub <redacted>
Tue, 3 Oct 2023 18:16:15 +0000 (21:16 +0300)
* Typo

* No `--in-prefix` coloring

The `--in-prefix` text was inconsistently colored. Now, it's never colored, just like the `--in-suffix` text.

examples/main/main.cpp

index 7367ae3625ce2220b0be9f505b6bdd6f63c10e97..775a5a201e5b8616a52b527d0f7faccd72fb4e43 100644 (file)
@@ -670,7 +670,7 @@ int main(int argc, char ** argv) {
             }
             fflush(stdout);
         }
-        // reset color to default if we there is no pending user input
+        // reset color to default if there is no pending user input
         if (input_echo && (int) embd_inp.size() == n_consumed) {
             console::set_display(console::reset);
         }
@@ -697,10 +697,8 @@ int main(int argc, char ** argv) {
                     if (last_output.find(antiprompt, search_start_pos) != std::string::npos) {
                         if (params.interactive) {
                             is_interacting = true;
-                            console::set_display(console::user_input);
                         }
                         is_antiprompt = true;
-                        fflush(stdout);
                         break;
                     }
                 }
@@ -724,8 +722,6 @@ int main(int argc, char ** argv) {
 
                     is_interacting = true;
                     printf("\n");
-                    console::set_display(console::user_input);
-                    fflush(stdout);
                 } else if (params.instruct) {
                     is_interacting = true;
                 }
@@ -750,6 +746,9 @@ int main(int argc, char ** argv) {
                     printf("%s", buffer.c_str());
                 }
 
+                // color user input only
+                console::set_display(console::user_input);
+
                 std::string line;
                 bool another_line = true;
                 do {