Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix prompt list size and colorized code line size to match input line size passed to Reline #1010

Merged
merged 1 commit into from
Sep 25, 2023

Conversation

tompng
Copy link
Member

@tompng tompng commented Aug 5, 2023

When you enter 1 and then OPTION+ENTER, rdbg will crash.

[tomoya.ishida:debug]% echo debugger > a.rb
[tomoya.ishida:debug]% rdbg a.rb
[1, 1] in a.rb
=>   1| debugger
=>#0	<main> at a.rb:1
(ruby) 1
#<Thread:0x000000011093fc90@DEBUGGER__::SESSION@server /Users/tomoya.ishida/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/debug-1.8.0/lib/debug/session.rb:179 run> terminated with exception (report_on_exception is true):
/Users/tomoya.ishida/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/reline-0.3.7/lib/reline/line_editor.rb:1131:in `+': TypeError
	from /Users/tomoya.ishida/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/reline-0.3.7/lib/reline/line_editor.rb:1131:in `render_partial'
	from /Users/tomoya.ishida/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/reline-0.3.7/lib/reline/line_editor.rb:498:in `rerender'
	from /Users/tomoya.ishida/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/reline-0.3.7/lib/reline.rb:356:in `block (3 levels) in inner_readline'
...

Fix colorize

Reline requires code.lines.size == output_modifier_proc(code).lines.size. Unless, Reline crashes.
I removed chomp from colorize target. This will fix the above bug.
chomp was added in #227 to implement RPROMT. RPROMPT is removed in #574 so chomp is no longer needed.

Fix prompt list

If prompt_proc returns few prompt list, it still works because reline interpolates missing prompt.
https://github.com/ruby/reline/blob/0f8000443e88ece87ba2f7cd918014c0013995cb/lib/reline/line_editor.rb#L139-L143
But it's better to return prompt list with the same size.

@tompng tompng changed the title Fix prompt list size and colorized code line size to match input line size Fix prompt list size and colorized code line size to match input line size passed to Reline Aug 5, 2023
when :ruby
[prompt.sub('rdbg'){colorize('ruby', [:RED])}] * 2
[prompt.sub('rdbg'){colorize('ruby', [:RED])}] * args.size
end
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we add * args.size here instead?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated

