feat(plugins): import IntelliJ theme plugins (#1184)

Settings › Plugins (gear menu) gets Import Theme from IntelliJ IDE… (theme plugins of the JetBrains IDEs on this machine, the one each IDE uses first) and Import IntelliJ Theme from File… (a Marketplace .jar / .zip or a .theme.json). The host reads the plugin with size limits; the UI converts it with the IntelliJ mapping (moved from scripts/theme to src/features/plugins/intellijTheme.ts, still used by pnpm theme:import-intellij) into one OpenIDEA theme plugin (engines.openidea ^1.0) with all of its themes, installed through the usual install page, and applies the chosen theme.

Theme pickers separate each plugin's themes, and Quick Switch Scheme › Theme previews the theme under the pointer or keyboard after 500 ms and restores the selected one when closed without a choice.

Co-authored-by: ldg030201 <[email protected]>

scripts/theme/import-intellij-theme.ts

@@ -10,7 +10,8 @@
 import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { basename, join } from "node:path";
 import { parseArgs } from "node:util";
-import { convertIntellijTheme, pluginManifest } from "./intellij.ts";
+import { convertIntellijTheme, pluginManifest } from "../../src/features/plugins/intellijTheme.ts";
+import { stripJsonComments } from "./tokens.ts";
 
 const { values, positionals } = parseArgs({
   allowPositionals: true,
@@ -25,7 +26,7 @@ if (!themePath || !values.out) {
 }
 
 const converted = convertIntellijTheme(
-  readFileSync(themePath, "utf8"),
+  stripJsonComments(readFileSync(themePath, "utf8")),
   iclsPath ? readFileSync(iclsPath, "utf8") : undefined,
   values.id,
 );
@@ -34,7 +35,17 @@ const source = [basename(themePath), iclsPath && basename(iclsPath)].filter(Bool
 const header = (what: string) => `// ${theme.name}: ${what}, converted from ${source}.\n`;
 
 mkdirSync(join(values.out, "themes"), { recursive: true });
-writeFileSync(join(values.out, "plugin.toml"), pluginManifest(converted, values.author ?? "Unknown", source));
+const info = {
+  id: `theme-${theme.id}`,
+  name: `${theme.name} Theme`,
+  version: "1.0.0",
+  description: `${theme.name}, converted from an IntelliJ theme.`,
+  authors: [values.author ?? "Unknown"],
+};
+writeFileSync(
+  join(values.out, "plugin.toml"),
+  pluginManifest(info, [converted], `Converted from ${source} by scripts/theme/import-intellij-theme.ts.`),
+);
 writeFileSync(
   join(values.out, "themes", `${theme.id}.theme.json`),
   header("UI theme") + JSON.stringify(theme, null, 2) + "\n",

scripts/theme/intellij.ts

@@ -1,327 +0,0 @@
-/**
- * Converts an IntelliJ theme (`.theme.json`, optionally with its editor scheme
- * `.icls`) into an OpenIDEA theme + editor scheme. The mapping covers the
- * main keys only; anything unmapped keeps the built-in value of the base
- * (`kind`). Pure functions, no dependencies: see import-intellij-theme.ts
- * for the command line.
- */
-import { stripJsonComments } from "./tokens.ts";
-
-/** OpenIDEA token ← IntelliJ `ui` keys, first present wins. `*.prop` wildcards apply too. */
-export const UI_KEYS: Record<string, string[]> = {
-  "--bg-app": ["Panel.background"],
-  "--bg-frame": ["MainWindow.background", "MainToolbar.background", "Panel.background"],
-  "--bg-island": ["ToolWindow.background", "Panel.background"],
-  "--bg-elev": ["ToolWindow.background", "SidePanel.background"],
-  "--bg-popup": ["Popup.background", "PopupMenu.background"],
-  "--bg-floating-toolbar": ["Toolbar.Floating.background"],
-  "--bg-backdrop": ["Popup.background"],
-  "--bg-hover": ["List.hoverBackground", "Tree.hoverBackground"],
-  "--bg-selected": ["List.selectionBackground", "Tree.selectionBackground"],
-  "--bg-selected-strong": ["List.selectionBackground"],
-  "--bg-tree-selected": ["Tree.selectionBackground", "List.selectionBackground"],
-  "--bg-tree-selected-inactive": ["Tree.selectionInactiveBackground", "List.selectionInactiveBackground"],
-  "--bg-input": ["TextField.background"],
-  "--bg-field": ["TextField.background"],
-  "--bg-dialog": ["Dialog.background", "Panel.background"],
-  "--border": ["Borders.color"],
-  "--border-popup": ["Popup.borderColor", "Popup.Border.color"],
-  "--border-strong": ["Component.borderColor", "Borders.ContrastBorderColor"],
-  "--border-window": ["Borders.ContrastBorderColor", "Component.borderColor"],
-  "--fg": ["Label.foreground"],
-  "--fg-emphasis": ["Label.foreground"],
-  "--fg-strong": ["Label.selectedForeground", "Label.foreground"],
-  "--fg-secondary": ["Label.infoForeground", "Component.infoForeground"],
-  "--fg-muted": ["Label.infoForeground", "Component.infoForeground"],
-  "--fg-subtle": ["Label.disabledForeground"],
-  "--fg-faint": ["Label.disabledForeground"],
-  "--accent": ["Button.default.startBackground", "Button.default.background", "Component.focusColor"],
-  "--fg-on-accent": ["Button.default.foreground"],
-  "--fg-button-primary": ["Button.default.foreground"],
-  "--focus-ring-soft": ["Component.focusColor"],
-  "--link": ["Link.activeForeground", "Hyperlink.linkColor"],
-  "--link-hover": ["Link.hoverForeground", "Link.activeForeground"],
-  "--danger": ["Component.errorFocusColor"],
-  "--warning": ["Component.warningFocusColor"],
-  "--bg-tooltip": ["ToolTip.background"],
-  "--fg-tooltip": ["ToolTip.foreground"],
-  "--border-tooltip": ["ToolTip.borderColor"],
-  "--bg-button": ["Button.startBackground", "Button.background"],
-  "--border-button": ["Button.startBorderColor", "Button.borderColor"],
-  "--bg-checkbox": ["Checkbox.Background.Default"],
-  "--border-checkbox": ["Checkbox.Border.Default"],
-  "--bg-tab-selected": ["EditorTabs.underlinedTabBackground", "EditorTabs.selectedBackground"],
-  "--border-tab-selected": ["EditorTabs.underlineColor"],
-  "--bg-tab-hover": ["EditorTabs.hoverBackground"],
-  "--border-editor-tabs": ["EditorTabs.borderColor"],
-  "--bg-toolbar-hover": ["ActionButton.hoverBackground"],
-  "--bg-toolbar-pressed": ["ActionButton.pressedBackground"],
-  "--bg-stripe-hover": ["ToolWindow.Button.hoverBackground"],
-  "--bg-stripe-selected": ["ToolWindow.Button.selectedBackground"],
-  "--scrollbar-thumb": ["ScrollBar.Mac.thumbColor", "ScrollBar.thumbColor"],
-  "--scrollbar-thumb-hover": ["ScrollBar.Mac.hoverThumbColor", "ScrollBar.hoverThumbColor"],
-  "--bg-progress-track": ["ProgressBar.trackColor"],
-  "--bg-counter": ["Counter.background"],
-  "--fg-counter": ["Counter.foreground"],
-  "--bg-search-match": ["SearchMatch.startBackground", "SearchMatch.endBackground"],
-  "--bg-toggle-on": ["ToggleButton.onBackground"],
-  "--fg-toggle-on": ["ToggleButton.onForeground"],
-  "--bg-toggle-off": ["ToggleButton.offBackground"],
-  "--fg-toggle-off": ["ToggleButton.offForeground"],
-  "--border-toggle": ["ToggleButton.borderColor"],
-  "--bg-toggle-knob": ["ToggleButton.buttonColor"],
-  "--bg-feedback-info": ["Banner.infoBackground"],
-  "--border-feedback-info": ["Banner.infoBorderColor"],
-  "--bg-feedback-error": ["Banner.errorBackground"],
-  "--border-feedback-error": ["Banner.errorBorderColor"],
-  "--bg-feedback-warning": ["Banner.warningBackground"],
-  "--border-feedback-warning": ["Banner.warningBorderColor"],
-  "--bg-feedback-success": ["Banner.successBackground"],
-  "--border-feedback-success": ["Banner.successBorderColor"],
-};
-
-/** `.icls` `<colors>` options → tokens. */
-export const ICLS_COLORS: Record<string, string[]> = {
-  CARET_COLOR: ["--caret"],
-  CARET_ROW_COLOR: ["--bg-current-line"],
-  SELECTION_BACKGROUND: ["--bg-editor-selection"],
-  LINE_NUMBERS_COLOR: ["--fg-line-number"],
-  LINE_NUMBER_ON_CARET_ROW_COLOR: ["--fg-line-number-current"],
-  GUTTER_BACKGROUND: ["--bg-editor-gutter"],
-  INDENT_GUIDE: ["--border-indent-guide"],
-  SELECTED_INDENT_GUIDE: ["--border-indent-guide-active"],
-  RIGHT_MARGIN_COLOR: ["--border-right-margin"],
-  WHITESPACES: ["--fg-whitespace"],
-  METHOD_SEPARATORS_COLOR: ["--border-method-separator"],
-  FILESTATUS_MODIFIED: ["--vcs-modified"],
-  FILESTATUS_ADDED: ["--vcs-added"],
-  FILESTATUS_DELETED: ["--vcs-deleted"],
-  FILESTATUS_UNKNOWN: ["--vcs-untracked"],
-  FILESTATUS_IDEA_FILESTATUS_IGNORED: ["--vcs-ignored"],
-  FILESTATUS_IDEA_FILESTATUS_MERGED_WITH_CONFLICTS: ["--vcs-conflict"],
-  MODIFIED_LINES_COLOR: ["--gutter-modified"],
-  ADDED_LINES_COLOR: ["--gutter-added"],
-  DELETED_LINES_COLOR: ["--gutter-deleted"],
-};
-
-type Part = "FOREGROUND" | "BACKGROUND" | "EFFECT_COLOR";
-
-/** `.icls` `<attributes>` options → [part, token] pairs. */
-export const ICLS_ATTRIBUTES: Record<string, Array<[Part, string]>> = {
-  TEXT: [
-    ["FOREGROUND", "--fg-editor"],
-    ["BACKGROUND", "--bg-editor"],
-  ],
-  DIFF_MODIFIED: [["BACKGROUND", "--diff-modified"]],
-  DIFF_INSERTED: [["BACKGROUND", "--diff-inserted"]],
-  DIFF_DELETED: [["BACKGROUND", "--diff-deleted"]],
-  DEFAULT_KEYWORD: [["FOREGROUND", "--syn-keyword"]],
-  DEFAULT_STRING: [["FOREGROUND", "--syn-string"]],
-  DEFAULT_NUMBER: [["FOREGROUND", "--syn-number"]],
-  DEFAULT_LINE_COMMENT: [["FOREGROUND", "--syn-comment"]],
-  DEFAULT_DOC_COMMENT: [["FOREGROUND", "--syn-doc-comment"]],
-  DEFAULT_FUNCTION_DECLARATION: [["FOREGROUND", "--syn-function"]],
-  DEFAULT_FUNCTION_CALL: [["FOREGROUND", "--syn-function-call"]],
-  DEFAULT_CLASS_NAME: [["FOREGROUND", "--syn-type"]],
-  DEFAULT_CONSTANT: [["FOREGROUND", "--syn-constant"]],
-  DEFAULT_INSTANCE_FIELD: [["FOREGROUND", "--syn-property"]],
-  DEFAULT_IDENTIFIER: [["FOREGROUND", "--syn-variable"]],
-  DEFAULT_LOCAL_VARIABLE: [["FOREGROUND", "--syn-variable"]],
-  DEFAULT_PARAMETER: [["FOREGROUND", "--syn-param"]],
-  DEFAULT_PREDEFINED_SYMBOL: [["FOREGROUND", "--syn-builtin"]],
-  DEFAULT_METADATA: [
-    ["FOREGROUND", "--syn-annotation"],
-    ["FOREGROUND", "--syn-decorator"],
-  ],
-  DEFAULT_OPERATION_SIGN: [["FOREGROUND", "--syn-punct"]],
-  DEFAULT_VALID_STRING_ESCAPE: [["FOREGROUND", "--syn-escape"]],
-  DEFAULT_TAG: [["FOREGROUND", "--syn-tag"]],
-  DEFAULT_ATTRIBUTE: [["FOREGROUND", "--syn-attribute"]],
-  TODO_DEFAULT_ATTRIBUTES: [["FOREGROUND", "--syn-todo"]],
-  BAD_CHARACTER: [["FOREGROUND", "--syn-invalid"]],
-  RAINBOW_COLOR1: [["FOREGROUND", "--syn-rainbow-1"]],
-  RAINBOW_COLOR2: [["FOREGROUND", "--syn-rainbow-2"]],
-  RAINBOW_COLOR3: [["FOREGROUND", "--syn-rainbow-3"]],
-  RAINBOW_COLOR4: [["FOREGROUND", "--syn-rainbow-4"]],
-  RAINBOW_COLOR5: [["FOREGROUND", "--syn-rainbow-5"]],
-  ERRORS_ATTRIBUTES: [["EFFECT_COLOR", "--wave-error"]],
-  WARNING_ATTRIBUTES: [["EFFECT_COLOR", "--wave-warning"]],
-  NOT_USED_ELEMENT_ATTRIBUTES: [["FOREGROUND", "--fg-unused"]],
-  MATCHED_BRACE_ATTRIBUTES: [["BACKGROUND", "--bg-matched-brace"]],
-  SEARCH_RESULT_ATTRIBUTES: [["BACKGROUND", "--bg-search-match"]],
-  TEXT_SEARCH_RESULT_ATTRIBUTES: [["BACKGROUND", "--bg-text-search-result"]],
-  IDENTIFIER_UNDER_CARET_ATTRIBUTES: [["BACKGROUND", "--bg-identifier-under-caret"]],
-  WRITE_IDENTIFIER_UNDER_CARET_ATTRIBUTES: [["BACKGROUND", "--bg-identifier-under-caret-write"]],
-  FOLDED_TEXT_ATTRIBUTES: [
-    ["FOREGROUND", "--fg-fold-placeholder"],
-    ["BACKGROUND", "--bg-fold-placeholder"],
-  ],
-  INLINE_PARAMETER_HINT: [
-    ["FOREGROUND", "--fg-inlay"],
-    ["BACKGROUND", "--bg-inlay"],
-  ],
-  BREAKPOINT_ATTRIBUTES: [["BACKGROUND", "--bg-breakpoint-line"]],
-  DEBUGGER_INLINED_VALUES: [["FOREGROUND", "--syn-inline-value"]],
-  "PY.SELF_PARAMETER": [["FOREGROUND", "--syn-self"]],
-  "PY.KEYWORD_ARGUMENT": [["FOREGROUND", "--syn-keyword-arg"]],
-  "PY.DOC_COMMENT": [["FOREGROUND", "--syn-docstring"]],
-  "PY.BUILTIN_NAME": [["FOREGROUND", "--syn-predefined"]],
-  MARKDOWN_HEADER_LEVEL_1: [["FOREGROUND", "--syn-markup-heading"]],
-  MARKDOWN_CODE_SPAN: [["FOREGROUND", "--syn-markup-code"]],
-  MARKDOWN_LINK_TEXT: [["FOREGROUND", "--syn-link"]],
-  CONSOLE_BLACK_OUTPUT: [["FOREGROUND", "--ansi-black"]],
-  CONSOLE_RED_OUTPUT: [["FOREGROUND", "--ansi-red"]],
-  CONSOLE_GREEN_OUTPUT: [["FOREGROUND", "--ansi-green"]],
-  CONSOLE_YELLOW_OUTPUT: [["FOREGROUND", "--ansi-yellow"]],
-  CONSOLE_BLUE_OUTPUT: [["FOREGROUND", "--ansi-blue"]],
-  CONSOLE_MAGENTA_OUTPUT: [["FOREGROUND", "--ansi-magenta"]],
-  CONSOLE_CYAN_OUTPUT: [["FOREGROUND", "--ansi-cyan"]],
-  CONSOLE_GRAY_OUTPUT: [["FOREGROUND", "--ansi-white"]],
-  CONSOLE_DARKGRAY_OUTPUT: [["FOREGROUND", "--ansi-bright-black"]],
-  CONSOLE_RED_BRIGHT_OUTPUT: [["FOREGROUND", "--ansi-bright-red"]],
-  CONSOLE_GREEN_BRIGHT_OUTPUT: [["FOREGROUND", "--ansi-bright-green"]],
-  CONSOLE_YELLOW_BRIGHT_OUTPUT: [["FOREGROUND", "--ansi-bright-yellow"]],
-  CONSOLE_BLUE_BRIGHT_OUTPUT: [["FOREGROUND", "--ansi-bright-blue"]],
-  CONSOLE_MAGENTA_BRIGHT_OUTPUT: [["FOREGROUND", "--ansi-bright-magenta"]],
-  CONSOLE_CYAN_BRIGHT_OUTPUT: [["FOREGROUND", "--ansi-bright-cyan"]],
-  CONSOLE_WHITE_OUTPUT: [["FOREGROUND", "--ansi-bright-white"]],
-};
-
-export interface ConvertedTheme {
-  theme: { id: string; name: string; kind: "dark" | "light"; tokens: Record<string, string> };
-  scheme: { name: string; tokens: Record<string, string> } | null;
-}
-
-type Json = string | number | boolean | null | Json[] | { [k: string]: Json };
-
-/** `"Button": {"default": {"startBackground": x}}` → `Button.default.startBackground`; `"*": {...}` → `*.prop`. */
-function flatten(obj: { [k: string]: Json }, prefix = "", out = new Map<string, string>()): Map<string, string> {
-  for (const [k, v] of Object.entries(obj)) {
-    const key = prefix ? `${prefix}.${k}` : k;
-    if (typeof v === "string") out.set(key, v);
-    else if (v && typeof v === "object" && !Array.isArray(v)) flatten(v, key, out);
-  }
-  return out;
-}
-
-const HEX = /^#?([0-9a-f]{3}|[0-9a-f]{6}|[0-9a-f]{8})$/i;
-
-/** IntelliJ colour (`#rrggbb`, `#rrggbbaa`, or a named colour from `colors`) → CSS hex. */
-function resolveColor(value: string, named: Map<string, string>, depth = 0): string | null {
-  const m = HEX.exec(value.trim());
-  if (m) return `#${m[1]!.toLowerCase()}`;
-  const ref = named.get(value);
-  return ref !== undefined && depth < 8 ? resolveColor(ref, named, depth + 1) : null;
-}
-
-/** `.icls` hex: RGB without `#`, leading zeros dropped (`"0"` is black, `"ff"` is #0000ff). */
-function iclsColor(value: string): string | null {
-  const v = value.trim().toLowerCase();
-  if (!/^[0-9a-f]{1,8}$/.test(v)) return null;
-  return `#${v.length <= 6 ? v.padStart(6, "0") : v.padStart(8, "0")}`;
-}
-
-const attr = (tag: string, name: string) => new RegExp(`${name}="([^"]*)"`).exec(tag)?.[1];
-
-/** Parses the colours and attributes of an `.icls` file into tokens. */
-export function convertIcls(xml: string): { name: string; dark: boolean | null; tokens: Record<string, string> } {
-  const tokens: Record<string, string> = {};
-  const set = (names: string[], color: string | null) => {
-    if (color) for (const n of names) tokens[n] ??= color;
-  };
-  const schemeTag = /<scheme\b[^>]*>/.exec(xml)?.[0] ?? "";
-  const name = attr(schemeTag, "name") ?? "Imported";
-  const parent = attr(schemeTag, "parent_scheme") ?? "";
-  const dark = parent ? /darcula|dark/i.test(parent) : null;
-
-  const colors = /<colors>([\s\S]*?)<\/colors>/.exec(xml)?.[1] ?? "";
-  for (const m of colors.matchAll(/<option\b[^>]*\/>/g)) {
-    const key = attr(m[0], "name");
-    const value = attr(m[0], "value");
-    if (key && value !== undefined && ICLS_COLORS[key]) set(ICLS_COLORS[key], iclsColor(value));
-  }
-
-  const attributes = /<attributes>([\s\S]*?)<\/attributes>/.exec(xml)?.[1] ?? "";
-  for (const m of attributes.matchAll(/<option name="([^"]+)"[^>]*>\s*<value>([\s\S]*?)<\/value>\s*<\/option>/g)) {
-    const map = ICLS_ATTRIBUTES[m[1]!];
-    if (!map) continue;
-    const parts = new Map<string, string>();
-    for (const o of m[2]!.matchAll(/<option\b[^>]*\/>/g)) {
-      const k = attr(o[0], "name");
-      const v = attr(o[0], "value");
-      if (k && v !== undefined) parts.set(k, v);
-    }
-    for (const [part, token] of map) set([token], iclsColor(parts.get(part) ?? ""));
-    // FONT_TYPE: 1 bold, 2 italic, 3 bold italic.
-    if (m[1] === "DEFAULT_LINE_COMMENT" && parts.has("FONT_TYPE")) {
-      tokens["--syn-comment-style"] = Number(parts.get("FONT_TYPE")) & 2 ? "italic" : "normal";
-    }
-  }
-  if (tokens["--wave-error"]) tokens["--editor-error-decoration"] = `underline wavy ${tokens["--wave-error"]}`;
-  if (tokens["--bg-editor"]) tokens["--bg-editor-gutter"] ??= tokens["--bg-editor"];
-  return { name, dark, tokens };
-}
-
-export function slug(name: string): string {
-  return (
-    name
-      .toLowerCase()
-      .replace(/[^a-z0-9]+/g, "-")
-      .replace(/^-+|-+$/g, "")
-      .slice(0, 48) || "imported"
-  );
-}
-
-/** Converts an IntelliJ `.theme.json` (and optionally its `.icls`) into OpenIDEA theme files. */
-export function convertIntellijTheme(themeJson: string, icls?: string, id?: string): ConvertedTheme {
-  const src = JSON.parse(stripJsonComments(themeJson)) as { [k: string]: Json };
-  const name = typeof src.name === "string" ? src.name : "Imported Theme";
-  const named = new Map<string, string>();
-  if (src.colors && typeof src.colors === "object" && !Array.isArray(src.colors)) {
-    for (const [k, v] of Object.entries(src.colors)) if (typeof v === "string") named.set(k, v);
-  }
-  const ui =
-    src.ui && typeof src.ui === "object" && !Array.isArray(src.ui) ? flatten(src.ui) : new Map<string, string>();
-  const lookup = (key: string): string | null => {
-    const v = ui.get(key) ?? ui.get(`*.${key.slice(key.lastIndexOf(".") + 1)}`);
-    return v === undefined ? null : resolveColor(v, named);
-  };
-
-  const tokens: Record<string, string> = {};
-  for (const [token, keys] of Object.entries(UI_KEYS)) {
-    for (const key of keys) {
-      const color = lookup(key);
-      if (color) {
-        tokens[token] = color;
-        break;
-      }
-    }
-  }
-  const scheme = icls ? convertIcls(icls) : null;
-  const dark = typeof src.dark === "boolean" ? src.dark : (scheme?.dark ?? true);
-  // The editor surface sits on an island in OpenIDEA: keep it on the editor background.
-  if (scheme?.tokens["--bg-editor"] && !tokens["--bg-island"]) tokens["--bg-island"] = scheme.tokens["--bg-editor"];
-  return {
-    theme: { id: id ?? slug(name), name, kind: dark ? "dark" : "light", tokens },
-    scheme: scheme ? { name: scheme.name, tokens: scheme.tokens } : null,
-  };
-}
-
-/** `plugin.toml` for a converted theme. */
-export function pluginManifest(c: ConvertedTheme, author: string, sourceName: string): string {
-  const q = (s: string) => JSON.stringify(s);
-  return [
-    `# Converted from ${sourceName} by scripts/theme/import-intellij-theme.ts.`,
-    `id = ${q(`theme-${c.theme.id}`)}`,
-    `name = ${q(`${c.theme.name} Theme`)}`,
-    `version = "1.0.0"`,
-    `description = ${q(`${c.theme.name}, converted from an IntelliJ theme.`)}`,
-    `authors = [${q(author)}]`,
-    `openidea-api = "0.1"`,
-    "",
-    "[[contributes.themes]]",
-    `path = ${q(`themes/${c.theme.id}.theme.json`)}`,
-    ...(c.scheme ? [`editor-scheme = ${q(`themes/${c.theme.id}.scheme.json`)}`] : []),
-    "",
-  ].join("\n");
-}

scripts/theme/theme.test.ts

@@ -5,9 +5,10 @@ import {
   convertIntellijTheme,
   ICLS_ATTRIBUTES,
   ICLS_COLORS,
+  intellijThemePackage,
   pluginManifest,
   UI_KEYS,
-} from "./intellij.ts";
+} from "../../src/features/plugins/intellijTheme.ts";
 import { referenceMarkdown, stripJsonComments, themeTokenGroups, tokenSets, withReference } from "./tokens.ts";
 
 const read = (p: string) => readFileSync(p, "utf8");
@@ -129,7 +130,7 @@ describe("IntelliJ theme import", () => {
 </scheme>`;
 
   it("maps ui keys, named colours and wildcards", () => {
-    const { theme: t, scheme: s } = convertIntellijTheme(themeJson);
+    const { theme: t, scheme: s } = convertIntellijTheme(stripJsonComments(themeJson));
     expect(t).toMatchObject({ id: "deep-sea", name: "Deep Sea", kind: "dark" });
     expect(t.tokens["--bg-app"]).toBe("#101820"); // *.background → named colour
     expect(t.tokens["--accent"]).toBe("#33aaff");
@@ -172,12 +173,71 @@ describe("IntelliJ theme import", () => {
   });
 
   it("produces an installable package", () => {
-    const c = convertIntellijTheme(themeJson.replace('"dark": true,', ""), icls.replace("Darcula", "Default"), "sea");
+    const light = stripJsonComments(themeJson.replace('"dark": true,', ""));
+    const c = convertIntellijTheme(light, icls.replace("Darcula", "Default"), "sea");
     expect(c.theme.kind).toBe("light");
     expect(c.theme.id).toBe("sea");
     expect(c.theme.tokens["--bg-island"]).toBe("#101820"); // ToolWindow ← *.background wins over the editor
-    const toml = pluginManifest(c, "Someone", "DeepSea.theme.json");
+    const info = {
+      id: "theme-sea",
+      name: 'Sea "Deep"',
+      version: "1.0.0",
+      description: "a\\b\nc",
+      authors: ["Someone"],
+    };
+    const toml = pluginManifest(info, [c], "Converted from\nDeepSea.theme.json");
+    expect(toml).toContain("# Converted from DeepSea.theme.json\n");
     expect(toml).toContain('id = "theme-sea"');
+    expect(toml).toContain('name = "Sea \\"Deep\\""');
+    expect(toml).toContain('description = "a\\\\b\\u000ac"');
+    expect(toml).toContain('engines.openidea = "^1.0"');
     expect(toml).toContain('editor-scheme = "themes/sea.scheme.json"');
   });
+
+  it("turns a theme plugin into one package with all its themes", () => {
+    const deep = stripJsonComments(themeJson);
+    const pkg = intellijThemePackage({
+      name: "Deep Sea Themes",
+      pluginId: "com.example.DeepSea",
+      version: "2.3",
+      vendor: "Someone",
+      themes: [
+        { id: "deep-sea-id", theme: deep, editorScheme: icls },
+        { id: "copy-id", theme: deep, editorScheme: null },
+        { id: "light-id", theme: '{"name":"Shallow","dark":false}', editorScheme: null },
+      ],
+    });
+    expect(pkg.id).toBe("intellij.com-example-deepsea");
+    expect(pkg.themes).toEqual([
+      { id: "deep-sea", sourceId: "deep-sea-id", name: "Deep Sea" },
+      { id: "deep-sea-2", sourceId: "copy-id", name: "Deep Sea" },
+      { id: "shallow", sourceId: "light-id", name: "Shallow" },
+    ]);
+    expect(pkg.files.map((f) => f.path)).toEqual([
+      "plugin.toml",
+      "themes/deep-sea.theme.json",
+      "themes/deep-sea.scheme.json",
+      "themes/deep-sea-2.theme.json",
+      "themes/shallow.theme.json",
+    ]);
+    const manifest = pkg.files[0]!.text;
+    expect(manifest).toContain('version = "2.3.0"');
+    expect(manifest).toContain('authors = ["Someone"]');
+    expect(manifest.match(/\[\[contributes\.themes\]\]/g)).toHaveLength(3);
+    const shallow = JSON.parse(pkg.files[4]!.text) as { id: string; kind: string };
+    expect(shallow).toMatchObject({ id: "shallow", kind: "light" });
+    expect(
+      intellijThemePackage({
+        name: "X",
+        pluginId: null,
+        version: "SNAPSHOT",
+        vendor: null,
+        themes: [{ id: "x", theme: "{}", editorScheme: null }],
+      }).files[0]!.text,
+    ).toContain('version = "1.0.0"');
+    expect(() =>
+      intellijThemePackage({ name: "Empty", pluginId: null, version: null, vendor: null, themes: [] }),
+    ).toThrow();
+    expect(() => convertIntellijTheme("[1]")).toThrow("Not an IntelliJ theme");
+  });
 });