diff options
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/python/lib/gdb/__init__.py | 2 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/style.c | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/style.exp | 8 |
5 files changed, 24 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 050c9b2..2c347fc 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2020-04-10 Tom de Vries <tdevries@suse.de> + + PR cli/25808 + * python/lib/gdb/__init__.py: Initialize lexer with stripnl=False. + 2020-04-09 Simon Marchi <simon.marchi@polymtl.ca> * MAINTAINERS (Global Maintainers): Add Tom de Vries. diff --git a/gdb/python/lib/gdb/__init__.py b/gdb/python/lib/gdb/__init__.py index a1aac00..3dfb51b 100644 --- a/gdb/python/lib/gdb/__init__.py +++ b/gdb/python/lib/gdb/__init__.py @@ -216,7 +216,7 @@ try: def colorize(filename, contents): # Don't want any errors. try: - lexer = lexers.get_lexer_for_filename(filename) + lexer = lexers.get_lexer_for_filename(filename, stripnl=False) formatter = formatters.TerminalFormatter() return highlight(contents, lexer, formatter) except: diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 16b982b..023f5a8 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2020-04-10 Tom de Vries <tdevries@suse.de> + + PR cli/25808 + * gdb.base/style.c: Add leading newlines. + * gdb.base/style.exp: Use gdb_get_line_number to get specific lines. + Check listing of main's one-line body. + 2020-04-08 Tom de Vries <tdevries@suse.de> * lib/gdb.exp (psymtabs_p): New proc. diff --git a/gdb/testsuite/gdb.base/style.c b/gdb/testsuite/gdb.base/style.c index cb75b3b..4e0e0df 100644 --- a/gdb/testsuite/gdb.base/style.c +++ b/gdb/testsuite/gdb.base/style.c @@ -1,3 +1,7 @@ + + +/* The leading newlines here are intentional, do not remove. They are used to + test that the source highlighter doesn't strip them. */ /* Copyright 2018-2020 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/gdb/testsuite/gdb.base/style.exp b/gdb/testsuite/gdb.base/style.exp index 47ef8c9..1071b02 100644 --- a/gdb/testsuite/gdb.base/style.exp +++ b/gdb/testsuite/gdb.base/style.exp @@ -39,6 +39,11 @@ save_vars { env(TERM) } { return } + # Check that the source highlighter has not stripped away the leading + # newlines. + set main_line [gdb_get_line_number "break here"] + gdb_test "list $main_line,$main_line" "return.*some_called_function.*" + gdb_test_no_output "set style enabled on" set main_expr [style main function] @@ -79,8 +84,9 @@ save_vars { env(TERM) } { } if {$test_macros} { + set macro_line [gdb_get_line_number "\#define SOME_MACRO"] gdb_test "info macro SOME_MACRO" \ - "Defined at $base_file_expr:16\r\n#define SOME_MACRO 23" + "Defined at $base_file_expr:$macro_line\r\n#define SOME_MACRO 23" } set func [style some_called_function function] |