`dd59960`

debug visual_length: log bytes after newline to trace prompt_vlen=4 miscalculation [skip-pty]

Authored by

espadonne 1 month ago

SHA: dd5996064efe7c8ef5f667e712407657f1156c95
Parents: 46a780e
Tree: 726e41a

2 changed files

Status	File	+	-
M	`src/fortsh.f90`	3	3
M	`src/io/readline.f90`	23	0

src/fortsh.f90modified

                char(27) // '[' // trim(col_str_buf) // 'G' // &
                trim(rprompt_str) // &
                prompt_str(newline_pos:len_trim(prompt_str))
 -            call readline_enhanced(trim(embedded_prompt), input_line, iostat)
 +            call readline_enhanced(trim(embedded_prompt), input_line, iostat, keep_raw=.true.)
            else
              ! Not enough space for RPROMPT — skip it
 -            call readline_enhanced(trim(prompt_str), input_line, iostat)
 +            call readline_enhanced(trim(prompt_str), input_line, iostat, keep_raw=.true.)
            end if
          else
            ! Single-line prompt: pass RPROMPT to readline for its handling
 -          call readline_enhanced(trim(prompt_str), input_line, iostat, trim(rprompt_str))
 +          call readline_enhanced(trim(prompt_str), input_line, iostat, trim(rprompt_str), keep_raw=.true.)
          end if
        else
          call readline_enhanced(trim(prompt_str), input_line, iostat, keep_raw=.true.)

src/io/readline.f90modified

      integer :: i, slen
      integer :: state
      integer :: terminator_code
 +    integer :: last_newline_pos
      ! State machine for parsing escape sequences
      integer, parameter :: STATE_NORMAL = 0
      integer, parameter :: STATE_OSC = 3
      vlen = 0
 +    last_newline_pos = 0
      slen = len_trim(str)
      state = STATE_NORMAL
          else if (str(i:i) == char(10)) then  ! LF
            ! Newline resets visual position (for multi-line prompts)
            vlen = 0
 +          last_newline_pos = i
            i = i + 1
          else
            ! Regular character - count it (account for wide UTF-8 chars)
          end if
        end select
      end do
++
 +    ! Debug: log visual_length result for multi-line prompts
 +    if (last_newline_pos > 0 .and. slen > 10) then
 +      block
 +        integer :: dbu_vl
 +        open(newunit=dbu_vl, file='/tmp/fortsh_readline_debug.log', &
 +             status='unknown', position='append', action='write')
 +        write(dbu_vl, '(A,I0,A,I0,A,I0,A,I0)') &
 +          'VLEN: result=', vlen, ' slen=', slen, &
 +          ' newline_at=', last_newline_pos, ' chars_after_nl=', slen - last_newline_pos
 +        if (last_newline_pos < slen) then
 +          write(dbu_vl, '(A)', advance='no') '  after_nl_bytes=['
 +          do i = last_newline_pos + 1, min(slen, last_newline_pos + 20)
 +            write(dbu_vl, '(I0,A)', advance='no') iachar(str(i:i)), ' '
 +          end do
 +          write(dbu_vl, '(A)') ']'
 +        end if
 +        close(dbu_vl)
 +      end block
 +    end if
    end function
    ! ===========================================================================