935dc9ff65
GDB's Python API documentation for gdb.Command.complete() says:
The 'complete' method can return several values:
* If the return value is a sequence, the contents of the
sequence are used as the completions. It is up to 'complete'
to ensure that the contents actually do complete the word. A
zero-length sequence is allowed, it means that there were no
completions available. Only string elements of the sequence
are used; other elements in the sequence are ignored.
* If the return value is one of the 'COMPLETE_' constants
defined below, then the corresponding GDB-internal completion
function is invoked, and its result is used.
* All other results are treated as though there were no
available completions.
So, returning a non-sequence, and non-integer from a complete method
should be fine; it should just be treated as though there are no
completions.
However, if I write a complete method that returns None, I see this
behaviour:
(gdb) complete completefilenone x
Python Exception <class 'TypeError'>: 'NoneType' object is not iterable
warning: internal error: Unhandled Python exception
(gdb)
Which is caused because we currently assume that anything that is not
an integer must be iterable, and we call PyObject_GetIter on it. When
this call fails a Python exception is set, but instead of
clearing (and therefore ignoring) this exception as we do everywhere
else in the Python completion code, we instead just return with the
exception set.
In this commit I add a PySequence_Check call. If this call returns
false (and we've already checked the integer case) then we can assume
there are no completion results.
I've added a test which checks returning a non-sequence.
Approved-By: Tom Tromey <tom@tromey.com>
143 lines
4.4 KiB
Plaintext
143 lines
4.4 KiB
Plaintext
# Copyright (C) 2014-2023 Free Software Foundation, Inc.
|
|
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
set testfile "py-completion"
|
|
|
|
load_lib gdb-python.exp
|
|
|
|
require allow_python_tests
|
|
|
|
set pyfile [gdb_remote_download host ${srcdir}/${subdir}/${testfile}.py]
|
|
set discard 0
|
|
gdb_exit
|
|
gdb_start
|
|
|
|
# Tab completion tests require readline support, and this set of tests
|
|
# doesn't work on a remote host either.
|
|
if { [readline_is_used] && ![is_remote host] } {
|
|
gdb_test_no_output "source ${pyfile}" "load python file"
|
|
|
|
# Create a temporary directory
|
|
set testdir "[standard_output_file "py-completion-testdir"]/"
|
|
set testdir_regex [string_to_regexp $testdir]
|
|
set testdir_complete [standard_output_file "py-completion-test"]
|
|
file mkdir $testdir
|
|
|
|
# This one should always pass.
|
|
send_gdb "completefileinit ${testdir_complete}\t"
|
|
gdb_test_multiple "" "completefileinit completion" {
|
|
-re "^completefileinit ${testdir_regex}$" {
|
|
pass "completefileinit completion"
|
|
}
|
|
}
|
|
|
|
# Just discarding whatever we typed.
|
|
gdb_test " " ".*" "discard #[incr discard]"
|
|
|
|
# This should offer no suggestions - the complete() methods
|
|
# returns something that is neither an integer, or a sequence.
|
|
gdb_test_no_output "complete completefilenone ${testdir_complete}" \
|
|
"no suggestions given"
|
|
|
|
# This is the problematic one.
|
|
send_gdb "completefilemethod ${testdir_complete}\t"
|
|
gdb_test_multiple "" "completefilemethod completion" {
|
|
-re "^completefilemethod ${testdir_regex} $" {
|
|
fail "completefilemethod completion (completed filename as wrong command arg)"
|
|
}
|
|
-re "^completefilemethod ${testdir_regex}$" {
|
|
pass "completefilemethod completion"
|
|
}
|
|
}
|
|
|
|
# Discarding again
|
|
gdb_test " " ".*" "discard #[incr discard]"
|
|
|
|
# Another problematic
|
|
set completion_regex "[string_to_regexp [standard_output_file "py-completion-t"]]"
|
|
send_gdb "completefilecommandcond [standard_output_file "py-completion-t\t"]"
|
|
gdb_test_multiple "" "completefilecommandcond completion" {
|
|
-re "^completefilecommandcond ${testdir}$" {
|
|
fail "completefilecommandcond completion (completed filename instead of command)"
|
|
}
|
|
-re "^completefilecommandcond ${completion_regex}\007$" {
|
|
pass "completefilecommandcond completion"
|
|
}
|
|
}
|
|
|
|
# Discarding again
|
|
gdb_test " " ".*" "discard #[incr discard]"
|
|
}
|
|
|
|
# Start gdb over again to clear out current state. This can interfere
|
|
# with the expected output of the below tests in a buggy gdb.
|
|
gdb_exit
|
|
gdb_start
|
|
gdb_test_no_output "source ${pyfile}" "load python file again"
|
|
|
|
gdb_test_sequence "complete completel" \
|
|
"list all completions of 'complete completel'" {
|
|
"completelimit1"
|
|
"completelimit2"
|
|
"completelimit3"
|
|
"completelimit4"
|
|
"completelimit5"
|
|
"completelimit6"
|
|
"completelimit7"
|
|
}
|
|
|
|
# Discarding again
|
|
gdb_test " " ".*" "discard #[incr discard]"
|
|
|
|
gdb_test_sequence "complete completelimit1 c" \
|
|
"list all completions of 'complete completelimit1 c'" {
|
|
"completelimit1 cl11"
|
|
"completelimit1 cl12"
|
|
"completelimit1 cl13"
|
|
}
|
|
|
|
# Discarding again
|
|
gdb_test " " ".*" "discard #[incr discard]"
|
|
|
|
# If using readline, we can TAB-complete. This used to trigger a bug
|
|
# because the cached result from the completer was being reused for
|
|
# a different python command.
|
|
if {[readline_is_used]} {
|
|
set testname "tab-complete 'completelimit1 c'"
|
|
send_gdb "completelimit1 c\t"
|
|
gdb_test_multiple "" $testname {
|
|
-re "^completelimit1 c\\\x07l1$" {
|
|
pass $testname
|
|
|
|
# Discard the command line
|
|
gdb_test " " ".*" "discard #[incr discard]"
|
|
}
|
|
}
|
|
|
|
gdb_test_sequence "complete completelimit2 c" \
|
|
"list all completions of 'complete completelimit2 c'" {
|
|
"completelimit2 cl21"
|
|
"completelimit2 cl210"
|
|
"completelimit2 cl22"
|
|
"completelimit2 cl23"
|
|
"completelimit2 cl24"
|
|
"completelimit2 cl25"
|
|
"completelimit2 cl26"
|
|
"completelimit2 cl27"
|
|
"completelimit2 cl28"
|
|
"completelimit2 cl29"
|
|
}
|
|
}
|