py/repl: If there're no better alternatives, try to complete "import".

Also do that only for the first word in a line. The idea is that when you
start up interpreter, high chance that you want to do an import. With this
patch, this can be achieved with "i<tab>".
This commit is contained in:
Paul Sokolovsky 2016-05-08 19:31:06 +03:00
parent 13a1acc7e2
commit d59c2e5e45
1 changed files with 11 additions and 0 deletions

View File

@ -126,6 +126,7 @@ bool mp_repl_continue_with_input(const char *input) {
mp_uint_t mp_repl_autocomplete(const char *str, mp_uint_t len, const mp_print_t *print, const char **compl_str) { mp_uint_t mp_repl_autocomplete(const char *str, mp_uint_t len, const mp_print_t *print, const char **compl_str) {
// scan backwards to find start of "a.b.c" chain // scan backwards to find start of "a.b.c" chain
const char *org_str = str;
const char *top = str + len; const char *top = str + len;
for (const char *s = top; --s >= str;) { for (const char *s = top; --s >= str;) {
if (!(unichar_isalpha(*s) || unichar_isdigit(*s) || *s == '_' || *s == '.')) { if (!(unichar_isalpha(*s) || unichar_isdigit(*s) || *s == '_' || *s == '.')) {
@ -219,6 +220,16 @@ mp_uint_t mp_repl_autocomplete(const char *str, mp_uint_t len, const mp_print_t
// nothing found // nothing found
if (n_found == 0) { if (n_found == 0) {
// If there're no better alternatives, and if it's first word
// in the line, try to complete "import".
if (s_start == org_str) {
static char import_str[] = "import ";
if (memcmp(s_start, import_str, s_len) == 0) {
*compl_str = import_str + s_len;
return sizeof(import_str) - 1 - s_len;
}
}
return 0; return 0;
} }