skir-codemirror-plugin 1.0.2 → 1.0.3

package/dist/json/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/json/types.ts"],"names":[],"mappings":"","sourcesContent":["// To use instead of `any`\nexport type Json =\n  | null\n  | boolean\n  | number\n  | string\n  | readonly Json[]\n  | Readonly<{ [name: string]: Json }>;\n\n// -----------------------------------------------------------------------------\n// ERRORS\n// -----------------------------------------------------------------------------\n\nexport interface JsonError {\n  readonly kind: \"error\";\n  readonly segment: Segment;\n  readonly message: string;\n}\n\n// -----------------------------------------------------------------------------\n// PARSING\n// -----------------------------------------------------------------------------\n\nexport interface JsonParseResult {\n  /// If `undefined`, then `errors` is guaranteed not to be empty.\n  readonly value: JsonValue | undefined;\n  readonly errors: readonly JsonError[];\n  /// Set of edits to apply to the original JSON code to fix formatting and\n  // comma errors (no comma between consecutive values, trailing comma).\n  readonly edits: readonly JsonEdit[];\n}\n\nexport type JsonValue = JsonArray | JsonObject | JsonLiteral;\n\nexport interface JsonArray {\n  readonly kind: \"array\";\n  /// Position of the '[' token.\n  readonly firstToken: Segment;\n  /// From '[' to ']' included.\n  readonly segment: Segment;\n  readonly values: JsonValue[];\n  expectedType?: TypeSignature;\n}\n\nexport interface JsonKey {\n  readonly keySegment: Segment;\n  readonly key: string;\n}\n\nexport interface JsonKeyValue {\n  readonly keySegment: Segment;\n  readonly key: string;\n  readonly value: JsonValue;\n  expectedType?: TypeSignature;\n}\n\nexport interface JsonObject {\n  readonly kind: \"object\";\n  /// Position of the '{' token.\n  readonly firstToken: Segment;\n  /// From '{' to '}' included.\n  readonly segment: Segment;\n  readonly keyValues: { [key: string]: JsonKeyValue };\n  /// Includes \"broken\" keys which produced a parsing error.\n  readonly allKeys: readonly JsonKey[];\n  expectedType?: TypeSignature;\n}\n\nexport interface JsonLiteral {\n  readonly kind: \"literal\";\n  /// Position of the first and only token. Same as `segment`.\n  readonly firstToken: Segment;\n  readonly segment: Segment;\n  readonly jsonCode: string;\n  readonly type: \"boolean\" | \"null\" | \"number\" | \"string\";\n  expectedType?: TypeSignature;\n}\n\nexport interface Segment {\n  readonly start: number;\n  readonly end: number;\n}\n\n/// Path to a sub-value within a valid Skir value.\nexport type Path =\n  | {\n      readonly kind: \"root\";\n    }\n  | {\n      readonly kind: \"field-value\";\n      /// Name of the field of the struct\n      readonly fieldName: string;\n      /// Path to the struct value\n      readonly structPath: Path;\n    }\n  | {\n      readonly kind: \"variant-value\";\n      /// Name of the wrapper variant of the enum\n      readonly variantName: string;\n      /// Path to the enum value\n      readonly enumPath: Path;\n    }\n  | {\n      readonly kind: \"array-item\";\n      readonly index: number;\n      readonly key: string | null;\n      readonly arrayPath: Path;\n    };\n\nexport interface JsonValueContext {\n  readonly value: JsonValue;\n  readonly path: Path;\n}\n\nexport interface JsonEdit {\n  readonly segment: Segment;\n  readonly replacement: string;\n}\n\n// -----------------------------------------------------------------------------\n// SCHEMA\n// -----------------------------------------------------------------------------\n\n/** JSON representation of a `TypeDescriptor`. */\nexport type TypeDefinition = {\n  readonly type: TypeSignature;\n  readonly records: readonly RecordDefinition[];\n};\n\n/** A type in the JSON representation of a `TypeDescriptor`. */\nexport type TypeSignature =\n  | {\n      kind: \"optional\";\n      value: TypeSignature;\n    }\n  | ArrayTypeSignature\n  | RecordTypeSignature\n  | {\n      kind: \"primitive\";\n      value: PrimitiveType;\n    };\n\nexport interface ArrayTypeSignature {\n  readonly kind: \"array\";\n  readonly value: {\n    readonly item: TypeSignature;\n    readonly key_extractor?: string;\n  };\n}\n\nexport interface RecordTypeSignature {\n  readonly kind: \"record\";\n  readonly value: string;\n}\n\nexport type PrimitiveType =\n  | \"bool\"\n  | \"int32\"\n  | \"int64\"\n  | \"hash64\"\n  | \"float32\"\n  | \"float64\"\n  | \"timestamp\"\n  | \"string\"\n  | \"bytes\";\n\nexport type RecordDefinition = StructDefinition | EnumDefinition;\n\n/** Definition of a struct in the JSON representation of a `TypeDescriptor`. */\nexport type StructDefinition = {\n  readonly kind: \"struct\";\n  readonly id: string;\n  readonly doc?: string;\n  readonly fields: readonly FieldDefinition[];\n  readonly removed_numbers?: readonly number[];\n};\n\n/**\n * Definition of a struct field in the JSON representation of a\n * `TypeDescriptor`.\n */\nexport type FieldDefinition = {\n  readonly name: string;\n  readonly type: TypeSignature;\n  readonly number: number;\n  readonly doc?: string;\n};\n\n/** Definition of an enum in the JSON representation of a `TypeDescriptor`. */\nexport type EnumDefinition = {\n  readonly kind: \"enum\";\n  readonly id: string;\n  readonly doc?: string;\n  readonly variants: readonly VariantDefinition[];\n  readonly removed_numbers?: readonly number[];\n};\n\n/**\n * Definition of an enum variant in the JSON representation of a\n * `TypeDescriptor`.\n */\nexport type VariantDefinition = {\n  readonly name: string;\n  readonly type?: TypeSignature;\n  readonly number: number;\n  readonly doc?: string;\n};\n\n// -----------------------------------------------------------------------------\n// SCHEMA VALIDATION\n// -----------------------------------------------------------------------------\n\nexport interface ValidationResult {\n  readonly errors: JsonError[];\n  readonly hints: Hint[];\n  readonly rootTypeHint: TypeHint | undefined;\n  readonly pathToTypeHint: ReadonlyMap<Path, TypeHint>;\n}\n\nexport interface TypeHint {\n  readonly segment: Segment;\n  readonly message: string | readonly string[];\n  readonly valueContext: JsonValueContext;\n  /// In order. All are included in 'valueContext.value.segment'.\n  readonly childHints: readonly TypeHint[];\n}\n\nexport type Hint =\n  | {\n      readonly segment: Segment;\n      readonly message: string;\n      readonly valueContext?: undefined;\n    }\n  | TypeHint;\n\nexport interface MutableTypeHint extends TypeHint {\n  readonly childHints: TypeHint[];\n}\n\n// -----------------------------------------------------------------------------\n// METHOD LIST\n// -----------------------------------------------------------------------------\n\nexport interface MethodList {\n  readonly methods: readonly Method[];\n}\n\nexport interface Method {\n  readonly method: string;\n  readonly number: number | string;\n  readonly request: TypeDefinition;\n  readonly response: TypeDefinition;\n  readonly doc?: string;\n}\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/json/types.ts"],"names":[],"mappings":"","sourcesContent":["// To use instead of `any`\nexport type Json =\n  | null\n  | boolean\n  | number\n  | string\n  | readonly Json[]\n  | Readonly<{ [name: string]: Json }>;\n\n// -----------------------------------------------------------------------------\n// ERRORS\n// -----------------------------------------------------------------------------\n\nexport interface JsonError {\n  readonly kind: \"error\";\n  readonly segment: Segment;\n  readonly message: string;\n}\n\n// -----------------------------------------------------------------------------\n// PARSING\n// -----------------------------------------------------------------------------\n\nexport interface JsonParseResult {\n  /// If `undefined`, then `errors` is guaranteed not to be empty.\n  readonly value: JsonValue | undefined;\n  readonly errors: readonly JsonError[];\n  /// Set of edits to apply to the original JSON code to fix formatting and\n  // comma errors (no comma between consecutive values, trailing comma).\n  readonly edits: readonly JsonEdit[];\n}\n\nexport type JsonValue = JsonArray | JsonObject | JsonLiteral;\n\nexport interface JsonArray {\n  readonly kind: \"array\";\n  /// Position of the '[' token.\n  readonly firstToken: Segment;\n  /// From '[' to ']' included.\n  readonly segment: Segment;\n  readonly values: JsonValue[];\n  readonly indent: number;\n  expectedType?: TypeSignature;\n}\n\nexport interface JsonKey {\n  readonly keySegment: Segment;\n  readonly key: string;\n}\n\nexport interface JsonKeyValue {\n  readonly keySegment: Segment;\n  readonly key: string;\n  readonly value: JsonValue;\n  expectedType?: TypeSignature;\n}\n\nexport interface JsonObject {\n  readonly kind: \"object\";\n  /// Position of the '{' token.\n  readonly firstToken: Segment;\n  /// From '{' to '}' included.\n  readonly segment: Segment;\n  readonly keyValues: { [key: string]: JsonKeyValue };\n  /// Includes \"broken\" keys which produced a parsing error.\n  readonly allKeys: readonly JsonKey[];\n  readonly indent: number;\n  expectedType?: TypeSignature;\n}\n\nexport interface JsonLiteral {\n  readonly kind: \"literal\";\n  /// Position of the first and only token. Same as `segment`.\n  readonly firstToken: Segment;\n  readonly segment: Segment;\n  readonly jsonCode: string;\n  readonly type: \"boolean\" | \"null\" | \"number\" | \"string\";\n  readonly indent: number;\n  expectedType?: TypeSignature;\n}\n\nexport interface Segment {\n  readonly start: number;\n  readonly end: number;\n}\n\n/// Path to a sub-value within a valid Skir value.\nexport type Path =\n  | {\n      readonly kind: \"root\";\n    }\n  | {\n      readonly kind: \"field-value\";\n      /// Name of the field of the struct\n      readonly fieldName: string;\n      /// Path to the struct value\n      readonly structPath: Path;\n    }\n  | {\n      readonly kind: \"variant-value\";\n      /// Name of the wrapper variant of the enum\n      readonly variantName: string;\n      /// Path to the enum value\n      readonly enumPath: Path;\n    }\n  | {\n      readonly kind: \"array-item\";\n      readonly index: number;\n      readonly key: string | null;\n      readonly arrayPath: Path;\n    };\n\nexport interface JsonValueContext {\n  readonly value: JsonValue;\n  readonly path: Path;\n}\n\nexport interface JsonEdit {\n  readonly segment: Segment;\n  readonly replacement: string;\n}\n\n// -----------------------------------------------------------------------------\n// SCHEMA\n// -----------------------------------------------------------------------------\n\n/** JSON representation of a `TypeDescriptor`. */\nexport type TypeDefinition = {\n  readonly type: TypeSignature;\n  readonly records: readonly RecordDefinition[];\n};\n\n/** A type in the JSON representation of a `TypeDescriptor`. */\nexport type TypeSignature =\n  | {\n      kind: \"optional\";\n      value: TypeSignature;\n    }\n  | ArrayTypeSignature\n  | RecordTypeSignature\n  | {\n      kind: \"primitive\";\n      value: PrimitiveType;\n    };\n\nexport interface ArrayTypeSignature {\n  readonly kind: \"array\";\n  readonly value: {\n    readonly item: TypeSignature;\n    readonly key_extractor?: string;\n  };\n}\n\nexport interface RecordTypeSignature {\n  readonly kind: \"record\";\n  readonly value: string;\n}\n\nexport type PrimitiveType =\n  | \"bool\"\n  | \"int32\"\n  | \"int64\"\n  | \"hash64\"\n  | \"float32\"\n  | \"float64\"\n  | \"timestamp\"\n  | \"string\"\n  | \"bytes\";\n\nexport type RecordDefinition = StructDefinition | EnumDefinition;\n\n/** Definition of a struct in the JSON representation of a `TypeDescriptor`. */\nexport type StructDefinition = {\n  readonly kind: \"struct\";\n  readonly id: string;\n  readonly doc?: string;\n  readonly fields: readonly FieldDefinition[];\n  readonly removed_numbers?: readonly number[];\n};\n\n/**\n * Definition of a struct field in the JSON representation of a\n * `TypeDescriptor`.\n */\nexport type FieldDefinition = {\n  readonly name: string;\n  readonly type: TypeSignature;\n  readonly number: number;\n  readonly doc?: string;\n};\n\n/** Definition of an enum in the JSON representation of a `TypeDescriptor`. */\nexport type EnumDefinition = {\n  readonly kind: \"enum\";\n  readonly id: string;\n  readonly doc?: string;\n  readonly variants: readonly VariantDefinition[];\n  readonly removed_numbers?: readonly number[];\n};\n\n/**\n * Definition of an enum variant in the JSON representation of a\n * `TypeDescriptor`.\n */\nexport type VariantDefinition = {\n  readonly name: string;\n  readonly type?: TypeSignature;\n  readonly number: number;\n  readonly doc?: string;\n};\n\n// -----------------------------------------------------------------------------\n// SCHEMA VALIDATION\n// -----------------------------------------------------------------------------\n\nexport interface ValidationResult {\n  readonly errors: JsonError[];\n  readonly hints: Hint[];\n  readonly rootTypeHint: TypeHint | undefined;\n  readonly pathToTypeHint: ReadonlyMap<Path, TypeHint>;\n}\n\nexport interface TypeHint {\n  readonly segment: Segment;\n  readonly message: string | readonly string[];\n  readonly valueContext: JsonValueContext;\n  /// In order. All are included in 'valueContext.value.segment'.\n  readonly childHints: readonly TypeHint[];\n  /// Set if the expected type is an enum and the value is a literal string.\n  /// In that case, the editor can show a dropdown with the possible variants\n  /// of the enum.\n  readonly enumDefinition?: EnumDefinition;\n}\n\nexport type Hint =\n  | {\n      readonly segment: Segment;\n      readonly message: string;\n      readonly valueContext?: undefined;\n    }\n  | TypeHint;\n\nexport interface MutableTypeHint extends TypeHint {\n  readonly childHints: TypeHint[];\n}\n\n// -----------------------------------------------------------------------------\n// METHOD LIST\n// -----------------------------------------------------------------------------\n\nexport interface MethodList {\n  readonly methods: readonly Method[];\n}\n\nexport interface Method {\n  readonly method: string;\n  readonly number: number | string;\n  readonly request: TypeDefinition;\n  readonly response: TypeDefinition;\n  readonly doc?: string;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skir-codemirror-plugin",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "",
   "homepage": "https://github.com/gepheum/skir-codemirror-plugin#readme",
   "bugs": {
@@ -46,8 +46,7 @@
   },
   "dependencies": {
     "@codemirror/lang-json": "^6.0.2",
-    "@uiw/codemirror-theme-tokyo-night": "^4.25.4",
-    "@uiw/codemirror-theme-tokyo-night-day": "^4.25.9",
+    "@uiw/codemirror-themes-all": "^4.25.9",
     "codemirror": "^6.0.2",
     "skir-client": "^1.0.11"
   },

