djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[repl] Autocomplete builtin modules

Browse Source
This commit is contained in:
Artyom Skrobov 2021-04-03 16:56:02 -04:00
parent 1d55dee15b
commit 59fa9b01ad
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
py/repl.c
View File

@ -26,6 +26,7 @@
#include <string.h> #include <string.h>
#include "py/obj.h" #include "py/obj.h"
#include "py/objmodule.h"
#include "py/runtime.h" #include "py/runtime.h"
#include "py/builtin.h" #include "py/builtin.h"
#include "py/repl.h" #include "py/repl.h"
@ -144,10 +145,16 @@ bool mp_repl_continue_with_input(const char *input) {
} }
STATIC bool test_qstr(mp_obj_t obj, qstr name) { STATIC bool test_qstr(mp_obj_t obj, qstr name) {
// try object member if (obj) {
mp_obj_t dest[2]; // try object member
mp_load_method_protected(obj, name, dest, true); mp_obj_t dest[2];
return dest[0] != MP_OBJ_NULL; mp_load_method_protected(obj, name, dest, true);
return dest[0] != MP_OBJ_NULL;
} else {
// try builtin module
return mp_map_lookup((mp_map_t *)&mp_builtin_module_map,
MP_OBJ_NEW_QSTR(name), MP_MAP_LOOKUP);
}
} }
STATIC const char *find_completions(const char *s_start, size_t s_len, STATIC const char *find_completions(const char *s_start, size_t s_len,
@ -282,21 +289,25 @@ size_t mp_repl_autocomplete(const char *str, size_t len, const mp_print_t *print
// nothing found // nothing found
if (q_first == 0) { if (q_first == 0) {
if (s_len == 0) {
*compl_str = " ";
return 4;
}
// If there're no better alternatives, and if it's first word // If there're no better alternatives, and if it's first word
// in the line, try to complete "import". // in the line, try to complete "import".
if (s_start == org_str) { static const char import_str[] = "import ";
static const char import_str[] = "import "; if (s_start == org_str && s_len > 0) {
if (memcmp(s_start, import_str, s_len) == 0) { if (memcmp(s_start, import_str, s_len) == 0) {
*compl_str = import_str + s_len; *compl_str = import_str + s_len;
return sizeof(import_str) - 1 - s_len; return sizeof(import_str) - 1 - s_len;
} }
} }
// after "import", suggest built-in modules
return 0; if (len >= 7 && !memcmp(org_str, import_str, 7)) {
obj = NULL;
match_str = find_completions(
s_start, s_len, obj, &match_len, &q_first, &q_last);
}
if (q_first == 0) {
*compl_str = " ";
return s_len ? 0 : 4;
}
} }
// 1 match found, or multiple matches with a common prefix // 1 match found, or multiple matches with a common prefix