Fix colors in phpdbg prompt with libedit integration #15722
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
petk
force-pushed
the
patch-phpdbg-prompt
branch
from
4ea4704 to
c0e1f29
Compare
When building phpdbg SAPI with libedit/readline integration, also start
and end ignore characters need to be added in the prompt pattern. This
should now work for libedit, readline, and phpdbg without
readline/libedit.
The RL_PROMPT_START_IGNORE and RL_PROMPT_END_IGNORE macros are checked
to ensure libedit has these available. Otherwise, this could be further
improved by concatenating strings and literal strings into single
argument or similar using these two symbols directly.
Autotools:
./configure --with-readline --enable-phpdbg-readline
make
./sapi/phpdbg/phpdb
In the phpdbg, the "prompt" should be colored (or bold) in some
terminals.
petk
force-pushed
the
patch-phpdbg-prompt
branch
from
006ec3e to
6031c7e
Compare
cmb69
reviewed
Jan 13, 2025
| /* TODO: libedit doesn't seems to support coloured prompt */ | ||
| #if !defined(HAVE_LIBEDIT) || (defined(HAVE_LIBEDIT) && defined(RL_PROMPT_START_IGNORE) && defined(RL_PROMPT_END_IGNORE)) | ||
| # if defined(HAVE_LIBEDIT) && defined(RL_PROMPT_START_IGNORE) && defined(RL_PROMPT_END_IGNORE) | ||
| # define PHPDBG_PROMPT_FORMAT "\1\033[%sm\2%s\1\033[0m\2 " |
There was a problem hiding this comment.
It might be better to actually use the macros, i.e.
Suggested change
| # define PHPDBG_PROMPT_FORMAT "\1\033[%sm\2%s\1\033[0m\2 " | |
| # define PHPDBG_PROMPT_FORMAT RL_PROMPT_START_IGNORE "\033[%sm\2%s\1\033[0m" RL_PROMPT_END_IGNORE " " |
There was a problem hiding this comment.
I'll check. Last time I've tried this there were some errors and these strings should be then concatenated differently. The libraries define them as this (with single quotes):
/usr/include/readline/readline.h:#define RL_PROMPT_START_IGNORE '\001'
/usr/include/editline/readline.h:#define RL_PROMPT_START_IGNORE '\1'
/usr/include/readline/readline.h:#define RL_PROMPT_END_IGNORE '\002'
/usr/include/editline/readline.h:#define RL_PROMPT_END_IGNORE '\2'
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is another step required for #13184
When building with:
The phpdbg prompt is not colored (or bold in some terminals):