UI: fix tab indent

Author: chrisws

src/ui/textedit.cpp

@@ -1008,19 +1008,8 @@ void TextEditInput::editTab() {
   }
 
   // adjust indent for statement terminators
-  if (strncasecmp(buf + curIndent, "wend", 4) == 0 ||
-      strncasecmp(buf + curIndent, "fi", 2) == 0 ||
-      strncasecmp(buf + curIndent, "endif", 5) == 0 ||
-      strncasecmp(buf + curIndent, "elseif ", 7) == 0 ||
-      strncasecmp(buf + curIndent, "elif ", 5) == 0 ||
-      strncasecmp(buf + curIndent, "else", 4) == 0 ||
-      strncasecmp(buf + curIndent, "next", 4) == 0 ||
-      strncasecmp(buf + curIndent, "case", 4) == 0 ||
-      strncasecmp(buf + curIndent, "end", 3) == 0 ||
-      strncasecmp(buf + curIndent, "until ", 6) == 0) {
-    if (indent >= _indentLevel) {
-      indent -= _indentLevel;
-    }
+  if (indent >= _indentLevel && endStatement(buf + curIndent)) {
+    indent -= _indentLevel;
   }
   if (curIndent < indent) {
     // insert additional spaces
@@ -1054,6 +1043,35 @@ void TextEditInput::editTab() {
   free(buf);
 }
 
+bool TextEditInput::endStatement(const char *buf) {
+  const struct Holder {
+    const char *symbol;
+    int len;
+  } term[] = {
+    {"wend", 4},
+    {"fi", 2},
+    {"endif", 5},
+    {"elseif ", 7},
+    {"elif ", 5},
+    {"else", 4},
+    {"next", 4},
+    {"case", 4},
+    {"end", 3},
+    {"until ", 6}
+  };
+  const int len = sizeof(term) / sizeof(Holder);
+  bool result = false;
+  for (int i = 0; i < len && !result; i++) {
+    if (strncasecmp(buf, term[i].symbol, term[i].len) == 0) {
+      char c = buf[term[i].len];
+      if (c == '\0' || IS_WHITE(c)) {
+        result = true;
+      }
+    }
+  }
+  return result;
+}
+
 void TextEditInput::findMatchingBrace() {
   char cursorChar = _state.cursor < _buf._len ? _buf._buffer[_state.cursor] : '\0';
   char cursorMatch = '\0';

src/ui/textedit.h

@@ -131,6 +131,7 @@ struct TextEditInput : public FormEditInput {
   void editDeleteLine();
   void editEnter();
   void editTab();
+  bool endStatement(const char *buf);
   void findMatchingBrace();
   int  getCursorRow() const;
   uint32_t getHash(const char *str, int offs, int &count);