package/src/codemirror/create_editor_state.ts

@@ -3,8 +3,7 @@ import { json as jsonExtension } from "@codemirror/lang-json";
 import { linter, lintGutter } from "@codemirror/lint";
 import { EditorState, Extension } from "@codemirror/state";
 import { EditorView } from "@codemirror/view";
-import { tokyoNight } from "@uiw/codemirror-theme-tokyo-night";
-import { tokyoNightDay } from "@uiw/codemirror-theme-tokyo-night-day";
+import * as codeMirrorThemes from "@uiw/codemirror-themes-all";
 import { basicSetup } from "codemirror";
 import { makeJsonTemplate } from "../json/to_json";
 import type { Json, RecordDefinition, TypeDefinition } from "../json/types";
@@ -18,14 +17,279 @@ export type CreateEditorStateParams = {
   schema: TypeDefinition;
   readOnly?: true;
   json?: Json;
-  theme?: "tokyo-night" | "tokyo-night-day" | CustomTheme;
+  theme?: BuiltinThemeName | CustomTheme;
+  otherExtension?: Extension;
 };
 
+export type BuiltinThemeName =
+  | "abcdef"
+  | "abyss"
+  | "androidstudio"
+  | "andromeda"
+  | "atomone"
+  | "aura"
+  | "basic-dark"
+  | "basic-light"
+  | "bbedit"
+  | "bespin"
+  | "console-dark"
+  | "console-light"
+  | "copilot"
+  | "darcula"
+  | "dracula"
+  | "duotone-dark"
+  | "duotone-light"
+  | "eclipse"
+  | "github-dark"
+  | "github-light"
+  | "gruvbox-dark"
+  | "gruvbox-light"
+  | "kimbie"
+  | "material"
+  | "material-dark"
+  | "material-light"
+  | "monokai"
+  | "monokai-dimmed"
+  | "noctis-lilac"
+  | "nord"
+  | "okaidia"
+  | "quietlight"
+  | "red"
+  | "solarized-dark"
+  | "solarized-light"
+  | "sublime"
+  | "tokyo-night"
+  | "tokyo-night-day"
+  | "tokyo-night-storm"
+  | "tomorrow-night-blue"
+  | "vscode-dark"
+  | "vscode-light"
+  | "white"
+  | "white-dark"
+  | "white-light"
+  | "xcode-dark"
+  | "xcode-light";
+
+const WHITE_THEME_COLORS: Omit<CustomTheme, "themeExtension"> = {
+  backgroundColor: "#fffdf7",
+  lighterBgColor: "#f3eee1",
+  borderColor: "#d4d0c4",
+  foregroundColor: "#111111",
+  accentColor: "#111111",
+  errorColor: "#232323",
+  selectionColor: "#d9d4c7",
+};
+
+const TOKYO_NIGHT_THEME_COLORS: Omit<CustomTheme, "themeExtension"> = {
+  backgroundColor: "#1a1b26",
+  lighterBgColor: "#1f2335",
+  borderColor: "#414868",
+  foregroundColor: "#c0caf5",
+  accentColor: "#7aa2f7",
+  errorColor: "#f7768e",
+  selectionColor: "#515c7e40",
+};
+
+const TOKYO_NIGHT_DAY_THEME_COLORS: Omit<CustomTheme, "themeExtension"> = {
+  backgroundColor: "#d5d6db",
+  lighterBgColor: "#e1e2e7",
+  borderColor: "#adb0bb",
+  foregroundColor: "#3760bf",
+  accentColor: "#2e7de9",
+  errorColor: "#f52a65",
+  selectionColor: "#3760bf33",
+};
+
+type ThemeDefaults = Partial<{
+  background: string;
+  foreground: string;
+  caret: string;
+  selection: string;
+  selectionMatch: string;
+  gutterBackground: string;
+  gutterForeground: string;
+  gutterBorder: string;
+  lineHighlight: string;
+}>;
+
+const BUILTIN_THEME_EXTENSIONS: Record<BuiltinThemeName, Extension> = {
+  abcdef: codeMirrorThemes.abcdef,
+  abyss: codeMirrorThemes.abyss,
+  androidstudio: codeMirrorThemes.androidstudio,
+  andromeda: codeMirrorThemes.andromeda,
+  atomone: codeMirrorThemes.atomone,
+  aura: codeMirrorThemes.aura,
+  "basic-dark": codeMirrorThemes.basicDark,
+  "basic-light": codeMirrorThemes.basicLight,
+  bbedit: codeMirrorThemes.bbedit,
+  bespin: codeMirrorThemes.bespin,
+  "console-dark": codeMirrorThemes.consoleDark,
+  "console-light": codeMirrorThemes.consoleLight,
+  copilot: codeMirrorThemes.copilot,
+  darcula: codeMirrorThemes.darcula,
+  dracula: codeMirrorThemes.dracula,
+  "duotone-dark": codeMirrorThemes.duotoneDark,
+  "duotone-light": codeMirrorThemes.duotoneLight,
+  eclipse: codeMirrorThemes.eclipse,
+  "github-dark": codeMirrorThemes.githubDark,
+  "github-light": codeMirrorThemes.githubLight,
+  "gruvbox-dark": codeMirrorThemes.gruvboxDark,
+  "gruvbox-light": codeMirrorThemes.gruvboxLight,
+  kimbie: codeMirrorThemes.kimbie,
+  material: codeMirrorThemes.material,
+  "material-dark": codeMirrorThemes.materialDark,
+  "material-light": codeMirrorThemes.materialLight,
+  monokai: codeMirrorThemes.monokai,
+  "monokai-dimmed": codeMirrorThemes.monokaiDimmed,
+  "noctis-lilac": codeMirrorThemes.noctisLilac,
+  nord: codeMirrorThemes.nord,
+  okaidia: codeMirrorThemes.okaidia,
+  quietlight: codeMirrorThemes.quietlight,
+  red: codeMirrorThemes.red,
+  "solarized-dark": codeMirrorThemes.solarizedDark,
+  "solarized-light": codeMirrorThemes.solarizedLight,
+  sublime: codeMirrorThemes.sublime,
+  "tokyo-night": codeMirrorThemes.tokyoNight,
+  "tokyo-night-day": codeMirrorThemes.tokyoNightDay,
+  "tokyo-night-storm": codeMirrorThemes.tokyoNightStorm,
+  "tomorrow-night-blue": codeMirrorThemes.tomorrowNightBlue,
+  "vscode-dark": codeMirrorThemes.vscodeDark,
+  "vscode-light": codeMirrorThemes.vscodeLight,
+  white: codeMirrorThemes.whiteLight,
+  "white-dark": codeMirrorThemes.whiteDark,
+  "white-light": codeMirrorThemes.whiteLight,
+  "xcode-dark": codeMirrorThemes.xcodeDark,
+  "xcode-light": codeMirrorThemes.xcodeLight,
+};
+
+const BUILTIN_THEME_DEFAULTS: Record<BuiltinThemeName, ThemeDefaults> = {
+  abcdef: codeMirrorThemes.defaultSettingsAbcdef,
+  abyss: codeMirrorThemes.defaultSettingsAbyss,
+  androidstudio: codeMirrorThemes.defaultSettingsAndroidstudio,
+  andromeda: codeMirrorThemes.defaultSettingsAndromeda,
+  atomone: codeMirrorThemes.defaultSettingsAtomone,
+  aura: codeMirrorThemes.defaultSettingsAura,
+  "basic-dark": codeMirrorThemes.defaultSettingsBasicDark,
+  "basic-light": codeMirrorThemes.defaultSettingsBasicLight,
+  bbedit: codeMirrorThemes.defaultSettingsBbedit,
+  bespin: codeMirrorThemes.defaultSettingsBespin,
+  "console-dark": codeMirrorThemes.defaultSettingsConsoleDark,
+  "console-light": codeMirrorThemes.defaultSettingsConsoleLight,
+  copilot: codeMirrorThemes.defaultSettingsCopilot,
+  darcula: codeMirrorThemes.defaultSettingsDarcula,
+  dracula: codeMirrorThemes.defaultSettingsDracula,
+  "duotone-dark": codeMirrorThemes.defaultSettingsDuotoneDark,
+  "duotone-light": codeMirrorThemes.defaultSettingsDuotoneLight,
+  eclipse: codeMirrorThemes.defaultSettingsEclipse,
+  "github-dark": codeMirrorThemes.defaultSettingsGithubDark,
+  "github-light": codeMirrorThemes.defaultSettingsGithubLight,
+  "gruvbox-dark": codeMirrorThemes.defaultSettingsGruvboxDark,
+  "gruvbox-light": codeMirrorThemes.defaultSettingsGruvboxLight,
+  kimbie: codeMirrorThemes.defaultSettingsKimbie,
+  material: codeMirrorThemes.defaultSettingsMaterial,
+  "material-dark": codeMirrorThemes.defaultSettingsMaterialDark,
+  "material-light": codeMirrorThemes.defaultSettingsMaterialLight,
+  monokai: codeMirrorThemes.defaultSettingsMonokai,
+  "monokai-dimmed": codeMirrorThemes.defaultSettingsMonokaiDimmed,
+  "noctis-lilac": codeMirrorThemes.defaultSettingsNoctisLilac,
+  nord: codeMirrorThemes.defaultSettingsNord,
+  okaidia: codeMirrorThemes.defaultSettingsOkaidia,
+  quietlight: codeMirrorThemes.defaultSettingsQuietlight,
+  red: codeMirrorThemes.defaultSettingsRed,
+  "solarized-dark": codeMirrorThemes.defaultSettingsSolarizedDark,
+  "solarized-light": codeMirrorThemes.defaultSettingsSolarizedLight,
+  sublime: codeMirrorThemes.defaultSettingsSublime,
+  "tokyo-night": codeMirrorThemes.defaultSettingsTokyoNight,
+  "tokyo-night-day": codeMirrorThemes.defaultSettingsTokyoNightDay,
+  "tokyo-night-storm": codeMirrorThemes.defaultSettingsTokyoNightStorm,
+  "tomorrow-night-blue": codeMirrorThemes.defaultSettingsTomorrowNightBlue,
+  "vscode-dark": codeMirrorThemes.defaultSettingsVscodeDark,
+  "vscode-light": codeMirrorThemes.defaultSettingsVscodeLight,
+  white: codeMirrorThemes.defaultSettingsWhiteLight,
+  "white-dark": codeMirrorThemes.defaultSettingsWhiteDark,
+  "white-light": codeMirrorThemes.defaultSettingsWhiteLight,
+  "xcode-dark": codeMirrorThemes.defaultSettingsXcodeDark,
+  "xcode-light": codeMirrorThemes.defaultSettingsXcodeLight,
+};
+
+function pickColor(
+  ...candidates: Array<string | undefined>
+): string | undefined {
+  for (const candidate of candidates) {
+    if (candidate && candidate !== "transparent") {
+      return candidate;
+    }
+  }
+  return undefined;
+}
+
+function themeFromDefaults(
+  defaults: ThemeDefaults,
+  themeExtension: Extension,
+): CustomTheme {
+  const background = pickColor(defaults.background, defaults.gutterBackground);
+  const foreground = pickColor(
+    defaults.caret,
+    defaults.foreground,
+    defaults.gutterForeground,
+  );
+  const selection = pickColor(
+    defaults.selection,
+    defaults.selectionMatch,
+    defaults.lineHighlight,
+  );
+  return {
+    backgroundColor: background ?? "#1a1b26",
+    lighterBgColor:
+      pickColor(
+        defaults.gutterBackground,
+        defaults.lineHighlight,
+        background,
+      ) ?? "#1f2335",
+    borderColor:
+      pickColor(
+        defaults.gutterBorder,
+        defaults.selectionMatch,
+        defaults.selection,
+        defaults.foreground,
+      ) ?? "#414868",
+    foregroundColor: foreground ?? "#c0caf5",
+    accentColor: pickColor(defaults.foreground, defaults.caret) ?? "#7aa2f7",
+    errorColor: pickColor(defaults.caret, defaults.foreground) ?? "#f7768e",
+    selectionColor: selection ?? "#515c7e40",
+    themeExtension,
+  };
+}
+
+function resolveBuiltinTheme(themeName: BuiltinThemeName): CustomTheme {
+  const themeExtension = BUILTIN_THEME_EXTENSIONS[themeName];
+  if (themeName === "white") {
+    return {
+      ...WHITE_THEME_COLORS,
+      themeExtension,
+    };
+  }
+  if (themeName === "tokyo-night") {
+    return {
+      ...TOKYO_NIGHT_THEME_COLORS,
+      themeExtension,
+    };
+  }
+  if (themeName === "tokyo-night-day") {
+    return {
+      ...TOKYO_NIGHT_DAY_THEME_COLORS,
+      themeExtension,
+    };
+  }
+  return themeFromDefaults(BUILTIN_THEME_DEFAULTS[themeName], themeExtension);
+}
+
 export function createEditorState({
   schema,
   readOnly,
   json,
   theme,
+  otherExtension,
 }: CreateEditorStateParams): EditorState {
   const idToRecordDef: { [id: string]: RecordDefinition } = {};
   for (const record of schema.records) {
@@ -33,34 +297,10 @@ export function createEditorState({
   }
   const content = json ?? makeJsonTemplate(schema.type, idToRecordDef);
 
-  switch (theme) {
-    case undefined:
-    case "tokyo-night": {
-      theme = {
-        backgroundColor: "#1a1b26",
-        lighterBgColor: "#1f2335",
-        borderColor: "#414868",
-        foregroundColor: "#c0caf5",
-        accentColor: "#7aa2f7",
-        errorColor: "#f7768e",
-        selectionColor: "#515c7e40",
-        themeExtension: tokyoNight,
-      };
-      break;
-    }
-    case "tokyo-night-day": {
-      theme = {
-        backgroundColor: "#d5d6db",
-        lighterBgColor: "#e1e2e7",
-        borderColor: "#adb0bb",
-        foregroundColor: "#3760bf",
-        accentColor: "#2e7de9",
-        errorColor: "#f52a65",
-        selectionColor: "#3760bf33",
-        themeExtension: tokyoNightDay,
-      };
-      break;
-    }
+  if (theme === undefined) {
+    theme = resolveBuiltinTheme("tokyo-night");
+  } else if (typeof theme === "string") {
+    theme = resolveBuiltinTheme(theme);
   }
 
   return EditorState.create({
@@ -262,6 +502,7 @@ export function createEditorState({
           borderTop: "1px solid",
         },
       }),
+      otherExtension ?? [],
     ],
   });
 }

package/src/codemirror/json_linter.ts

@@ -1,7 +1,8 @@
 import { Diagnostic } from "@codemirror/lint";
 import { EditorView } from "@codemirror/view";
+import { makeJsonTemplate } from "../json/to_json";
 import { Hint, JsonError, JsonLiteral, TypeHint } from "../json/types";
-import { ensureJsonState, jsonStateField } from "./json_state";
+import { jsonStateField } from "./json_state";
 
 export function jsonLinter(
   editable: "editable" | "read-only",
@@ -221,8 +222,6 @@ function getTimestampControlRows(
         insert: newJsonString,
       },
     });
