admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

mirb_editor.c: extract is_dedent_keyword() helper

Browse Source 
consolidate duplicated dedenting keyword detection logic that was
repeated in reindent_line(), handle_tab_indent(), and handle_key().
the helper checks for end, else, elsif, when, in, rescue, ensure, and }.

Co-authored-by: Claude <noreply@anthropic.com>
This commit is contained in:
Yukihiro "Matz" Matsumoto
2025-12-22 09:13:51 +09:00
parent e4b8ae5156
commit c09fbbd262
1 changed files with 26 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-bin-mirb/tools/mirb/mirb_editor.c
+26 -40
View File
@@ -40,6 +40,29 @@ leading_spaces(const char *line)
return count;
}
/*
* Check if content starts with a dedenting keyword
* (end, else, elsif, when, in, rescue, ensure) or '}'
*/
static mrb_bool
is_dedent_keyword(const char *content)
{
if (content[0] == '}') return TRUE;
if (strncmp(content, "end", 3) == 0 &&
(content[3] == '\0' || content[3] == ' ' || content[3] == '\t' ||
content[3] == '.' || content[3] == ')')) return TRUE;
if (strncmp(content, "else", 4) == 0 &&
(content[4] == '\0' || content[4] == ' ' || content[4] == '\t')) return TRUE;
if (strncmp(content, "elsif", 5) == 0 && content[5] == ' ') return TRUE;
if (strncmp(content, "when", 4) == 0 && content[4] == ' ') return TRUE;
if (strncmp(content, "in", 2) == 0 && content[2] == ' ') return TRUE;
if (strncmp(content, "rescue", 6) == 0 &&
(content[6] == '\0' || content[6] == ' ' || content[6] == '\t')) return TRUE;
if (strncmp(content, "ensure", 6) == 0 &&
(content[6] == '\0' || content[6] == ' ' || content[6] == '\t')) return TRUE;
return FALSE;
}
/*
* Calculate indent level by counting open blocks in code
*/
@@ -270,19 +293,7 @@ reindent_line(mirb_buffer *buf)
/* Check if line content starts with dedenting keyword */
content = line->data + current_spaces;
if ((strncmp(content, "end", 3) == 0 &&
(content[3] == '\0' || content[3] == ' ' || content[3] == '\t' ||
content[3] == '.' || content[3] == ')')) ||
(strncmp(content, "else", 4) == 0 &&
(content[4] == '\0' || content[4] == ' ' || content[4] == '\t')) ||
(strncmp(content, "elsif", 5) == 0 && content[5] == ' ') ||
(strncmp(content, "when", 4) == 0 && content[4] == ' ') ||
(strncmp(content, "in", 2) == 0 && content[2] == ' ') ||
(strncmp(content, "rescue", 6) == 0 &&
(content[6] == '\0' || content[6] == ' ' || content[6] == '\t')) ||
(strncmp(content, "ensure", 6) == 0 &&
(content[6] == '\0' || content[6] == ' ' || content[6] == '\t')) ||
content[0] == '}') {
if (is_dedent_keyword(content)) {
if (expected_indent > 0) expected_indent--;
}
@@ -451,19 +462,7 @@ handle_tab_indent(mirb_editor *ed)
/* Check if line content starts with dedenting keyword */
content = line->data + current_spaces;
if ((strncmp(content, "end", 3) == 0 &&
(content[3] == '\0' || content[3] == ' ' || content[3] == '\t' ||
content[3] == '.' || content[3] == ')')) ||
(strncmp(content, "else", 4) == 0 &&
(content[4] == '\0' || content[4] == ' ' || content[4] == '\t')) ||
(strncmp(content, "elsif", 5) == 0 && content[5] == ' ') ||
(strncmp(content, "when", 4) == 0 && content[4] == ' ') ||
(strncmp(content, "in", 2) == 0 && content[2] == ' ') ||
(strncmp(content, "rescue", 6) == 0 &&
(content[6] == '\0' || content[6] == ' ' || content[6] == '\t')) ||
(strncmp(content, "ensure", 6) == 0 &&
(content[6] == '\0' || content[6] == ' ' || content[6] == '\t')) ||
content[0] == '}') {
if (is_dedent_keyword(content)) {
if (expected_indent > 0) expected_indent--;
}
@@ -808,20 +807,7 @@ handle_key(mirb_editor *ed, int key, mirb_edit_result *result)
/* Check if new line starts with dedenting keyword */
mirb_line *new_line = &ed->buf.lines[ed->buf.cursor_line];
const char *content = new_line->data;
if ((strncmp(content, "end", 3) == 0 &&
(content[3] == '\0' || content[3] == ' ' || content[3] == '\t' ||
content[3] == '.' || content[3] == ')')) ||
(strncmp(content, "else", 4) == 0 &&
(content[4] == '\0' || content[4] == ' ' || content[4] == '\t')) ||
(strncmp(content, "elsif", 5) == 0 && content[5] == ' ') ||
(strncmp(content, "when", 4) == 0 && content[4] == ' ') ||
(strncmp(content, "in", 2) == 0 && content[2] == ' ') ||
(strncmp(content, "rescue", 6) == 0 &&
(content[6] == '\0' || content[6] == ' ' || content[6] == '\t')) ||
(strncmp(content, "ensure", 6) == 0 &&
(content[6] == '\0' || content[6] == ' ' || content[6] == '\t')) ||
content[0] == '}') {
if (is_dedent_keyword(new_line->data)) {
if (indent > 0) indent--;
}