bill/whetstone_DSL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Step 179: rainbow brackets and delimiter intelligence

Browse Source
This commit is contained in:
Bill
2026-02-09 22:35:05 -07:00
parent 6f3bfb7094
commit bc28dbbffb
8 changed files with 218 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
PROGRESS.md
View File

@@ -526,4 +526,5 @@ Sprint 5 in progress. Step 141 (Emacs daemon with user config) done. Next: Step
| 2026-02-10 | Codex | Step 176: Smooth UI transitions (panel slides, tab fade, tooltip fade, toast animations, search pulse, cursor blink) + reduce-motion/cursor blink settings. 2/2 tests pass (step176_test, step176_integration_test). |
| 2026-02-10 | Codex | Step 177: Enhanced find/replace (match counts, regex preview, replace preview, selection scope, history, toggles, find next/prev) with SearchUtils. 2/2 tests pass (step177_test, step177_integration_test). |
| 2026-02-10 | Codex | Step 178: Multi-cursor editing (Alt+Click, Ctrl+D, Ctrl+Alt+Up/Down, column selection) with multi-caret rendering and shared edits. 2/2 tests pass (step178_test, step178_integration_test). |
| 2026-02-10 | Codex | Step 179: Rainbow brackets, bracket-pair highlight, scope tint, and auto-surround with language-specific auto-close. 2/2 tests pass (step179_test, step179_integration_test). |
| 2026-02-10 | Codex | Step 166: Extract main.cpp into panel headers marked complete (already implemented). step166_test passes; file_limits_test 4/4 passes. |

7
editor/CMakeLists.txt
View File

@@ -1037,6 +1037,13 @@ add_executable(step178_integration_test tests/step178_integration_test.cpp)
target_include_directories(step178_integration_test PRIVATE src)
target_link_libraries(step178_integration_test PRIVATE nlohmann_json::nlohmann_json)
add_executable(step179_test tests/step179_test.cpp)
target_include_directories(step179_test PRIVATE src)
add_executable(step179_integration_test tests/step179_integration_test.cpp)
target_include_directories(step179_integration_test PRIVATE src)
target_link_libraries(step179_integration_test PRIVATE nlohmann_json::nlohmann_json)
find_package(SDL2 CONFIG REQUIRED)
find_package(OpenGL REQUIRED)
find_package(glad CONFIG REQUIRED)

105
editor/src/CodeEditorRendering.h
View File