-
-    ensureJsonState(view, (view as any).schema);
   };
 
   // Enter key handler for unix_millis input
@@ -300,6 +299,84 @@ function getTimestampControlRows(
   return [headerRow, controlsRow];
 }
 
+function getEnumDropdown(
+  view: EditorView,
+  typeHint: TypeHint,
+  enumDefinition: NonNullable<TypeHint["enumDefinition"]>,
+): HTMLDivElement {
+  const controlsRow = document.createElement("div");
+  controlsRow.className = "cm-diagnostic-controls";
+
+  const label = document.createElement("span");
+  label.className = "cm-diagnostic-label";
+  label.textContent = "Variant:";
+
+  const select = document.createElement("select");
+  select.className = "cm-diagnostic-input";
+
+  {
+    // Add the UNKNOWN variant
+    const option = document.createElement("option");
+    option.value = "UNKNOWN";
+    option.textContent = "UNKNOWN";
+    select.appendChild(option);
+  }
+  for (const variant of enumDefinition.variants) {
+    const option = document.createElement("option");
+    option.value = variant.name;
+    option.textContent = variant.name;
+    select.appendChild(option);
+  }
+
+  const currentValue = typeHint.valueContext?.value;
+  if (
+    currentValue &&
+    currentValue.kind === "literal" &&
+    currentValue.type === "string"
+  ) {
+    try {
+      select.value = JSON.parse(currentValue.jsonCode) as string;
+    } catch {
+      // Ignore invalid value and keep the default selection.
+    }
+  }
+
+  select.addEventListener("change", () => {
+    const variant = enumDefinition.variants.find(
+      (variant) => variant.name === select.value,
+    )!;
+    let newJsonString: string;
+    if (variant.type) {
+      const jsonState = view.state.field(jsonStateField, false)!;
+      const valueJson = makeJsonTemplate(
+        variant.type,
+        jsonState.recordIdToDefinition,
+      );
+      newJsonString = JSON.stringify(
+        {
+          kind: variant.name,
+          value: valueJson,
+        },
+        null,
+        2,
+      ).replaceAll("\n", "\n" + " ".repeat(typeHint.valueContext.value.indent));
+    } else {
+      newJsonString = JSON.stringify(variant.name);
+    }
+    view.dispatch({
+      changes: {
+        from: typeHint.segment.start,
+        to: typeHint.segment.end,
+        insert: newJsonString,
+      },
+    });
+  });
+
+  controlsRow.appendChild(label);
+  controlsRow.appendChild(select);
+  return controlsRow;
+}
+
 function hintToDiagnostic(
   typeHint: Hint,
   editable: "editable" | "read-only",
@@ -337,13 +414,21 @@ function hintToDiagnostic(
         // Render a timestamp editing control for timestamp hints.
         rows = getTimestampControlRows(view, typeHint);
       } else {
-        // Display the message for non-string types
+        // Display the message.
         const pieces = typeof message === "string" ? [message] : message;
         rows = pieces.map((piece) => {
           const row = document.createElement("div");
           row.textContent = piece;
           return row;
         });
+        if (
+          typeHint.valueContext &&
+          typeHint.enumDefinition &&
+          editable === "editable"
+        ) {
+          // Render a dropdown for selecting a different variant.
+          rows.push(getEnumDropdown(view, typeHint, typeHint.enumDefinition));
+        }
       }
 
       for (const row of rows) {

package/src/codemirror/json_state.ts

@@ -9,6 +9,7 @@ import { parseJsonValue } from "../json/json_parser";
 import { validateSchema } from "../json/schema_validator";
 import type {
   JsonParseResult,
+  RecordDefinition,
   TypeDefinition,
   ValidationResult,
 } from "../json/types";
@@ -17,6 +18,8 @@ export interface JsonState {
   readonly parseResult: JsonParseResult;
   readonly validationResult?: ValidationResult;
   readonly source: string;
+  readonly schema: TypeDefinition;
+  readonly recordIdToDefinition: { [id: string]: RecordDefinition };
 }
 
 const updateJsonState = StateEffect.define<JsonState>();
@@ -58,7 +61,15 @@ export function ensureJsonState(
     validationResult = validateSchema(parseResult.value, schema);
   }
 
-  const newState: JsonState = { parseResult, validationResult, source };
+  const recordIdToDefinition = indexRecordDefinitions(schema, currentState);
+
+  const newState: JsonState = {
+    parseResult,
+    validationResult,
+    source,
+    schema,
+    recordIdToDefinition,
+  };
 
   // Update the state if it's different
   if (!currentState || currentState !== newState) {
@@ -139,21 +150,37 @@ export function debouncedJsonParser(schema: TypeDefinition): Extension[] {
               insert: edit.replacement,
             }));
 
+            const oldState = this.view.state.field(jsonStateField, false);
+            const recordIdToDefinition = indexRecordDefinitions(
+              schema,
+              oldState,
+            );
+
             this.view.dispatch({
               changes,
               effects: updateJsonState.of({
                 parseResult,
                 validationResult,
                 source,
+                schema,
+                recordIdToDefinition,
               }),
               scrollIntoView: true,
             });
           } else {
+            const oldState = this.view.state.field(jsonStateField, false);
+            const recordIdToDefinition = indexRecordDefinitions(
+              schema,
+              oldState,
+            );
+
             this.view.dispatch({
               effects: updateJsonState.of({
                 parseResult,
                 validationResult,
                 source,
+                schema,
+                recordIdToDefinition,
               }),
             });
           }
