1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Chomp last punctuations from descriptions for -h

Browse Source 
The following parts will not be shown for `-h` option.  And not to
reach 80 columns.  Some terminal emulators (Windows command prompt at
least) wrap the cursor to the next line when reaching the rightmost
column, before exceeding.
This commit is contained in:
Nobuyoshi Nakada 2024-03-13 12:00:38 +09:00
parent a05dfbd405
commit c843afbf6f
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ruby.c
View File

@ -254,6 +254,7 @@ show_usage_part(const char *str, const unsigned int namelen,
const char *sb = highlight ? esc_bold : esc_none; const char *sb = highlight ? esc_bold : esc_none;
const char *se = highlight ? esc_reset : esc_none; const char *se = highlight ? esc_reset : esc_none;
unsigned int desclen = (unsigned int)strcspn(desc, "\n"); unsigned int desclen = (unsigned int)strcspn(desc, "\n");
if (!help && desclen > 0 && strchr(".;:", desc[desclen-1])) --desclen;
if (help && (namelen + 1 > w) && /* a padding space */ if (help && (namelen + 1 > w) && /* a padding space */
(int)(namelen + secondlen + indent_width) >= columns) { (int)(namelen + secondlen + indent_width) >= columns) {
printf(USAGE_INDENT "%s" "%.*s" "%s\n", sb, namelen, str, se); printf(USAGE_INDENT "%s" "%.*s" "%s\n", sb, namelen, str, se);
@ -341,7 +342,7 @@ usage(const char *name, int help, int highlight, int columns)
M("-S", "", "Search directories found in the PATH environment variable."), M("-S", "", "Search directories found in the PATH environment variable."),
M("-v", "", "Print version; set $VERBOSE to true."), M("-v", "", "Print version; set $VERBOSE to true."),
M("-w", "", "Synonym for -W1."), M("-w", "", "Synonym for -W1."),
M("-W[level=2|:category]", "", "Set warning flag ($-W):\n" M("-W[level=2|:category]", "", "Set warning flag ($-W):\n"
"0 for silent; 1 for moderate; 2 for verbose."), "0 for silent; 1 for moderate; 2 for verbose."),
M("-x[dirpath]", "", "Execute Ruby code starting from a #!ruby line."), M("-x[dirpath]", "", "Execute Ruby code starting from a #!ruby line."),
M("--jit", "", "Enable JIT for the platform; same as " PLATFORM_JIT_OPTION "."), M("--jit", "", "Enable JIT for the platform; same as " PLATFORM_JIT_OPTION "."),
@ -363,7 +364,7 @@ usage(const char *name, int help, int highlight, int columns)
M("--dump=items", "", "Dump items; see list below."), M("--dump=items", "", "Dump items; see list below."),
M("--enable=features", "", "Enable features; see list below."), M("--enable=features", "", "Enable features; see list below."),
M("--external-encoding=encoding", "", "Set default external encoding."), M("--external-encoding=encoding", "", "Set default external encoding."),
M("--help", "", "Print long help message; use -h for short message."), M("--help", "", "Print long help message; use -h for short message."),
M("--internal-encoding=encoding", "", "Set default internal encoding."), M("--internal-encoding=encoding", "", "Set default internal encoding."),
M("--parser=parser", "", "Set Ruby parser: parse.y or prism."), M("--parser=parser", "", "Set Ruby parser: parse.y or prism."),
M("--verbose", "", "Set $VERBOSE to true; ignore input from $stdin."), M("--verbose", "", "Set $VERBOSE to true; ignore input from $stdin."),

2
test/ruby/test_rubyoptions.rb
View File

@ -46,7 +46,7 @@ class TestRubyOptions < Test::Unit::TestCase
def test_usage def test_usage
assert_in_out_err(%w(-h)) do |r, e| assert_in_out_err(%w(-h)) do |r, e|
assert_operator(r.size, :<=, 25) assert_operator(r.size, :<=, 25)
longer = r[1..-1].select {|x| x.size > 80} longer = r[1..-1].select {|x| x.size >= 80}
assert_equal([], longer) assert_equal([], longer)
assert_equal([], e) assert_equal([], e)
end end