Skip to content

fix(shell): keep else/elif/except/finally inside multi-line REPL block #381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pikasTech merged 1 commit into from
Sep 11, 2026
+24 −1
Merged

fix(shell): keep else/elif/except/finally inside multi-line REPL block #381

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion src/PikaObj.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1807,6 +1807,29 @@ static void handle_history_navigation(char inputChar,
return;
}

static pika_bool _shell_lineStaysInBlock(char* line) {
if ((line[0] == ' ') || (line[0] == '\t')) {
return pika_true;
}
if (strIsStartWith(line, "else") &&
((line[4] == ' ') || (line[4] == ':'))) {
return pika_true;
}
if (strIsStartWith(line, "elif") &&
((line[4] == ' ') || (line[4] == ':'))) {
return pika_true;
}
if (strIsStartWith(line, "except") &&
((line[6] == ' ') || (line[6] == ':'))) {
return pika_true;
}
if (strIsStartWith(line, "finally") &&
((line[7] == ' ') || (line[7] == ':'))) {
return pika_true;
}
return pika_false;
}

enum shellCTRL _inner_do_obj_runChar(PikaObj* self,
char inputChar,
ShellConfig* shell) {
Expand Down Expand Up @@ -1995,7 +2018,7 @@ enum shellCTRL _inner_do_obj_runChar(PikaObj* self,
obj_setStr(self, shell->blockBuffName, shell_buff_new);
strsDeinit(&buffs);
/* go out from block */
if ((shell->lineBuff[0] != ' ') && (shell->lineBuff[0] != '\t')) {
if (!_shell_lineStaysInBlock(shell->lineBuff)) {
shell->inBlock = pika_false;
input_line = obj_getStr(self, shell->blockBuffName);
ctrl = shell->handler(self, input_line, shell);
Expand Down