Merge branch 'lukas/kernel/fix-jcl-odd-edlin-results-26/OTP-19072' into maint-26

* lukas/kernel/fix-jcl-odd-edlin-results-26/OTP-19072:
  kernel: Handle new edlin result in JCL mode

Author: Erlang/OTP

lib/kernel/src/user_drv.erl

@@ -87,7 +87,7 @@
         %% Clears the state, not touching the characters
         new_prompt.
 
--export_type([message/0]).
+-export_type([message/0, request/0]).
 -export([start/0, start/1, start_shell/0, start_shell/1, whereis_group/0]).
 
 %% gen_statem state callbacks
@@ -644,8 +644,18 @@ switch_loop(info,{ReadHandle,{data,Cs}}, {Cont, #state{ read = ReadHandle } = St
         {blink,NewCont,Rs} ->
             {keep_state,
              {NewCont, State#state{ tty = io_requests(Rs, State#state.tty)}},
-             1000}
+             1000};
+        {_What, _Cs, _NewCont, _Rs}  ->
+            keep_state_and_data;
+        {_What, _Bef, _Cs, _NewCont, _Rs}  ->
+            keep_state_and_data
     end;
+switch_loop(info, {Requester, get_unicode_state}, {_Cont, #state{ tty = TTYState }}) ->
+    Requester ! {self(), get_unicode_state, prim_tty:unicode(TTYState) },
+    keep_state_and_data;
+switch_loop(info, {Requester, get_terminal_state}, _State) ->
+    Requester ! {self(), get_terminal_state, prim_tty:isatty(stdout) },
+    keep_state_and_data;
 switch_loop(timeout, _, {_Cont, State}) ->
     {keep_state_and_data,
      {next_event, info, {State#state.read,{data,[]}}}};

lib/kernel/test/interactive_shell_SUITE.erl

@@ -1616,7 +1616,7 @@ setup_tty(Config) ->
                    "strace" ->
                        STraceLog = filename:join(proplists:get_value(priv_dir,Config),
                                                  Name++".strace"),
-                       ct:pal("Link to strace: file://~ts", [STraceLog]),
+                       ct:log("Link to strace: file://~ts", [STraceLog]),
                        [os:find_executable("strace"),"-f",
                         "-o",STraceLog,
                         "-e","trace=all",
@@ -2018,7 +2018,7 @@ shell_history_eaccess(Config) ->
                {expect, "echo\r\n"}
               ], [], [], mk_history_param(Path)),
 
-        ct:pal("~p",[Logs1]),
+        ct:log("~p",[Logs1]),
         rtnode:check_logs("erlang.log.1", "Error handling file", Logs1),
 
         %% shell_docs recursively creates the folder to store the
@@ -2278,6 +2278,14 @@ job_control_local(Config) when is_list(Config) ->
                {putline, "h"},
                {expect,  "this message"},
                {expect,  "--> $"},
+               {putdata, "\t"}, %% Test that we don't crash
+               {sleep, 100},
+               {putline, ""},
+               {expect,  "^\r\n\r\n --> $"},
+               {putdata, "\^r"}, %% Test that we don't crash
+               {sleep, 100},
+               {putline, ""},
+               {expect,  "^\r\n\r\n --> $"},
                {putline, "c 1"},
                {expect, "\r\n"},
                {putline, "35."},

lib/kernel/test/rtnode.erl

@@ -140,7 +140,7 @@ send_commands(Node, CPid, [{expect, Encoding, Expect}|T], N) when is_list(Expect
         ok ->
             send_commands(Node, CPid, T, N + 1);
         {expect_timeout, Got} ->
-            ct:pal("expect timed out waiting for ~p\ngot: ~p\n", [Expect,Got]),
+            ct:log("expect timed out waiting for ~p\ngot: ~p\n", [Expect,Got]),
             {error, timeout};
         Other ->
             Other
@@ -289,7 +289,7 @@ start_runerl_node(RunErl,Erl,Tempdir,Nodename,Args) ->
 
 start_runerl_command(RunErl, Tempdir, Cmd) ->
     FullCmd = "\""++RunErl++"\" "++Tempdir++"/ "++Tempdir++" \""++Cmd++"\"",
-    ct:pal("~ts",[FullCmd]),
+    ct:log("~ts",[FullCmd]),
     os:cmd(FullCmd).
 
 start_peer_runerl_node(RunErl,Erl,Tempdir,[],Args) ->
@@ -533,9 +533,9 @@ dump_logs(Logs) ->
     maps:foreach(
       fun(File, Data) ->
               try re:replace(Data,"\e","\\\\e",[unicode,global]) of
-                  D -> ct:pal("~ts: ~ts",[File, D])
+                  D -> ct:log("~ts: ~ts",[File, D])
               catch error:badarg ->
-                      ct:pal("~ts: ~s",[File, re:replace(Data,"\e","\\\\e",[global])])
+                      ct:log("~ts: ~s",[File, re:replace(Data,"\e","\\\\e",[global])])
               end
       end, Logs).
 
@@ -546,6 +546,7 @@ read_logs(Tempdir) ->
     LogFiles = [F || F <- LogFiles0,
                      case F of
                          "erlang.log" ++ _ -> true;
+%                         "peer" ++ _ -> true;
                          _ -> false
                      end],
 

lib/stdlib/src/edlin.erl

@@ -88,11 +88,24 @@ start(Pbs, EditState) ->
 keymap() ->
     get(key_map).
 
+-type continuation() :: {line, _, _, _} | {_, _, _}.
+-spec edit_line(unicode:chardata() | eof, continuation()) ->
+          {done, continuation(), Rest :: unicode:chardata(), [user_drv:request()]} |
+          {open_editor | format_expression | history_up | history_down | search,
+           Cs :: unicode:chardata(), continuation(), [user_drv:request()]} |
+          {help | expand | expand_full,
+           Before :: unicode:chardata(),
+           Cs :: unicode:chardata(), continuation(),
+           [user_drv:request()]} |
+          {search_found | search_quit | search_cancel,
+           Cs :: unicode:chardata(), [user_drv:request()]} |
+          {blink | more_chars, continuation(), [user_drv:request()]}.
 edit_line(Cs, {line,P,L,{blink,N_Rs}}) ->
     edit(Cs, P, L, {normal, none}, N_Rs);
 edit_line(Cs, {line,P,L,M}) ->
     edit(Cs, P, L, M, []).
 
+%% Called when in search mode
 edit_line1(Cs, {line,P,L,{blink,N_Rs}}) ->
     edit(Cs, P, L, {normal, none}, N_Rs);
 edit_line1(Cs, {line,P,{B,{[],[]},A},{normal,none}}) ->