@fresh-editor/fresh-editor 0.2.20 → 0.2.21

package/CHANGELOG.md

@@ -1,5 +1,45 @@
 # Release Notes
 
+## 0.2.21
+
+### Features
+
+* **Fast Completions without LSP**: New basic completions providers without language server — buffer-word candidates appear below LSP results in the popup. Also, a new setting (config) controls auto-trigger vs explicit Ctrl+Space (default: explicit). Enter dismisses the popup (Tab accepts). I plan to further improve it (make it more intelligent) in future releases.
+
+* **Current Line Highlighting**: Highlights the cursor line. Enabled by default, togglable from the command palette and Settings UI (caveat: wrapped lines are currently highlighted in their entirety, this should probably be changed to visual lines).
+
+* **LSP Code Actions**: Code action modal now actually works! Select an action by number or up/down arrows and enter (#1405). Supports resolve, execute command, and server-initiated workspace edits (previously dropped silently). File create/rename/delete operations handled. Actions from multiple servers unified into one popup. Default keybinding changed to Alt+. - because Ctrl+. is filtered by many terminals.
+
+* **LSP Completion Resolve and Formatting**: Auto-imports applied on completion accept. Format Buffer falls back to LSP when no external formatter is configured. Also adds range formatting and pre-rename validation.
+
+* **LSP Server Selection for Restart/Stop**: Popup to choose which server to restart/stop individually, or all at once.
+
+* **Grammar Listing**: `fresh --cmd grammar list` and `editor.listGrammars()` plugin API show all available grammars with source and extensions. When specifying a grammar in a `languages` entry in the config, you must currently use a full name from this list - for example "Bourne Again Shell (bash)" rather than "bash". This will be improved once I add grammar aliases.
+
+### Improvements
+
+* **Theme Contrast**: Replaced all named ANSI colors with explicit RGB in built-in themes for deterministic rendering. Improved contrast ratios across both high-contrast and light themes. Diagnostic and semantic overlays now re-apply correctly on theme change, including during live preview.
+
+* **Git Status Marker Refresh**: File explorer markers update on terminal focus gain and by polling for git index changes (#1431).
+
+* **Config-Only Languages**: Custom languages without a built-in grammar (e.g., "fish") appear in the Set Language popup and are detected correctly — no more fallthrough to wrong built-in grammars.
+
+* **Theme Inspector**: Records exact theme keys during rendering instead of reverse-mapping via heuristics. Theme editor Save As improved for built-in themes.
+
+* **LSP Reliability**: Diagnostics cleared on server stop/crash, buffers re-opened on server start, document version checking for workspace edits, LSP notified after undo/redo of bulk edits, pending requests drained on server death to prevent deadlocks, hover suppressed while popups are visible.
+
+### Vim Mode
+
+22 bug fixes: C/D/S/cc, e motion, nG, h/l line clamping, ^, $, J with space, f/t special chars, r replace, ~ toggle case, visual mode entry/switching, count display. Key motions moved from async plugin commands to native Rust actions, eliminating race conditions.
+
+If you use the Vim plugin please drop a note at https://github.com/sinelaw/fresh/discussions/417 - I need feedback on this feature.
+
+### Bug Fixes
+
+* Fixed Ctrl+W panic on accented/multi-byte characters (#1332).
+
+* Fixed LSP diagnostics from stopped servers reappearing from queued messages.
+
 ## 0.2.20
 
 ### Features

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fresh-editor/fresh-editor",
-  "version": "0.2.20",
+  "version": "0.2.21",
   "description": "A modern terminal-based text editor with plugin support",
   "repository": {
     "type": "git",

package/plugins/config-schema.json

@@ -32,6 +32,7 @@
       "default": {
         "line_numbers": true,
         "relative_line_numbers": false,
+        "highlight_current_line": true,
         "line_wrap": true,
         "wrap_indent": true,
         "wrap_column": null,
@@ -66,10 +67,10 @@
         "ensure_final_newline_on_save": false,
         "highlight_matching_brackets": true,
         "rainbow_brackets": true,
+        "completion_popup_auto_show": false,
         "quick_suggestions": true,
         "quick_suggestions_delay_ms": 150,
         "suggest_on_trigger_characters": true,
-        "accept_suggestion_on_enter": "on",
         "enable_inlay_hints": true,
         "enable_semantic_tokens_full": false,
         "diagnostics_inline_text": false,
@@ -251,6 +252,12 @@
           "default": false,
           "x-section": "Display"
         },
+        "highlight_current_line": {
+          "description": "Highlight the line containing the cursor",
+          "type": "boolean",
+          "default": true,
+          "x-section": "Display"
+        },
         "line_wrap": {
           "description": "Wrap long lines to fit the window width (default for new views)",
           "type": "boolean",
@@ -474,8 +481,14 @@
           "default": true,
           "x-section": "Bracket Matching"
         },
+        "completion_popup_auto_show": {
+          "description": "Automatically show the completion popup while typing.\nWhen false (default), the popup only appears when explicitly invoked\n(e.g. via Ctrl+Space). When true, it appears automatically after a\nshort delay while typing.\nDefault: false",
+          "type": "boolean",
+          "default": false,
+          "x-section": "Completion"
+        },
         "quick_suggestions": {
-          "description": "Enable quick suggestions (VS Code-like behavior).\nWhen enabled, completion suggestions appear automatically while typing,\nnot just on trigger characters (like `.` or `::`).\nDefault: true",
+          "description": "Enable quick suggestions (VS Code-like behavior).\nWhen enabled, completion suggestions appear automatically while typing,\nnot just on trigger characters (like `.` or `::`).\nOnly takes effect when completion_popup_auto_show is true.\nDefault: true",
           "type": "boolean",
           "default": true,
           "x-section": "Completion"
@@ -494,12 +507,6 @@
           "default": true,
           "x-section": "Completion"
         },
-        "accept_suggestion_on_enter": {
-          "description": "Controls whether pressing Enter accepts the selected completion.\n  - \"on\": Enter always accepts the completion\n  - \"off\": Enter inserts a newline (use Tab to accept)\n  - \"smart\": Enter accepts only if the completion text differs from typed text\n\nDefault: \"on\"",
-          "$ref": "#/$defs/AcceptSuggestionOnEnter",
-          "default": "on",
-          "x-section": "Completion"
-        },
         "enable_inlay_hints": {
           "description": "Whether to enable LSP inlay hints (type hints, parameter hints, etc.)",
           "type": "boolean",
@@ -687,16 +694,6 @@
       ],
       "default": "lf"
     },
-    "AcceptSuggestionOnEnter": {
-      "description": "Controls whether Enter accepts a completion suggestion",
-      "type": "string",
-      "enum": [
-        "on",
-        "off",
-        "smart"
-      ],
-      "default": "on"
-    },
     "FileExplorerConfig": {
       "description": "File explorer configuration",
       "type": "object",
@@ -1020,6 +1017,14 @@
             "$ref": "#/$defs/OnSaveAction"
           },
           "default": []
+        },
+        "word_characters": {
+          "description": "Extra characters (beyond alphanumeric and `_`) considered part of\nidentifiers for this language. Used by dabbrev and buffer-word\ncompletion to correctly tokenise language-specific naming conventions.\n\nExamples:\n- Lisp/Clojure/CSS: `\"-\"` (kebab-case identifiers)\n- PHP/Bash: `\"$\"` (variable sigils)\n- Ruby: `\"?!\"` (predicate/bang methods)\n- Rust (default): `\"\"` (standard alphanumeric + underscore)",
+          "type": [
+            "string",
+            "null"
+          ],
+          "default": null
         }
       },
       "x-display-field": "/grammar"

package/plugins/git_explorer.ts

@@ -156,8 +156,14 @@ function onGitExplorerEditorInitialized() {
 }
 registerHandler("onGitExplorerEditorInitialized", onGitExplorerEditorInitialized);
 
+function onGitExplorerFocusGained() {
+  refreshGitExplorerDecorations();
+}
+registerHandler("onGitExplorerFocusGained", onGitExplorerFocusGained);
+
 editor.on("after_file_open", "onGitExplorerAfterFileOpen");
 editor.on("after_file_save", "onGitExplorerAfterFileSave");
 editor.on("editor_initialized", "onGitExplorerEditorInitialized");
+editor.on("focus_gained", "onGitExplorerFocusGained");
 
 refreshGitExplorerDecorations();

package/plugins/theme_editor.i18n.json

@@ -300,7 +300,9 @@
     "field.punctuation_bracket": "závorka",
     "field.punctuation_bracket_desc": "závorkas ({, }, (, ), [, ])",
     "field.punctuation_delimiter": "oddělovač",
-    "field.punctuation_delimiter_desc": "oddělovačs (;, ,, .)"
+    "field.punctuation_delimiter_desc": "oddělovačs (;, ,, .)",
+    "suggestion.current_builtin": "(aktuální · vestavěný · pouze pro čtení)",
+    "prompt.save_as_builtin_error": "Nelze přepsat vestavěný motiv, zvolte jiný název: "
   },
   "de": {
     "cmd.edit_theme": "Theme bearbeiten",
@@ -603,7 +605,9 @@
     "field.punctuation_bracket": "Klammer",
     "field.punctuation_bracket_desc": "Klammern ({, }, (, ), [, ])",
     "field.punctuation_delimiter": "Trennzeichen",
-    "field.punctuation_delimiter_desc": "Trennzeichen (;, ,, .)"
+    "field.punctuation_delimiter_desc": "Trennzeichen (;, ,, .)",
+    "suggestion.current_builtin": "(aktuell · eingebaut · schreibgeschützt)",
+    "prompt.save_as_builtin_error": "Eingebautes Theme kann nicht überschrieben werden, anderen Namen wählen: "
   },
   "en": {
     "cmd.edit_theme": "Edit Theme",
@@ -906,7 +910,9 @@
     "field.punctuation_bracket": "Punctuation Bracket",
     "field.punctuation_bracket_desc": "Brackets and parentheses ({, }, (, ), [, ])",
     "field.punctuation_delimiter": "Punctuation Delimiter",
-    "field.punctuation_delimiter_desc": "Delimiters and separators (;, ,, .)"
+    "field.punctuation_delimiter_desc": "Delimiters and separators (;, ,, .)",
+    "suggestion.current_builtin": "(current · built-in · read-only)",
+    "prompt.save_as_builtin_error": "Can't override built-in theme, choose a different name: "
   },
   "es": {
     "cmd.edit_theme": "Editar tema",
@@ -1209,7 +1215,9 @@
     "field.punctuation_bracket": "Paréntesis",
     "field.punctuation_bracket_desc": "Paréntesis y corchetes ({, }, (, ), [, ])",
     "field.punctuation_delimiter": "Delimitador",
-    "field.punctuation_delimiter_desc": "Delimitadores y separadores (;, ,, .)"
+    "field.punctuation_delimiter_desc": "Delimitadores y separadores (;, ,, .)",
+    "suggestion.current_builtin": "(actual · predefinido · solo lectura)",
+    "prompt.save_as_builtin_error": "No se puede sobrescribir un tema predefinido, elija otro nombre: "
   },
   "fr": {
     "cmd.edit_theme": "Modifier le theme",
@@ -1512,7 +1520,9 @@
     "field.punctuation_bracket": "Parenthese",
     "field.punctuation_bracket_desc": "Parentheses et crochets ({, }, (, ), [, ])",
     "field.punctuation_delimiter": "Delimiteur",
-    "field.punctuation_delimiter_desc": "Delimiteurs et separateurs (;, ,, .)"
+    "field.punctuation_delimiter_desc": "Delimiteurs et separateurs (;, ,, .)",
+    "suggestion.current_builtin": "(actuel · intégré · lecture seule)",
+    "prompt.save_as_builtin_error": "Impossible de remplacer un thème intégré, choisissez un autre nom : "
   },
   "ja": {
     "cmd.edit_theme": "テーマを編集",
@@ -1815,7 +1825,9 @@
     "field.punctuation_bracket": "括弧",
     "field.punctuation_bracket_desc": "括弧 ({、}、(、)、[、])",
     "field.punctuation_delimiter": "区切り文字",
-    "field.punctuation_delimiter_desc": "区切り文字 (;、,、.)"
+    "field.punctuation_delimiter_desc": "区切り文字 (;、,、.)",
+    "suggestion.current_builtin": "(現在 · 組み込み · 読み取り専用)",
+    "prompt.save_as_builtin_error": "組み込みテーマは上書きできません。別の名前を入力してください: "
   },
   "ko": {
     "cmd.edit_theme": "편집 Theme",
@@ -2118,7 +2130,9 @@
     "field.punctuation_bracket": "괄호",
     "field.punctuation_bracket_desc": "괄호s ({, }, (, ), [, ])",
     "field.punctuation_delimiter": "구분자",
-    "field.punctuation_delimiter_desc": "구분자s (;, ,, .)"
+    "field.punctuation_delimiter_desc": "구분자s (;, ,, .)",
+    "suggestion.current_builtin": "(현재 · 기본 제공 · 읽기 전용)",
+    "prompt.save_as_builtin_error": "기본 제공 테마를 덮어쓸 수 없습니다. 다른 이름을 입력하세요: "
   },
   "pt-BR": {
     "cmd.edit_theme": "editar Theme",
@@ -2421,7 +2435,9 @@
     "field.punctuation_bracket": "parêntese",
     "field.punctuation_bracket_desc": "parênteses ({, }, (, ), [, ])",
     "field.punctuation_delimiter": "delimitador",
-    "field.punctuation_delimiter_desc": "delimitadors (;, ,, .)"
+    "field.punctuation_delimiter_desc": "delimitadors (;, ,, .)",
+    "suggestion.current_builtin": "(atual · integrado · somente leitura)",
+    "prompt.save_as_builtin_error": "Não é possível sobrescrever tema integrado, escolha outro nome: "
   },
   "ru": {
     "cmd.edit_theme": "редактировать Theme",
@@ -2724,7 +2740,9 @@
     "field.punctuation_bracket": "скобка",
     "field.punctuation_bracket_desc": "скобкаs ({, }, (, ), [, ])",
     "field.punctuation_delimiter": "разделитель",
-    "field.punctuation_delimiter_desc": "разделительs (;, ,, .)"
+    "field.punctuation_delimiter_desc": "разделительs (;, ,, .)",
+    "suggestion.current_builtin": "(текущий · встроенная · только чтение)",
+    "prompt.save_as_builtin_error": "Невозможно перезаписать встроенную тему, выберите другое имя: "
   },
   "th": {
     "cmd.edit_theme": "แก้ไข Theme",
@@ -3027,7 +3045,9 @@
     "field.punctuation_bracket": "วงเล็บ",
     "field.punctuation_bracket_desc": "วงเล็บs ({, }, (, ), [, ])",
     "field.punctuation_delimiter": "ตัวคั่น",
-    "field.punctuation_delimiter_desc": "ตัวคั่นs (;, ,, .)"
+    "field.punctuation_delimiter_desc": "ตัวคั่นs (;, ,, .)",
+    "suggestion.current_builtin": "(ปัจจุบัน · ในตัว · อ่านอย่างเดียว)",
+    "prompt.save_as_builtin_error": "ไม่สามารถเขียนทับธีมในตัวได้ กรุณาเลือกชื่ออื่น: "
   },
   "uk": {
     "cmd.edit_theme": "редагувати Theme",
@@ -3330,7 +3350,9 @@
     "field.punctuation_bracket": "дужка",
     "field.punctuation_bracket_desc": "дужкаs ({, }, (, ), [, ])",
     "field.punctuation_delimiter": "роздільник",
-    "field.punctuation_delimiter_desc": "роздільникs (;, ,, .)"
+    "field.punctuation_delimiter_desc": "роздільникs (;, ,, .)",
+    "suggestion.current_builtin": "(поточний · вбудована · лише читання)",
+    "prompt.save_as_builtin_error": "Неможливо перезаписати вбудовану тему, виберіть іншу назву: "
   },
   "vi": {
     "cmd.edit_theme": "Chỉnh sửa giao diện",
@@ -3633,7 +3655,9 @@
     "field.punctuation_bracket": "Dấu ngoặc",
     "field.punctuation_bracket_desc": "Dấu ngoặc ({, }, (, ), [, ])",
     "field.punctuation_delimiter": "Dấu phân cách",
-    "field.punctuation_delimiter_desc": "Dấu phân cách (;, ,, .)"
+    "field.punctuation_delimiter_desc": "Dấu phân cách (;, ,, .)",
+    "suggestion.current_builtin": "(hiện tại · có sẵn · chỉ đọc)",
+    "prompt.save_as_builtin_error": "Không thể ghi đè chủ đề có sẵn, chọn tên khác: "
   },
   "zh-CN": {
     "cmd.edit_theme": "编辑主题",
@@ -3936,7 +3960,9 @@
     "field.punctuation_bracket": "括号",
     "field.punctuation_bracket_desc": "括号 ({、}、(、)、[、])",
     "field.punctuation_delimiter": "分隔符",
-    "field.punctuation_delimiter_desc": "分隔符 (;、,、.)"
+    "field.punctuation_delimiter_desc": "分隔符 (;、,、.)",
+    "suggestion.current_builtin": "(当前 · 内置 · 只读)",
+    "prompt.save_as_builtin_error": "无法覆盖内置主题，请选择其他名称: "
   },
   "it": {
     "cmd.edit_theme": "Modifica tema",
@@ -4239,6 +4265,8 @@
     "field.punctuation_bracket": "Parentesi",
     "field.punctuation_bracket_desc": "Parentesi e parentesi quadre ({, }, (, ), [, ])",
     "field.punctuation_delimiter": "Delimitatore",
-    "field.punctuation_delimiter_desc": "Delimitatori e separatori (;, ,, .)"
+    "field.punctuation_delimiter_desc": "Delimitatori e separatori (;, ,, .)",
+    "suggestion.current_builtin": "(corrente · integrato · sola lettura)",
+    "prompt.save_as_builtin_error": "Impossibile sovrascrivere il tema integrato, scegli un altro nome: "
   }
 }

