[Bf-blender-cvs] [0ad4d2694ba] blender-v3.1-release: Python: change behavior for CONSOLE_OT_indent_or_autocomplete
Campbell Barton
noreply at git.blender.org
Tue Feb 22 09:59:25 CET 2022
Commit: 0ad4d2694bae7f4db551138ec79a46f8f7e57bba
Author: Campbell Barton
Date: Tue Feb 22 19:57:36 2022 +1100
Branches: blender-v3.1-release
https://developer.blender.org/rB0ad4d2694bae7f4db551138ec79a46f8f7e57bba
Python: change behavior for CONSOLE_OT_indent_or_autocomplete
Checking only the previous character broke import auto-completion.
===================================================================
M source/blender/editors/space_console/console_ops.c
===================================================================
diff --git a/source/blender/editors/space_console/console_ops.c b/source/blender/editors/space_console/console_ops.c
index c6fb2560dc0..0201b11f0bb 100644
--- a/source/blender/editors/space_console/console_ops.c
+++ b/source/blender/editors/space_console/console_ops.c
@@ -470,7 +470,18 @@ void CONSOLE_OT_insert(wmOperatorType *ot)
static int console_indent_or_autocomplete_exec(bContext *C, wmOperator *UNUSED(op))
{
ConsoleLine *ci = console_history_verify(C);
- bool text_before_cursor = ci->cursor != 0 && !ELEM(ci->line[ci->cursor - 1], ' ', '\t');
+ bool text_before_cursor = false;
+
+ /* Check any text before cursor (not just the previous character) as is done for
+ * #TEXT_OT_indent_or_autocomplete because Python auto-complete operates on import
+ * statements such as completing possible sub-modules: `from bpy import `. */
+ for (int i = 0; i < ci->cursor; i += BLI_str_utf8_size_safe(&ci->line[i])) {
+ if (!ELEM(ci->line[i], ' ', '\t')) {
+ text_before_cursor = true;
+ break;
+ }
+ }
+
if (text_before_cursor) {
WM_operator_name_call(C, "CONSOLE_OT_autocomplete", WM_OP_INVOKE_DEFAULT, NULL);
}
More information about the Bf-blender-cvs
mailing list