@@ -30,6 +30,76 @@ public:
}
const int lineCount = (int)lineStarts.size();
auto isOpenBracket = [](char c) {
return c == '(' || c == '[' || c == '{';
};
auto isCloseBracket = [](char c) {
return c == ')' || c == ']' || c == '}';
};
auto matchingOpen = [](char c) {
if (c == ')') return '(';
if (c == ']') return '[';
if (c == '}') return '{';
return '\0';
};
auto isBracketChar = [&](char c) {
return isOpenBracket(c) || isCloseBracket(c);
};
std::vector<int> bracketDepth(text.size(), -1);
std::vector<int> bracketMatch(text.size(), -1);
std::vector<int> stack;
std::vector<char> stackChars;
stack.reserve(128);
stackChars.reserve(128);
for (int i = 0; i < (int)text.size(); ++i) {
char c = text[i];
if (isOpenBracket(c)) {
stack.push_back(i);
stackChars.push_back(c);
bracketDepth[i] = (int)stack.size() - 1;
} else if (isCloseBracket(c)) {
char open = matchingOpen(c);
if (!stackChars.empty() && stackChars.back() == open) {
int openPos = stack.back();
stack.pop_back();
stackChars.pop_back();
int depth = (int)stack.size();
bracketDepth[i] = depth;
bracketMatch[i] = openPos;
bracketMatch[openPos] = i;
}
}
}
std::array<ImU32, 6> rainbow = {
ThemeEngine::instance().editorColor("bracket_1", IM_COL32(242, 120, 75, 255)),
ThemeEngine::instance().editorColor("bracket_2", IM_COL32(241, 196, 15, 255)),
ThemeEngine::instance().editorColor("bracket_3", IM_COL32(46, 204, 113, 255)),
ThemeEngine::instance().editorColor("bracket_4", IM_COL32(52, 152, 219, 255)),
ThemeEngine::instance().editorColor("bracket_5", IM_COL32(155, 89, 182, 255)),
ThemeEngine::instance().editorColor("bracket_6", IM_COL32(231, 76, 60, 255))
};
int focusBracketPos = -1;
int focusBracketMatch = -1;
if (cursor_ > 0 && cursor_ - 1 < (int)text.size() && isBracketChar(text[cursor_ - 1])) {
focusBracketPos = cursor_ - 1;
} else if (cursor_ < (int)text.size() && isBracketChar(text[cursor_])) {
focusBracketPos = cursor_;
}
if (focusBracketPos >= 0 && focusBracketPos < (int)bracketMatch.size()) {
focusBracketMatch = bracketMatch[focusBracketPos];
}
int scopeStartLine = -1;
int scopeEndLine = -1;
if (focusBracketMatch >= 0) {
int start = std::min(focusBracketPos, focusBracketMatch);
int end = std::max(focusBracketPos, focusBracketMatch);
scopeStartLine = lineFromPos(start, lineStarts);
scopeEndLine = lineFromPos(end, lineStarts);
}
// Clamp cursor
if (cursor_ < 0) cursor_ = 0;
if (cursor_ > (int)text.size()) cursor_ = (int)text.size();
@@ -383,6 +453,13 @@ public:
ThemeEngine::instance().editorColor("line_highlight",
IM_COL32(40, 40, 40, 120)));
}
if (scopeStartLine >= 0 && ln >= scopeStartLine && ln <= scopeEndLine) {
ImVec2 hlA(textBase.x, y);
ImVec2 hlB(textBase.x + textAreaWidth, y + lineHeight);
drawList->AddRectFilled(hlA, hlB,
ThemeEngine::instance().editorColor("scope_highlight",
IM_COL32(60, 60, 90, 40)));
}
if (options.highlightLine >= 0 && ln == options.highlightLine) {
ImVec2 hlA(textBase.x, y);
ImVec2 hlB(textBase.x + textAreaWidth, y + lineHeight);
@@ -431,13 +508,41 @@ public:
}
}
// Bracket pair highlight
if (focusBracketPos >= 0 && focusBracketMatch >= 0) {
int matchPositions[2] = {focusBracketPos, focusBracketMatch};
for (int i = 0; i < 2; ++i) {
int pos = matchPositions[i];
if (pos < start || pos >= end) continue;
int col = pos - start;
ImVec2 a(textBase.x + col * charAdvance, y);
ImVec2 b(textBase.x + (col + 1) * charAdvance, y + lineHeight);
drawList->AddRectFilled(a, b,
ThemeEngine::instance().editorColor("bracket_match",
IM_COL32(120, 140, 200, 100)));
}
}
// Render text with colors
int pos = start;
while (pos < end) {
TokenCategory cat = TokenCategory::Plain;
if (pos < (int)charCats.size()) cat = charCats[pos];
if (pos < (int)text.size() && isBracketChar(text[pos]) && bracketDepth[pos] >= 0) {
ImU32 col = rainbow[bracketDepth[pos] % rainbow.size()];
char buf[2] = {text[pos], 0};
ImVec2 p(textBase.x + (pos - start) * charAdvance, y);
drawList->AddText(font, font->FontSize, p, col, buf);
++pos;
continue;
}
int spanEnd = pos + 1;
while (spanEnd < end) {
if (spanEnd < (int)text.size() && isBracketChar(text[spanEnd]) && bracketDepth[spanEnd] >= 0) {
break;
}
TokenCategory nextCat = TokenCategory::Plain;
if (spanEnd < (int)charCats.size()) nextCat = charCats[spanEnd];
if (nextCat != cat) break;

59
editor/src/CodeEditorSelection.h
View File

@@ -163,17 +163,54 @@
void insertPair(std::string& text, char open, char close, bool& changed) {
syncPrimaryToMulti();
std::string pair;
pair.push_back(open);
pair.push_back(close);
std::vector<MultiCursor> edits = cursors_;
std::vector<std::string> inserts(edits.size(), pair);
applyEdits(text, edits, inserts, changed);
for (auto& c : cursors_) {
c.cursor -= 1;
c.selStart = c.cursor;
c.selEnd = c.cursor;
if (cursors_.empty()) return;
struct Plan { int index; int start; int end; std::string insert; int cursorTarget; };
std::vector<Plan> plans;
plans.reserve(cursors_.size());
for (size_t i = 0; i < cursors_.size(); ++i) {
const auto& c = cursors_[i];
int start = c.cursor;
int end = c.cursor;
std::string insert;
int target = 0;
if (cursorHasSelection(c)) {
start = std::min(c.selStart, c.selEnd);
end = std::max(c.selStart, c.selEnd);
std::string selected = text.substr(start, end - start);
insert.push_back(open);
insert += selected;
insert.push_back(close);
target = (int)insert.size();
} else {
insert.push_back(open);
insert.push_back(close);
target = 1;
}
plans.push_back({(int)i, start, end, insert, target});
}
std::sort(plans.begin(), plans.end(),
[](const Plan& a, const Plan& b) { return a.start > b.start; });
std::vector<MultiCursor> next = cursors_;
bool didChange = false;
for (const auto& plan : plans) {
if (plan.start < 0 || plan.start > (int)text.size()) continue;
int safeEnd = std::max(plan.start, std::min(plan.end, (int)text.size()));
if (safeEnd > plan.start) {
text.erase(plan.start, safeEnd - plan.start);
didChange = true;
}
if (!plan.insert.empty()) {
text.insert(plan.start, plan.insert);
didChange = true;
}
next[plan.index].cursor = plan.start + plan.cursorTarget;
next[plan.index].selStart = next[plan.index].cursor;
next[plan.index].selEnd = next[plan.index].cursor;
}
if (didChange) changed = true;
cursors_ = std::move(next);
syncMultiToPrimary();
}
@@ -227,7 +264,7 @@
} else if (c >= 32) {
if (mode) {
char close = mode->getClosingBracket((char)c);
if (close != 0) {
if (close != 0 && mode->autoCloseBrackets()) {
insertPair(text, (char)c, close, changed);
} else {
char buf[5] = {0};

12
editor/src/EditorMode.h
View File

@@ -131,6 +131,7 @@ public:
// --- Auto-close brackets ---
const std::vector<BracketPair>& getBracketPairs() const { return brackets_; }
bool autoCloseBrackets() const { return autoCloseBrackets_; }
// Given an opening character, return the closing character (0 if not a bracket)
char getClosingBracket(char open) const {
@@ -208,6 +209,7 @@ private:
indent_ = {":", "return", 4, false};
comment_ = {"#", "\"\"\"", "\"\"\""};
brackets_ = {{'(', ')'}, {'[', ']'}, {'{', '}'}, {'\'', '\''}, {'"', '"'}};
autoCloseBrackets_ = true;
snippets_ = {
{"def", "def $1($2):\n $0", "Function definition"},
{"class", "class $1:\n def __init__(self):\n $0", "Class definition"},
@@ -223,6 +225,7 @@ private:
indent_ = {"{", "}", 4, false};
comment_ = {"//", "/*", "*/"};
brackets_ = {{'(', ')'}, {'[', ']'}, {'{', '}'}, {'\'', '\''}, {'"', '"'}, {'<', '>'}};
autoCloseBrackets_ = true;
snippets_ = {
{"main", "int main(int argc, char* argv[]) {\n $0\n return 0;\n}", "Main function"},
{"class", "class $1 {\npublic:\n $1();\n ~$1();\nprivate:\n $0\n};", "Class definition"},
@@ -239,6 +242,7 @@ private:
indent_ = {"(", ")", 2, false};
comment_ = {";;", "", ""};
brackets_ = {{'(', ')'}, {'[', ']'}, {'"', '"'}};
autoCloseBrackets_ = false;
snippets_ = {
{"defun", "(defun $1 ($2)\n \"$3\"\n $0)", "Function definition"},
{"let", "(let (($1 $2))\n $0)", "Let binding"},
@@ -253,6 +257,7 @@ private:
indent_ = {"", "", 4, false};
comment_ = {"", "", ""};
brackets_ = {{'(', ')'}, {'[', ']'}, {'{', '}'}, {'"', '"'}};
autoCloseBrackets_ = false;
snippets_ = {};
}
@@ -261,6 +266,7 @@ private:
indent_ = {"{", "}", 2, false};
comment_ = {"//", "/*", "*/"};
brackets_ = {{'(', ')'}, {'[', ']'}, {'{', '}'}, {'\'', '\''}, {'"', '"'}};
autoCloseBrackets_ = true;
snippets_ = {
{"fn", "function $1($2) {\\n $0\\n}", "Function"},
{"if", "if ($1) {\\n $0\\n}", "If statement"},
@@ -273,6 +279,7 @@ private:
indent_ = {"{", "}", 2, false};
comment_ = {"//", "/*", "*/"};
brackets_ = {{'(', ')'}, {'[', ']'}, {'{', '}'}, {'\'', '\''}, {'"', '"'}, {'<', '>'}};
autoCloseBrackets_ = true;
snippets_ = {
{"fn", "function $1($2): $3 {\\n $0\\n}", "Function"},
{"if", "if ($1) {\\n $0\\n}", "If statement"},
@@ -284,6 +291,7 @@ private:
indent_ = {"{", "}", 4, false};
comment_ = {"//", "/*", "*/"};
brackets_ = {{'(', ')'}, {'[', ']'}, {'{', '}'}, {'\'', '\''}, {'"', '"'}};
autoCloseBrackets_ = true;
snippets_ = {
{"class", "class $1 {\\n $0\\n}", "Class"},
{"if", "if ($1) {\\n $0\\n}", "If statement"},
@@ -295,6 +303,7 @@ private:
indent_ = {"{", "}", 4, false};
comment_ = {"//", "/*", "*/"};
brackets_ = {{'(', ')'}, {'[', ']'}, {'{', '}'}, {'\'', '\''}, {'\"', '\"'}};
autoCloseBrackets_ = true;
snippets_ = {
{"fn", "fn $1($2) -> $3 {\\n $0\\n}", "Function"},
{"if", "if $1 {\\n $0\\n}", "If statement"},
@@ -306,6 +315,7 @@ private:
indent_ = {"{", "}", 4, false};
comment_ = {"//", "/*", "*/"};
brackets_ = {{'(', ')'}, {'[', ']'}, {'{', '}'}, {'\'', '\''}, {'\"', '\"'}};
autoCloseBrackets_ = true;
snippets_ = {
{"fn", "func $1($2) $3 {\\n $0\\n}", "Function"},
{"if", "if $1 {\\n $0\\n}", "If statement"},
@@ -317,6 +327,7 @@ private:
indent_ = {"", "", 2, false};
comment_ = {"#", "", ""};
brackets_ = {{'(', ')'}, {'[', ']'}, {'{', '}'}, {'\"', '\"'}};
autoCloseBrackets_ = false;
snippets_ = {
{"src", "#+begin_src $1\\n$0\\n#+end_src", "Source block"},
{"hdr", "* $1\\n$0", "Heading"},
@@ -328,5 +339,6 @@ private:
IndentRule indent_;
CommentStyle comment_;
std::vector<BracketPair> brackets_;
bool autoCloseBrackets_ = true;
std::vector<SnippetTemplate> snippets_;
};

15
editor/tests/step179_integration_test.cpp Normal file
View File

@@ -0,0 +1,15 @@
// Step 179: EditorMode auto-close toggle integration checks.
#include <cassert>
#include "EditorMode.h"
int main() {
EditorMode elisp("elisp");
EditorMode cpp("cpp");
assert(elisp.autoCloseBrackets() == false);
assert(cpp.autoCloseBrackets() == true);
printf("step179_integration_test: all assertions passed\n");
return 0;
}

29
editor/tests/step179_test.cpp Normal file
View File

@@ -0,0 +1,29 @@
// Step 179: Rainbow brackets and delimiter intelligence checks.
#include <cassert>
#include <fstream>
#include <string>
static std::string readFile(const std::string& path) {
std::ifstream f(path);
if (!f.is_open()) return {};
return std::string((std::istreambuf_iterator<char>(f)),
std::istreambuf_iterator<char>());
}
static void assertContains(const std::string& text, const std::string& needle) {
assert(text.find(needle) != std::string::npos);
}
int main() {
const std::string editorMode = readFile("src/EditorMode.h");
assertContains(editorMode, "autoCloseBrackets");
const std::string rendering = readFile("src/CodeEditorRendering.h");
assertContains(rendering, "bracketMatch");
assertContains(rendering, "scope_highlight");
assertContains(rendering, "rainbow");
printf("step179_test: all assertions passed\n");
return 0;
}

2
sprint6_plan.md
View File

@@ -182,7 +182,7 @@ Core editing improvements that make daily use smooth.
- Works with auto-indent and bracket completion
*Modifies:* `CodeEditorWidget.h`
- [ ] **Step 179: Rainbow brackets and delimiter intelligence**
- [x] **Step 179: Rainbow brackets and delimiter intelligence**
Smart bracket handling:
- Rainbow bracket coloring: nested brackets get rotating colors
(configurable, theme-aware, toggleable)