package/plugins/theme_editor.ts

@@ -355,6 +355,8 @@ interface ThemeEditorState {
   savedCursorPath: string | null;
   /** Whether to close the editor after a successful save */
   closeAfterSave: boolean;
+  /** Whether the Save As prompt has been pre-filled (to distinguish first vs second Enter) */
+  saveAsPreFilled: boolean;
   /** Which panel has focus */
   focusPanel: "tree" | "picker";
   /** Focus target within picker panel */
@@ -420,6 +422,7 @@ const state: ThemeEditorState = {
   isBuiltin: false,
   savedCursorPath: null,
   closeAfterSave: false,
+  saveAsPreFilled: false,
   focusPanel: "tree",
   pickerFocus: { type: "hex-input" },
   filterText: "",
@@ -1604,10 +1607,31 @@ async function onThemeSaveAsPromptConfirmed(args: {
 
   const name = args.input.trim();
   if (name) {
+    // If user accepted a suggestion without typing, pre-fill the prompt so they can edit the name
+    if (args.selected_index !== null && !state.saveAsPreFilled) {
+      state.saveAsPreFilled = true;
+      editor.startPromptWithInitial(editor.t("prompt.save_as"), "theme-save-as", name);
+      editor.setPromptSuggestions([{
+        text: state.themeName,
+        description: state.isBuiltin
+          ? editor.t("suggestion.current_builtin")
+          : editor.t("suggestion.current"),
+        value: state.themeName,
+      }]);
+      return true;
+    }
+    state.saveAsPreFilled = false;
+
     // Reject names that match a built-in theme
     if (state.builtinThemes.includes(name)) {
-      editor.setStatus(editor.t("error.name_is_builtin", { name }));
-      theme_editor_save_as();
+      editor.startPromptWithInitial(editor.t("prompt.save_as_builtin_error"), "theme-save-as", name);
+      editor.setPromptSuggestions([{
+        text: state.themeName,
+        description: state.isBuiltin
+          ? editor.t("suggestion.current_builtin")
+          : editor.t("suggestion.current"),
+        value: state.themeName,
+      }]);
       return true;
     }
 
@@ -2757,11 +2781,14 @@ function theme_editor_save_as() : void {
     state.savedCursorPath = getCurrentFieldPath();
   }
 
+  state.saveAsPreFilled = false;
   editor.startPrompt(editor.t("prompt.save_as"), "theme-save-as");
 
   editor.setPromptSuggestions([{
     text: state.themeName,
-    description: editor.t("suggestion.current"),
+    description: state.isBuiltin
+      ? editor.t("suggestion.current_builtin")
+      : editor.t("suggestion.current"),
     value: state.themeName,
   }]);
 }

package/plugins/vi_mode.ts

@@ -64,6 +64,14 @@ const state: ViState = {
   visualBlockAnchor: null,
 };
 
+// Safe getBufferText that clamps end to buffer length
+async function safeGetBufferText(bufferId: number, start: number, end: number): Promise<string | null> {
+  const bufLen = editor.getBufferLength(bufferId);
+  const clampedEnd = Math.min(end, bufLen);
+  if (clampedEnd <= start) return null;
+  return editor.getBufferText(bufferId, start, clampedEnd);
+}
+
 // Mode indicator for status bar
 function getModeIndicator(mode: ViMode): string {
   const countPrefix = state.count !== null ? `${state.count} ` : "";
@@ -179,7 +187,11 @@ function getCount(): number {
 // Returns the count (defaults to 1)
 function consumeCount(): number {
   const count = state.count ?? 1;
-  state.count = null;
+  if (state.count !== null) {
+    state.count = null;
+    // Update status to clear the count display
+    editor.setStatus(getModeIndicator(state.mode));
+  }
   return count;
 }
 
@@ -212,6 +224,7 @@ const motionToSelection: Record<string, string> = {
   move_down: "select_down",
   move_word_left: "select_word_left",
   move_word_right: "select_word_right",
+  vi_move_word_end: "vi_select_word_end",
   move_line_start: "select_line_start",
   move_line_end: "select_line_end",
   move_document_start: "select_document_start",
@@ -227,6 +240,7 @@ const atomicOperatorActions: OperatorMotionMap = {
     // Delete operators
     move_word_right: "delete_word_forward",
     move_word_left: "delete_word_backward",
+    vi_move_word_end: "delete_vi_word_end",
     move_line_end: "delete_to_line_end",
     move_line_start: "delete_to_line_start",
   },
@@ -234,6 +248,7 @@ const atomicOperatorActions: OperatorMotionMap = {
     // Yank operators
     move_word_right: "yank_word_forward",
     move_word_left: "yank_word_backward",
+    vi_move_word_end: "yank_vi_word_end",
     move_line_end: "yank_to_line_end",
     move_line_start: "yank_to_line_start",
   },
@@ -325,7 +340,8 @@ function handleMotionWithOperator(motionAction: string): void {
 
 // Navigation (all support count prefix, e.g., 5j moves down 5 lines)
 function vi_left() : void {
-  executeWithCount("move_left");
+  // h — line-bounded move left (vim doesn't wrap across lines)
+  executeWithCount("move_left_in_line");
 }
 registerHandler("vi_left", vi_left);
 
@@ -340,7 +356,8 @@ function vi_up() : void {
 registerHandler("vi_up", vi_up);
 
 function vi_right() : void {
-  executeWithCount("move_right");
+  // l — line-bounded move right (vim doesn't wrap across lines)
+  executeWithCount("move_right_in_line");
 }
 registerHandler("vi_right", vi_right);
 
@@ -355,12 +372,8 @@ function vi_word_back() : void {
 registerHandler("vi_word_back", vi_word_back);
 
 function vi_word_end() : void {
-  // Move to end of word - for count, repeat the whole operation
-  const count = consumeCount();
-  for (let i = 0; i < count; i++) {
-    editor.executeAction("move_word_right");
-    editor.executeAction("move_left");
-  }
+  // Vim 'e' motion — uses native vi_move_word_end action
+  executeWithCount("vi_move_word_end");
 }
 registerHandler("vi_word_end", vi_word_end);
 
@@ -373,13 +386,36 @@ registerHandler("vi_line_start", vi_line_start);
 function vi_line_end() : void {
   consumeCount(); // Count doesn't apply to line end
   editor.executeAction("move_line_end");
+  // In vim normal mode, cursor should be ON the last char, not past it
+  // move_line_end goes past the last char; move_left corrects this
+  editor.executeAction("move_left");
 }
 registerHandler("vi_line_end", vi_line_end);
 
-function vi_first_non_blank() : void {
+async function vi_first_non_blank() : Promise<void> {
   consumeCount(); // Count doesn't apply
-  editor.executeAction("move_line_start");
-  // TODO: skip whitespace
+  // Get line start position directly (avoids stale snapshot from executeAction)
+  const line = editor.getCursorLine();
+  const bufferId = editor.getActiveBufferId();
+  const lineStart = await editor.getLineStartPosition(line);
+  if (lineStart === null) {
+    editor.executeAction("move_line_start");
+    return;
+  }
+  const text = await safeGetBufferText(bufferId, lineStart, lineStart + 200);
+  if (text) {
+    let offset = 0;
+    while (offset < text.length && (text[offset] === ' ' || text[offset] === '\t')) {
+      offset++;
+    }
+    if (offset < text.length && text[offset] !== '\n' && text[offset] !== '\r') {
+      editor.setBufferCursor(bufferId, lineStart + offset);
+    } else {
+      editor.setBufferCursor(bufferId, lineStart);
+    }
+  } else {
+    editor.executeAction("move_line_start");
+  }
 }
 registerHandler("vi_first_non_blank", vi_first_non_blank);
 
@@ -390,8 +426,22 @@ function vi_doc_start() : void {
 registerHandler("vi_doc_start", vi_doc_start);
 
 function vi_doc_end() : void {
-  consumeCount(); // Count doesn't apply
-  editor.executeAction("move_document_end");
+  const count = state.count;
+  consumeCount();
+  if (count !== null) {
+    // nG = go to line n (1-indexed; goto_line expects 0-indexed internally)
+    // Use setBufferCursor to move to line start via getLineStartPosition
+    const line = count - 1; // Convert to 0-indexed
+    editor.getLineStartPosition(line).then((pos) => {
+      if (pos !== null) {
+        editor.setBufferCursor(editor.getActiveBufferId(), pos);
+      }
+    });
+  } else {
+    editor.executeAction("move_document_end");
+  }
+  // Update status to clear any count display
+  editor.setStatus(getModeIndicator(state.mode));
 }
 registerHandler("vi_doc_end", vi_doc_end);
 
@@ -489,13 +539,10 @@ registerHandler("vi_delete_line", vi_delete_line);
 function vi_change_line() : void {
   const count = consumeCount();
   state.lastChange = { type: "line-op", action: "change_line", count };
+  // Select from line start to line end, then cut (avoids stale snapshot issue)
   editor.executeAction("move_line_start");
-  const start = editor.getCursorPosition();
-  editor.executeAction("move_line_end");
-  const end = editor.getCursorPosition();
-  if (start !== null && end !== null) {
-    editor.deleteRange(editor.getActiveBufferId(), start, end);
-  }
+  editor.executeAction("select_line_end");
+  editor.executeAction("cut");
   switchMode("insert");
 }
 registerHandler("vi_change_line", vi_change_line);
@@ -535,11 +582,27 @@ function vi_delete_char_before() : void {
 registerHandler("vi_delete_char_before", vi_delete_char_before);
 
 function vi_replace_char() : void {
-  // TODO: implement character replacement (need to read next char)
-  editor.setStatus(editor.t("status.replace_not_implemented"));
+  // Enter replace-char mode to read the replacement character
+  state.mode = "find-char"; // Reuse find-char mode mechanism
+  editor.setEditorMode("vi-replace-char");
+  editor.setStatus("-- REPLACE CHAR --");
 }
 registerHandler("vi_replace_char", vi_replace_char);
 
+// Handler for replacement character input
+async function vi_replace_char_handler(char: string): Promise<void> {
+  const count = consumeCount();
+  // Replace character(s) under cursor without moving
+  for (let i = 0; i < count; i++) {
+    editor.executeAction("delete_forward");
+    editor.insertAtCursor(char);
+  }
+  // Move cursor back to stay on the replaced char (vim behavior)
+  editor.executeAction("move_left");
+  switchMode("normal");
+}
+registerHandler("vi_replace_char_handler", vi_replace_char_handler);
+
 // Substitute (delete char and enter insert mode)
 function vi_substitute() : void {
   const count = consumeCount();
@@ -553,27 +616,19 @@ function vi_substitute() : void {
 }
 registerHandler("vi_substitute", vi_substitute);
 
-// Delete to end of line
+// Delete to end of line (D)
 function vi_delete_to_end() : void {
   state.lastChange = { type: "operator-motion", operator: "d", motion: "move_line_end" };
-  const start = editor.getCursorPosition();
-  editor.executeAction("move_line_end");
-  const end = editor.getCursorPosition();
-  if (start !== null && end !== null && end > start) {
-    editor.deleteRange(editor.getActiveBufferId(), start, end);
-  }
+  // Use the atomic delete_to_line_end action to avoid stale snapshot issues
+  editor.executeAction("delete_to_line_end");
 }
 registerHandler("vi_delete_to_end", vi_delete_to_end);
 
-// Change to end of line
+// Change to end of line (C)
 function vi_change_to_end() : void {
   state.lastChange = { type: "operator-motion", operator: "c", motion: "move_line_end" };
-  const start = editor.getCursorPosition();
-  editor.executeAction("move_line_end");
-  const end = editor.getCursorPosition();
-  if (start !== null && end !== null && end > start) {
-    editor.deleteRange(editor.getActiveBufferId(), start, end);
-  }
+  // Use the atomic delete_to_line_end action to avoid stale snapshot issues
+  editor.executeAction("delete_to_line_end");
   switchMode("insert");
 }
 registerHandler("vi_change_to_end", vi_change_to_end);
@@ -665,14 +720,10 @@ async function vi_repeat() : Promise<void> {
           editor.executeAction("delete_line");
         }
       } else if (change.action === "change_line") {
-        // Change line: delete line content and insert text
+        // Change line: select line content, cut, insert text
         editor.executeAction("move_line_start");
-        const start = editor.getCursorPosition();
-        editor.executeAction("move_line_end");
-        const end = editor.getCursorPosition();
-        if (start !== null && end !== null) {
-          editor.deleteRange(editor.getActiveBufferId(), start, end);
-        }
+        editor.executeAction("select_line_end");
+        editor.executeAction("cut");
         if (change.insertedText) {
           editor.insertAtCursor(change.insertedText);
         }
@@ -721,14 +772,22 @@ async function vi_repeat() : Promise<void> {
 }
 registerHandler("vi_repeat", vi_repeat);
 
-// Join lines
+// Join lines — delete newline at end of current line and insert a space
 function vi_join() : void {
   editor.executeAction("move_line_end");
+  // Delete the newline character
   editor.executeAction("delete_forward");
-  editor.executeAction("insert_text_at_cursor");
+  // Insert a space between the joined content
+  editor.insertAtCursor(" ");
 }
 registerHandler("vi_join", vi_join);
 
+// Toggle case (~) — uses native toggle_case action
+function vi_toggle_case() : void {
+  executeWithCount("toggle_case");
+}
+registerHandler("vi_toggle_case", vi_toggle_case);
+
 // Search
 function vi_search_forward() : void {
   editor.executeAction("search");
@@ -822,7 +881,9 @@ registerHandler("vi_op_digit_0_or_line_start", vi_op_digit_0_or_line_start);
 // Enter character-wise visual mode
 function vi_visual_char() : void {
   state.visualAnchor = editor.getCursorPosition();
-  // Select current character to start visual selection
+  // Select the character under cursor to establish the anchor.
+  // This moves cursor one position right (the selection end), which is
+  // standard visual mode behavior — the first char is part of the selection.
   editor.executeAction("select_right");
   switchMode("visual");
 }
@@ -831,8 +892,7 @@ registerHandler("vi_visual_char", vi_visual_char);
 // Enter line-wise visual mode
 function vi_visual_line() : void {
   state.visualAnchor = editor.getCursorPosition();
-  // Select current line
-  editor.executeAction("move_line_start");
+  // Select full line including newline (select_line selects and moves to next line)
   editor.executeAction("select_line");
   switchMode("visual-line");
 }
@@ -989,6 +1049,7 @@ function vi_vis_word_back() : void {
 registerHandler("vi_vis_word_back", vi_vis_word_back);
 
 function vi_vis_word_end() : void {
+  // Extend selection to end of word
   const count = consumeCount();
   for (let i = 0; i < count; i++) {
     editor.executeAction("select_word_right");
@@ -1557,6 +1618,13 @@ function vi_op_word_back(): void {
 }
 registerHandler("vi_op_word_back", vi_op_word_back);
 
+// Operator-pending e (word end) - select to word end, then apply operator
+// Operator-pending e (word end) — uses native vi_move_word_end motion
+function vi_op_word_end(): void {
+  handleMotionWithOperator("vi_move_word_end");
+}
+registerHandler("vi_op_word_end", vi_op_word_end);
+
 function vi_op_line_start(): void {
   handleMotionWithOperator("move_line_start");
 }
@@ -1680,6 +1748,7 @@ editor.defineMode("vi-normal", [
 
   // Other
   ["J", "vi_join"],
+  ["~", "vi_toggle_case"],
 
   // Command mode
   [":", "vi_command_mode"],
@@ -1829,6 +1898,24 @@ registerHandler("vi_fc_9", vi_fc_9);
 async function vi_fc_space(): Promise<void> { return vi_find_char_handler(" "); }
 registerHandler("vi_fc_space", vi_fc_space);
 
+// Punctuation character handlers for find-char mode
+const punctuationChars: [string, string][] = [
+  ["!", "excl"], ["@", "at"], ["#", "hash"], ["$", "dollar"], ["%", "percent"],
+  ["^", "caret"], ["&", "amp"], ["*", "star"], ["(", "lparen"], [")", "rparen"],
+  ["-", "minus"], ["_", "underscore"], ["=", "equals"], ["+", "plus"],
+  ["[", "lbracket"], ["]", "rbracket"], ["{", "lbrace"], ["}", "rbrace"],
+  ["\\", "backslash"], ["|", "pipe"], [";", "semi"], [":", "colon"],
+  ["'", "squote"], ["\"", "dquote"], [",", "comma"], [".", "dot"],
+  ["<", "lt"], [">", "gt"], ["/", "slash"], ["?", "question"], ["`", "backtick"],
+  ["~", "tilde"],
+];
+
+for (const [char, name] of punctuationChars) {
+  const handlerName = `vi_fc_p_${name}`;
+  const handler = async (): Promise<void> => { return vi_find_char_handler(char); };
+  registerHandler(handlerName, handler);
+}
+
 // Define vi-find-char mode with all the character bindings
 editor.defineMode("vi-find-char", [
   ["Escape", "vi_find_char_cancel"],
@@ -1851,8 +1938,56 @@ editor.defineMode("vi-find-char", [
   ["0", "vi_fc_0"], ["1", "vi_fc_1"], ["2", "vi_fc_2"], ["3", "vi_fc_3"],
   ["4", "vi_fc_4"], ["5", "vi_fc_5"], ["6", "vi_fc_6"], ["7", "vi_fc_7"],
   ["8", "vi_fc_8"], ["9", "vi_fc_9"],
-  // Common punctuation
+  // Space and punctuation
   ["Space", "vi_fc_space"],
+  ["!", "vi_fc_p_excl"], ["@", "vi_fc_p_at"], ["#", "vi_fc_p_hash"],
+  ["$", "vi_fc_p_dollar"], ["%", "vi_fc_p_percent"], ["^", "vi_fc_p_caret"],
+  ["&", "vi_fc_p_amp"], ["*", "vi_fc_p_star"], ["(", "vi_fc_p_lparen"],
+  [")", "vi_fc_p_rparen"], ["-", "vi_fc_p_minus"], ["_", "vi_fc_p_underscore"],
+  ["=", "vi_fc_p_equals"], ["+", "vi_fc_p_plus"], ["[", "vi_fc_p_lbracket"],
+  ["]", "vi_fc_p_rbracket"], ["{", "vi_fc_p_lbrace"], ["}", "vi_fc_p_rbrace"],
+  ["\\", "vi_fc_p_backslash"], ["|", "vi_fc_p_pipe"], [";", "vi_fc_p_semi"],
+  [":", "vi_fc_p_colon"], ["'", "vi_fc_p_squote"], ["\"", "vi_fc_p_dquote"],
+  [",", "vi_fc_p_comma"], [".", "vi_fc_p_dot"], ["<", "vi_fc_p_lt"],
+  [">", "vi_fc_p_gt"], ["/", "vi_fc_p_slash"], ["?", "vi_fc_p_question"],
+  ["`", "vi_fc_p_backtick"], ["~", "vi_fc_p_tilde"],
+], true);
+
+// Define vi-replace-char mode — reuses find-char handlers but calls vi_replace_char_handler
+// We create replace-char specific handlers that delegate to the replace handler
+const rcHandlers: [string, string][] = [];
+for (const c of "abcdefghijklmnopqrstuvwxyz") {
+  const name = `vi_rc_${c}`;
+  const handler = async (): Promise<void> => { return vi_replace_char_handler(c); };
+  registerHandler(name, handler);
+  rcHandlers.push([c, name]);
+}
+for (const c of "ABCDEFGHIJKLMNOPQRSTUVWXYZ") {
+  const name = `vi_rc_${c}`;
+  const handler = async (): Promise<void> => { return vi_replace_char_handler(c); };
+  registerHandler(name, handler);
+  rcHandlers.push([c, name]);
+}
+for (const c of "0123456789") {
+  const name = `vi_rc_d${c}`;
+  const handler = async (): Promise<void> => { return vi_replace_char_handler(c); };
+  registerHandler(name, handler);
+  rcHandlers.push([c, name]);
+}
+// Space and common punctuation for replace-char mode
+const rcSpaceHandler = async (): Promise<void> => { return vi_replace_char_handler(" "); };
+registerHandler("vi_rc_space", rcSpaceHandler);
+for (const [char, pname] of punctuationChars) {
+  const name = `vi_rc_p_${pname}`;
+  const handler = async (): Promise<void> => { return vi_replace_char_handler(char); };
+  registerHandler(name, handler);
+}
+
+editor.defineMode("vi-replace-char", [
+  ["Escape", "vi_find_char_cancel"],
+  ...rcHandlers.map(([key, name]): [string, string] => [key, name]),
+  ["Space", "vi_rc_space"],
+  ...punctuationChars.map(([char, pname]): [string, string] => [char, `vi_rc_p_${pname}`]),
 ], true);
 
 // Define vi-operator-pending mode
@@ -1876,6 +2011,7 @@ editor.defineMode("vi-operator-pending", [
   ["l", "vi_op_right"],
   ["w", "vi_op_word"],
   ["b", "vi_op_word_back"],
+  ["e", "vi_op_word_end"],
   ["$", "vi_op_line_end"],
   ["g g", "vi_op_doc_start"],
   ["G", "vi_op_doc_end"],
@@ -1948,8 +2084,9 @@ editor.defineMode("vi-visual", [
   ["g g", "vi_vis_doc_start"],
   ["G", "vi_vis_doc_end"],
 
-  // Switch to line mode
+  // Switch visual sub-modes
   ["V", "vi_visual_toggle_line"],
+  ["C-v", "vi_visual_block"],  // Switch to block mode
 
   // Operators
   ["d", "vi_vis_delete"],
@@ -1986,8 +2123,9 @@ editor.defineMode("vi-visual-line", [
   ["g g", "vi_vis_doc_start"],
   ["G", "vi_vis_doc_end"],
 
-  // Switch to char mode
+  // Switch visual sub-modes
   ["v", "vi_visual_toggle_line"],
+  ["C-v", "vi_visual_block"],  // Switch to block mode
 
   // Operators
   ["d", "vi_vis_delete"],

package/themes/high-contrast.json

@@ -1,103 +1,103 @@
 {
   "name": "high-contrast",
   "editor": {
-    "bg": "Black",
-    "fg": "White",
-    "cursor": "White",
-    "inactive_cursor": "DarkGray",
+    "bg": [0, 0, 0],
+    "fg": [255, 255, 255],
+    "cursor": [255, 255, 255],
+    "inactive_cursor": [127, 127, 127],
     "selection_bg": [0, 100, 200],
     "current_line_bg": [20, 20, 20],
     "line_number_fg": [140, 140, 140],
-    "line_number_bg": "Black",
-    "diff_add_bg": [0, 80, 0],
-    "diff_remove_bg": [100, 0, 0],
+    "line_number_bg": [0, 0, 0],
+    "diff_add_bg": [0, 35, 0],
+    "diff_remove_bg": [50, 0, 0],
     "diff_modify_bg": [25, 22, 0],
     "whitespace_indicator_fg": [80, 80, 80]
   },
   "ui": {
-    "tab_active_fg": "Black",
-    "tab_active_bg": "Yellow",
-    "tab_inactive_fg": "White",
-    "tab_inactive_bg": "Black",
+    "tab_active_fg": [0, 0, 0],
+    "tab_active_bg": [255, 255, 0],
+    "tab_inactive_fg": [255, 255, 255],
+    "tab_inactive_bg": [0, 0, 0],
     "tab_separator_bg": [30, 30, 35],
     "tab_close_hover_fg": [249, 38, 114],
     "tab_hover_bg": [50, 50, 55],
     "menu_bg": [50, 50, 55],
-    "menu_fg": "White",
-    "menu_active_bg": "Yellow",
-    "menu_active_fg": "Black",
+    "menu_fg": [255, 255, 255],
+    "menu_active_bg": [255, 255, 0],
+    "menu_active_fg": [0, 0, 0],
     "menu_dropdown_bg": [20, 20, 20],
-    "menu_dropdown_fg": "White",
+    "menu_dropdown_fg": [255, 255, 255],
     "menu_highlight_bg": [0, 100, 200],
-    "menu_highlight_fg": "White",
-    "menu_border_fg": "Yellow",
-    "menu_separator_fg": "White",
+    "menu_highlight_fg": [255, 255, 255],
+    "menu_border_fg": [255, 255, 0],
+    "menu_separator_fg": [255, 255, 255],
     "menu_hover_bg": [50, 50, 50],
-    "menu_hover_fg": "Yellow",
-    "menu_disabled_fg": "DarkGray",
+    "menu_hover_fg": [255, 255, 0],
+    "menu_disabled_fg": [127, 127, 127],
     "menu_disabled_bg": [20, 20, 20],
-    "status_bar_fg": "White",
+    "status_bar_fg": [255, 255, 255],
     "status_bar_bg": [20, 20, 20],
-    "prompt_fg": "White",
+    "prompt_fg": [255, 255, 255],
     "prompt_bg": [10, 10, 10],
-    "prompt_selection_fg": "White",
+    "prompt_selection_fg": [255, 255, 255],
     "prompt_selection_bg": [0, 100, 200],
-    "popup_border_fg": "LightCyan",
-    "popup_bg": "Black",
+    "popup_border_fg": [0, 255, 255],
+    "popup_bg": [0, 0, 0],
     "popup_selection_bg": [0, 100, 200],
-    "popup_text_fg": "White",
-    "suggestion_bg": "Black",
+    "popup_text_fg": [255, 255, 255],
+    "suggestion_bg": [0, 0, 0],
     "suggestion_selected_bg": [0, 100, 200],
-    "help_bg": "Black",
-    "help_fg": "White",
-    "help_key_fg": "LightCyan",
-    "help_separator_fg": "White",
-    "help_indicator_fg": "Red",
-    "help_indicator_bg": "Black",
+    "help_bg": [0, 0, 0],
+    "help_fg": [255, 255, 255],
+    "help_key_fg": [0, 255, 255],
+    "help_separator_fg": [255, 255, 255],
+    "help_indicator_fg": [255, 80, 80],
+    "help_indicator_bg": [0, 0, 0],
     "inline_code_bg": [40, 40, 40],
     "split_separator_fg": [140, 140, 140],
-    "split_separator_hover_fg": "Yellow",
-    "scrollbar_track_fg": "White",
-    "scrollbar_thumb_fg": "Yellow",
-    "scrollbar_track_hover_fg": "Yellow",
-    "scrollbar_thumb_hover_fg": "Cyan",
+    "split_separator_hover_fg": [255, 255, 0],
+    "scrollbar_track_fg": [255, 255, 255],
+    "scrollbar_thumb_fg": [255, 255, 0],
+    "scrollbar_track_hover_fg": [255, 255, 0],
+    "scrollbar_thumb_hover_fg": [0, 255, 255],
     "compose_margin_bg": [10, 10, 10],
-    "semantic_highlight_bg": [0, 60, 100],
+    "semantic_highlight_bg": [0, 25, 55],
     "terminal_bg": "Default",
     "terminal_fg": "Default",
-    "status_warning_indicator_bg": "Yellow",
-    "status_warning_indicator_fg": "Black",
-    "status_error_indicator_bg": "Red",
-    "status_error_indicator_fg": "White",
-    "status_warning_indicator_hover_bg": "LightYellow",
-    "status_warning_indicator_hover_fg": "Black",
-    "status_error_indicator_hover_bg": "LightRed",
-    "status_error_indicator_hover_fg": "White",
+    "status_warning_indicator_bg": [255, 255, 0],
+    "status_warning_indicator_fg": [0, 0, 0],
+    "status_error_indicator_bg": [255, 60, 60],
+    "status_error_indicator_fg": [255, 255, 255],
+    "status_warning_indicator_hover_bg": [255, 255, 100],
+    "status_warning_indicator_hover_fg": [0, 0, 0],
+    "status_error_indicator_hover_bg": [255, 100, 100],
+    "status_error_indicator_hover_fg": [255, 255, 255],
     "tab_drop_zone_bg": [0, 100, 200],
-    "tab_drop_zone_border": "Yellow"
+    "tab_drop_zone_border": [255, 255, 0]
   },
   "search": {
-    "match_bg": "Yellow",
-    "match_fg": "Black"
+    "match_bg": [255, 255, 0],
+    "match_fg": [0, 0, 0]
   },
   "diagnostic": {
-    "error_fg": "Red",
-    "error_bg": [100, 0, 0],
-    "warning_fg": "Yellow",
-    "warning_bg": [100, 100, 0],
-    "info_fg": "Cyan",
-    "info_bg": [0, 50, 100],
-    "hint_fg": "White",
-    "hint_bg": [50, 50, 50]
+    "error_fg": [255, 80, 80],
+    "error_bg": [50, 0, 0],
+    "warning_fg": [255, 255, 0],
+    "warning_bg": [35, 30, 0],
+    "info_fg": [0, 255, 255],
+    "info_bg": [0, 25, 55],
+    "hint_fg": [255, 255, 255],
+    "hint_bg": [30, 30, 30]
   },
   "syntax": {
-    "keyword": "Cyan",
-    "string": "Green",
-    "comment": "Gray",
-    "function": "Yellow",
-    "type": "Magenta",
-    "variable": "White",
-    "constant": "LightBlue",
-    "operator": "White"
+    "keyword": [0, 255, 255],
+    "string": [0, 205, 0],
+    "comment": [229, 229, 229],
+    "function": [255, 255, 0],
+    "type": [255, 85, 255],
+    "variable": [255, 255, 255],
+    "constant": [120, 130, 255],
+    "operator": [255, 255, 255]
   }
 }

package/themes/light.json

@@ -7,7 +7,7 @@
     "inactive_cursor": [180, 180, 180],
     "selection_bg": [173, 214, 255],
     "current_line_bg": [245, 245, 245],
-    "line_number_fg": [140, 140, 140],
+    "line_number_fg": [115, 115, 115],
     "line_number_bg": [255, 255, 255],
     "diff_add_bg": [200, 255, 200],
     "diff_remove_bg": [255, 200, 200],
@@ -36,11 +36,11 @@
     "menu_hover_fg": [0, 0, 0],
     "menu_disabled_fg": [160, 160, 160],
     "menu_disabled_bg": [248, 248, 248],
-    "status_bar_fg": "Black",
+    "status_bar_fg": [0, 0, 0],
     "status_bar_bg": [220, 220, 220],
-    "prompt_fg": "Black",
+    "prompt_fg": [0, 0, 0],
     "prompt_bg": [230, 240, 250],
-    "prompt_selection_fg": "Black",
+    "prompt_selection_fg": [0, 0, 0],
     "prompt_selection_bg": [173, 214, 255],
     "popup_border_fg": [140, 140, 140],
     "popup_bg": [232, 238, 245],
@@ -48,12 +48,12 @@
     "popup_text_fg": [30, 30, 30],
     "suggestion_bg": [232, 238, 245],
     "suggestion_selected_bg": [209, 226, 243],
-    "help_bg": "White",
-    "help_fg": "Black",
-    "help_key_fg": "Blue",
-    "help_separator_fg": "Gray",
-    "help_indicator_fg": "Red",
-    "help_indicator_bg": "White",
+    "help_bg": [255, 255, 255],
+    "help_fg": [0, 0, 0],
+    "help_key_fg": [0, 0, 180],
+    "help_separator_fg": [170, 170, 170],
+    "help_indicator_fg": [200, 30, 30],
+    "help_indicator_bg": [255, 255, 255],
     "inline_code_bg": [230, 230, 235],
     "split_separator_fg": [140, 140, 140],
     "split_separator_hover_fg": [70, 130, 180],
@@ -81,14 +81,14 @@
     "match_fg": [0, 0, 0]
   },
   "diagnostic": {
-    "error_fg": "Red",
-    "error_bg": [255, 220, 220],
-    "warning_fg": [128, 128, 0],
-    "warning_bg": [255, 255, 200],
-    "info_fg": "Blue",
-    "info_bg": [220, 240, 255],
-    "hint_fg": "DarkGray",
-    "hint_bg": [240, 240, 240]
+    "error_fg": [180, 0, 0],
+    "error_bg": [255, 210, 210],
+    "warning_fg": [150, 110, 0],
+    "warning_bg": [255, 248, 170],
+    "info_fg": [0, 0, 180],
+    "info_bg": [210, 230, 255],
+    "hint_fg": [100, 100, 100],
+    "hint_bg": [235, 235, 240]
   },
   "syntax": {
     "keyword": [175, 0, 219],