@@ -168,3 +195,19 @@ export function debouncedJsonParser(schema: TypeDefinition): Extension[] {
     ),
   ];
 }
+
+function indexRecordDefinitions(
+  schema: TypeDefinition,
+  oldState: JsonState | null | undefined,
+): {
+  [id: string]: RecordDefinition;
+} {
+  if (schema === oldState?.schema) {
+    return oldState.recordIdToDefinition;
+  }
+  const idToRecordDef: { [id: string]: RecordDefinition } = {};
+  for (const recordDef of schema.records) {
+    idToRecordDef[recordDef.id] = recordDef;
+  }
+  return idToRecordDef;
+}

package/src/index.ts

@@ -1,5 +1,6 @@
 export { createEditorState } from "./codemirror/create_editor_state";
 export type {
+  BuiltinThemeName,
   CreateEditorStateParams,
   CustomTheme,
 } from "./codemirror/create_editor_state";

package/src/json/json_parser.test.ts

@@ -63,6 +63,18 @@ describe("json_parser", () => {
     });
   });
 
+  it("tracks indent for top-level literal", () => {
+    expect(parseJsonValue("   true")).toMatch({
+      value: {
+        kind: "literal",
+        jsonCode: "true",
+        type: "boolean",
+        indent: 3,
+      },
+      errors: [],
+    });
+  });
+
   it("parses empty array", () => {
     expect(parseJsonValue("[]")).toMatch({
       value: { kind: "array", values: [] },
@@ -119,6 +131,45 @@ describe("json_parser", () => {
     });
   });
 
+  it("tracks indent from line leading spaces for field values", () => {
+    const result = parseJsonValue(`{
+  "a": 1,
+  "b": [
+    2
+  ]
+}`);
+
+    expect(result).toMatch({
+      value: {
+        kind: "object",
+        indent: 0,
+        keyValues: {
+          a: {
+            value: {
+              kind: "literal",
+              jsonCode: "1",
+              indent: 2,
+            },
+          },
+          b: {
+            value: {
+              kind: "array",
+              indent: 2,
+              values: [
+                {
+                  kind: "literal",
+                  jsonCode: "2",
+                  indent: 4,
+                },
+              ],
+            },
+          },
+        },
+      },
+      errors: [],
+    });
+  });
+
   it("parses arrays with whitespace", () => {
     expect(parseJsonValue(" [ 1 ] ")).toMatch({
       value: {