@tompng tompng force-pushed the fix_reline_prompt_colorize_line_size branch from adf6d62 to df0b653 Compare August 16, 2023 04:02
@ko1 ko1 merged commit 3d822a1 into ruby:master Sep 25, 2023
20 checks passed
@tompng tompng deleted the fix_reline_prompt_colorize_line_size branch September 25, 2023 08:57
xjunior referenced this pull request in powerhome/audiences Dec 11, 2023
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [debug](https://togithub.com/ruby/debug) | `1.8.0` -> `1.9.0` |
[![age](https://developer.mend.io/api/mc/badges/age/rubygems/debug/1.9.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/rubygems/debug/1.9.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/rubygems/debug/1.8.0/1.9.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/rubygems/debug/1.8.0/1.9.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>ruby/debug (debug)</summary>

### [`v1.9.0`](https://togithub.com/ruby/debug/releases/tag/v1.9.0)

[Compare
Source](https://togithub.com/ruby/debug/compare/v1.8.0...v1.9.0)

#### What's Changed

-   Configuration
- `session_name` config by [@&#8203;ko1](https://togithub.com/ko1) in
[https://github.com/ruby/debug/pull/1036](https://togithub.com/ruby/debug/pull/1036)
-   CLI
- Require Reline 0.3.8+ to avoid frozen issue by
[@&#8203;st0012](https://togithub.com/st0012) in
[https://github.com/ruby/debug/pull/1020](https://togithub.com/ruby/debug/pull/1020)
- Fix prompt list size and colorized code line size to match input line
size passed to Reline by [@&#8203;tompng](https://togithub.com/tompng)
in
[https://github.com/ruby/debug/pull/1010](https://togithub.com/ruby/debug/pull/1010)
- Fix broken command history when executing debugger on irb by
[@&#8203;takatea](https://togithub.com/takatea) in
[https://github.com/ruby/debug/pull/997](https://togithub.com/ruby/debug/pull/997)
- Drop patch for Reline 0.2.7 by
[@&#8203;st0012](https://togithub.com/st0012) in
[https://github.com/ruby/debug/pull/1022](https://togithub.com/ruby/debug/pull/1022)
- Support IRB console by [@&#8203;st0012](https://togithub.com/st0012)
in
[https://github.com/ruby/debug/pull/1024](https://togithub.com/ruby/debug/pull/1024)
-   Remote
- Allow TracePoint reentry during DAP's evaluation by
[@&#8203;st0012](https://togithub.com/st0012) in
[https://github.com/ruby/debug/pull/1026](https://togithub.com/ruby/debug/pull/1026)
- CDP: Add debuggerId field in the RETURN OBJECT of "Debugger.enable" by
[@&#8203;ono-max](https://togithub.com/ono-max) in
[https://github.com/ruby/debug/pull/1028](https://togithub.com/ruby/debug/pull/1028)
- CDP: disable JavaScript engine based autocompletion by
[@&#8203;ono-max](https://togithub.com/ono-max) in
[https://github.com/ruby/debug/pull/1029](https://togithub.com/ruby/debug/pull/1029)
- Do not use HEAD request if 1 port by
[@&#8203;ko1](https://togithub.com/ko1) in
[https://github.com/ruby/debug/pull/1035](https://togithub.com/ruby/debug/pull/1035)
- Show session_name on connection by
[@&#8203;ko1](https://togithub.com/ko1) in
[https://github.com/ruby/debug/pull/1037](https://togithub.com/ruby/debug/pull/1037)
-   Internal
- Stop assuming Integer#times is written in C by
[@&#8203;k0kubun](https://togithub.com/k0kubun) in
[https://github.com/ruby/debug/pull/1015](https://togithub.com/ruby/debug/pull/1015)
- Disable cloned breakpoints trace point events by
[@&#8203;vinistock](https://togithub.com/vinistock) in
[https://github.com/ruby/debug/pull/1008](https://togithub.com/ruby/debug/pull/1008)
- Unfreeze threads for some object-evaluating commands by
[@&#8203;st0012](https://togithub.com/st0012) in
[https://github.com/ruby/debug/pull/1030](https://togithub.com/ruby/debug/pull/1030)
- Prevent backtrace from hanging if objects in the backtrace use Thread
in inspect by [@&#8203;vinistock](https://togithub.com/vinistock) in
[https://github.com/ruby/debug/pull/1038](https://togithub.com/ruby/debug/pull/1038)
- Compile iseq_collector.c logic only on CRuby by
[@&#8203;eregon](https://togithub.com/eregon) in
[https://github.com/ruby/debug/pull/1039](https://togithub.com/ruby/debug/pull/1039)
- Fix compatibility with Fiber Scheduler. by
[@&#8203;ioquatix](https://togithub.com/ioquatix) in
[https://github.com/ruby/debug/pull/987](https://togithub.com/ruby/debug/pull/987)
- Do not make a Fiber for commands by
[@&#8203;ko1](https://togithub.com/ko1) in
[https://github.com/ruby/debug/pull/1044](https://togithub.com/ruby/debug/pull/1044)
- support Ruby 3.3 by [@&#8203;ko1](https://togithub.com/ko1) in
[https://github.com/ruby/debug/pull/1045](https://togithub.com/ruby/debug/pull/1045)
-   Misc/Doc
- Fix ruby warnings by [@&#8203;y-yagi](https://togithub.com/y-yagi) in
[https://github.com/ruby/debug/pull/993](https://togithub.com/ruby/debug/pull/993)
- Fix a typo by [@&#8203;makenowjust](https://togithub.com/makenowjust)
in
[https://github.com/ruby/debug/pull/988](https://togithub.com/ruby/debug/pull/988)
- Update `TrapInterceptor` to avoid assigning to an unused variable by
[@&#8203;DavidZivk](https://togithub.com/DavidZivk) in
[https://github.com/ruby/debug/pull/985](https://togithub.com/ruby/debug/pull/985)
- remove debug print by [@&#8203;ko1](https://togithub.com/ko1) in
[https://github.com/ruby/debug/pull/1043](https://togithub.com/ruby/debug/pull/1043)
- Minor punctuation and grammar fixes by
[@&#8203;ahangarha](https://togithub.com/ahangarha) in
[https://github.com/ruby/debug/pull/1041](https://togithub.com/ruby/debug/pull/1041)
-   Tests
- Bump actions/checkout from 3 to 4 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[https://github.com/ruby/debug/pull/1014](https://togithub.com/ruby/debug/pull/1014)

#### New Contributors

- [@&#8203;dependabot](https://togithub.com/dependabot) made their first
contribution in
[https://github.com/ruby/debug/pull/1014](https://togithub.com/ruby/debug/pull/1014)
- [@&#8203;tompng](https://togithub.com/tompng) made their first
contribution in
[https://github.com/ruby/debug/pull/1010](https://togithub.com/ruby/debug/pull/1010)
- [@&#8203;takatea](https://togithub.com/takatea) made their first
contribution in
[https://github.com/ruby/debug/pull/997](https://togithub.com/ruby/debug/pull/997)
- [@&#8203;y-yagi](https://togithub.com/y-yagi) made their first
contribution in
[https://github.com/ruby/debug/pull/993](https://togithub.com/ruby/debug/pull/993)
- [@&#8203;DavidZivk](https://togithub.com/DavidZivk) made their first
contribution in
[https://github.com/ruby/debug/pull/985](https://togithub.com/ruby/debug/pull/985)
- [@&#8203;eregon](https://togithub.com/eregon) made their first
contribution in
[https://github.com/ruby/debug/pull/1039](https://togithub.com/ruby/debug/pull/1039)
- [@&#8203;ahangarha](https://togithub.com/ahangarha) made their first
contribution in
[https://github.com/ruby/debug/pull/1041](https://togithub.com/ruby/debug/pull/1041)
- [@&#8203;ioquatix](https://togithub.com/ioquatix) made their first
contribution in
[https://github.com/ruby/debug/pull/987](https://togithub.com/ruby/debug/pull/987)

**Full Changelog**:
ruby/debug@v1.8.0...v1.9.0

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/powerhome/audiences).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy44Ny4yIiwidXBkYXRlZEluVmVyIjoiMzcuODcuMiIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants