Undo/redo: - cmd_newline recorded the undo node's position after the cursor moved past the split point, so undoing Enter joined the wrong pair of lines. - Backspace/Delete line-joins recorded UndoType::Newline, whose apply() semantics are inverted for a join (forward=split); add UndoType::JoinLines with correct forward/backward behavior. - Regex replace-all, indent/unindent region, kill-to-eol, kill-line, kill-region, and delete-word-prev/next mutated the buffer via the no-undo-recording raw APIs; they now record undo, grouped atomically via a shared UndoGroupGuard. - Plain-text replace-all with an empty replacement advanced the scan position one character too far, skipping adjacent/overlapping matches. Crash recovery / memory safety: - Buffer's move ctor/assignment never carried over swap_rec_, on_disk_identity_, or the visual-line-mode fields, so the crash-recovery journal silently stopped tracking a buffer whenever Editor's std::vector<Buffer> reallocated or shifted (e.g. opening/closing files). Added SwapManager::Rehome() plus Flush()-before-mutate in Editor::AddBuffer/CloseBuffer so the journal's Buffer* key and the background writer thread never reference a stale address. - UndoTree leaked its entire node graph (including all edit text) on every buffer close/reload; added ~UndoTree() to free it. - main.cc didn't restore the terminal if an exception escaped the run loop; added an RAII guard around Frontend::Shutdown(). Input handling: - Terminal frontend used getch() instead of get_wch(), silently dropping non-ASCII keyboard input despite linking wide-char ncurses. - KKeymap's C-k lookup switches on an already-lowercased key, making `case 'E'` unreachable dead code; C-k Shift-E silently aliased to C-k e. - ImGui file picker wasn't modal: keystrokes typed while it was open still reached the buffer underneath as edit commands, and Escape didn't close it. - Gated ImGuiInputHandler's unconditional fprintf/fflush diagnostics behind an IMGUI_IH_DEBUG macro, matching QtInputHandler's existing convention. Syntax highlighting: - Go/Rust/SQL highlighters weren't stateful, so multi-line /* */ comments mis-highlighted as code starting on the second line. - Python's triple-quoted-string handler didn't re-scan the remainder of a line after a string closed mid-line, missing a same-line reopen. - HighlighterEngine's state_last_contig_ field was declared but unused, forcing an O(n) scan of state_cache_ on every stateful lookup; wired it up as a real fast path and fixed InvalidateFrom() to keep it in sync. - kge's :syntax off was silently undone the next frame because apply_syntax_to_buffer() re-applied the config default unconditionally every frame; added a user-override flag mirroring the existing edit-mode-detection guard. Added regression tests for all of the above (test_undo.cc, test_kkeymap.cc, test_command_semantics.cc, test_search_replace_flow.cc, and a new test_syntax_highlighting.cc). Full suite (163 tests) passes, including under AddressSanitizer. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
166 lines
4.3 KiB
C++
166 lines
4.3 KiB
C++
#include "PythonHighlighter.h"
|
|
#include "../Buffer.h"
|
|
#include <cctype>
|
|
|
|
namespace kte {
|
|
static void
|
|
push(std::vector<HighlightSpan> &out, int a, int b, TokenKind k)
|
|
{
|
|
if (b > a)
|
|
out.push_back({a, b, k});
|
|
}
|
|
|
|
|
|
static bool
|
|
is_ident_start(char c)
|
|
{
|
|
return std::isalpha(static_cast<unsigned char>(c)) || c == '_';
|
|
}
|
|
|
|
|
|
static bool
|
|
is_ident_char(char c)
|
|
{
|
|
return std::isalnum(static_cast<unsigned char>(c)) || c == '_';
|
|
}
|
|
|
|
|
|
PythonHighlighter::PythonHighlighter()
|
|
{
|
|
const char *kw[] = {
|
|
"and", "as", "assert", "break", "class", "continue", "def", "del", "elif", "else", "except", "False",
|
|
"finally", "for", "from", "global", "if", "import", "in", "is", "lambda", "None", "nonlocal", "not",
|
|
"or", "pass", "raise", "return", "True", "try", "while", "with", "yield"
|
|
};
|
|
for (auto s: kw)
|
|
kws_.insert(s);
|
|
}
|
|
|
|
|
|
void
|
|
PythonHighlighter::HighlightLine(const Buffer &buf, int row, std::vector<HighlightSpan> &out) const
|
|
{
|
|
LineState st;
|
|
(void) HighlightLineStateful(buf, row, st, out);
|
|
}
|
|
|
|
|
|
StatefulHighlighter::LineState
|
|
PythonHighlighter::HighlightLineStateful(const Buffer &buf, int row, const LineState &prev,
|
|
std::vector<HighlightSpan> &out) const
|
|
{
|
|
StatefulHighlighter::LineState state = prev;
|
|
if (row < 0 || static_cast<std::size_t>(row) >= buf.Nrows())
|
|
return state;
|
|
std::string s = buf.GetLineString(static_cast<std::size_t>(row));
|
|
int n = static_cast<int>(s.size());
|
|
|
|
int i = 0;
|
|
|
|
// Triple-quoted string continuation uses in_raw_string with raw_delim either "'''" or "\"\"\""
|
|
if (state.in_raw_string && (state.raw_delim == "'''" || state.raw_delim == "\"\"\"")) {
|
|
auto pos = s.find(state.raw_delim);
|
|
if (pos == std::string::npos) {
|
|
push(out, 0, n, TokenKind::String);
|
|
return state; // still inside
|
|
}
|
|
int end = static_cast<int>(pos + static_cast<int>(state.raw_delim.size()));
|
|
push(out, 0, end, TokenKind::String);
|
|
state.in_raw_string = false;
|
|
state.raw_delim.clear();
|
|
// Resume the normal tokenizer at the closing delimiter's end, on the
|
|
// same (unmodified) `s`/`n`, so anything after it - including a new
|
|
// triple-quoted string opening on this same line - is re-scanned
|
|
// instead of being dumped into a single opaque Default span.
|
|
i = end;
|
|
}
|
|
|
|
// Detect comment start '#', ignoring inside strings
|
|
while (i < n) {
|
|
char c = s[i];
|
|
if (c == ' ' || c == '\t') {
|
|
int j = i + 1;
|
|
while (j < n && (s[j] == ' ' || s[j] == '\t'))
|
|
++j;
|
|
push(out, i, j, TokenKind::Whitespace);
|
|
i = j;
|
|
continue;
|
|
}
|
|
if (c == '#') {
|
|
push(out, i, n, TokenKind::Comment);
|
|
break;
|
|
}
|
|
// Strings: triple quotes and single-line
|
|
if (c == '"' || c == '\'') {
|
|
char q = c;
|
|
// triple?
|
|
if (i + 2 < n && s[i + 1] == q && s[i + 2] == q) {
|
|
std::string delim(3, q);
|
|
int j = i + 3; // search for closing triple
|
|
auto pos = s.find(delim, static_cast<std::size_t>(j));
|
|
if (pos == std::string::npos) {
|
|
push(out, i, n, TokenKind::String);
|
|
state.in_raw_string = true;
|
|
state.raw_delim = delim;
|
|
return state;
|
|
} else {
|
|
int end = static_cast<int>(pos + 3);
|
|
push(out, i, end, TokenKind::String);
|
|
i = end;
|
|
continue;
|
|
}
|
|
} else {
|
|
int j = i + 1;
|
|
bool esc = false;
|
|
while (j < n) {
|
|
char d = s[j++];
|
|
if (esc) {
|
|
esc = false;
|
|
continue;
|
|
}
|
|
if (d == '\\') {
|
|
esc = true;
|
|
continue;
|
|
}
|
|
if (d == q)
|
|
break;
|
|
}
|
|
push(out, i, j, TokenKind::String);
|
|
i = j;
|
|
continue;
|
|
}
|
|
}
|
|
if (std::isdigit(static_cast<unsigned char>(c))) {
|
|
int j = i + 1;
|
|
while (j < n && (std::isalnum(static_cast<unsigned char>(s[j])) || s[j] == '.' || s[j] == '_'))
|
|
++j;
|
|
push(out, i, j, TokenKind::Number);
|
|
i = j;
|
|
continue;
|
|
}
|
|
if (is_ident_start(c)) {
|
|
int j = i + 1;
|
|
while (j < n && is_ident_char(s[j]))
|
|
++j;
|
|
std::string id = s.substr(i, j - i);
|
|
TokenKind k = TokenKind::Identifier;
|
|
if (kws_.count(id))
|
|
k = TokenKind::Keyword;
|
|
push(out, i, j, k);
|
|
i = j;
|
|
continue;
|
|
}
|
|
if (std::ispunct(static_cast<unsigned char>(c))) {
|
|
TokenKind k = TokenKind::Operator;
|
|
if (c == ':' || c == ',' || c == '(' || c == ')' || c == '[' || c == ']')
|
|
k = TokenKind::Punctuation;
|
|
push(out, i, i + 1, k);
|
|
++i;
|
|
continue;
|
|
}
|
|
push(out, i, i + 1, TokenKind::Default);
|
|
++i;
|
|
}
|
|
return state;
|
|
}
|
|
} // namespace kte
|